Merge "Always show "Swipe up to open" on tapping empty space on LS" into sc-qpr1-dev am: 374929be06 am: f33bb45579

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

Change-Id: I86932b67901a6c304a8c3a8593c63e76d1ca2d5f
This commit is contained in:
Android Build Prod User
2021-08-27 03:58:08 +00:00
committed by Automerger Merge Worker

View File

@@ -811,13 +811,8 @@ public class KeyguardIndicationController {
mStatusBarKeyguardViewManager.showBouncerMessage(message, mInitialTextColorState);
}
} 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),
false /* isError */, true /* hideOnScreenOff */);
}
showTransientIndication(mContext.getString(R.string.keyguard_unlock),
false /* isError */, true /* hideOnScreenOff */);
}
}