Merge "Remember which list child has A11y focus BEFORE clearing A11y focus." into jb-mr2-dev (e4c9ac2d) · Commits · e / os / android_frameworks_base

core/java/android/widget/ListView.java

+26 −24

Original line number	Diff line number	Diff line
		@@ -1550,6 +1550,32 @@ public class ListView extends AbsListView {

		setSelectedPositionInt(mNextSelectedPosition);

		// Remember which child, if any, had accessibility focus. This must
		// occur before recycling any views, since that will clear
		// accessibility focus.
		final ViewRootImpl viewRootImpl = getViewRootImpl();
		if (viewRootImpl != null) {
		final View accessFocusedView = viewRootImpl.getAccessibilityFocusedHost();
		if (accessFocusedView != null) {
		final View accessFocusedChild = findAccessibilityFocusedChild(
		accessFocusedView);
		if (accessFocusedChild != null) {
		if (!dataChanged \|\| isDirectChildHeaderOrFooter(accessFocusedChild)) {
		// If the views won't be changing, try to maintain
		// focus on the current view host and (if
		// applicable) its virtual view.
		accessibilityFocusLayoutRestoreView = accessFocusedView;
		accessibilityFocusLayoutRestoreNode = viewRootImpl
		.getAccessibilityFocusedVirtualView();
		} else {
		// Otherwise, try to maintain focus at the same
		// position.
		accessibilityFocusPosition = getPositionForView(accessFocusedChild);
		}
		}
		}
		}

		// Pull all children into the RecycleBin.
		// These views will be reused if possible
		final int firstPosition = mFirstPosition;
		@@ -1590,30 +1616,6 @@ public class ListView extends AbsListView {
		requestFocus();
		}

		// Remember which child, if any, had accessibility focus.
		final ViewRootImpl viewRootImpl = getViewRootImpl();
		if (viewRootImpl != null) {
		final View accessFocusedView = viewRootImpl.getAccessibilityFocusedHost();
		if (accessFocusedView != null) {
		final View accessFocusedChild = findAccessibilityFocusedChild(
		accessFocusedView);
		if (accessFocusedChild != null) {
		if (!dataChanged \|\| isDirectChildHeaderOrFooter(accessFocusedChild)) {
		// If the views won't be changing, try to maintain
		// focus on the current view host and (if
		// applicable) its virtual view.
		accessibilityFocusLayoutRestoreView = accessFocusedView;
		accessibilityFocusLayoutRestoreNode = viewRootImpl
		.getAccessibilityFocusedVirtualView();
		} else {
		// Otherwise, try to maintain focus at the same
		// position.
		accessibilityFocusPosition = getPositionForView(accessFocusedChild);
		}
		}
		}
		}

		// Clear out old views
		detachAllViewsFromParent();
		recycleBin.removeSkippedScrap();