drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Fix dodgy states of keyguard transport controls"" into klp-dev

Browse Source
This commit is contained in:
Jim Miller
2013-10-19 01:08:11 +00:00
committed by Android (Google) Code Review
parent 43e533dea9 4d20ed3f26
commit 42b7b6927c
2 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java
View File

@ -16,6 +16,10 @@
package com.android.keyguard;
import com.android.internal.widget.LockPatternUtils;
import com.android.keyguard.KeyguardSecurityModel.SecurityMode;
import com.android.keyguard.KeyguardUpdateMonitor.DisplayClientState;
import android.app.Activity;
import android.app.ActivityManager;
import android.app.ActivityOptions;
@ -51,9 +55,6 @@ import android.view.MotionEvent;
import android.view.View;
import android.view.WindowManager;
import android.widget.RemoteViews.OnClickHandler;
import com.android.internal.widget.LockPatternUtils;
import com.android.keyguard.KeyguardSecurityModel.SecurityMode;
import com.android.keyguard.KeyguardUpdateMonitor.DisplayClientState;
import java.io.File;
import java.lang.ref.WeakReference;
@ -279,7 +280,7 @@ public class KeyguardHostView extends KeyguardViewBase {
if (newState != mTransportState) {
mTransportState = newState;
if (DEBUGXPORT) Log.v(TAG, "update widget: transport state changed");
KeyguardHostView.this.postShowAppropriateWidgetPage();
KeyguardHostView.this.post(mSwitchPageRunnable);
}
}
@Override
@ -291,7 +292,7 @@ public class KeyguardHostView extends KeyguardViewBase {
if (newState != mTransportState) {
mTransportState = newState;
if (DEBUGXPORT) Log.v(TAG, "update widget: play state changed");
KeyguardHostView.this.postShowAppropriateWidgetPage();
KeyguardHostView.this.post(mSwitchPageRunnable);
}
}
}
@ -495,7 +496,6 @@ public class KeyguardHostView extends KeyguardViewBase {
@Override
protected void onDetachedFromWindow() {
super.onDetachedFromWindow();
removeCallbacks(mSwitchPageRunnable);
mAppWidgetHost.stopListening();
KeyguardUpdateMonitor.getInstance(mContext).removeCallback(mUpdateMonitorCallbacks);
}
@ -1438,7 +1438,7 @@ public class KeyguardHostView extends KeyguardViewBase {
mAppWidgetToShow = ss.appWidgetToShow;
setInsets(ss.insets);
if (DEBUG) Log.d(TAG, "onRestoreInstanceState, transport=" + mTransportState);
postShowAppropriateWidgetPage();
post(mSwitchPageRunnable);
}
@Override
@ -1471,22 +1471,13 @@ public class KeyguardHostView extends KeyguardViewBase {
}
}
void showAppropriateWidgetPage() {
private void showAppropriateWidgetPage() {
int state = mTransportState;
ensureTransportPresentOrRemoved(state);
if (mAppWidgetContainer.isLayoutRequested()) {
postShowAppropriateWidgetPage();
return;
}
int pageToShow = getAppropriateWidgetPage(state);
mAppWidgetContainer.setCurrentPage(pageToShow);
}
void postShowAppropriateWidgetPage() {
removeCallbacks(mSwitchPageRunnable);
post(mSwitchPageRunnable);
}
/**
* Examines the current state and adds the transport to the widget pager when the state changes.
*

1
packages/Keyguard/src/com/android/keyguard/KeyguardWidgetPager.java
View File

@ -40,6 +40,7 @@ import android.view.accessibility.AccessibilityManager;
import android.view.animation.DecelerateInterpolator;
import android.widget.FrameLayout;
import android.widget.TextClock;
import com.android.internal.widget.LockPatternUtils;
import java.util.ArrayList;