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

Commit df857cf3 authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

Merge "Don't hide the alternate bouncer on keyguardReset" into tm-qpr-dev am:... 

Merge "Don't hide the alternate bouncer on keyguardReset" into tm-qpr-dev am: 3b62ab70 am: 345ae533 am: 4f4c3cef

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



Change-Id: I0455ea976d1985e01bf58ab4ac0929b422f3eeca
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5a04dab6 4f4c3cef

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

+3 −1
Original line number Diff line number Diff line
@@ -733,7 +733,9 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
            } else {

                showBouncerOrKeyguard(hideBouncerWhenShowing);

            }

            if (hideBouncerWhenShowing) {

                hideAlternateBouncer(false);

            }

            mKeyguardUpdateManager.sendKeyguardReset();

            updateStates();

        }

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

+26 −0
Original line number Diff line number Diff line
@@ -683,4 +683,30 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { 
        // the following call before registering centralSurfaces should NOT throw a NPE:

        mStatusBarKeyguardViewManager.hideAlternateBouncer(true);

    }



    @Test

    public void testResetHideBouncerWhenShowing_alternateBouncerHides() {

        // GIVEN the keyguard is showing

        reset(mAlternateBouncerInteractor);

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



        // WHEN SBKV is reset with hideBouncerWhenShowing=true

        mStatusBarKeyguardViewManager.reset(true);



        // THEN alternate bouncer is hidden

        verify(mAlternateBouncerInteractor).hide();

    }



    @Test

    public void testResetHideBouncerWhenShowingIsFalse_alternateBouncerHides() {

        // GIVEN the keyguard is showing

        reset(mAlternateBouncerInteractor);

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



        // WHEN SBKV is reset with hideBouncerWhenShowing=false

        mStatusBarKeyguardViewManager.reset(false);



        // THEN alternate bouncer is NOT hidden

        verify(mAlternateBouncerInteractor, never()).hide();

    }

}