commit 3f5945539f9cab6c632bfec90e58742cde14cb94
author Aran Ink <nesciosquid@google.com> Mon May 13 14:29:35 2019 -0400
committer Aran Ink <nesciosquid@google.com> Mon May 13 14:29:35 2019 -0400
tree 819e6fccafc805bcab78e9a71beed98f12864863
parent 15b601425213887dde2cdbdd2641d0d9fd8259a1

Remove FeatureFlagUtils entries for Global Actions Dialog.

Test: Automated tests pass. GAD still displays correctly when holding down power button.

Bug: 123397865
Bug: 127644235
Change-Id: I5ca5e760d9a987c75a93c43783ad2b38728d48fc

core/java/android/util/FeatureFlagUtils.java

diff --git a/core/java/android/util/FeatureFlagUtils.java b/core/java/android/util/FeatureFlagUtils.java
index e3e837d..4af403f 100644
--- a/core/java/android/util/FeatureFlagUtils.java
+++ b/core/java/android/util/FeatureFlagUtils.java
@@ -37,10 +37,6 @@
     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 @@
         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

diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
index e87ff52..a098fee 100644
--- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
@@ -1542,9 +1542,7 @@
         }
 
         private boolean shouldUsePanel() {
-            return isPanelEnabled(mContext)
-                    && mPanelController != null
-                    && mPanelController.getPanelContent() != null;
+            return mPanelController != null && mPanelController.getPanelContent() != null;
         }
 
         private void initializePanel() {
@@ -1791,14 +1789,6 @@
         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.