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

Commit ee47af62 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Turn on QS media player by default" into rvc-dev

parents 0a71d606 67960972

packages/SystemUI/src/com/android/systemui/util/Utils.java

+2 −1
Original line number Diff line number Diff line
@@ -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;

    }

}

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationMediaTemplateViewWrapperTest.java

+4 −0
Original line number Diff line number Diff line
@@ -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 {