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

Commit c5865d6f authored by Phil Weaver's avatar Phil Weaver
Browse files

Change a11y shortcut default lockscreen behavior 

If the user hasn't chosen a preference, the shortcut
will not work on the lockscreen until the user agrees
to use the shortcut. After the user so agrees, the
shortcut will also work on the shortcut.

Bug: 70944865
Test: Adding a test for the new behavior
Change-Id: I41e1238fad43a4432cd341c6808e26ad6e155506
parent f157b9f9

core/java/com/android/internal/accessibility/AccessibilityShortcutController.java

+8 −1
Original line number Diff line number Diff line
@@ -143,6 +143,9 @@ public class AccessibilityShortcutController { 
        mContext.getContentResolver().registerContentObserver(

                Settings.Secure.getUriFor(Settings.Secure.ACCESSIBILITY_SHORTCUT_ON_LOCK_SCREEN),

                false, co, UserHandle.USER_ALL);

        mContext.getContentResolver().registerContentObserver(

                Settings.Secure.getUriFor(Settings.Secure.ACCESSIBILITY_SHORTCUT_DIALOG_SHOWN),

                false, co, UserHandle.USER_ALL);

        setCurrentUser(mUserId);

    }
@@ -168,8 +171,12 @@ public class AccessibilityShortcutController { 
        final ContentResolver cr = mContext.getContentResolver();

        final boolean enabled = Settings.Secure.getIntForUser(

                cr, Settings.Secure.ACCESSIBILITY_SHORTCUT_ENABLED, 1, mUserId) == 1;

        // Enable the shortcut from the lockscreen by default if the dialog has been shown

        final int dialogAlreadyShown = Settings.Secure.getIntForUser(

                cr, Settings.Secure.ACCESSIBILITY_SHORTCUT_DIALOG_SHOWN, 0, mUserId);

        mEnabledOnLockScreen = Settings.Secure.getIntForUser(

                cr, Settings.Secure.ACCESSIBILITY_SHORTCUT_ON_LOCK_SCREEN, 0, mUserId) == 1;

                cr, Settings.Secure.ACCESSIBILITY_SHORTCUT_ON_LOCK_SCREEN,

                dialogAlreadyShown, mUserId) == 1;

        mIsShortcutEnabled = enabled && haveValidService;

    }

core/tests/coretests/src/com/android/internal/accessibility/AccessibilityShortcutControllerTest.java

+14 −0
Original line number Diff line number Diff line
@@ -213,6 +213,20 @@ public class AccessibilityShortcutControllerTest { 
        assertTrue(getController().isAccessibilityShortcutAvailable(true));

    }



    @Test

    public void testShortcutAvailable_onLockScreenAndLockScreenPreferenceUnset() {

        // When the user hasn't specified a lock screen preference, we allow from the lock screen

        // as long as the user has agreed to enable the shortcut

        configureValidShortcutService();

        configureShortcutEnabled(ENABLED_INCLUDING_LOCK_SCREEN);

        Settings.Secure.putString(

                mContentResolver, ACCESSIBILITY_SHORTCUT_ON_LOCK_SCREEN, null);

        Settings.Secure.putInt(mContentResolver, ACCESSIBILITY_SHORTCUT_DIALOG_SHOWN, 0);

        assertFalse(getController().isAccessibilityShortcutAvailable(true));

        Settings.Secure.putInt(mContentResolver, ACCESSIBILITY_SHORTCUT_DIALOG_SHOWN, 1);

        assertTrue(getController().isAccessibilityShortcutAvailable(true));

    }



    @Test

    public void testShortcutAvailable_whenServiceIdBecomesNull_shouldReturnFalse() {

        configureShortcutEnabled(ENABLED_EXCEPT_LOCK_SCREEN);