Touch exploration - nits (887e1a17) · Commits · e / os / android_frameworks_base

core/java/android/view/accessibility/AccessibilityEvent.java

+6 −4

Original line number	Diff line number	Diff line
		@@ -253,7 +253,7 @@ public final class AccessibilityEvent extends AccessibilityRecord implements Par
		public static final int TYPES_ALL_MASK = 0xFFFFFFFF;

		private static final int MAX_POOL_SIZE = 10;
		private static final Object mPoolLock = new Object();
		private static final Object sPoolLock = new Object();
		private static AccessibilityEvent sPool;
		private static int sPoolSize;

		@@ -375,7 +375,7 @@ public final class AccessibilityEvent extends AccessibilityRecord implements Par
		* @return An instance.
		*/
		public static AccessibilityEvent obtain() {
		synchronized (mPoolLock) {
		synchronized (sPoolLock) {
		if (sPool != null) {
		AccessibilityEvent event = sPool;
		sPool = sPool.mNext;
		@@ -392,14 +392,16 @@ public final class AccessibilityEvent extends AccessibilityRecord implements Par
		* Return an instance back to be reused.
		* <p>
		* <b>Note: You must not touch the object after calling this function.</b>
		*
		* @throws IllegalStateException If the event is already recycled.
		*/
		@Override
		public void recycle() {
		if (mIsInPool) {
		return;
		throw new IllegalStateException("Event already recycled!");
		}
		clear();
		synchronized (mPoolLock) {
		synchronized (sPoolLock) {
		if (sPoolSize <= MAX_POOL_SIZE) {
		mNext = sPool;
		sPool = this;

+6 −4

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ public class AccessibilityRecord {
		private static final int PROPERTY_FULL_SCREEN = 0x00000080;

		private static final int MAX_POOL_SIZE = 10;
		private static final Object mPoolLock = new Object();
		private static final Object sPoolLock = new Object();
		private static AccessibilityRecord sPool;
		private static int sPoolSize;

		@@ -342,7 +342,7 @@ public class AccessibilityRecord {
		* @return An instance.
		*/
		protected static AccessibilityRecord obtain() {
		synchronized (mPoolLock) {
		synchronized (sPoolLock) {
		if (sPool != null) {
		AccessibilityRecord record = sPool;
		sPool = sPool.mNext;
		@@ -359,13 +359,15 @@ public class AccessibilityRecord {
		* Return an instance back to be reused.
		* <p>
		* <b>Note: You must not touch the object after calling this function.</b>
		*
		* @throws IllegalStateException If the record is already recycled.
		*/
		public void recycle() {
		if (mIsInPool) {
		return;
		throw new IllegalStateException("Record already recycled!");
		}
		clear();
		synchronized (mPoolLock) {
		synchronized (sPoolLock) {
		if (sPoolSize <= MAX_POOL_SIZE) {
		mNext = sPool;
		sPool = this;

+2 −0

Original line number	Diff line number	Diff line
		@@ -899,6 +899,8 @@ public abstract class AdapterView<T extends Adapter> extends ViewGroup {

		@Override
		public void onPopulateAccessibilityEvent(AccessibilityEvent event) {
		super.onPopulateAccessibilityEvent(event);

		View selectedView = getSelectedView();
		if (selectedView != null) {
		event.setEnabled(selectedView.isEnabled());

+5 −9

Original line number	Diff line number	Diff line
		@@ -2009,7 +2009,6 @@ public class ListView extends AbsListView {
		ListAdapter adapter = getAdapter();
		if (adapter != null) {
		final int count = adapter.getCount();
		if (count < 15) {
		for (int i = 0; i < count; i++) {
		if (adapter.isEnabled(i)) {
		itemCount++;
		@@ -2017,9 +2016,6 @@ public class ListView extends AbsListView {
		currentItemIndex--;
		}
		}
		} else {
		itemCount = count;
		}
		}

		event.setItemCount(itemCount);

+2 −0

Original line number	Diff line number	Diff line
		@@ -7897,6 +7897,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener

		@Override
		public void onPopulateAccessibilityEvent(AccessibilityEvent event) {
		super.onPopulateAccessibilityEvent(event);

		if (!isShown()) {
		return;
		}