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

Commit 8780db61 authored by shaoweishen's avatar shaoweishen Committed by Automerger Merge Worker
Browse files

DO NOT MERGE: Downbranch merge conflict [Output Switcher] [A11y] Set title for... 

DO NOT MERGE: Downbranch merge conflict [Output Switcher] [A11y] Set title for dialog for a11y am: 3ef0800f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18349733



Change-Id: Ia67a0593072085c451fff20a791841c09080ef2c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 81ae67c2 3ef0800f

packages/SystemUI/res/values/strings.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -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] -->

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

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