Merge "Remove lock icon from AOD" (69a83a3b) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeServiceHost.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -261,7 +261,6 @@ public final class DozeServiceHost implements DozeHost {
		mKeyguardViewMediator.setPulsing(pulsing);
		mNotificationPanel.setPulsing(pulsing);
		mVisualStabilityManager.setPulsing(pulsing);
		mLockscreenLockIconController.setPulsing(pulsing);
		mIgnoreTouchWhilePulsing = false;
		if (mKeyguardUpdateMonitor != null && passiveAuthInterrupt) {
		mKeyguardUpdateMonitor.onAuthInterruptDetected(pulsing /* active */);

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

+5 −8

Original line number	Diff line number	Diff line
		@@ -52,7 +52,6 @@ public class LockIcon extends KeyguardAffordanceView {
		private int mIconColor;
		private int mOldState;
		private int mState;
		private boolean mPulsing;
		private boolean mDozing;
		private boolean mKeyguardJustShown;
		private boolean mPredrawRegistered;
		@@ -134,9 +133,8 @@ public class LockIcon extends KeyguardAffordanceView {
		return false;
		}

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

		@@ -164,8 +162,7 @@ public class LockIcon extends KeyguardAffordanceView {

		private Drawable getIcon(int newState) {
		@LockAnimIndex final int lockAnimIndex =
		getAnimationIndexForTransition(mOldState, newState, mPulsing, mDozing,
		mKeyguardJustShown);
		getAnimationIndexForTransition(mOldState, newState, mDozing, mKeyguardJustShown);

		boolean isAnim = lockAnimIndex != -1;
		int iconRes = isAnim ? getThemedAnimationResId(lockAnimIndex) : getIconForState(newState);
		@@ -198,11 +195,11 @@ public class LockIcon extends KeyguardAffordanceView {
		return iconRes;
		}

		private static int getAnimationIndexForTransition(int oldState, int newState, boolean pulsing,
		boolean dozing, boolean keyguardJustShown) {
		private static int getAnimationIndexForTransition(int oldState, int newState, boolean dozing,
		boolean keyguardJustShown) {

		// Never animate when screen is off
		if (dozing && !pulsing) {
		if (dozing) {
		return -1;
		}

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

+4 −14

Original line number	Diff line number	Diff line
		@@ -76,7 +76,6 @@ public class LockscreenLockIconController {
		private boolean mKeyguardShowing;
		private boolean mKeyguardJustShown;
		private boolean mBlockUpdates;
		private boolean mPulsing;
		private boolean mDozing;
		private boolean mSimLocked;
		private boolean mTransientBiometricsError;
		@@ -375,14 +374,6 @@ public class LockscreenLockIconController {
		}
		}

		/**
		* Propagate {@link StatusBar} pulsing state.
		*/
		public void setPulsing(boolean pulsing) {
		mPulsing = pulsing;
		update();
		}

		/**
		* We need to hide the lock whenever there's a fingerprint unlock, otherwise you'll see the
		* icon on top of the black front scrim.
		@@ -461,7 +452,7 @@ public class LockscreenLockIconController {
		shouldUpdate = false;
		}
		if (shouldUpdate && mLockIcon != null) {
		mLockIcon.update(state, mPulsing, mDozing, mKeyguardJustShown);
		mLockIcon.update(state, mDozing, mKeyguardJustShown);
		}
		mLastState = state;
		mKeyguardJustShown = false;
		@@ -475,7 +466,7 @@ public class LockscreenLockIconController {
		return STATE_LOCK_OPEN;
		} else if (mTransientBiometricsError) {
		return STATE_BIOMETRICS_ERROR;
		} else if (mKeyguardUpdateMonitor.isFaceDetectionRunning() && !mPulsing) {
		} else if (mKeyguardUpdateMonitor.isFaceDetectionRunning()) {
		return STATE_SCANNING_FACE;
		} else {
		return STATE_LOCKED;
		@@ -502,9 +493,8 @@ public class LockscreenLockIconController {
		* @return true if the visibility changed
		*/
		private boolean updateIconVisibility() {
		boolean onAodNotPulsingOrDocked = mDozing && (!mPulsing \|\| mDocked);
		boolean invisible = onAodNotPulsingOrDocked \|\| mWakeAndUnlockRunning
		\|\| mShowingLaunchAffordance;
		boolean onAodOrDocked = mDozing \|\| mDocked;
		boolean invisible = onAodOrDocked \|\| mWakeAndUnlockRunning \|\| mShowingLaunchAffordance;
		if (mKeyguardBypassController.getBypassEnabled() && !mBouncerShowingScrimmed) {
		if ((mHeadsUpManagerPhone.isHeadsUpGoingAway()
		\|\| mHeadsUpManagerPhone.hasPinnedHeadsUp()