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

Merge "Don't show lock icon if face/udfps isn't enrolled" into sc-dev am: f6e8d81381

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

Change-Id: I9ed384c76d098df9a2df8a0eed879517f25c52c9
This commit is contained in:
Beverly Tai
2021-04-12 15:35:35 +00:00
committed by Automerger Merge Worker
parent 431ab32ffb f6e8d81381
commit 9ea3cf537b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
View File

@@ -199,14 +199,14 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
}
private void updateVisibility() {
if (!mIsKeyguardShowing) {
if (!mIsKeyguardShowing || (!mUdfpsEnrolled && !mFaceAuthEnrolled)) {
mView.setVisibility(View.INVISIBLE);
return;
}
// these three states are mutually exclusive:
mShowButton = mUdfpsEnrolled && !mCanDismissLockScreen && !mRunningFPS && isLockScreen();
mShowUnlockIcon = mCanDismissLockScreen && isLockScreen();
mShowUnlockIcon = mFaceAuthEnrolled & mCanDismissLockScreen && isLockScreen();
mShowLockIcon = !mUdfpsEnrolled && !mCanDismissLockScreen && isLockScreen()
&& mFaceAuthEnrolled;