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

Commit 7e525568 authored by Aaron Liu's avatar Aaron Liu
Browse files

Make sim pin one handed enabled. 

Enable one handed mode for sim pin and sim puk.

Fixes: 273186564
Test: Open sim pin on foldable. View folded and unfolded screen.
Change-Id: I344e394b6c1fc90217233e047021e7d29212e827
parent ade3d74f

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

+8 −6
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.keyguard;



import static android.app.StatusBarManager.SESSION_KEYGUARD;



import static com.android.keyguard.KeyguardSecurityContainer.BOUNCER_DISMISS_BIOMETRIC;

import static com.android.keyguard.KeyguardSecurityContainer.BOUNCER_DISMISS_EXTENDED_ACCESS;

import static com.android.keyguard.KeyguardSecurityContainer.BOUNCER_DISMISS_NONE_SECURITY;
@@ -1058,12 +1057,15 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
     * one side).

     */

    private boolean canUseOneHandedBouncer() {

        if (!(mCurrentSecurityMode == SecurityMode.Pattern

                || mCurrentSecurityMode == SecurityMode.PIN)) {

        switch(mCurrentSecurityMode) {

            case PIN:

            case Pattern:

            case SimPin:

            case SimPuk:

                return getResources().getBoolean(R.bool.can_use_one_handed_bouncer);

            default:

                return false;

        }



        return getResources().getBoolean(R.bool.can_use_one_handed_bouncer);

    }



    private boolean canDisplayUserSwitcher() {

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

+30 −0
Original line number Diff line number Diff line
@@ -380,6 +380,36 @@ class KeyguardSecurityContainerControllerTest : SysuiTestCase() { 
            )

    }



    @Test

    fun showSecurityScreen_oneHandedMode_flagEnabled_oneHandedMode_simpin() {

        testableResources.addOverride(R.bool.can_use_one_handed_bouncer, true)

        setupGetSecurityView(SecurityMode.SimPin)

        verify(view)

            .initMode(

                eq(KeyguardSecurityContainer.MODE_ONE_HANDED),

                eq(globalSettings),

                eq(falsingManager),

                eq(userSwitcherController),

                any(),

                eq(falsingA11yDelegate)

            )

    }



    @Test

    fun showSecurityScreen_oneHandedMode_flagEnabled_oneHandedMode_simpuk() {

        testableResources.addOverride(R.bool.can_use_one_handed_bouncer, true)

        setupGetSecurityView(SecurityMode.SimPuk)

        verify(view)

            .initMode(

                eq(KeyguardSecurityContainer.MODE_ONE_HANDED),

                eq(globalSettings),

                eq(falsingManager),

                eq(userSwitcherController),

                any(),

                eq(falsingA11yDelegate)

            )

    }



    @Test

    fun showSecurityScreen_twoHandedMode_flagEnabled_noOneHandedMode() {

        testableResources.addOverride(R.bool.can_use_one_handed_bouncer, true)