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

Merge "Fix lock icon animation for bio-auth." into rvc-dev am: 24ec473937 am: 1d2aaf2b26

Browse Source 
Change-Id: I510cec2b12772998a7b8bceaeb2a6f5ddb3cc113
This commit is contained in:
TreeHugger Robot
2020-04-27 20:38:56 +00:00
committed by Automerger Merge Worker
parent 67b6bb0b54 1d2aaf2b26
commit 3667a9a02d
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
View File

@@ -1717,9 +1717,9 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
resetKeyguardDonePendingLocked(); resetKeyguardDonePendingLocked();
} }
mUpdateMonitor.clearBiometricRecognized();
if (mGoingToSleep) { if (mGoingToSleep) {
mUpdateMonitor.clearBiometricRecognized();
Log.i(TAG, "Device is going to sleep, aborting keyguardDone"); Log.i(TAG, "Device is going to sleep, aborting keyguardDone");
return; return;
} }
@@ -1740,6 +1740,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
} }
handleHide(); handleHide();
mUpdateMonitor.clearBiometricRecognized();
Trace.endSection(); Trace.endSection();
} }

2
packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java
View File

@@ -65,7 +65,6 @@ public class LockIcon extends KeyguardAffordanceView {
mPredrawRegistered = false; mPredrawRegistered = false;
int newState = mState; int newState = mState;
mOldState = mState;
Drawable icon = getIcon(newState); Drawable icon = getIcon(newState);
setImageDrawable(icon, false); setImageDrawable(icon, false);
@@ -135,6 +134,7 @@ public class LockIcon extends KeyguardAffordanceView {
} }
void update(int newState, boolean pulsing, boolean dozing, boolean keyguardJustShown) { void update(int newState, boolean pulsing, boolean dozing, boolean keyguardJustShown) {
mOldState = mState;
mState = newState; mState = newState;
mPulsing = pulsing; mPulsing = pulsing;
mDozing = dozing; mDozing = dozing;

6
packages/SystemUI/src/com/android/systemui/statusbar/phone/LockscreenLockIconController.java
View File

@@ -470,8 +470,10 @@ public class LockscreenLockIconController {
} }
private int getState() { private int getState() {
if ((mKeyguardStateController.canDismissLockScreen() || !mKeyguardShowing if ((mKeyguardStateController.canDismissLockScreen()
|| mKeyguardStateController.isKeyguardGoingAway()) && !mSimLocked) { || !mKeyguardStateController.isShowing()
|| mKeyguardStateController.isKeyguardGoingAway()
|| mKeyguardStateController.isKeyguardFadingAway()) && !mSimLocked) {
return STATE_LOCK_OPEN; return STATE_LOCK_OPEN;
} else if (mTransientBiometricsError) { } else if (mTransientBiometricsError) {
return STATE_BIOMETRICS_ERROR; return STATE_BIOMETRICS_ERROR;