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

Commit 8d8fc469 authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

Merge "Don't orphan footers with transient state Bug #8725945" into jb-mr2-dev

parents 56cd646a b7e0f794

core/java/android/view/ViewRootImpl.java

+1 −0
Original line number Diff line number Diff line
@@ -2829,6 +2829,7 @@ public final class ViewRootImpl implements ViewParent, 


        setAccessibilityFocus(null, null);



        mView.assignParent(null);

        mView = null;

        mAttachInfo.mRootView = null;

        mAttachInfo.mSurface = null;

core/java/android/widget/AbsListView.java

+2 −2
Original line number Diff line number Diff line
@@ -6390,7 +6390,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te 
            int viewType = lp.viewType;

            final boolean scrapHasTransientState = scrap.hasTransientState();

            if (!shouldRecycleViewType(viewType) || scrapHasTransientState) {

                if (viewType != ITEM_VIEW_TYPE_HEADER_OR_FOOTER || scrapHasTransientState) {

                if (viewType != ITEM_VIEW_TYPE_HEADER_OR_FOOTER && scrapHasTransientState) {

                    if (mSkippedScrap == null) {

                        mSkippedScrap = new ArrayList<View>();

                    }
@@ -6464,7 +6464,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te 
                    final boolean scrapHasTransientState = victim.hasTransientState();

                    if (!shouldRecycleViewType(whichScrap) || scrapHasTransientState) {

                        // Do not move views that should be ignored

                        if (whichScrap != ITEM_VIEW_TYPE_HEADER_OR_FOOTER ||

                        if (whichScrap != ITEM_VIEW_TYPE_HEADER_OR_FOOTER &&

                                scrapHasTransientState) {

                            removeDetachedView(victim, false);

                        }