Merge "Fix Global Actions animations, and use old power menu when panel is disabled...

diff --cc core/java/android/util/FeatureFlagUtils.java
index 5d33b49,6db4bf3..336c2e5
--- 1/core/java/android/util/FeatureFlagUtils.java
--- 2/core/java/android/util/FeatureFlagUtils.java
+++ b/core/java/android/util/FeatureFlagUtils.java
@@@ -38,10 -38,10 +38,11 @@@ public class FeatureFlagUtils 
      public static final String HEARING_AID_SETTINGS = "settings_bluetooth_hearing_aid";
      public static final String SAFETY_HUB = "settings_safety_hub";
      public static final String SCREENRECORD_LONG_PRESS = "settings_screenrecord_long_press";
-     public static final String GLOBAL_ACTIONS_GRID_ENABLED = "settings_global_actions_grid_enabled";
+     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;
  
@@@ -53,12 -53,12 +54,12 @@@
          DEFAULT_FLAGS.put("settings_slice_injection", "true");
          DEFAULT_FLAGS.put("settings_systemui_theme", "true");
          DEFAULT_FLAGS.put("settings_mainline_module", "true");
 -        DEFAULT_FLAGS.put("settings_dynamic_system", "false");
 +        DEFAULT_FLAGS.put(DYNAMIC_SYSTEM, "false");
          DEFAULT_FLAGS.put(SEAMLESS_TRANSFER, "false");
          DEFAULT_FLAGS.put(HEARING_AID_SETTINGS, "false");
 -        DEFAULT_FLAGS.put(SAFETY_HUB, "false");
 +        DEFAULT_FLAGS.put(SAFETY_HUB, "true");
          DEFAULT_FLAGS.put(SCREENRECORD_LONG_PRESS, "false");
-         DEFAULT_FLAGS.put(GLOBAL_ACTIONS_GRID_ENABLED, "true");
+         DEFAULT_FLAGS.put(FORCE_GLOBAL_ACTIONS_GRID_ENABLED, "false");
          DEFAULT_FLAGS.put(GLOBAL_ACTIONS_PANEL_ENABLED, "true");
          DEFAULT_FLAGS.put("settings_wifi_details_saved_screen", "true");
          DEFAULT_FLAGS.put("settings_wifi_details_datausage_header", "false");