Don't read state twice ("on on"/"off off") in Settings Toggle preferences.

Bug: 26967006

Change-Id: I329aabc577ed8b3dc56fe86d9f7bc8f64461c2a0
This commit is contained in:
Anna Galusza
2016-02-18 13:26:29 -08:00
parent 4bd2152cbc
commit e88a05601c

View File

@@ -318,11 +318,15 @@ public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedC
requestLayout();
}
@Override
public CharSequence getAccessibilityClassName() {
return Switch.class.getName();
}
/** @hide */
@Override
public void onInitializeAccessibilityNodeInfoInternal(AccessibilityNodeInfo info) {
super.onInitializeAccessibilityNodeInfoInternal(info);
info.setClassName(Switch.class.getName());
info.setText(mTextView.getText());
info.setCheckable(true);
info.setChecked(mSwitch.isChecked());
@@ -332,7 +336,10 @@ public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedC
@Override
public void onInitializeAccessibilityEventInternal(AccessibilityEvent event) {
super.onInitializeAccessibilityEventInternal(event);
event.setClassName(Switch.class.getName());
// Don't say "on on" or "off off" - rather, speak the state only once. We need to specify
// this explicitly as each of our children (the textview and the checkbox) contribute to
// the state once, giving us duplicate text by default.
event.setContentDescription(mTextView.getText());
event.setChecked(mSwitch.isChecked());
}
}