Skip to content

Commit 1108a2c

Browse files
author
Danielle Millett
committed
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
1 parent cfc3086 commit 1108a2c

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

core/java/com/android/internal/policy/IFaceLockInterface.aidl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ interface IFaceLockInterface {
2323
void startUi(IBinder containingWindowToken, int x, int y, int width, int height,
2424
boolean useLiveliness);
2525
void stopUi();
26+
void makeInvisible();
2627
void registerCallback(IFaceLockCallback cb);
2728
void unregisterCallback(IFaceLockCallback cb);
2829
}

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,14 @@ public boolean stop() {
151151
}
152152

153153
boolean mWasRunning = mIsRunning;
154+
try {
155+
if (mService != null) {
156+
mService.makeInvisible();
157+
}
158+
} catch (RemoteException e) {
159+
Log.e(TAG, "Caught exception making Face Unlock invisible: " + e.toString());
160+
}
161+
154162
stopUi();
155163

156164
if (mBoundToService) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public void onDetachedFromWindow() {
8585
public void onPause() {
8686
if (DEBUG) Log.d(TAG, "onPause()");
8787
if (mBiometricUnlock != null) {
88-
mBiometricUnlock.stopAndShowBackup();
88+
mBiometricUnlock.stop();
8989
}
9090
KeyguardUpdateMonitor.getInstance(mContext).removeCallback(mUpdateCallback);
9191
}

0 commit comments

Comments
 (0)