Merge "Always show "Swipe up to open" on tapping empty space on LS" into sc-qpr1-dev

This commit is contained in:
Android Build Prod User
2021-08-26 23:08:28 +00:00
committed by Android (Google) Code Review

View File

@@ -811,15 +811,10 @@ public class KeyguardIndicationController {
mStatusBarKeyguardViewManager.showBouncerMessage(message, mInitialTextColorState); mStatusBarKeyguardViewManager.showBouncerMessage(message, mInitialTextColorState);
} }
} else if (mKeyguardUpdateMonitor.isScreenOn()) { } else if (mKeyguardUpdateMonitor.isScreenOn()) {
if (mKeyguardUpdateMonitor.isUdfpsAvailable()) {
showTransientIndication(mContext.getString(R.string.keyguard_unlock_press),
false /* isError */, true /* hideOnScreenOff */);
} else {
showTransientIndication(mContext.getString(R.string.keyguard_unlock), showTransientIndication(mContext.getString(R.string.keyguard_unlock),
false /* isError */, true /* hideOnScreenOff */); false /* isError */, true /* hideOnScreenOff */);
} }
} }
}
private void showTryFingerprintMsg(String a11yString) { private void showTryFingerprintMsg(String a11yString) {
if (mKeyguardUpdateMonitor.isUdfpsAvailable()) { if (mKeyguardUpdateMonitor.isUdfpsAvailable()) {