Merge "Fix lock icon animation for bio-auth." into rvc-dev am: 24ec473937 (d340674c) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -1717,9 +1717,9 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
		resetKeyguardDonePendingLocked();
		}

		mUpdateMonitor.clearBiometricRecognized();

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

		handleHide();
		mUpdateMonitor.clearBiometricRecognized();
		Trace.endSection();
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -65,7 +65,6 @@ public class LockIcon extends KeyguardAffordanceView {
		mPredrawRegistered = false;

		int newState = mState;
		mOldState = mState;
		Drawable icon = getIcon(newState);
		setImageDrawable(icon, false);

		@@ -135,6 +134,7 @@ public class LockIcon extends KeyguardAffordanceView {
		}

		void update(int newState, boolean pulsing, boolean dozing, boolean keyguardJustShown) {
		mOldState = mState;
		mState = newState;
		mPulsing = pulsing;
		mDozing = dozing;

+4 −2

Original line number	Diff line number	Diff line
		@@ -470,8 +470,10 @@ public class LockscreenLockIconController {
		}

		private int getState() {
		if ((mKeyguardStateController.canDismissLockScreen() \|\| !mKeyguardShowing
		\|\| mKeyguardStateController.isKeyguardGoingAway()) && !mSimLocked) {
		if ((mKeyguardStateController.canDismissLockScreen()
		\|\| !mKeyguardStateController.isShowing()
		\|\| mKeyguardStateController.isKeyguardGoingAway()
		\|\| mKeyguardStateController.isKeyguardFadingAway()) && !mSimLocked) {
		return STATE_LOCK_OPEN;
		} else if (mTransientBiometricsError) {
		return STATE_BIOMETRICS_ERROR;