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

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

Merge "[Output Switcher] Upadte text string" into tm-dev

parents f6169105 ee66a6d0
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@
            style="@style/Widget.Dialog.Button.BorderButton"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="@string/keyboard_key_media_stop"
            android:text="@string/media_output_dialog_button_stop_casting"
            android:visibility="gone"/>

        <Space
+2 −0
Original line number Diff line number Diff line
@@ -2226,6 +2226,8 @@
    <string name="media_output_dialog_launch_app_text">To cast this session, please open the app.</string>
    <!-- App name when can't get app name [CHAR LIMIT=60] -->
    <string name="media_output_dialog_unknown_launch_app_name">Unknown app</string>
    <!-- Button text for stopping casting [CHAR LIMIT=60] -->
    <string name="media_output_dialog_button_stop_casting">Stop casting</string>


    <!-- Label for clip data when copying the build number off QS [CHAR LIMIT=NONE]-->
+1 −3
Original line number Diff line number Diff line
@@ -211,10 +211,8 @@ public abstract class MediaOutputBaseDialog extends SystemUIDialog implements
                ColorFilter buttonColorFilter = new PorterDuffColorFilter(
                        mAdapter.getController().getColorButtonBackground(),
                        PorterDuff.Mode.SRC_IN);
                ColorFilter onlineButtonColorFilter = new PorterDuffColorFilter(
                        mAdapter.getController().getColorInactiveItem(), PorterDuff.Mode.SRC_IN);
                mDoneButton.getBackground().setColorFilter(buttonColorFilter);
                mStopButton.getBackground().setColorFilter(onlineButtonColorFilter);
                mStopButton.getBackground().setColorFilter(buttonColorFilter);
            }
            mHeaderIcon.setVisibility(View.VISIBLE);
            mHeaderIcon.setImageIcon(icon);