diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2011-09-12 16:58:13 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-12 16:58:13 -0700 |
| commit | bd5c9768c4432c6cb2bfa5f521d49ff03c087ff8 (patch) | |
| tree | ee0f7512e1d40a2d3eb0218e544a141f0167b322 /core/java/android/widget | |
| parent | e44365b539056b84a3ab57f5a9338d182eb10033 (diff) | |
| parent | 031d9c1389de2b9dac7f175af0b962e24b21d5be (diff) | |
| download | frameworks_base-bd5c9768c4432c6cb2bfa5f521d49ff03c087ff8.zip frameworks_base-bd5c9768c4432c6cb2bfa5f521d49ff03c087ff8.tar.gz frameworks_base-bd5c9768c4432c6cb2bfa5f521d49ff03c087ff8.tar.bz2 | |
Merge "Adding accessibility delegate mechanism for backwards compatibility support."
Diffstat (limited to 'core/java/android/widget')
| -rw-r--r-- | core/java/android/widget/AdapterView.java | 1 | ||||
| -rw-r--r-- | core/java/android/widget/ImageView.java | 1 | ||||
| -rw-r--r-- | core/java/android/widget/TabWidget.java | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/widget/AdapterView.java b/core/java/android/widget/AdapterView.java index 2d10bbe..72db8e8 100644 --- a/core/java/android/widget/AdapterView.java +++ b/core/java/android/widget/AdapterView.java @@ -896,6 +896,7 @@ public abstract class AdapterView<T extends Adapter> extends ViewGroup { @Override public void onPopulateAccessibilityEvent(AccessibilityEvent event) { + super.onPopulateAccessibilityEvent(event); // We send selection events only from AdapterView to avoid // generation of such event for each child. getSelectedView().dispatchPopulateAccessibilityEvent(event); diff --git a/core/java/android/widget/ImageView.java b/core/java/android/widget/ImageView.java index b92130d..a5d6c9a 100644 --- a/core/java/android/widget/ImageView.java +++ b/core/java/android/widget/ImageView.java @@ -212,6 +212,7 @@ public class ImageView extends View { @Override public void onPopulateAccessibilityEvent(AccessibilityEvent event) { + super.onPopulateAccessibilityEvent(event); CharSequence contentDescription = getContentDescription(); if (!TextUtils.isEmpty(contentDescription)) { event.getText().add(contentDescription); diff --git a/core/java/android/widget/TabWidget.java b/core/java/android/widget/TabWidget.java index 191c4ca..80bfe99 100644 --- a/core/java/android/widget/TabWidget.java +++ b/core/java/android/widget/TabWidget.java @@ -489,6 +489,7 @@ public class TabWidget extends LinearLayout implements OnFocusChangeListener { public void sendAccessibilityEventUnchecked(AccessibilityEvent event) { // this class fires events only when tabs are focused or selected if (event.getEventType() == AccessibilityEvent.TYPE_VIEW_FOCUSED && isFocused()) { + event.recycle(); return; } super.sendAccessibilityEventUnchecked(event); |