am 42b7b692: Merge "Revert "Fix dodgy states of keyguard transport controls"" into klp-dev
* commit '42b7b6927cd31679691b216d1ba09be31c24206e':
Revert "Fix dodgy states of keyguard transport controls"
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java
index e94cf18..fdc06a6 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java
@@ -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.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 @@
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 @@
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 @@
@Override
protected void onDetachedFromWindow() {
super.onDetachedFromWindow();
- removeCallbacks(mSwitchPageRunnable);
mAppWidgetHost.stopListening();
KeyguardUpdateMonitor.getInstance(mContext).removeCallback(mUpdateMonitorCallbacks);
}
@@ -1438,7 +1438,7 @@
mAppWidgetToShow = ss.appWidgetToShow;
setInsets(ss.insets);
if (DEBUG) Log.d(TAG, "onRestoreInstanceState, transport=" + mTransportState);
- postShowAppropriateWidgetPage();
+ post(mSwitchPageRunnable);
}
@Override
@@ -1471,22 +1471,13 @@
}
}
- 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.
*
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardWidgetPager.java b/packages/Keyguard/src/com/android/keyguard/KeyguardWidgetPager.java
index e07e0d0..704af6e 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardWidgetPager.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardWidgetPager.java
@@ -40,6 +40,7 @@
import android.view.animation.DecelerateInterpolator;
import android.widget.FrameLayout;
import android.widget.TextClock;
+
import com.android.internal.widget.LockPatternUtils;
import java.util.ArrayList;