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

Commit 4e7bb3a1 authored by Riley Jones's avatar Riley Jones
Browse files

Cleanup of a11yMenuHideBeforeTakingAction 

Removes flag, assumes the behavior of when flag is enabled

Test: N/A
Flag: N/A
Bug: 292020123
Change-Id: Ied982ac12a1ec3b056afb9345ccef72fdfa45881
parent 851604f1

packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/AccessibilityMenuService.java

+9 −24
Original line number Diff line number Diff line
@@ -280,10 +280,8 @@ public class AccessibilityMenuService extends AccessibilityService 
            return;

        }



        if (Flags.a11yMenuHideBeforeTakingAction()) {

        // Hide the a11y menu UI before performing the following shortcut actions.

        mA11yMenuLayout.hideMenu();

        }



        if (viewTag == ShortcutId.ID_ASSISTANT_VALUE.ordinal()) {

            // Always restart the voice command activity, so that the UI is reloaded.
@@ -299,31 +297,18 @@ public class AccessibilityMenuService extends AccessibilityService 
        } else if (viewTag == ShortcutId.ID_RECENT_VALUE.ordinal()) {

            performGlobalActionInternal(GLOBAL_ACTION_RECENTS);

        } else if (viewTag == ShortcutId.ID_LOCKSCREEN_VALUE.ordinal()) {

            if (Flags.a11yMenuHideBeforeTakingAction()) {

            // Delay before locking the screen to give time for the UI to close.

            mHandler.postDelayed(

                    () -> performGlobalActionInternal(GLOBAL_ACTION_LOCK_SCREEN),

                    HIDE_UI_DELAY_MS);

            } else {

                performGlobalActionInternal(GLOBAL_ACTION_LOCK_SCREEN);

            }

        } else if (viewTag == ShortcutId.ID_QUICKSETTING_VALUE.ordinal()) {

            performGlobalActionInternal(GLOBAL_ACTION_QUICK_SETTINGS);

        } else if (viewTag == ShortcutId.ID_NOTIFICATION_VALUE.ordinal()) {

            performGlobalActionInternal(GLOBAL_ACTION_NOTIFICATIONS);

        } else if (viewTag == ShortcutId.ID_SCREENSHOT_VALUE.ordinal()) {

            if (Flags.a11yMenuHideBeforeTakingAction()) {

                // Delay before taking a screenshot to give time for the UI to close.

            mHandler.postDelayed(

                    () -> performGlobalActionInternal(GLOBAL_ACTION_TAKE_SCREENSHOT),

                    HIDE_UI_DELAY_MS);

            } else {

                performGlobalActionInternal(GLOBAL_ACTION_TAKE_SCREENSHOT);

            }

        }



        if (!Flags.a11yMenuHideBeforeTakingAction()) {

            mA11yMenuLayout.hideMenu();

        }

    }