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

Commit 4287511c authored by Aaron Liu's avatar Aaron Liu Committed by Android (Google) Code Review
Browse files

Merge changes I344e394b,Icd964a7d into main 

* changes:
  Make sim pin one handed enabled.
  Set setMessage after user activity.
parents d4c91e12 7e525568

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/src/com/android/keyguard/KeyguardSimPinViewController.java

+2 −2
Original line number Diff line number Diff line
@@ -141,10 +141,10 @@ public class KeyguardSimPinViewController 
        // GSM 02.17 version 5.0.1, Section 5.6 PIN Management

        if ((entry.length() < 4) || (entry.length() > 8)) {

            // otherwise, display a message to the user, and don't submit.

            mMessageAreaController.setMessage(

                    com.android.systemui.R.string.kg_invalid_sim_pin_hint);

            mView.resetPasswordText(true /* animate */, true /* announce */);

            getKeyguardSecurityCallback().userActivity();

            mMessageAreaController.setMessage(

                    com.android.systemui.R.string.kg_invalid_sim_pin_hint);

            return;

        }

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)