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

Commit 0aadb77a authored by Shaowei Shen's avatar Shaowei Shen Committed by Android (Google) Code Review
Browse files

Merge "[Output Switcher] Update stop button text" into tm-qpr-dev

parents 3020d252 ac3cf468

packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java

+6 −3
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.bluetooth.BluetoothAdapter; 
import android.bluetooth.BluetoothDevice;

import android.content.Context;

import android.graphics.drawable.Drawable;

import android.media.AudioDeviceAttributes;

import android.media.AudioManager;

import android.media.RoutingSessionInfo;

import android.os.Build;
@@ -592,9 +593,11 @@ public class LocalMediaManager implements BluetoothCallback { 
        }



        private boolean isMutingExpectedDevice(CachedBluetoothDevice cachedDevice) {

            return mAudioManager.getMutingExpectedDevice() != null

                    && cachedDevice.getAddress().equals(

                    mAudioManager.getMutingExpectedDevice().getAddress());

            AudioDeviceAttributes mutingExpectedDevice = mAudioManager.getMutingExpectedDevice();

            if (mutingExpectedDevice == null || cachedDevice == null) {

                return false;

            }

            return cachedDevice.getAddress().equals(mutingExpectedDevice.getAddress());

        }



        private List<MediaDevice> buildDisconnectedBluetoothDevice() {

packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialog.java

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ public class MediaOutputDialog extends MediaOutputBaseDialog { 


    @Override

    public CharSequence getStopButtonText() {

        int resId = R.string.keyboard_key_media_stop;

        int resId = R.string.media_output_dialog_button_stop_casting;

        if (isBroadcastSupported() && mMediaOutputController.isPlaying()

                && !mMediaOutputController.isBluetoothLeBroadcastEnabled()) {

            resId = R.string.media_output_broadcast;

packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputDialogTest.java

+2 −1
Original line number Diff line number Diff line
@@ -247,7 +247,8 @@ public class MediaOutputDialogTest extends SysuiTestCase { 


    @Test

    public void getStopButtonText_notSupportsBroadcast_returnsDefaultText() {

        String stopText = mContext.getText(R.string.keyboard_key_media_stop).toString();

        String stopText = mContext.getText(

                R.string.media_output_dialog_button_stop_casting).toString();

        MediaOutputController mockMediaOutputController = mock(MediaOutputController.class);

        when(mockMediaOutputController.isBroadcastSupported()).thenReturn(false);