Merge "ListView transient state fix" (573596de) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -6068,8 +6068,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		mTransientStateCount = 0;
		Log.e(VIEW_LOG_TAG, "hasTransientState decremented below 0: " +
		"unmatched pair of setHasTransientState calls");
		}
		if ((hasTransientState && mTransientStateCount == 1) \|\|
		} else if ((hasTransientState && mTransientStateCount == 1) \|\|
		(!hasTransientState && mTransientStateCount == 0)) {
		// update flag if we've just incremented up from 0 or decremented down to 0
		mPrivateFlags2 = (mPrivateFlags2 & ~PFLAG2_HAS_TRANSIENT_STATE) \|

core/java/android/widget/AbsListView.java

+57 −15

Original line number	Diff line number	Diff line
		@@ -6167,6 +6167,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
		private ArrayList<View> mSkippedScrap;

		private SparseArray<View> mTransientStateViews;
		private LongSparseArray<View> mTransientStateViewsById;

		public void setViewTypeCount(int viewTypeCount) {
		if (viewTypeCount < 1) {
		@@ -6205,6 +6206,12 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
		mTransientStateViews.valueAt(i).forceLayout();
		}
		}
		if (mTransientStateViewsById != null) {
		final int count = mTransientStateViewsById.size();
		for (int i = 0; i < count; i++) {
		mTransientStateViewsById.valueAt(i).forceLayout();
		}
		}
		}

		public boolean shouldRecycleViewType(int viewType) {
		@@ -6234,6 +6241,9 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
		if (mTransientStateViews != null) {
		mTransientStateViews.clear();
		}
		if (mTransientStateViewsById != null) {
		mTransientStateViewsById.clear();
		}
		}

		/**
		@@ -6281,17 +6291,22 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
		}

		View getTransientStateView(int position) {
		if (mTransientStateViews == null) {
		return null;
		if (mAdapter != null && mAdapterHasStableIds && mTransientStateViewsById != null) {
		long id = mAdapter.getItemId(position);
		View result = mTransientStateViewsById.get(id);
		mTransientStateViewsById.remove(id);
		return result;
		}
		if (mTransientStateViews != null) {
		final int index = mTransientStateViews.indexOfKey(position);
		if (index < 0) {
		return null;
		}
		final View result = mTransientStateViews.valueAt(index);
		if (index >= 0) {
		View result = mTransientStateViews.valueAt(index);
		mTransientStateViews.removeAt(index);
		return result;
		}
		}
		return null;
		}

		/**
		* Dump any currently saved views with transient state.
		@@ -6300,6 +6315,9 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
		if (mTransientStateViews != null) {
		mTransientStateViews.clear();
		}
		if (mTransientStateViewsById != null) {
		mTransientStateViewsById.clear();
		}
		}

		/**
		@@ -6342,12 +6360,19 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
		mSkippedScrap.add(scrap);
		}
		if (scrapHasTransientState) {
		scrap.dispatchStartTemporaryDetach();
		if (mAdapter != null && mAdapterHasStableIds) {
		if (mTransientStateViewsById == null) {
		mTransientStateViewsById = new LongSparseArray<View>();
		}
		mTransientStateViewsById.put(lp.itemId, scrap);
		} else {
		if (mTransientStateViews == null) {
		mTransientStateViews = new SparseArray<View>();
		}
		scrap.dispatchStartTemporaryDetach();
		mTransientStateViews.put(position, scrap);
		}
		}
		return;
		}

		@@ -6405,11 +6430,19 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
		removeDetachedView(victim, false);
		}
		if (scrapHasTransientState) {
		if (mAdapter != null && mAdapterHasStableIds) {
		if (mTransientStateViewsById == null) {
		mTransientStateViewsById = new LongSparseArray<View>();
		}
		long id = mAdapter.getItemId(mFirstActivePosition + i);
		mTransientStateViewsById.put(id, victim);
		} else {
		if (mTransientStateViews == null) {
		mTransientStateViews = new SparseArray<View>();
		}
		mTransientStateViews.put(mFirstActivePosition + i, victim);
		}
		}
		continue;
		}

		@@ -6457,6 +6490,15 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
		}
		}
		}
		if (mTransientStateViewsById != null) {
		for (int i = 0; i < mTransientStateViewsById.size(); i++) {
		final View v = mTransientStateViewsById.valueAt(i);
		if (!v.hasTransientState()) {
		mTransientStateViewsById.removeAt(i);
		i--;
		}
		}
		}
		}

		/**