Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I0d288c09eb716d852222f37d477429f4d1f8a399
This commit is contained in:
Android Build Prod User
2021-08-27 04:19:57 +00:00
committed by Automerger Merge Worker
parent 05701b8eb5 cf6c71d0ad
commit a03e6d14a9
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
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 */);
}
}