Merge "Accessibility focus on temporary detached view not cleared." into jb-dev

2 files changed, 9 insertions, 1 deletions

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 2972774ff86f..4d2bc42a141d 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -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();
     }
 
     /**
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index 29613d557039..acfca26db219 100644
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -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);