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

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

Merge "[Output Switcher] Sync stop text with qpr branch"

parents 35ae828f f1c196b4

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

+1 −1
Original line number Diff line number Diff line
@@ -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() {

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.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;