Merge "Move media setting to a constant, disabling it" into rvc-dev am: 2d8266cdc4 am: 926a823c27 am: 8aa59d2de4

Change-Id: Id7e789c19021b753f6e8720449b642d9206ff4f8

core/java/android/provider/Settings.java

@@ -9687,6 +9687,13 @@ public final class Settings {
         public static final String HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED =
                 "hdmi_control_auto_device_off_enabled";
 
+        /**
+         * Whether or not media is shown automatically when bypassing as a heads up.
+         * @hide
+         */
+        public static final String SHOW_MEDIA_ON_QUICK_SETTINGS =
+                "qs_media_player";
+
         /**
          * The interval in milliseconds at which location requests will be throttled when they are
          * coming from the background.

packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java

@@ -585,6 +585,7 @@ public class SettingsBackupTest {
                     Settings.Global.MODEM_STACK_ENABLED_FOR_SLOT,
                     Settings.Global.POWER_BUTTON_LONG_PRESS,
                     Settings.Global.POWER_BUTTON_VERY_LONG_PRESS,
+                    Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, // Temporary for R beta
                     Settings.Global.INTEGRITY_CHECK_INCLUDES_RULE_PROVIDER,
                     Settings.Global.ADVANCED_BATTERY_USAGE_AMOUNT);
 

packages/SystemUI/src/com/android/systemui/util/Utils.java

@@ -126,10 +126,11 @@ public class Utils {
 
     /**
      * Allow the media player to be shown in the QS area, controlled by 2 flags.
-     * On by default, but can be disabled by setting to 0
+     * Off by default, but can be disabled by setting to 0
      */
     public static boolean useQsMediaPlayer(Context context) {
-        int flag = Settings.System.getInt(context.getContentResolver(), "qs_media_player", 1);
+        int flag = Settings.Global.getInt(context.getContentResolver(),
+                Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, 0);
         return flag > 0;
     }
 }