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

Commit 21dc131e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Controls a11y - Fix status change update" into rvc-dev am: 6a3f241e 

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

Change-Id: I6adc54ed518459670a8d6561c5eb2ad1faf3b878
parents 40d9f56c 6a3f241e

packages/SystemUI/src/com/android/systemui/controls/ui/ControlViewHolder.kt

+3 −2
Original line number Diff line number Diff line
@@ -218,13 +218,11 @@ class ControlViewHolder( 
        cancelUpdate = uiExecutor.executeDelayed({

            animateStatusChange(/* animated */ true, {

                setStatusText(previousText, /* immediately */ true)

                updateContentDescription()

            })

        }, UPDATE_DELAY_IN_MILLIS)



        animateStatusChange(/* animated */ true, {

            setStatusText(tempStatus, /* immediately */ true)

            updateContentDescription()

        })

    }
@@ -296,6 +294,7 @@ class ControlViewHolder( 
        if (immediately) {

            status.alpha = STATUS_ALPHA_ENABLED

            status.text = text

            updateContentDescription()

        }

        nextStatusText = text

    }
@@ -412,6 +411,8 @@ class ControlViewHolder( 
        setEnabled(enabled)



        status.text = text

        updateContentDescription()



        status.setTextColor(color)



        control?.getCustomIcon()?.let {

packages/SystemUI/src/com/android/systemui/controls/ui/ToggleRangeBehavior.kt

+4 −2
Original line number Diff line number Diff line
@@ -163,8 +163,10 @@ class ToggleRangeBehavior : Behavior { 
                    AccessibilityNodeInfo.RangeInfo.RANGE_TYPE_FLOAT

                }



                if (isChecked) {

                    val rangeInfo = AccessibilityNodeInfo.RangeInfo.obtain(type, min, max, current)

                    info.setRangeInfo(rangeInfo)

                }

                info.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_SET_PROGRESS)

            }