am 8e21d4df: Merge "Adding accessibility check in the node provider of NumberPicker." into jb-mr1-dev

* commit '8e21d4df2154ad13916b95efc6c4b89815bb2cfb':
  Adding accessibility check in the node provider of NumberPicker.
This commit is contained in:
Svetoslav Ganov
2012-09-06 20:02:28 -07:00
committed by Android Git Automerger

View File

@@ -2305,22 +2305,26 @@ public class NumberPicker extends LinearLayout {
} }
private void sendAccessibilityEventForVirtualText(int eventType) { private void sendAccessibilityEventForVirtualText(int eventType) {
AccessibilityEvent event = AccessibilityEvent.obtain(eventType); if (AccessibilityManager.getInstance(mContext).isEnabled()) {
mInputText.onInitializeAccessibilityEvent(event); AccessibilityEvent event = AccessibilityEvent.obtain(eventType);
mInputText.onPopulateAccessibilityEvent(event); mInputText.onInitializeAccessibilityEvent(event);
event.setSource(NumberPicker.this, VIRTUAL_VIEW_ID_INPUT); mInputText.onPopulateAccessibilityEvent(event);
requestSendAccessibilityEvent(NumberPicker.this, event); event.setSource(NumberPicker.this, VIRTUAL_VIEW_ID_INPUT);
requestSendAccessibilityEvent(NumberPicker.this, event);
}
} }
private void sendAccessibilityEventForVirtualButton(int virtualViewId, int eventType, private void sendAccessibilityEventForVirtualButton(int virtualViewId, int eventType,
String text) { String text) {
AccessibilityEvent event = AccessibilityEvent.obtain(eventType); if (AccessibilityManager.getInstance(mContext).isEnabled()) {
event.setClassName(Button.class.getName()); AccessibilityEvent event = AccessibilityEvent.obtain(eventType);
event.setPackageName(mContext.getPackageName()); event.setClassName(Button.class.getName());
event.getText().add(text); event.setPackageName(mContext.getPackageName());
event.setEnabled(NumberPicker.this.isEnabled()); event.getText().add(text);
event.setSource(NumberPicker.this, virtualViewId); event.setEnabled(NumberPicker.this.isEnabled());
requestSendAccessibilityEvent(NumberPicker.this, event); event.setSource(NumberPicker.this, virtualViewId);
requestSendAccessibilityEvent(NumberPicker.this, event);
}
} }
private void findAccessibilityNodeInfosByTextInChild(String searchedLowerCase, private void findAccessibilityNodeInfosByTextInChild(String searchedLowerCase,