diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-06-07 20:40:33 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-06-07 20:40:33 +0000 |
commit | e752b75dadbae20ab28d6e75e342707288e09fd3 (patch) | |
tree | 70983514fe8f7e50aad4ce6b54d959496d69ea66 | |
parent | 0631de5772e2a2b87ba2d1dbbf77e6c825d38ad0 (diff) | |
parent | 52c21c8c345dd9846184a6db8374c35ce2798e3e (diff) | |
download | base-e752b75dadbae20ab28d6e75e342707288e09fd3.tar.gz |
Merge "Hide backdrop when waking up from fp" into pi-dev
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java | 13 | ||||
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java | 10 |
2 files changed, 17 insertions, 6 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java index 76860e62435a..f0b1a82cfc2f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java @@ -403,10 +403,19 @@ public class FingerprintUnlockController extends KeyguardUpdateMonitorCallback { pw.print(" mWakeLock="); pw.println(mWakeLock); } + /** + * Successful authentication with fingerprint that wakes up the device. + */ public boolean isWakeAndUnlock() { - return mMode == MODE_UNLOCK - || mMode == MODE_WAKE_AND_UNLOCK + return mMode == MODE_WAKE_AND_UNLOCK || mMode == MODE_WAKE_AND_UNLOCK_PULSING || mMode == MODE_WAKE_AND_UNLOCK_FROM_DREAM; } + + /** + * Successful authentication with fingerprint when the screen was either on or off. + */ + public boolean isFingerprintUnlock() { + return isWakeAndUnlock() || mMode == MODE_UNLOCK; + } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index c70f03405db3..7bbeed63fd98 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -1599,7 +1599,9 @@ public class StatusBar extends SystemUI implements DemoMode, return; // called too early } - if (mLaunchTransitionFadingAway) { + boolean wakeAndUnlock = mFingerprintUnlockController != null + && mFingerprintUnlockController.isWakeAndUnlock(); + if (mLaunchTransitionFadingAway || wakeAndUnlock) { mBackdrop.setVisibility(View.INVISIBLE); Trace.endSection(); return; @@ -4712,11 +4714,11 @@ public class StatusBar extends SystemUI implements DemoMode, // We don't want to end up in KEYGUARD state when we're unlocking with // fingerprint from doze. We should cross fade directly from black. - final boolean wakeAndUnlocking = mFingerprintUnlockController.getMode() - == FingerprintUnlockController.MODE_WAKE_AND_UNLOCK; + boolean wakeAndUnlocking = mFingerprintUnlockController.isWakeAndUnlock(); // Do not animate the scrim expansion when triggered by the fingerprint sensor. - mScrimController.setExpansionAffectsAlpha(!mFingerprintUnlockController.isWakeAndUnlock()); + mScrimController.setExpansionAffectsAlpha( + !mFingerprintUnlockController.isFingerprintUnlock()); if (mBouncerShowing) { // Bouncer needs the front scrim when it's on top of an activity, |