am 3ac51b3d: Merge "Fix bug 2523622 - ListView invokes onItemClick for... (9ebc9f46) · Commits · e / os / android_frameworks_base

core/java/android/widget/AbsListView.java

+12 −11

Original line number	Diff line number	Diff line
		@@ -1688,11 +1688,12 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
		// bail out before bad things happen
		if (mDataChanged) return;

		if (mAdapter != null && mItemCount > 0 &&
		mClickMotionPosition != INVALID_POSITION &&
		mClickMotionPosition < mAdapter.getCount() && sameWindow()) {
		performItemClick(mChild, mClickMotionPosition, getAdapter().getItemId(
		mClickMotionPosition));
		final ListAdapter adapter = mAdapter;
		final int motionPosition = mClickMotionPosition;
		if (adapter != null && mItemCount > 0 &&
		motionPosition != INVALID_POSITION &&
		motionPosition < adapter.getCount() && sameWindow()) {
		performItemClick(mChild, motionPosition, adapter.getItemId(motionPosition));
		}
		}
		}
		@@ -2118,8 +2119,8 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
		mPendingCheckForTap : mPendingCheckForLongPress);
		}
		mLayoutMode = LAYOUT_NORMAL;
		if (!mDataChanged && mAdapter.isEnabled(motionPosition)) {
		mTouchMode = TOUCH_MODE_TAP;
		if (!mDataChanged) {
		setSelectedPositionInt(mMotionPosition);
		layoutChildren();
		child.setPressed(true);
		@@ -2141,14 +2142,14 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
		mTouchMode = TOUCH_MODE_REST;
		}
		}, ViewConfiguration.getPressedStateDuration());
		} else {
		mTouchMode = TOUCH_MODE_REST;
		}
		return true;
		} else {
		if (!mDataChanged) {
		} else if (!mDataChanged && mAdapter.isEnabled(motionPosition)) {
		post(performClick);
		}
		}
		}
		mTouchMode = TOUCH_MODE_REST;
		break;
		case TOUCH_MODE_SCROLL: