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

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

Change-Id: I9e52ec8c638922f44a020eb9cb9593004ed3beaf
This commit is contained in:
TreeHugger Robot
2021-09-17 14:07:35 +00:00
committed by Automerger Merge Worker

View File

@@ -811,13 +811,8 @@ 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),
showTransientIndication(mContext.getString(R.string.keyguard_unlock_press), false /* isError */, true /* hideOnScreenOff */);
false /* isError */, true /* hideOnScreenOff */);
} else {
showTransientIndication(mContext.getString(R.string.keyguard_unlock),
false /* isError */, true /* hideOnScreenOff */);
}
} }
} }