Merge "Updating isShowing during onResume()" into jb-mr1-lockscreen-dev (080471e4) · Commits · e / os / android_frameworks_base

policy/src/com/android/internal/policy/impl/keyguard/KeyguardFaceUnlockView.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -93,6 +93,7 @@ public class KeyguardFaceUnlockView extends LinearLayout implements KeyguardSecu
		@Override
		public void onResume() {
		if (DEBUG) Log.d(TAG, "onResume()");
		mIsShowing = KeyguardUpdateMonitor.getInstance(mContext).isKeyguardVisible();
		maybeStartBiometricUnlock();
		KeyguardUpdateMonitor.getInstance(mContext).registerCallback(mUpdateCallback);
		}

+8 −1

Original line number	Diff line number	Diff line
		@@ -92,6 +92,7 @@ public class KeyguardUpdateMonitor {
		private CharSequence mTelephonySpn;
		private int mRingMode;
		private int mPhoneState;
		private boolean mKeyguardIsVisible;

		// Device provisioning state
		private boolean mDeviceProvisioned;
		@@ -566,14 +567,20 @@ public class KeyguardUpdateMonitor {
		*/
		private void handleKeyguardVisibilityChanged(int showing) {
		if (DEBUG) Log.d(TAG, "handleKeyguardVisibilityChanged(" + showing + ")");
		boolean isShowing = (showing == 1);
		mKeyguardIsVisible = isShowing;
		for (int i = 0; i < mCallbacks.size(); i++) {
		KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();
		if (cb != null) {
		cb.onKeyguardVisibilityChanged(showing == 1);
		cb.onKeyguardVisibilityChanged(isShowing);
		}
		}
		}

		public boolean isKeyguardVisible() {
		return mKeyguardIsVisible;
		}

		private static boolean isBatteryUpdateInteresting(BatteryStatus old, BatteryStatus current) {
		final boolean nowPluggedIn = current.isPluggedIn();
		final boolean wasPluggedIn = old.isPluggedIn();