DEV/material-components_material-components-android
1
0
Fork 0
mirror of https://github.com/material-components/material-components-android.git synced 2026-02-20 08:39:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Override onInitializeAccessibilityNodeInfo to explicitly tell the AccessibilityInfoNode whether a chip is checkable or clickable.

Browse Source 
Avoid setting custom ExploreByTouchHelper as delegate in pre-N unless there's a close/trailing icon. This is necessary to workaround a Talkback bug.

PiperOrigin-RevId: 211490101
This commit is contained in:
connieshi 2018-09-04 14:17:13 -04:00 committed by ldjcmu
parent 7528288743
commit bf33b9e4e7
1 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/java/com/google/android/material/chip/Chip.java
View File

@ -79,6 +79,7 @@ import android.view.ViewParent;
import android.view.ViewTreeObserver;
import android.view.ViewTreeObserver.OnGlobalLayoutListener;
import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityNodeInfo;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.reflect.Field;
@ -193,9 +194,13 @@ public class Chip extends AppCompatCheckBox implements Delegate {
ChipDrawable.createFromAttributes(
context, attrs, defStyleAttr, R.style.Widget_MaterialComponents_Chip_Action);
setChipDrawable(drawable);
touchHelper = new ChipTouchHelper(this);
ViewCompat.setAccessibilityDelegate(this, touchHelper);
touchHelper = new ChipTouchHelper(this);
if (VERSION.SDK_INT >= VERSION_CODES.N) {
ViewCompat.setAccessibilityDelegate(this, touchHelper);
} else {
updateAccessibilityDelegate();
}
initOutlineProvider();
// Set deferred values
setChecked(deferredCheckedValue);
@ -218,6 +223,27 @@ public class Chip extends AppCompatCheckBox implements Delegate {
setupTouchTargetDelegate(context, attrs, defStyleAttr);
}
@Override
public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {
super.onInitializeAccessibilityNodeInfo(info);
info.setClassName(Chip.class.getName());
info.setCheckable(isCheckable());
info.setClickable(isClickable());
}
// TODO: Due to a11y bug, avoid setting custom ExploreByTouchHelper as delegate
// unless there's a close/trailing icon. Revert this once bug is fixed.
private void updateAccessibilityDelegate() {
if (VERSION.SDK_INT >= VERSION_CODES.N) {
return;
}
if ((hasCloseIcon() && isCloseIconVisible())) {
ViewCompat.setAccessibilityDelegate(this, touchHelper);
} else {
ViewCompat.setAccessibilityDelegate(this, null);
}
}
private void setupTouchTargetDelegate(Context context, AttributeSet attrs, int defStyleAttr) {
if (attrs == null) {
return;
@ -1040,7 +1066,8 @@ public class Chip extends AppCompatCheckBox implements Delegate {
@Override
protected void onPopulateNodeForHost(AccessibilityNodeInfoCompat node) {
node.setCheckable(chipDrawable != null && chipDrawable.isCheckable());
node.setCheckable(isCheckable());
node.setClickable(isClickable());
node.setClassName(Chip.class.getName());
CharSequence chipText = getText();
if (VERSION.SDK_INT >= VERSION_CODES.M) {
@ -1369,15 +1396,14 @@ public class Chip extends AppCompatCheckBox implements Delegate {
}
public void setCloseIconVisible(@BoolRes int id) {
if (chipDrawable != null) {
chipDrawable.setCloseIconVisible(id);
}
setCloseIconVisible(getResources().getBoolean(id));
}
public void setCloseIconVisible(boolean closeIconVisible) {
if (chipDrawable != null) {
chipDrawable.setCloseIconVisible(closeIconVisible);
}
updateAccessibilityDelegate();
}
/** @deprecated Use {@link Chip#setCloseIconVisible(int)} instead. */
@ -1401,12 +1427,14 @@ public class Chip extends AppCompatCheckBox implements Delegate {
if (chipDrawable != null) {
chipDrawable.setCloseIconResource(id);
}
updateAccessibilityDelegate();
}
public void setCloseIcon(@Nullable Drawable closeIcon) {
if (chipDrawable != null) {
chipDrawable.setCloseIcon(closeIcon);
}
updateAccessibilityDelegate();
}
@Nullable