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

Commit 0f470a64 authored by Nicolò Mazzucato's avatar Nicolò Mazzucato Committed by Automerger Merge Worker
Browse files

Merge "Fix sidefps not visible after home-control longpress" into tm-qpr-dev... 

Merge "Fix sidefps not visible after home-control longpress" into tm-qpr-dev am: f1840aed am: 2245012e

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



Change-Id: I1de2a4df082b2290f7e8f2e26feb899aad3ea1ad
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a169eaf8 2245012e

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java

+1 −0
Original line number Diff line number Diff line
@@ -418,6 +418,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
            SysUiStatsLog.write(SysUiStatsLog.KEYGUARD_BOUNCER_STATE_CHANGED, state);



            getCurrentSecurityController().onResume(reason);

            updateSideFpsVisibility();

        }

        mView.onResume(

                mSecurityModel.getSecurityMode(KeyguardUpdateMonitor.getCurrentUser()),

packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java

+27 −0
Original line number Diff line number Diff line
@@ -386,6 +386,33 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase { 
        verify(mSidefpsController, never()).show();

    }



    @Test

    public void onResume_sideFpsHintShouldBeShown_sideFpsHintShown() {

        setupGetSecurityView();

        setupConditionsToEnableSideFpsHint();

        mKeyguardSecurityContainerController.onBouncerVisibilityChanged(View.VISIBLE);

        reset(mSidefpsController);



        mKeyguardSecurityContainerController.onResume(0);



        verify(mSidefpsController).show();

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

    }



    @Test

    public void onResume_sideFpsHintShouldNotBeShown_sideFpsHintHidden() {

        setupGetSecurityView();

        setupConditionsToEnableSideFpsHint();

        setSideFpsHintEnabledFromResources(false);

        mKeyguardSecurityContainerController.onBouncerVisibilityChanged(View.VISIBLE);

        reset(mSidefpsController);



        mKeyguardSecurityContainerController.onResume(0);



        verify(mSidefpsController).hide();

        verify(mSidefpsController, never()).show();

    }



    @Test

    public void showNextSecurityScreenOrFinish_setsSecurityScreenToPinAfterSimPinUnlock() {

        // GIVEN the current security method is SimPin