summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author shaoweishen <shaoweishen@google.com> 2022-05-13 23:55:52 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-05-13 23:55:52 +0000
commit2a100cdcc97a90e873a55bba6c9a7a4a4d23a85b (patch)
tree89eb89ab077f59d8150edb4c0bb787d3edd72925
parent843431d91997a875f94e2208d3030f3fe2e9a25e (diff)
parent3ef0800f3a78ad4da1431a30ae73497292ca774a (diff)
DO NOT MERGE: Downbranch merge conflict [Output Switcher] [A11y] Set title for dialog for a11y am: 3ef0800f3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18349733 Change-Id: I5edf5c91be727b50aeffdb4f6f905d9793bb4d0d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--packages/SystemUI/res/values/strings.xml2
-rw-r--r--packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index 269820d5e622..d3711bcfca5a 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -2292,6 +2292,8 @@
<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>
+ <!-- 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 -->
<!-- Title for Broadcast First Notify Dialog [CHAR LIMIT=60] -->
diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java
index 7e2610f8b135..e9c00ef01e2a 100644
--- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java
@@ -227,9 +227,7 @@ public abstract class MediaOutputBaseDialog extends SystemUIDialog implements
lp.setFitInsetsIgnoringVisibility(true);
window.setAttributes(lp);
window.setContentView(mDialogView);
- // Sets window to a blank string to avoid talkback announce app label first when pop up,
- // which doesn't make sense.
- window.setTitle(EMPTY_TITLE);
+ window.setTitle(mContext.getString(R.string.media_output_dialog_accessibility_title));
mHeaderTitle = mDialogView.requireViewById(R.id.header_title);
mHeaderSubtitle = mDialogView.requireViewById(R.id.header_subtitle);