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

Commit dfb0b752 authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge "SIM - Resume view controller" into tm-dev am: 00638802 

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



Change-Id: Ia6f2d5a25a7b1f0374954d6a11fc7c9ed2992687
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ec7e43f6 00638802

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

+4 −0
Original line number Diff line number Diff line
@@ -188,6 +188,10 @@ public class KeyguardBouncer { 
            }



            if (mContainer.getVisibility() == View.VISIBLE || mShowingSoon) {

                // Calls to reset must resume the ViewControllers when in fullscreen mode

                if (needsFullscreenBouncer()) {

                    mKeyguardViewController.onResume();

                }

                return;

            }

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

+15 −0
Original line number Diff line number Diff line
@@ -475,4 +475,19 @@ public class KeyguardBouncerTest extends SysuiTestCase { 
        mBouncer.setExpansion(bouncerHideAmount);

        verify(callback, never()).onExpansionChanged(bouncerHideAmount);

    }



    @Test

    public void testOnResumeCalledForFullscreenBouncerOnSecondShow() {

        // GIVEN a security mode which requires fullscreen bouncer

        when(mKeyguardSecurityModel.getSecurityMode(anyInt()))

                .thenReturn(KeyguardSecurityModel.SecurityMode.SimPin);

        mBouncer.show(true);



        // WHEN a second call to show occurs, the bouncer will already by visible

        reset(mKeyguardHostViewController);

        mBouncer.show(true);



        // THEN ensure the ViewController is told to resume

        verify(mKeyguardHostViewController).onResume();

    }

}