Merge "CheckableRelativeLayout accessibility checked state updates" into main (ed15a107) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/widget/CheckableRelativeLayout.java

+16 −3

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

		package com.android.settings.widget;

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

		import android.content.Context;
		import android.util.AttributeSet;
		import android.view.View;
		@@ -90,11 +92,17 @@ public class CheckableRelativeLayout extends RelativeLayout implements Checkable
		if (mCheckable != null) {
		mCheckable.setChecked(checked);
		}
		if (triStateChecked()) {
		notifyViewAccessibilityStateChangedIfNeeded(
		AccessibilityEvent.CONTENT_CHANGE_TYPE_CHECKED);
		}
		}
		setStateDescriptionIfNeeded();
		if (!triStateChecked()) {
		notifyViewAccessibilityStateChangedIfNeeded(
		AccessibilityEvent.CONTENT_CHANGE_TYPE_UNDEFINED);
		}
		}

		private void setStateDescriptionIfNeeded() {
		if (mCheckableChild == null) {
		@@ -122,6 +130,11 @@ public class CheckableRelativeLayout extends RelativeLayout implements Checkable
		@Override
		public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {
		super.onInitializeAccessibilityNodeInfo(info);
		if (triStateChecked()) {
		info.setChecked(mChecked ? AccessibilityNodeInfo.CHECKED_STATE_TRUE :
		AccessibilityNodeInfo.CHECKED_STATE_FALSE);
		} else {
		info.setChecked(mChecked);
		}
		}
		}