Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8533837d authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Remove obsolete state" into qt-r1-dev 

am: cee9ee34

Change-Id: I31d85a437146faa863c3e07936e7b32a38cd23fc
parents 88aa9a89 cee9ee34

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

+1 −27
Original line number Diff line number Diff line
@@ -66,8 +66,6 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange 
        StatusBarStateController.StateListener, ConfigurationController.ConfigurationListener,

        UnlockMethodCache.OnUnlockMethodChangedListener {



    private static final int FP_DRAW_OFF_TIMEOUT = 800;



    private static final int STATE_LOCKED = 0;

    private static final int STATE_LOCK_OPEN = 1;

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


    private int mLastState = 0;

    private boolean mTransientBiometricsError;

    private boolean mScreenOn;

    private boolean mLastScreenOn;

    private boolean mIsFaceUnlockState;

    private boolean mSimLocked;

    private int mDensity;
@@ -109,7 +105,6 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange 
                    update(false /* force */);

                }

            };

    private final Runnable mDrawOffTimeout = () -> update(true /* forceUpdate */);

    private final DockManager.DockEventListener mDockEventListener =

            new DockManager.DockEventListener() {

                @Override
@@ -125,18 +120,6 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange 


    private final KeyguardUpdateMonitorCallback mUpdateMonitorCallback =

            new KeyguardUpdateMonitorCallback() {

                @Override

                public void onScreenTurnedOn() {

                    mScreenOn = true;

                    update();

                }



                @Override

                public void onScreenTurnedOff() {

                    mScreenOn = false;

                    update();

                }



                @Override

                public void onSimStateChanged(int subId, int slotId,

                        IccCardConstants.State simState) {
@@ -249,8 +232,7 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange 
    public void update(boolean force) {

        int state = getState();

        mIsFaceUnlockState = state == STATE_SCANNING_FACE;

        if (state != mLastState || mLastDozing != mDozing || mLastPulsing != mPulsing

                || mLastScreenOn != mScreenOn || force) {

        if (state != mLastState || mLastDozing != mDozing || mLastPulsing != mPulsing || force) {

            @LockAnimIndex final int lockAnimIndex = getAnimationIndexForTransition(mLastState,

                    state, mLastPulsing, mPulsing, mLastDozing, mDozing);

            boolean isAnim = lockAnimIndex != -1;
@@ -289,15 +271,7 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange 
            }

            updateDarkTint();



            if (isAnim && !mLastScreenOn) {

                removeCallbacks(mDrawOffTimeout);

                postDelayed(mDrawOffTimeout, FP_DRAW_OFF_TIMEOUT);

            } else {

                removeCallbacks(mDrawOffTimeout);

            }



            mLastState = state;

            mLastScreenOn = mScreenOn;

            mLastDozing = mDozing;

            mLastPulsing = mPulsing;

        }