Merge "Updating isShowing during onResume()" into jb-mr1-lockscreen-dev

Author: Danielle Millett

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

@@ -93,6 +93,7 @@ public void onPause() {
     @Override
     public void onResume() {
         if (DEBUG) Log.d(TAG, "onResume()");
+        mIsShowing = KeyguardUpdateMonitor.getInstance(mContext).isKeyguardVisible();
         maybeStartBiometricUnlock();
         KeyguardUpdateMonitor.getInstance(mContext).registerCallback(mUpdateCallback);
     }

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

@@ -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 @@ private void handleClockVisibilityChanged() {
      */
     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();