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

Merge "Show swipe up to open message on faceAuth from AOD2" into sc-qpr1-dev am: 0efdcfc86b

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

Change-Id: I8375fb41fc967772ddb9f71b996be59a57e90333
This commit is contained in:
TreeHugger Robot
2021-09-17 13:33:17 +00:00
committed by Automerger Merge Worker
parent c042ee13fb 0efdcfc86b
commit 3967b4b8bd
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
View File

@@ -800,7 +800,9 @@ public class KeyguardIndicationController {
* Show message on the keyguard for how the user can unlock/enter their device. * Show message on the keyguard for how the user can unlock/enter their device.
*/ */
public void showActionToUnlock() { public void showActionToUnlock() {
if (mDozing) { if (mDozing
&& !mKeyguardUpdateMonitor.getUserCanSkipBouncer(
KeyguardUpdateMonitor.getCurrentUser())) {
return; return;
} }
@@ -811,7 +813,7 @@ public class KeyguardIndicationController {
String message = mContext.getString(R.string.keyguard_retry); String message = mContext.getString(R.string.keyguard_retry);
mStatusBarKeyguardViewManager.showBouncerMessage(message, mInitialTextColorState); mStatusBarKeyguardViewManager.showBouncerMessage(message, mInitialTextColorState);
} }
} else if (mKeyguardUpdateMonitor.isScreenOn()) { } else {
showTransientIndication(mContext.getString(R.string.keyguard_unlock), showTransientIndication(mContext.getString(R.string.keyguard_unlock),
false /* isError */, true /* hideOnScreenOff */); false /* isError */, true /* hideOnScreenOff */);
} }