Merge "Rename media control flag" into sc-dev (9fd619e7) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -11005,7 +11005,7 @@ public final class Settings {
		*/
		@Readable
		public static final String SHOW_MEDIA_ON_QUICK_SETTINGS =
		"qs_media_player";
		"qs_media_controls";

		/**
		* The interval in milliseconds at which location requests will be throttled when they are

+6 −5

Original line number	Diff line number	Diff line
		@@ -44,15 +44,16 @@ class NotificationSectionsFeatureManagerTest : SysuiTestCase() {
		public fun setup() {
		manager = NotificationSectionsFeatureManager(proxyFake, mContext)
		manager!!.clearCache()
		originalQsMediaPlayer = Settings.System.getInt(context.getContentResolver(),
		"qs_media_player", 1)
		Settings.Global.putInt(context.getContentResolver(), "qs_media_player", 0)
		originalQsMediaPlayer = Settings.Global.getInt(context.getContentResolver(),
		Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, 1)
		Settings.Global.putInt(context.getContentResolver(),
		Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, 0)
		}

		@After
		public fun teardown() {
		Settings.Global.putInt(context.getContentResolver(), "qs_media_player",
		originalQsMediaPlayer)
		Settings.Global.putInt(context.getContentResolver(),
		Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, originalQsMediaPlayer)
		}

		@Test