Merge "Fixing AdapterViewAnimator onItemClick compatibility" (f961f9c2) · Commits · e / os / android_frameworks_base

core/java/android/widget/AdapterViewAnimator.java

+36 −13

Original line number	Diff line number	Diff line
		@@ -79,7 +79,7 @@ public abstract class AdapterViewAnimator extends AdapterView<Adapter>
		/**
		* Map of the children of the {@link AdapterViewAnimator}.
		*/
		HashMap<Integer, ViewAndIndex> mViewsMap = new HashMap<Integer, ViewAndIndex>();
		HashMap<Integer, ViewAndMetaData> mViewsMap = new HashMap<Integer, ViewAndMetaData>();

		/**
		* List of views pending removal from the {@link AdapterViewAnimator}
		@@ -204,13 +204,18 @@ public abstract class AdapterViewAnimator extends AdapterView<Adapter>
		mPreviousViews = new ArrayList<Integer>();
		}

		class ViewAndIndex {
		ViewAndIndex(View v, int i) {
		view = v;
		index = i;
		}
		class ViewAndMetaData {
		View view;
		int index;
		int relativeIndex;
		int adapterPosition;
		long itemId;

		ViewAndMetaData(View view, int relativeIndex, int adapterPosition, long itemId) {
		this.view = view;
		this.relativeIndex = relativeIndex;
		this.adapterPosition = adapterPosition;
		this.itemId = itemId;
		}
		}

		/**
		@@ -376,6 +381,15 @@ public abstract class AdapterViewAnimator extends AdapterView<Adapter>
		}
		}

		private ViewAndMetaData getMetaDataForChild(View child) {
		for (ViewAndMetaData vm: mViewsMap.values()) {
		if (vm.view == child) {
		return vm;
		}
		}
		return null;
		}

		LayoutParams createOrReuseLayoutParams(View v) {
		final ViewGroup.LayoutParams currentLp = v.getLayoutParams();
		if (currentLp instanceof ViewGroup.LayoutParams) {
		@@ -478,7 +492,7 @@ public abstract class AdapterViewAnimator extends AdapterView<Adapter>

		if (remove) {
		View previousView = mViewsMap.get(index).view;
		int oldRelativeIndex = mViewsMap.get(index).index;
		int oldRelativeIndex = mViewsMap.get(index).relativeIndex;

		mPreviousViews.add(index);
		transformViewForTransition(oldRelativeIndex, -1, previousView, animate);
		@@ -494,7 +508,7 @@ public abstract class AdapterViewAnimator extends AdapterView<Adapter>
		int index = modulo(i, getWindowSize());
		int oldRelativeIndex;
		if (mViewsMap.containsKey(index)) {
		oldRelativeIndex = mViewsMap.get(index).index;
		oldRelativeIndex = mViewsMap.get(index).relativeIndex;
		} else {
		oldRelativeIndex = -1;
		}
		@@ -507,14 +521,16 @@ public abstract class AdapterViewAnimator extends AdapterView<Adapter>

		if (inOldRange) {
		View view = mViewsMap.get(index).view;
		mViewsMap.get(index).index = newRelativeIndex;
		mViewsMap.get(index).relativeIndex = newRelativeIndex;
		applyTransformForChildAtIndex(view, newRelativeIndex);
		transformViewForTransition(oldRelativeIndex, newRelativeIndex, view, animate);

		// Otherwise this view is new to the window
		} else {
		// Get the new view from the adapter, add it and apply any transform / animation
		View newView = mAdapter.getView(modulo(i, adapterCount), null, this);
		final int adapterPosition = modulo(i, adapterCount);
		View newView = mAdapter.getView(adapterPosition, null, this);
		long itemId = mAdapter.getItemId(adapterPosition);

		// We wrap the new view in a FrameLayout so as to respect the contract
		// with the adapter, that is, that we don't modify this view directly
		@@ -524,7 +540,8 @@ public abstract class AdapterViewAnimator extends AdapterView<Adapter>
		if (newView != null) {
		fl.addView(newView);
		}
		mViewsMap.put(index, new ViewAndIndex(fl, newRelativeIndex));
		mViewsMap.put(index, new ViewAndMetaData(fl, newRelativeIndex,
		adapterPosition, itemId));
		addChild(fl);
		applyTransformForChildAtIndex(fl, newRelativeIndex);
		transformViewForTransition(-1, newRelativeIndex, fl, animate);
		@@ -601,6 +618,7 @@ public abstract class AdapterViewAnimator extends AdapterView<Adapter>
		case MotionEvent.ACTION_UP: {
		if (mTouchMode == TOUCH_MODE_DOWN_IN_CURRENT_VIEW) {
		final View v = getCurrentView();
		final ViewAndMetaData viewData = getMetaDataForChild(v);
		if (v != null) {
		if (isTransformedTouchPointInView(ev.getX(), ev.getY(), v, null)) {
		final Handler handler = getHandler();
		@@ -613,8 +631,13 @@ public abstract class AdapterViewAnimator extends AdapterView<Adapter>
		hideTapFeedback(v);
		post(new Runnable() {
		public void run() {
		if (viewData != null) {
		performItemClick(v, viewData.adapterPosition,
		viewData.itemId);
		} else {
		performItemClick(v, 0, 0);
		}
		}
		});
		}
		}, ViewConfiguration.getPressedStateDuration());

core/java/android/widget/StackView.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -427,8 +427,8 @@ public class StackView extends AdapterViewAnimator {
		// Here we need to make sure that the z-order of the children is correct
		for (int i = mCurrentWindowEnd; i >= mCurrentWindowStart; i--) {
		int index = modulo(i, getWindowSize());
		ViewAndIndex vi = mViewsMap.get(index);
		if (vi != null) {
		ViewAndMetaData vm = mViewsMap.get(index);
		if (vm != null) {
		View v = mViewsMap.get(index).view;
		if (v != null) v.bringToFront();
		}