Merge "Always set item type on obtained ListView item views" (3b6502f5) · Commits · e / os / android_frameworks_base

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) {