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

Commit 081a7f7f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update face unlocked string when a11y is enabled" into tm-qpr-dev

parents 18dfc2fb 616ec5ec

packages/SystemUI/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -802,6 +802,8 @@ 
    <!-- Message shown when lock screen is unlocked (ie: by trust agent) and the user taps the empty space on the lock screen and UDFPS is supported. Provides extra instructions for how the user can enter their device [CHAR LIMIT=60] -->

    <string name="keyguard_unlock_press">Press the unlock icon to open</string>



    <!-- Message shown when non-bypass face authentication succeeds. Provides extra instructions for how the user can enter their device [CHAR LIMIT=60] -->

    <string name="keyguard_face_successful_unlock_swipe">Unlocked by face. Swipe up to open.</string>

    <!-- Message shown when non-bypass face authentication succeeds and UDFPS is supported. Provides extra instructions for how the user can enter their device [CHAR LIMIT=60] -->

    <string name="keyguard_face_successful_unlock_press">Unlocked by face. Press the unlock icon to open.</string>

    <!-- Message shown when non-bypass face authentication succeeds and UDFPS is supported. Provides extra instructions for how the user can enter their device [CHAR LIMIT=60] -->

packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java

+29 −9
Original line number Diff line number Diff line
@@ -900,16 +900,36 @@ public class KeyguardIndicationController { 
                mStatusBarKeyguardViewManager.showBouncerMessage(message, mInitialTextColorState);

            }

        } else {

            if (!mAccessibilityManager.isEnabled()

                    && !mAccessibilityManager.isTouchExplorationEnabled()

                    && mKeyguardUpdateMonitor.isUdfpsSupported()

                    && mKeyguardUpdateMonitor.getUserCanSkipBouncer(

                    KeyguardUpdateMonitor.getCurrentUser())) {

                final int stringId = mKeyguardUpdateMonitor.getIsFaceAuthenticated()

                        ? R.string.keyguard_face_successful_unlock_press

                        : R.string.keyguard_unlock_press;

                showBiometricMessage(mContext.getString(stringId));

            final boolean canSkipBouncer = mKeyguardUpdateMonitor.getUserCanSkipBouncer(

                    KeyguardUpdateMonitor.getCurrentUser());

            if (canSkipBouncer) {

                final boolean faceAuthenticated = mKeyguardUpdateMonitor.getIsFaceAuthenticated();

                final boolean udfpsSupported = mKeyguardUpdateMonitor.isUdfpsSupported();

                final boolean a11yEnabled = mAccessibilityManager.isEnabled()

                        || mAccessibilityManager.isTouchExplorationEnabled();

                if (udfpsSupported && faceAuthenticated) { // co-ex

                    if (a11yEnabled) {

                        showBiometricMessage(mContext.getString(

                                R.string.keyguard_face_successful_unlock_swipe));

                    } else {

                        showBiometricMessage(mContext.getString(

                                R.string.keyguard_face_successful_unlock_press));

                    }

                } else if (faceAuthenticated) { // face-only

                    showBiometricMessage(mContext.getString(

                            R.string.keyguard_face_successful_unlock_swipe));

                } else if (udfpsSupported) { // udfps-only

                    if (a11yEnabled) {

                        showBiometricMessage(mContext.getString(R.string.keyguard_unlock));

                    } else {

                        showBiometricMessage(mContext.getString(

                                R.string.keyguard_unlock_press));

                    }

                } else { // no security or unlocked by a trust agent

                    showBiometricMessage(mContext.getString(R.string.keyguard_unlock));

                }

            } else {

                // suggest swiping up for the primary authentication bouncer

                showBiometricMessage(mContext.getString(R.string.keyguard_unlock));

            }

        }

packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java

+130 −23
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import static com.android.systemui.keyguard.KeyguardIndicationRotateTextViewCont 
import static com.android.systemui.keyguard.KeyguardIndicationRotateTextViewController.INDICATION_TYPE_TRANSIENT;

import static com.android.systemui.keyguard.KeyguardIndicationRotateTextViewController.INDICATION_TYPE_TRUST;

import static com.android.systemui.keyguard.KeyguardIndicationRotateTextViewController.INDICATION_TYPE_USER_LOCKED;

import static com.android.systemui.keyguard.ScreenLifecycle.SCREEN_ON;



import static com.google.common.truth.Truth.assertThat;
@@ -212,7 +213,7 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase { 
                R.string.do_financed_disclosure_with_name, ORGANIZATION_NAME);



        when(mKeyguardUpdateMonitor.isUnlockingWithBiometricAllowed(anyBoolean())).thenReturn(true);

        when(mScreenLifecycle.getScreenState()).thenReturn(ScreenLifecycle.SCREEN_ON);

        when(mScreenLifecycle.getScreenState()).thenReturn(SCREEN_ON);

        when(mKeyguardUpdateMonitor.isUserUnlocked(anyInt())).thenReturn(true);



        when(mIndicationArea.findViewById(R.id.keyguard_indication_text_bottom))
@@ -954,64 +955,170 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase { 
    }



    @Test

    public void nonBypassFaceSuccess_touchExplorationEnabled_showsSwipeToOpen() {

        // GIVEN non bypass face auth and touch exploration is enabled

        when(mKeyguardBypassController.canBypass()).thenReturn(false);

        when(mAccessibilityManager.isTouchExplorationEnabled()).thenReturn(true);

    public void coEx_faceSuccess_showsPressToOpen() {

        // GIVEN bouncer isn't showing, can skip bouncer, udfps is supported, no a11y enabled

        when(mStatusBarKeyguardViewManager.isBouncerShowing()).thenReturn(false);

        when(mKeyguardUpdateMonitor.getUserCanSkipBouncer(KeyguardUpdateMonitor.getCurrentUser()))

                .thenReturn(true);

        when(mKeyguardUpdateMonitor.isUdfpsSupported()).thenReturn(true);

        when(mAccessibilityManager.isEnabled()).thenReturn(false);

        when(mAccessibilityManager.isTouchExplorationEnabled()).thenReturn(false);

        createController();

        mController.setVisible(true);



        // WHEN face auth succeeds

        when(mKeyguardUpdateMonitor.getIsFaceAuthenticated()).thenReturn(true);

        mController.getKeyguardCallback().onBiometricAuthenticated(0,

                BiometricSourceType.FACE, false);



        // THEN 'face unlocked. press unlock icon to open' message shows

        String pressToOpen = mContext.getString(R.string.keyguard_face_successful_unlock_press);

        verifyIndicationMessage(INDICATION_TYPE_BIOMETRIC_MESSAGE, pressToOpen);



        assertThat(mTextView.getText()).isNotEqualTo(pressToOpen);

    }





    @Test

    public void coEx_faceSuccess_touchExplorationEnabled_showsFaceUnlockedSwipeToOpen() {

        // GIVEN bouncer isn't showing, can skip bouncer, udfps is supported, a11y enabled

        when(mStatusBarKeyguardViewManager.isBouncerShowing()).thenReturn(false);

        when(mKeyguardUpdateMonitor.getUserCanSkipBouncer(KeyguardUpdateMonitor.getCurrentUser()))

                .thenReturn(true);

        when(mKeyguardUpdateMonitor.isUdfpsSupported()).thenReturn(true);

        when(mAccessibilityManager.isEnabled()).thenReturn(true);

        when(mAccessibilityManager.isTouchExplorationEnabled()).thenReturn(true);

        createController();

        String swipeToOpen = mContext.getString(R.string.keyguard_unlock);

        mController.setVisible(true);



        // WHEN face authenticated

        when(mKeyguardUpdateMonitor.getIsFaceAuthenticated()).thenReturn(true);

        mController.getKeyguardCallback().onBiometricAuthenticated(0,

                BiometricSourceType.FACE, false);



        // THEN show 'swipe up to open' message

        verifyIndicationMessage(INDICATION_TYPE_BIOMETRIC_MESSAGE, swipeToOpen);

        // THEN show 'face unlocked. swipe up to open' message

        String faceUnlockedSwipeToOpen =

                mContext.getString(R.string.keyguard_face_successful_unlock_swipe);

        verifyIndicationMessage(INDICATION_TYPE_BIOMETRIC_MESSAGE, faceUnlockedSwipeToOpen);

    }



    @Test

    public void nonBypassFaceSuccess_a11yEnabled_showsSwipeToOpen() {

        // GIVEN non bypass face auth and a11y is enabled

        when(mKeyguardBypassController.canBypass()).thenReturn(false);

    public void coEx_faceSuccess_a11yEnabled_showsFaceUnlockedSwipeToOpen() {

        // GIVEN bouncer isn't showing, can skip bouncer, udfps is supported, a11y is enabled

        when(mStatusBarKeyguardViewManager.isBouncerShowing()).thenReturn(false);

        when(mKeyguardUpdateMonitor.getUserCanSkipBouncer(KeyguardUpdateMonitor.getCurrentUser()))

                .thenReturn(true);

        when(mKeyguardUpdateMonitor.isUdfpsSupported()).thenReturn(true);

        when(mAccessibilityManager.isEnabled()).thenReturn(true);

        createController();

        mController.setVisible(true);



        // WHEN face auth is successful

        when(mKeyguardUpdateMonitor.getIsFaceAuthenticated()).thenReturn(true);

        mController.getKeyguardCallback().onBiometricAuthenticated(0,

                BiometricSourceType.FACE, false);



        // THEN show 'swipe up to open' message

        String faceUnlockedSwipeToOpen =

                mContext.getString(R.string.keyguard_face_successful_unlock_swipe);

        verifyIndicationMessage(INDICATION_TYPE_BIOMETRIC_MESSAGE, faceUnlockedSwipeToOpen);

    }



    @Test

    public void faceOnly_faceSuccess_showsFaceUnlockedSwipeToOpen() {

        // GIVEN bouncer isn't showing, can skip bouncer, no udfps supported

        when(mStatusBarKeyguardViewManager.isBouncerShowing()).thenReturn(false);

        when(mKeyguardUpdateMonitor.getUserCanSkipBouncer(KeyguardUpdateMonitor.getCurrentUser()))

                .thenReturn(true);

        when(mKeyguardUpdateMonitor.isUdfpsSupported()).thenReturn(false);

        createController();

        String swipeToOpen = mContext.getString(R.string.keyguard_unlock);

        mController.setVisible(true);



        // WHEN face auth is successful

        when(mKeyguardUpdateMonitor.getIsFaceAuthenticated()).thenReturn(true);

        mController.getKeyguardCallback().onBiometricAuthenticated(0,

                BiometricSourceType.FACE, false);



        // THEN show 'swipe up to open' message

        String faceUnlockedSwipeToOpen =

                mContext.getString(R.string.keyguard_face_successful_unlock_swipe);

        verifyIndicationMessage(INDICATION_TYPE_BIOMETRIC_MESSAGE, faceUnlockedSwipeToOpen);

    }



    @Test

    public void udfpsOnly_a11yEnabled_showsSwipeToOpen() {

        // GIVEN bouncer isn't showing, can skip bouncer, udfps is supported, a11y is enabled

        when(mStatusBarKeyguardViewManager.isBouncerShowing()).thenReturn(false);

        when(mKeyguardUpdateMonitor.getUserCanSkipBouncer(KeyguardUpdateMonitor.getCurrentUser()))

                .thenReturn(true);

        when(mKeyguardUpdateMonitor.isUdfpsSupported()).thenReturn(true);

        when(mAccessibilityManager.isEnabled()).thenReturn(true);

        when(mAccessibilityManager.isTouchExplorationEnabled()).thenReturn(true);

        createController();

        mController.setVisible(true);



        // WHEN showActionToUnlock

        mController.showActionToUnlock();



        // THEN show 'swipe up to open' message

        String swipeToOpen = mContext.getString(R.string.keyguard_unlock);

        verifyIndicationMessage(INDICATION_TYPE_BIOMETRIC_MESSAGE, swipeToOpen);

    }



    @Test

    public void coEx_nonBypassFaceSuccess_showsPressLockIcon() {

        // GIVEN udfps is supported, non-bypass face auth, and no a11y enabled

    public void udfpsOnly_showsPressToOpen() {

        // GIVEN bouncer isn't showing, udfps is supported, a11y is NOT enabled, can skip bouncer

        when(mStatusBarKeyguardViewManager.isBouncerShowing()).thenReturn(false);

        when(mKeyguardUpdateMonitor.getUserCanSkipBouncer(KeyguardUpdateMonitor.getCurrentUser()))

                .thenReturn(true);

        when(mKeyguardUpdateMonitor.isUdfpsSupported()).thenReturn(true);

        when(mKeyguardBypassController.canBypass()).thenReturn(false);

        when(mKeyguardUpdateMonitor.getIsFaceAuthenticated()).thenReturn(true);

        when(mAccessibilityManager.isEnabled()).thenReturn(false);

        when(mAccessibilityManager.isTouchExplorationEnabled()).thenReturn(false);

        createController();

        mController.setVisible(true);



        // WHEN showActionToUnlock

        mController.showActionToUnlock();



        // THEN show 'press unlock icon to open' message

        String pressToOpen = mContext.getString(R.string.keyguard_unlock_press);

        verifyIndicationMessage(INDICATION_TYPE_BIOMETRIC_MESSAGE, pressToOpen);

    }



    @Test

    public void canSkipBouncer_noSecurity_showSwipeToUnlockHint() {

        // GIVEN bouncer isn't showing, can skip bouncer, no security (udfps isn't supported,

        // face wasn't authenticated)

        when(mStatusBarKeyguardViewManager.isBouncerShowing()).thenReturn(false);

        when(mKeyguardUpdateMonitor.getUserCanSkipBouncer(KeyguardUpdateMonitor.getCurrentUser()))

                .thenReturn(true);

        when(mKeyguardUpdateMonitor.isUdfpsSupported()).thenReturn(false);

        createController();

        mController.setVisible(true);



        // WHEN face auth succeeds

        mController.getKeyguardCallback().onBiometricAuthenticated(0,

                BiometricSourceType.FACE, false);

        // WHEN showActionToUnlock

        mController.showActionToUnlock();



        // THEN press unlock icon to open message shows

        String pressLockIcon = mContext.getString(R.string.keyguard_face_successful_unlock_press);

        verifyIndicationMessage(INDICATION_TYPE_BIOMETRIC_MESSAGE, pressLockIcon);

        // THEN show 'swipe up to open' message

        String swipeToOpen = mContext.getString(R.string.keyguard_unlock);

        verifyIndicationMessage(INDICATION_TYPE_BIOMETRIC_MESSAGE, swipeToOpen);

    }



        assertThat(mTextView.getText()).isNotEqualTo(pressLockIcon);

    @Test

    public void cannotSkipBouncer_showSwipeToUnlockHint() {

        // GIVEN bouncer isn't showing and cannot skip bouncer

        when(mStatusBarKeyguardViewManager.isBouncerShowing()).thenReturn(false);

        when(mKeyguardUpdateMonitor.getUserCanSkipBouncer(KeyguardUpdateMonitor.getCurrentUser()))

                .thenReturn(false);

        createController();

        mController.setVisible(true);



        // WHEN showActionToUnlock

        mController.showActionToUnlock();



        // THEN show 'swipe up to open' message

        String swipeToOpen = mContext.getString(R.string.keyguard_unlock);

        verifyIndicationMessage(INDICATION_TYPE_BIOMETRIC_MESSAGE, swipeToOpen);

    }



    private void sendUpdateDisclosureBroadcast() {