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

Commit 9639e4c2 authored by Hawkwood Glazier's avatar Hawkwood Glazier Committed by Automerger Merge Worker
Browse files

Merge "Fix missing KeyguardStatusView after cancelling fps login" into tm-qpr-dev am: 196dc4a6 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20966486



Change-Id: I381ca717256c37ecd602905471d5489cb0af7a0e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 62e5fd57 196dc4a6

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

+3 −0
Original line number Diff line number Diff line
@@ -3773,6 +3773,9 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
            });

        } else if (mDozing && !unlocking) {

            mScrimController.transitionTo(ScrimState.AOD);

            // This will cancel the keyguardFadingAway animation if it is running. We need to do

            // this as otherwise it can remain pending and leave keyguard in a weird state.

            mUnlockScrimCallback.onCancelled();

        } else if (mKeyguardStateController.isShowing() && !isOccluded() && !unlocking) {

            mScrimController.transitionTo(ScrimState.KEYGUARD);

        } else if (mKeyguardStateController.isShowing() && mKeyguardUpdateMonitor.isDreaming()

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java

+12 −0
Original line number Diff line number Diff line
@@ -1009,6 +1009,18 @@ public class CentralSurfacesImplTest extends SysuiTestCase { 
        verify(mScrimController).transitionTo(eq(ScrimState.KEYGUARD));

    }



    @Test

    public void testSetDozingNotUnlocking_transitionToAOD_cancelKeyguardFadingAway() {

        setDozing(true);

        when(mKeyguardStateController.isShowing()).thenReturn(false);

        when(mKeyguardStateController.isKeyguardFadingAway()).thenReturn(true);



        mCentralSurfaces.updateScrimController();



        verify(mScrimController, times(2)).transitionTo(eq(ScrimState.AOD));

        verify(mStatusBarKeyguardViewManager).onKeyguardFadedAway();

    }



    @Test

    public void testShowKeyguardImplementation_setsState() {

        when(mLockscreenUserManager.getCurrentProfiles()).thenReturn(new SparseArray<>());