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

Commit 0a12f381 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 28752b72 e482415e

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

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

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

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