diff options
3 files changed, 11 insertions, 2 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index b280c5d63cd7..fdf3afd00529 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -9688,6 +9688,13 @@ public final class Settings { "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. * diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index f5589d713bf7..be0a8640760f 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/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); diff --git a/packages/SystemUI/src/com/android/systemui/util/Utils.java b/packages/SystemUI/src/com/android/systemui/util/Utils.java index 5f821187e30c..6a9d9b6e3ff1 100644 --- a/packages/SystemUI/src/com/android/systemui/util/Utils.java +++ b/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; } } |