From 679609721c4a7422ac3612dde69c9e2639ea6883 Mon Sep 17 00:00:00 2001 From: Beth Thibodeau Date: Tue, 25 Feb 2020 17:06:18 -0500 Subject: Turn on QS media player by default Test: manual; atest NotificationMediaTemplateViewWrapperTest Bug: 150285848 Change-Id: I1d692360f4f18b60ef34f2f18c9514a52ec88ea2 --- packages/SystemUI/src/com/android/systemui/util/Utils.java | 3 ++- .../row/wrapper/NotificationMediaTemplateViewWrapperTest.java | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/util/Utils.java b/packages/SystemUI/src/com/android/systemui/util/Utils.java index cfa2947eb862..5f821187e30c 100644 --- a/packages/SystemUI/src/com/android/systemui/util/Utils.java +++ b/packages/SystemUI/src/com/android/systemui/util/Utils.java @@ -126,9 +126,10 @@ 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 */ public static boolean useQsMediaPlayer(Context context) { - int flag = Settings.System.getInt(context.getContentResolver(), "qs_media_player", 0); + int flag = Settings.System.getInt(context.getContentResolver(), "qs_media_player", 1); return flag > 0; } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationMediaTemplateViewWrapperTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationMediaTemplateViewWrapperTest.java index 69e4f2205c35..18ea774e56f0 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationMediaTemplateViewWrapperTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationMediaTemplateViewWrapperTest.java @@ -25,6 +25,7 @@ import android.app.Notification; import android.media.MediaMetadata; import android.media.session.MediaSession; import android.media.session.PlaybackState; +import android.provider.Settings; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper.RunWithLooper; import android.view.View; @@ -66,6 +67,9 @@ public class NotificationMediaTemplateViewWrapperTest extends SysuiTestCase { allowTestableLooperAsMainThread(); mDependency.injectTestDependency(MetricsLogger.class, mMetricsLogger); + + // These tests are for regular media style notifications, not controls in quick settings + Settings.System.putInt(mContext.getContentResolver(), "qs_media_player", 0); } private void makeTestNotification(long duration, boolean allowSeeking) throws Exception { -- cgit v1.2.3-59-g8ed1b