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

Commit e6be9c78 authored by Alan Viverette's avatar Alan Viverette
Browse files

Always set item type on obtained ListView item views 

If a view is scrapped without layout params being set, it will
incorrectly be recycled as item type 0.

BUG: 13212603
Change-Id: I2a42c04ec5065067ab260a0a8afb07207db729f6
parent af7c240b

core/java/android/widget/AbsListView.java

+20 −13
Original line number Diff line number Diff line
@@ -2313,6 +2313,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te 


                // If we failed to re-bind the data, scrap the obtained view.

                if (updatedView != transientView) {

                    setItemViewLayoutParams(updatedView, position);

                    mRecycler.addScrapView(updatedView, position);

                }

            }
@@ -2343,19 +2344,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te 
            child.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_YES);

        }



        if (mAdapterHasStableIds) {

            final ViewGroup.LayoutParams vlp = child.getLayoutParams();

            LayoutParams lp;

            if (vlp == null) {

                lp = (LayoutParams) generateDefaultLayoutParams();

            } else if (!checkLayoutParams(vlp)) {

                lp = (LayoutParams) generateLayoutParams(vlp);

            } else {

                lp = (LayoutParams) vlp;

            }

            lp.itemId = mAdapter.getItemId(position);

            child.setLayoutParams(lp);

        }

        setItemViewLayoutParams(child, position);



        if (AccessibilityManager.getInstance(mContext).isEnabled()) {

            if (mAccessibilityDelegate == null) {
@@ -2371,6 +2360,24 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te 
        return child;

    }



    private void setItemViewLayoutParams(View child, int position) {

        final ViewGroup.LayoutParams vlp = child.getLayoutParams();

        LayoutParams lp;

        if (vlp == null) {

            lp = (LayoutParams) generateDefaultLayoutParams();

        } else if (!checkLayoutParams(vlp)) {

            lp = (LayoutParams) generateLayoutParams(vlp);

        } else {

            lp = (LayoutParams) vlp;

        }



        if (mAdapterHasStableIds) {

            lp.itemId = mAdapter.getItemId(position);

        }

        lp.viewType = mAdapter.getItemViewType(position);

        child.setLayoutParams(lp);

    }



    class ListItemAccessibilityDelegate extends AccessibilityDelegate {

        @Override

        public AccessibilityNodeInfo createAccessibilityNodeInfo(View host) {