Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Hide backdrop when waking up from fp" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-06-07 20:40:33 +00:00
committed by Android (Google) Code Review
parent 0631de5772 52c21c8c34
commit e752b75dad
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java
View File

@@ -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;
}
}

10
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
View File

@@ -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,