Merge "Don't overwrite accessibility delegates in AbsListView items." into jb-mr1-dev (f0340d15) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -4924,6 +4924,18 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		return false;
		}

		/**
		* Returns the delegate for implementing accessibility support via
		* composition. For more details see {@link AccessibilityDelegate}.
		*
		* @return The delegate, or null if none set.
		*
		* @hide
		*/
		public AccessibilityDelegate getAccessibilityDelegate() {
		return mAccessibilityDelegate;
		}

		/**
		* Sets a delegate for implementing accessibility support via compositon as
		* opposed to inheritance. The delegate's primary use is for implementing

+3 −1

Original line number	Diff line number	Diff line
		@@ -2158,8 +2158,10 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
		if (mAccessibilityDelegate == null) {
		mAccessibilityDelegate = new ListItemAccessibilityDelegate();
		}
		if (child.getAccessibilityDelegate() == null) {
		child.setAccessibilityDelegate(mAccessibilityDelegate);
		}
		}

		return child;
		}