Merge "Clear accessibility focus when view becomes invisible" into klp-dev (d9f53c02) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -8895,10 +8895,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		*/
		mPrivateFlags \|= PFLAG_DRAWN;

		if (((mViewFlags & VISIBILITY_MASK) == INVISIBLE) && hasFocus()) {
		if (((mViewFlags & VISIBILITY_MASK) == INVISIBLE)) {
		// root view becoming invisible shouldn't clear focus and accessibility focus
		if (getRootView() != this) {
		clearFocus();
		if (hasFocus()) clearFocus();
		clearAccessibilityFocus();
		}
		}