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

Commit 8e9adcbe 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: 8f040ef1 

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



Change-Id: I7743fe938b86866df120996289229e88ed3a2ee9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1b3878d0 8f040ef1

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

+5 −6
Original line number Original line Diff line number Diff line
@@ -385,6 +385,11 @@ open class QSTileViewImpl @JvmOverloads constructor( 
        super.onInitializeAccessibilityNodeInfo(info)

        super.onInitializeAccessibilityNodeInfo(info)

        // Clear selected state so it is not announce by talkback.

        // Clear selected state so it is not announce by talkback.

        info.isSelected = false

        info.isSelected = false

        info.text = if (TextUtils.isEmpty(secondaryLabel.text)) {

            "${label.text}"

        } else {

            "${label.text}, ${secondaryLabel.text}"

        }

        if (lastDisabledByPolicy) {

        if (lastDisabledByPolicy) {

            info.addAction(

            info.addAction(

                    AccessibilityNodeInfo.AccessibilityAction(

                    AccessibilityNodeInfo.AccessibilityAction(
@@ -402,12 +407,6 @@ open class QSTileViewImpl @JvmOverloads constructor( 
                accessibilityClass

                accessibilityClass

            }

            }

            if (Switch::class.java.name == 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.isChecked = tileState

                info.isCheckable = true

                info.isCheckable = true

                if (isLongClickable) {

                if (isLongClickable) {