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

This commit is contained in:
TreeHugger Robot
2021-09-17 13:53:46 +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() { private void showTryFingerprintMsg() {
if (mKeyguardUpdateMonitor.isUdfpsAvailable()) { if (mKeyguardUpdateMonitor.isUdfpsAvailable()) {