Merge "CompoundButton accessibility checked state updates" into main (ba5e8ea3) · Commits · e / os / android_frameworks_base

core/java/android/widget/CompoundButton.java

+12 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package android.widget;

		import static android.view.accessibility.Flags.triStateChecked;

		import android.annotation.DrawableRes;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		@@ -209,6 +211,10 @@ public abstract class CompoundButton extends Button implements Checkable {
		mCheckedFromResource = false;
		mChecked = checked;
		refreshDrawableState();
		if (triStateChecked()) {
		notifyViewAccessibilityStateChangedIfNeeded(
		AccessibilityEvent.CONTENT_CHANGE_TYPE_CHECKED);
		}

		// Avoid infinite recursions if setChecked() is called from a listener
		if (mBroadcasting) {
		@@ -490,8 +496,13 @@ public abstract class CompoundButton extends Button implements Checkable {
		public void onInitializeAccessibilityNodeInfoInternal(AccessibilityNodeInfo info) {
		super.onInitializeAccessibilityNodeInfoInternal(info);
		info.setCheckable(true);
		if (triStateChecked()) {
		info.setChecked(mChecked ? AccessibilityNodeInfo.CHECKED_STATE_TRUE :
		AccessibilityNodeInfo.CHECKED_STATE_FALSE);
		} else {
		info.setChecked(mChecked);
		}
		}

		@Override
		public int getCompoundPaddingLeft() {