diff options
| author | 2023-04-25 14:13:41 -0400 | |
|---|---|---|
| committer | 2023-04-25 14:13:41 -0400 | |
| commit | b5d358480af466aaebd9c4af498d361471404cd3 (patch) | |
| tree | 8c92f4754ac5fb2a1395d35069342b2855967352 | |
| parent | 01b56bb057b0db0a4e711ad530940714cd856452 (diff) | |
Put all text content in the node's text
Instead of just putting the state, put all the text content from the
tile. That way, the relevant services will find it. "on"/"off" is not
necessary anymore for ui tests because we use `isChecked`.
Test: manual with Talkback and Select To Speak
Test: android.platform.test.scenario.sysui.quicksettings
Bug: 261994726
Change-Id: Iea47ab940ea3e0163ba196109851ea21260af017
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt index 4a3199850e0f..b80668379e49 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt @@ -385,6 +385,11 @@ open class QSTileViewImpl @JvmOverloads constructor( super.onInitializeAccessibilityNodeInfo(info) // Clear selected state so it is not announce by talkback. info.isSelected = false + info.text = if (TextUtils.isEmpty(secondaryLabel.text)) { + "${label.text}" + } else { + "${label.text}, ${secondaryLabel.text}" + } if (lastDisabledByPolicy) { info.addAction( AccessibilityNodeInfo.AccessibilityAction( @@ -402,12 +407,6 @@ open class QSTileViewImpl @JvmOverloads constructor( accessibilityClass } if (Switch::class.java.name == accessibilityClass) { - val label = resources.getString( - if (tileState) R.string.switch_bar_on else R.string.switch_bar_off) - // Set the text here for tests in - // android.platform.test.scenario.sysui.quicksettings. Can be removed when - // UiObject2 has a new getStateDescription() API and tests are updated. - info.text = label info.isChecked = tileState info.isCheckable = true if (isLongClickable) { |