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

Commit f4744c68 authored by Aran Ink's avatar Aran Ink
Browse files

Remove GlobalActionsDialog values from FeatureFlagUtils. 

Merged-in: I5ca5e760d9a987c75a93c43783ad2b38728d48fc
Test: Automated tests pass. Manual testing shows GAD still works.
Fixes: 123397865
Fixes: 127644235

Change-Id: I0a8e285c96eea566ed1b19fa05e4143324f5937b
parent 0ef7b0d4

core/java/android/util/FeatureFlagUtils.java

+0 −6
Original line number Diff line number Diff line
@@ -37,10 +37,6 @@ public class FeatureFlagUtils { 
    public static final String SEAMLESS_TRANSFER = "settings_seamless_transfer";

    public static final String HEARING_AID_SETTINGS = "settings_bluetooth_hearing_aid";

    public static final String SCREENRECORD_LONG_PRESS = "settings_screenrecord_long_press";

    public static final String FORCE_GLOBAL_ACTIONS_GRID_ENABLED =

            "settings_global_actions_force_grid_enabled";

    public static final String GLOBAL_ACTIONS_PANEL_ENABLED =

            "settings_global_actions_panel_enabled";

    public static final String PIXEL_WALLPAPER_CATEGORY_SWITCH =

            "settings_pixel_wallpaper_category_switch";

    public static final String DYNAMIC_SYSTEM = "settings_dynamic_system";
@@ -57,8 +53,6 @@ public class FeatureFlagUtils { 
        DEFAULT_FLAGS.put(SEAMLESS_TRANSFER, "false");

        DEFAULT_FLAGS.put(HEARING_AID_SETTINGS, "false");

        DEFAULT_FLAGS.put(SCREENRECORD_LONG_PRESS, "false");

        DEFAULT_FLAGS.put(FORCE_GLOBAL_ACTIONS_GRID_ENABLED, "false");

        DEFAULT_FLAGS.put(GLOBAL_ACTIONS_PANEL_ENABLED, "true");

        DEFAULT_FLAGS.put(PIXEL_WALLPAPER_CATEGORY_SWITCH, "false");

        DEFAULT_FLAGS.put("settings_wifi_details_datausage_header", "false");

    }

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java

+1 −12
Original line number Diff line number Diff line
@@ -1549,9 +1549,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, 
        }



        private boolean shouldUsePanel() {

            return isPanelEnabled(mContext)

                    && mPanelController != null

                    && mPanelController.getPanelContent() != null;

            return mPanelController != null && mPanelController.getPanelContent() != null;

        }



        private void initializePanel() {
@@ -1814,15 +1812,6 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, 
        return isPanelDebugModeEnabled(context);

    }



    /**

     * Determines whether or not the Global Actions Panel should appear when the power button

     * is held.

     */

    private static boolean isPanelEnabled(Context context) {

        return FeatureFlagUtils.isEnabled(

                context, FeatureFlagUtils.GLOBAL_ACTIONS_PANEL_ENABLED);

    }



    /**

     * Determines whether the Global Actions menu should use a separated view for emergency actions.

     */