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

Commit 3b9fbd2f authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

Merge "Fixed a bug with encryption where the keyguard was never shown with PIN" into mnc-dev

parents 749d66b8 edd32b88

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

+1 −2
Original line number Diff line number Diff line
@@ -622,9 +622,8 @@ public class KeyguardViewMediator extends SystemUI { 
        synchronized (this) {

            if (DEBUG) Log.d(TAG, "onSystemReady");

            mSystemReady = true;

            mUpdateMonitor.registerCallback(mUpdateCallback);



            doKeyguardLocked(null);

            mUpdateMonitor.registerCallback(mUpdateCallback);

        }

        // Most services aren't available until the system reaches the ready state, so we

        // send it here when the device first boots.

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

+1 −0
Original line number Diff line number Diff line
@@ -200,6 +200,7 @@ public class KeyguardBouncer { 
     * notifications on Keyguard, like SIM PIN/PUK.

     */

    public boolean needsFullscreenBouncer() {

        ensureView();

        if (mKeyguardView != null) {

            SecurityMode mode = mKeyguardView.getSecurityMode();

            return mode == SecurityMode.SimPin || mode == SecurityMode.SimPuk;

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

+13 −3
Original line number Diff line number Diff line
@@ -137,6 +137,12 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, 
        scheduleUpdate();

    }



    public void abortKeyguardFadingOut() {

        if (mAnimateKeyguardFadingOut) {

            endAnimateKeyguardFadingOut();

        }

    }



    public void animateGoingToFullShade(long delay, long duration) {

        mDurationOverride = duration;

        mAnimationDelay = delay;
@@ -321,17 +327,21 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, 
        mScrimBehind.getViewTreeObserver().removeOnPreDrawListener(this);

        mUpdatePending = false;

        updateScrims();

        mAnimateKeyguardFadingOut = false;

        mDurationOverride = -1;

        mAnimationDelay = 0;



        // Make sure that we always call the listener even if we didn't start an animation.

        endAnimateKeyguardFadingOut();

        mAnimationStarted = false;

        return true;

    }



    private void endAnimateKeyguardFadingOut() {

        mAnimateKeyguardFadingOut = false;

        if (!mAnimationStarted && mOnAnimationFinished != null) {

            mOnAnimationFinished.run();

            mOnAnimationFinished = null;

        }

        mAnimationStarted = false;

        return true;

    }



    public void setBackDropView(BackDropView backDropView) {

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

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ public class StatusBarKeyguardViewManager { 
    public void show(Bundle options) {

        mShowing = true;

        mStatusBarWindowManager.setKeyguardShowing(true);

        mScrimController.abortKeyguardFadingOut();

        reset();

    }