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

Merge "Show alt auth bouncer before input bouncer" into sc-dev am: 211d685267

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14549749

Change-Id: I47155e14e95ac4af8834d222d6e7612729b0894a
This commit is contained in:
TreeHugger Robot
2021-05-17 20:58:35 +00:00
committed by Automerger Merge Worker
parent 3702903288 211d685267
commit 6f8abf7e73
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3706,7 +3706,7 @@ public class StatusBar extends SystemUI implements DemoMode,
private void showBouncerIfKeyguard() {
if ((mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED)
&& !mKeyguardViewMediator.isHiding()) {
mStatusBarKeyguardViewManager.showBouncer(true /* scrimmed */);
mStatusBarKeyguardViewManager.showGenericBouncer(true /* scrimmed */);
}
}

22
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
View File

@@ -365,6 +365,26 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
return false;
}
/**
* If applicable, shows the alternate authentication bouncer. Else, shows the input
* (pin/password/pattern) bouncer.
* @param scrimmed true when the input bouncer should show scrimmed, false when the user will be
* dragging it and translation should be deferred {@see KeyguardBouncer#show(boolean, boolean)}
*/
public void showGenericBouncer(boolean scrimmed) {
if (mAlternateAuthInterceptor != null) {
if (mAlternateAuthInterceptor.showAlternateAuthBouncer()) {
mStatusBar.updateScrimController();
}
return;
}
showBouncer(scrimmed);
}
/**
* Hides the input bouncer (pin/password/pattern).
*/
@VisibleForTesting
void hideBouncer(boolean destroyView) {
if (mBouncer == null) {
@@ -380,7 +400,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
}
/**
* Shows the keyguard bouncer - the password challenge on the lock screen
* Shows the keyguard input bouncer - the password challenge on the lock screen
*
* @param scrimmed true when the bouncer should show scrimmed, false when the user will be
* dragging it and translation should be deferred {@see KeyguardBouncer#show(boolean, boolean)}