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

Commit e397435f authored by Yalan Yiue's avatar Yalan Yiue Committed by Android (Google) Code Review
Browse files

Merge "Talkback read unlocked split shade as QS" into tm-qpr-dev

parents 7da32f64 77cac05f

packages/SystemUI/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -479,6 +479,8 @@ 
    <string name="accessibility_desc_notification_shade">Notification shade.</string>

    <!-- Content description for the quick settings panel (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_desc_quick_settings">Quick settings.</string>

    <!-- Content description for the split notification shade that also includes QS (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_desc_qs_notification_shade">Quick settings and Notification shade.</string>

    <!-- Content description for the lock screen (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_desc_lock_screen">Lock screen.</string>

    <!-- Content description for the work profile lock screen. This prevents work profile apps from being used, but personal apps can be used as normal (not shown on the screen). [CHAR LIMIT=NONE] -->

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+6 −1
Original line number Diff line number Diff line
@@ -2206,7 +2206,12 @@ public final class NotificationPanelViewController implements Dumpable { 
                && mQsController.getFullyExpanded()) {

            // Upon initialisation when we are not layouted yet we don't want to announce that we

            // are fully expanded, hence the != 0.0f check.

            if (mSplitShadeEnabled) {

                // In split shade, QS is expanded but it also shows notifications

                return mResources.getString(R.string.accessibility_desc_qs_notification_shade);

            } else {

                return mResources.getString(R.string.accessibility_desc_quick_settings);

            }

        } else if (mBarState == KEYGUARD) {

            return mResources.getString(R.string.accessibility_desc_lock_screen);

        } else {