Merge "Accessibility focus not cleared on temporary detach." into jb-mr1-dev

core/java/android/view/ViewGroup.java

@@ -3912,6 +3912,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
      * @see #removeDetachedView(View, boolean)
      */
     protected void detachViewFromParent(View child) {
+        child.clearAccessibilityFocus();
         removeFromArray(indexOfChild(child));
     }
 
@@ -3933,6 +3934,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
      * @see #removeDetachedView(View, boolean)
      */
     protected void detachViewFromParent(int index) {
+        getChildAt(index).clearAccessibilityFocus();
         removeFromArray(index);
     }