Merge "removeAllViews should also clean-up focusedInCluster" into oc-dev

am: 7666d6f967 Change-Id: Idc3a8f95bea47bad543d90e9ad18c606255e55ae
2017-04-28 17:13:23 +00:00
parent eb9a99c3d4 7666d6f967
commit adcc61d65f
1 changed files with 3 additions and 0 deletions
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -5414,6 +5414,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
        if (mDefaultFocus != null) {
            clearDefaultFocus(mDefaultFocus);
        }
+        if (mFocusedInCluster != null) {
+            clearFocusedInCluster(mFocusedInCluster);
+        }
        if (clearChildFocus) {
            clearChildFocus(focused);
            if (!rootViewRequestFocus()) {