Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "The stop string is media_output_dialog_button_stop_casting" into tm-dev

Browse Source
This commit is contained in:
Lucas Dupin
2022-05-05 04:56:02 +00:00
committed by Android (Google) Code Review
parent b09396142a 0426625408
commit 100004b0ca
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java
View File

@@ -449,7 +449,7 @@ public abstract class MediaOutputBaseDialog extends SystemUIDialog implements
abstract int getStopButtonVisibility(); abstract int getStopButtonVisibility();
public CharSequence getStopButtonText() { public CharSequence getStopButtonText() {
return mContext.getText(R.string.keyboard_key_media_stop); return mContext.getText(R.string.media_output_dialog_button_stop_casting);
} }
public void onStopButtonClick() { public void onStopButtonClick() {

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

@@ -104,7 +104,7 @@ public class MediaOutputDialog extends MediaOutputBaseDialog {
@Override @Override
public CharSequence getStopButtonText() { 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() if (isBroadcastSupported() && mMediaOutputController.isPlaying()
&& !mMediaOutputController.isBluetoothLeBroadcastEnabled()) { && !mMediaOutputController.isBluetoothLeBroadcastEnabled()) {
resId = R.string.media_output_broadcast; resId = R.string.media_output_broadcast;