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

Commit 904bbc95 authored by Shaowei Shen's avatar Shaowei Shen Committed by Automerger Merge Worker
Browse files

Merge "[Output Switcher] Update stop button text" into tm-qpr-dev am: 0aadb77a 

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



Change-Id: I9381adf75db05dcb29667611faded8ef0bb4f1e9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a0617029 0aadb77a

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
@@ -117,7 +117,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
@@ -306,7 +306,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);