From d574521810ec2682f8a3a7f75372ece44bdd434e Mon Sep 17 00:00:00 2001 From: Ben Lin Date: Mon, 3 Feb 2025 21:34:46 -0800 Subject: Update Talkback text for app header "menu". So now this is updated to "App Name - Double Tap to 'Open menu'. 'Open Menu' is the text supplied by the string resource. Bug: 329208268 Test: Manual. Turn Talkback on, focus on App Header for Settings - says "Settings - Double tap to open menu". Flag: EXEMPT bugfix Change-Id: Id92aecb06676d5a63aba379f65db1a6af422d65b Change-Id: I55104d3ae2cc3ee7b463644b9c054c5dd2aed052 --- .../shell/windowdecor/viewholder/AppHeaderViewHolder.kt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/viewholder/AppHeaderViewHolder.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/viewholder/AppHeaderViewHolder.kt index bc2be901d320..4762bc21d79c 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/viewholder/AppHeaderViewHolder.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/viewholder/AppHeaderViewHolder.kt @@ -93,6 +93,9 @@ class AppHeaderViewHolder( private val lightColors = dynamicLightColorScheme(context) private val darkColors = dynamicDarkColorScheme(context) + private val headerButtonOpenMenuA11yText = context.resources + .getString(R.string.desktop_mode_app_header_chip_text) + /** * The corner radius to apply to the app chip, maximize and close button's background drawable. **/ @@ -228,6 +231,18 @@ class AppHeaderViewHolder( } } + val a11yActionOpenHeaderMenu = AccessibilityAction(AccessibilityNodeInfo.ACTION_CLICK, + headerButtonOpenMenuA11yText) + openMenuButton.accessibilityDelegate = object : View.AccessibilityDelegate() { + override fun onInitializeAccessibilityNodeInfo( + host: View, + info: AccessibilityNodeInfo + ) { + super.onInitializeAccessibilityNodeInfo(host, info) + info.addAction(a11yActionOpenHeaderMenu) + } + } + with(context.resources) { // Update a11y read out to say "double tap to maximize or restore window size" ViewCompat.replaceAccessibilityAction( @@ -260,6 +275,7 @@ class AppHeaderViewHolder( /** Sets the app's name in the header. */ fun setAppName(name: CharSequence) { appNameTextView.text = name + openMenuButton.contentDescription = name } /** Sets the app's icon in the header. */ -- cgit v1.2.3-59-g8ed1b