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

Commit 197fea12 authored by Daniel Norman's avatar Daniel Norman Committed by Android (Google) Code Review
Browse files

Merge "Roll out bugfix enable_hardware_shortcut_disables_warning" into main

parents cc9c7f85 3e31c23a

services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java

+5 −7
Original line number Diff line number Diff line
@@ -4503,13 +4503,11 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
        }

        if (shortcutType == HARDWARE) {

            skipVolumeShortcutDialogTimeoutRestriction(userId);

            if (com.android.server.accessibility.Flags.enableHardwareShortcutDisablesWarning()) {

            persistIntToSetting(

                    userId,

                    Settings.Secure.ACCESSIBILITY_SHORTCUT_DIALOG_SHOWN,

                    AccessibilityShortcutController.DialogStatus.SHOWN

            );

            }

        } else if (shortcutType == SOFTWARE) {

            // Update the A11y FAB size to large when the Magnification shortcut is

            // enabled and the user hasn't changed the floating button size

services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java

+0 −1
Original line number Diff line number Diff line
@@ -1136,7 +1136,6 @@ public class AccessibilityManagerServiceTest { 
    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_HARDWARE_SHORTCUT_DISABLES_WARNING)

    public void enableHardwareShortcutsForTargets_shortcutDialogSetting_isShown() {

        // TODO(b/111889696): Remove the user 0 assumption once we support multi-user

        assumeTrue("The test is setup to run as a user 0",