Merge "Accessibility focus on temporary detached view not cleared." into jb-dev (cdbbecf3) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -6665,6 +6665,7 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
		* @hide
		*/
		public void dispatchStartTemporaryDetach() {
		clearAccessibilityFocus();
		onStartTemporaryDetach();
		}

		@@ -11279,7 +11280,6 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
		resetResolvedLayoutDirection();
		resetResolvedTextAlignment();
		resetAccessibilityStateChanged();
		clearAccessibilityFocus();
		}

		/**

+8 −0

Original line number	Diff line number	Diff line
		@@ -3586,6 +3586,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		clearChildFocus = true;
		}

		view.clearAccessibilityFocus();

		cancelTouchTarget(view);
		cancelHoverTarget(view);

		@@ -3669,6 +3671,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		clearChildFocus = view;
		}

		view.clearAccessibilityFocus();

		cancelTouchTarget(view);
		cancelHoverTarget(view);

		@@ -3742,6 +3746,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		clearChildFocus = view;
		}

		view.clearAccessibilityFocus();

		cancelTouchTarget(view);
		cancelHoverTarget(view);

		@@ -3790,6 +3796,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		child.clearFocus();
		}

		child.clearAccessibilityFocus();

		cancelTouchTarget(child);
		cancelHoverTarget(child);