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

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

Browse Source
This commit is contained in:
Yalan Yiue
2023-02-17 18:50:21 +00:00
committed by Android (Google) Code Review
parent 7da32f6486 77cac05f7d
commit e397435f1a
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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] -->

7
packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
View File

@@ -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.
return mResources.getString(R.string.accessibility_desc_quick_settings);
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 {