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

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

Browse Source
This commit is contained in:
Shaowei Shen
2022-03-04 17:06:02 +00:00
committed by Android (Google) Code Review
parent f61691052e ee66a6d0d2
commit 5a3319de81
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/layout/media_output_dialog.xml
View File

@@ -129,7 +129,7 @@
style="@style/Widget.Dialog.Button.BorderButton" style="@style/Widget.Dialog.Button.BorderButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="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"/> android:visibility="gone"/>
<Space <Space

2
packages/SystemUI/res/values/strings.xml
View File

@@ -2226,6 +2226,8 @@
<string name="media_output_dialog_launch_app_text">To cast this session, please open the app.</string> <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] --> <!-- App name when can't get app name [CHAR LIMIT=60] -->
<string name="media_output_dialog_unknown_launch_app_name">Unknown app</string> <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]--> <!-- Label for clip data when copying the build number off QS [CHAR LIMIT=NONE]-->

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

@@ -211,10 +211,8 @@ public abstract class MediaOutputBaseDialog extends SystemUIDialog implements
ColorFilter buttonColorFilter = new PorterDuffColorFilter( ColorFilter buttonColorFilter = new PorterDuffColorFilter(
mAdapter.getController().getColorButtonBackground(), mAdapter.getController().getColorButtonBackground(),
PorterDuff.Mode.SRC_IN); PorterDuff.Mode.SRC_IN);
ColorFilter onlineButtonColorFilter = new PorterDuffColorFilter(
mAdapter.getController().getColorInactiveItem(), PorterDuff.Mode.SRC_IN);
mDoneButton.getBackground().setColorFilter(buttonColorFilter); mDoneButton.getBackground().setColorFilter(buttonColorFilter);
mStopButton.getBackground().setColorFilter(onlineButtonColorFilter); mStopButton.getBackground().setColorFilter(buttonColorFilter);
} }
mHeaderIcon.setVisibility(View.VISIBLE); mHeaderIcon.setVisibility(View.VISIBLE);
mHeaderIcon.setImageIcon(icon); mHeaderIcon.setImageIcon(icon);