From f1c196b4044c775a54961a91b1dda8e32a59d028 Mon Sep 17 00:00:00 2001 From: shaoweishen Date: Mon, 26 Sep 2022 08:18:01 +0000 Subject: [PATCH] [Output Switcher] Sync stop text with qpr branch Text for Stop button already been updated at qpr branch, sync change at master. Bug: 248605781 Test: atest MediaOutputAdapterTest MediaOutputControllerTest MediaOutputBaseDialogTest MediaOutputDialogTest Change-Id: I7bcac5d353ad3adb958d8688bc4aeb1fa508e8b3 --- .../android/systemui/media/dialog/MediaOutputBaseDialog.java | 2 +- .../com/android/systemui/media/dialog/MediaOutputDialog.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java index b5166899dafa5..a9e1a4d325d2d 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java @@ -516,7 +516,7 @@ public abstract class MediaOutputBaseDialog extends SystemUIDialog implements abstract int getStopButtonVisibility(); public CharSequence getStopButtonText() { - return mContext.getText(R.string.media_output_dialog_button_stop_casting); + return mContext.getText(R.string.keyboard_key_media_stop); } public void onStopButtonClick() { diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialog.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialog.java index cb6f5a78ec302..fbd0079f8dc0d 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialog.java +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialog.java @@ -108,7 +108,7 @@ public class MediaOutputDialog extends MediaOutputBaseDialog { @Override public CharSequence getStopButtonText() { - int resId = R.string.media_output_dialog_button_stop_casting; + int resId = R.string.keyboard_key_media_stop; if (isBroadcastSupported() && mMediaOutputController.isPlaying() && !mMediaOutputController.isBluetoothLeBroadcastEnabled()) { resId = R.string.media_output_broadcast;