Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8aa9cd13 authored by Beth Thibodeau's avatar Beth Thibodeau Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I940062728e2ca803dd8c609a9fd595112ac3f745
parents f0dbfd00 9fd619e7

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

































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



+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