Update mIsBeingDragged in onTouchEvent(ACTION_DOWN) (c9c88ee0) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/PagedView.java

+22 −17

Original line number	Original line	Diff line number	Diff line
	@@ -890,23 +890,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
	mTotalMotionX = 0;		mTotalMotionX = 0;
	mActivePointerId = ev.getPointerId(0);		mActivePointerId = ev.getPointerId(0);

	/*		updateIsBeingDraggedOnTouchDown();
	* If being flinged and user touches the screen, initiate drag;
	* otherwise don't. mScroller.isFinished should be false when
	* being flinged.
	*/
	final int xDist = Math.abs(mScroller.getFinalPos() - mScroller.getCurrPos());
	final boolean finishedScrolling = (mScroller.isFinished() \|\| xDist < mTouchSlop / 3);

	if (finishedScrolling) {
	mIsBeingDragged = false;
	if (!mScroller.isFinished() && !mFreeScroll) {
	setCurrentPage(getNextPage());
	pageEndTransition();
	}
	} else {
	mIsBeingDragged = true;
	}

	break;		break;
	}		}
	@@ -929,6 +913,25 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
	return mIsBeingDragged;		return mIsBeingDragged;
	}		}

			/**
			* If being flinged and user touches the screen, initiate drag; otherwise don't.
			*/
			private void updateIsBeingDraggedOnTouchDown() {
			// mScroller.isFinished should be false when being flinged.
			final int xDist = Math.abs(mScroller.getFinalPos() - mScroller.getCurrPos());
			final boolean finishedScrolling = (mScroller.isFinished() \|\| xDist < mTouchSlop / 3);

			if (finishedScrolling) {
			mIsBeingDragged = false;
			if (!mScroller.isFinished() && !mFreeScroll) {
			setCurrentPage(getNextPage());
			pageEndTransition();
			}
			} else {
			mIsBeingDragged = true;
			}
			}

	public boolean isHandlingTouch() {		public boolean isHandlingTouch() {
	return mIsBeingDragged;		return mIsBeingDragged;
	}		}
	@@ -1104,6 +1107,8 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou

	switch (action & MotionEvent.ACTION_MASK) {		switch (action & MotionEvent.ACTION_MASK) {
	case MotionEvent.ACTION_DOWN:		case MotionEvent.ACTION_DOWN:
			updateIsBeingDraggedOnTouchDown();

	/*		/*
	* If being flinged and user touches, stop the fling. isFinished		* If being flinged and user touches, stop the fling. isFinished
	* will be false if being flinged.		* will be false if being flinged.