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

Commit 7476e9dd authored by Aran Ink's avatar Aran Ink Committed by Android (Google) Code Review
Browse files

Merge "Remove FeatureFlagUtils entries for Global Actions Dialog."

parents 78b20680 3f594553

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 DYNAMIC_SYSTEM = "settings_dynamic_system";



    private static final Map<String, String> DEFAULT_FLAGS;
@@ -55,8 +51,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("settings_wifi_details_datausage_header", "false");

    }

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

+1 −11
Original line number Diff line number Diff line
@@ -1542,9 +1542,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() {
@@ -1791,14 +1789,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.