am 1ffeb7bf: am 77f9e5dc: am d5b18387: Merge "Ensure partially-detached... (7f10d785) · Commits · e / os / android_frameworks_base

core/java/android/widget/AbsListView.java

+14 −6

Original line number	Diff line number	Diff line
		@@ -6613,6 +6613,8 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
		void addScrapView(View scrap, int position) {
		final AbsListView.LayoutParams lp = (AbsListView.LayoutParams) scrap.getLayoutParams();
		if (lp == null) {
		// Can't recycle, skip the scrap heap.
		getSkippedScrap().add(scrap);
		return;
		}

		@@ -6622,6 +6624,8 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
		// should otherwise not be recycled.
		final int viewType = lp.viewType;
		if (!shouldRecycleViewType(viewType)) {
		// Can't recycle, skip the scrap heap.
		getSkippedScrap().add(scrap);
		return;
		}

		@@ -6641,22 +6645,19 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
		// If the adapter has stable IDs, we can reuse the view for
		// the same data.
		if (mTransientStateViewsById == null) {
		mTransientStateViewsById = new LongSparseArray<View>();
		mTransientStateViewsById = new LongSparseArray<>();
		}
		mTransientStateViewsById.put(lp.itemId, scrap);
		} else if (!mDataChanged) {
		// If the data hasn't changed, we can reuse the views at
		// their old positions.
		if (mTransientStateViews == null) {
		mTransientStateViews = new SparseArray<View>();
		mTransientStateViews = new SparseArray<>();
		}
		mTransientStateViews.put(position, scrap);
		} else {
		// Otherwise, we'll have to remove the view and start over.
		if (mSkippedScrap == null) {
		mSkippedScrap = new ArrayList<View>();
		}
		mSkippedScrap.add(scrap);
		getSkippedScrap().add(scrap);
		}
		} else {
		if (mViewTypeCount == 1) {
		@@ -6671,6 +6672,13 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
		}
		}

		private ArrayList<View> getSkippedScrap() {
		if (mSkippedScrap == null) {
		mSkippedScrap = new ArrayList<>();
		}
		return mSkippedScrap;
		}

		/**
		* Finish the removal of any views that skipped the scrap heap.
		*/