Merge "Controls a11y - Fix status change update" into rvc-dev (6a3f241e) · Commits · e / os / android_frameworks_base

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 {

+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)
		}