Merge "Remove obsolete state" into qt-r1-dev (cee9ee34) · Commits · e / os / android_frameworks_base

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

+1 −27

Original line number	Original line	Diff line number	Diff line
	@@ -66,8 +66,6 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange
	StatusBarStateController.StateListener, ConfigurationController.ConfigurationListener,		StatusBarStateController.StateListener, ConfigurationController.ConfigurationListener,
	UnlockMethodCache.OnUnlockMethodChangedListener {		UnlockMethodCache.OnUnlockMethodChangedListener {

	private static final int FP_DRAW_OFF_TIMEOUT = 800;

	private static final int STATE_LOCKED = 0;		private static final int STATE_LOCKED = 0;
	private static final int STATE_LOCK_OPEN = 1;		private static final int STATE_LOCK_OPEN = 1;
	private static final int STATE_SCANNING_FACE = 2;		private static final int STATE_SCANNING_FACE = 2;
	@@ -83,8 +81,6 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange

	private int mLastState = 0;		private int mLastState = 0;
	private boolean mTransientBiometricsError;		private boolean mTransientBiometricsError;
	private boolean mScreenOn;
	private boolean mLastScreenOn;
	private boolean mIsFaceUnlockState;		private boolean mIsFaceUnlockState;
	private boolean mSimLocked;		private boolean mSimLocked;
	private int mDensity;		private int mDensity;
	@@ -109,7 +105,6 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange
	update(false /* force */);		update(false /* force */);
	}		}
	};		};
	private final Runnable mDrawOffTimeout = () -> update(true /* forceUpdate */);
	private final DockManager.DockEventListener mDockEventListener =		private final DockManager.DockEventListener mDockEventListener =
	new DockManager.DockEventListener() {		new DockManager.DockEventListener() {
	@Override		@Override
	@@ -125,18 +120,6 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange

	private final KeyguardUpdateMonitorCallback mUpdateMonitorCallback =		private final KeyguardUpdateMonitorCallback mUpdateMonitorCallback =
	new KeyguardUpdateMonitorCallback() {		new KeyguardUpdateMonitorCallback() {
	@Override
	public void onScreenTurnedOn() {
	mScreenOn = true;
	update();
	}

	@Override
	public void onScreenTurnedOff() {
	mScreenOn = false;
	update();
	}

	@Override		@Override
	public void onSimStateChanged(int subId, int slotId,		public void onSimStateChanged(int subId, int slotId,
	IccCardConstants.State simState) {		IccCardConstants.State simState) {
	@@ -249,8 +232,7 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange
	public void update(boolean force) {		public void update(boolean force) {
	int state = getState();		int state = getState();
	mIsFaceUnlockState = state == STATE_SCANNING_FACE;		mIsFaceUnlockState = state == STATE_SCANNING_FACE;
	if (state != mLastState \|\| mLastDozing != mDozing \|\| mLastPulsing != mPulsing		if (state != mLastState \|\| mLastDozing != mDozing \|\| mLastPulsing != mPulsing \|\| force) {
	\|\| mLastScreenOn != mScreenOn \|\| force) {
	@LockAnimIndex final int lockAnimIndex = getAnimationIndexForTransition(mLastState,		@LockAnimIndex final int lockAnimIndex = getAnimationIndexForTransition(mLastState,
	state, mLastPulsing, mPulsing, mLastDozing, mDozing);		state, mLastPulsing, mPulsing, mLastDozing, mDozing);
	boolean isAnim = lockAnimIndex != -1;		boolean isAnim = lockAnimIndex != -1;
	@@ -289,15 +271,7 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange
	}		}
	updateDarkTint();		updateDarkTint();

	if (isAnim && !mLastScreenOn) {
	removeCallbacks(mDrawOffTimeout);
	postDelayed(mDrawOffTimeout, FP_DRAW_OFF_TIMEOUT);
	} else {
	removeCallbacks(mDrawOffTimeout);
	}

	mLastState = state;		mLastState = state;
	mLastScreenOn = mScreenOn;
	mLastDozing = mDozing;		mLastDozing = mDozing;
	mLastPulsing = mPulsing;		mLastPulsing = mPulsing;
	}		}