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: I20c2195e7f94abf514490e5c441e1f9798d6b0b5
This commit is contained in:
TreeHugger Robot
2021-09-17 14:07:33 +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 */);
}
}