Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit adcc61d6 authored by Evan Rosky's avatar Evan Rosky Committed by android-build-merger
Browse files

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

am: 7666d6f9

Change-Id: Idc3a8f95bea47bad543d90e9ad18c606255e55ae
parents eb9a99c3 7666d6f9

core/java/android/view/ViewGroup.java

+3 −0
Original line number Diff line number Diff line
@@ -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()) {