From 1108a2cb412b054cc9e4acc48182c46c45180c0c Mon Sep 17 00:00:00 2001
From: Danielle Millett <dmillett@google.com>
Date: Mon, 29 Oct 2012 22:16:32 -0400
Subject: [PATCH] Added a makeInvisible call to Face Unlock

This makes it so that the view is hidden immediately when
a call to stop is made.  This also changes the call in onPause to
only stop and not go to the backup because we still want Face Unlock
to show as the view is being dragged down.

Change-Id: I66d8fc24e82dc3a0155f7d59d8ced932cb584660
---
 core/java/com/android/internal/policy/IFaceLockInterface.aidl     | 1 +
 .../src/com/android/internal/policy/impl/keyguard/FaceUnlock.java | 8 ++++++++
 .../internal/policy/impl/keyguard/KeyguardFaceUnlockView.java     | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/core/java/com/android/internal/policy/IFaceLockInterface.aidl b/core/java/com/android/internal/policy/IFaceLockInterface.aidl
index 017801bbf886..a017722439d4 100644
--- a/core/java/com/android/internal/policy/IFaceLockInterface.aidl
+++ b/core/java/com/android/internal/policy/IFaceLockInterface.aidl
@@ -23,6 +23,7 @@ interface IFaceLockInterface {
     void startUi(IBinder containingWindowToken, int x, int y, int width, int height,
             boolean useLiveliness);
     void stopUi();
+    void makeInvisible();
     void registerCallback(IFaceLockCallback cb);
     void unregisterCallback(IFaceLockCallback cb);
 }
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/FaceUnlock.java b/policy/src/com/android/internal/policy/impl/keyguard/FaceUnlock.java
index 000acb19b902..cae598cc7d99 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/FaceUnlock.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/FaceUnlock.java
@@ -151,6 +151,14 @@ public class FaceUnlock implements BiometricSensorUnlock, Handler.Callback {
         }
 
         boolean mWasRunning = mIsRunning;
+        try {
+            if (mService != null) {
+                mService.makeInvisible();
+            }
+        } catch (RemoteException e) {
+            Log.e(TAG, "Caught exception making Face Unlock invisible: " + e.toString());
+        }
+
         stopUi();
 
         if (mBoundToService) {
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardFaceUnlockView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardFaceUnlockView.java
index e1160e066930..a88456849a45 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardFaceUnlockView.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardFaceUnlockView.java
@@ -85,7 +85,7 @@ public class KeyguardFaceUnlockView extends LinearLayout implements KeyguardSecu
     public void onPause() {
         if (DEBUG) Log.d(TAG, "onPause()");
         if (mBiometricUnlock != null) {
-            mBiometricUnlock.stopAndShowBackup();
+            mBiometricUnlock.stop();
         }
         KeyguardUpdateMonitor.getInstance(mContext).removeCallback(mUpdateCallback);
     }
-- 
2.11.0