Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename media control flag" into sc-dev am: 9fd619e7e4

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15151227

Change-Id: I1c56557d96a96d7c48cad1fbbdbbd902d911ba00
This commit is contained in:
Beth Thibodeau
2021-07-01 23:36:58 +00:00
committed by Automerger Merge Worker
parent 6dcc8a65a6 9fd619e7e4
commit 8da064040b
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/provider/Settings.java
View File

@@ -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

11
packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationSectionsFeatureManagerTest.kt
View File

@@ -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