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

Commit a219cfc3 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge "Put all text content in the node's text" into udc-dev am: 5d0e1903 am: 1a999d5a 

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



Change-Id: I37bd0e1c44554aa96aac7913766013db1f9049b7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1b7e4273 1a999d5a

packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt

+5 −6
Original line number Diff line number Diff line
@@ -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) {