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

Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] [A11y] Set title for dialog for a11y" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-05-13 23:40:22 +00:00
committed by Android (Google) Code Review
parent 3e5894b2e8 3ef0800f3a
commit f823b9a196
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2279,6 +2279,8 @@
<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] --> <!-- Button text for stopping casting [CHAR LIMIT=60] -->
<string name="media_output_dialog_button_stop_casting">Stop casting</string> <string name="media_output_dialog_button_stop_casting">Stop casting</string>
<!-- Accessibility text describing purpose of media output dialog. [CHAR LIMIT=NONE] -->
<string name="media_output_dialog_accessibility_title">Available devices for audio output.</string>
<!-- Media Output Broadcast Dialog --> <!-- Media Output Broadcast Dialog -->
<!-- Title for Broadcast First Notify Dialog [CHAR LIMIT=60] --> <!-- Title for Broadcast First Notify Dialog [CHAR LIMIT=60] -->

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

@@ -227,9 +227,7 @@ public abstract class MediaOutputBaseDialog extends SystemUIDialog implements
lp.setFitInsetsIgnoringVisibility(true); lp.setFitInsetsIgnoringVisibility(true);
window.setAttributes(lp); window.setAttributes(lp);
window.setContentView(mDialogView); window.setContentView(mDialogView);
// Sets window to a blank string to avoid talkback announce app label first when pop up, window.setTitle(mContext.getString(R.string.media_output_dialog_accessibility_title));
// which doesn't make sense.
window.setTitle(EMPTY_TITLE);
mHeaderTitle = mDialogView.requireViewById(R.id.header_title); mHeaderTitle = mDialogView.requireViewById(R.id.header_title);
mHeaderSubtitle = mDialogView.requireViewById(R.id.header_subtitle); mHeaderSubtitle = mDialogView.requireViewById(R.id.header_subtitle);