am c5fb5805: Merge "Accessiblity focus not following input focus and text nav broken." into jb-dev (c2f64117) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -6159,7 +6159,8 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
		ViewRootImpl viewRootImpl = getViewRootImpl();
		if (viewRootImpl != null) {
		View focusHost = viewRootImpl.getAccessibilityFocusedHost();
		if (focusHost != null && ViewRootImpl.isViewDescendantOf(focusHost, this)) {
		if (focusHost != null && focusHost != this
		&& ViewRootImpl.isViewDescendantOf(focusHost, this)) {
		viewRootImpl.setAccessibilityFocusedHost(null);
		}
		}
		@@ -6637,7 +6638,7 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal

		private boolean nextAtGranularity(int granularity) {
		CharSequence text = getIterableTextForAccessibility();
		if (text != null && text.length() > 0) {
		if (text == null \|\| text.length() == 0) {
		return false;
		}
		TextSegmentIterator iterator = getIteratorForGranularity(granularity);
		@@ -6661,7 +6662,7 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal

		private boolean previousAtGranularity(int granularity) {
		CharSequence text = getIterableTextForAccessibility();
		if (text != null && text.length() > 0) {
		if (text == null \|\| text.length() == 0) {
		return false;
		}
		TextSegmentIterator iterator = getIteratorForGranularity(granularity);