Merge "Revert "Improve fling physics for recents"" into lmp-mr1-dev (21af21ca) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/recents/views/SwipeHelper.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@ public class SwipeHelper {
		private float SWIPE_ESCAPE_VELOCITY = 100f; // dp/sec
		private int DEFAULT_ESCAPE_ANIMATION_DURATION = 75; // ms
		private int MAX_ESCAPE_ANIMATION_DURATION = 150; // ms
		private int MAX_DISMISS_VELOCITY = 2000; // dp/sec
		private static final int SNAP_ANIM_LEN = SLOW_ANIMATIONS ? 1000 : 250; // ms

		public static float ALPHA_FADE_START = 0.15f; // fraction of thumbnail width
		@@ -349,7 +350,8 @@ public class SwipeHelper {
		}

		private void endSwipe(VelocityTracker velocityTracker) {
		velocityTracker.computeCurrentVelocity(1000 /* px/sec */);
		float maxVelocity = MAX_DISMISS_VELOCITY * mDensityScale;
		velocityTracker.computeCurrentVelocity(1000 /* px/sec */, maxVelocity);
		float velocity = getVelocity(velocityTracker);
		float perpendicularVelocity = getPerpendicularVelocity(velocityTracker);
		float escapeVelocity = SWIPE_ESCAPE_VELOCITY * mDensityScale;

packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java

+13 −6

Original line number	Diff line number	Diff line
		@@ -143,21 +143,22 @@ class TaskStackViewTouchHandler implements SwipeHelper.Callback {
		// Initialize the velocity tracker
		initOrResetVelocityTracker();
		mVelocityTracker.addMovement(createMotionEventForStackScroll(ev));
		// Check if the scroller is finished yet
		mIsScrolling = mScroller.isScrolling();
		break;
		}
		case MotionEvent.ACTION_MOVE: {
		if (mActivePointerId == INACTIVE_POINTER_ID) break;

		// Initialize the velocity tracker if necessary
		initVelocityTrackerIfNotExists();
		mVelocityTracker.addMovement(createMotionEventForStackScroll(ev));

		int activePointerIndex = ev.findPointerIndex(mActivePointerId);
		int y = (int) ev.getY(activePointerIndex);
		int x = (int) ev.getX(activePointerIndex);
		if (Math.abs(y - mInitialMotionY) > mScrollTouchSlop) {
		// Save the touch move info
		mIsScrolling = true;
		// Initialize the velocity tracker if necessary
		initVelocityTrackerIfNotExists();
		mVelocityTracker.addMovement(createMotionEventForStackScroll(ev));
		// Disallow parents from intercepting touch events
		final ViewParent parent = mSv.getParent();
		if (parent != null) {
		@@ -236,8 +237,6 @@ class TaskStackViewTouchHandler implements SwipeHelper.Callback {
		case MotionEvent.ACTION_MOVE: {
		if (mActivePointerId == INACTIVE_POINTER_ID) break;

		mVelocityTracker.addMovement(createMotionEventForStackScroll(ev));

		int activePointerIndex = ev.findPointerIndex(mActivePointerId);
		int x = (int) ev.getX(activePointerIndex);
		int y = (int) ev.getY(activePointerIndex);
		@@ -247,6 +246,9 @@ class TaskStackViewTouchHandler implements SwipeHelper.Callback {
		if (!mIsScrolling) {
		if (yTotal > mScrollTouchSlop) {
		mIsScrolling = true;
		// Initialize the velocity tracker
		initOrResetVelocityTracker();
		mVelocityTracker.addMovement(createMotionEventForStackScroll(ev));
		// Disallow parents from intercepting touch events
		final ViewParent parent = mSv.getParent();
		if (parent != null) {
		@@ -265,6 +267,11 @@ class TaskStackViewTouchHandler implements SwipeHelper.Callback {
		/ maxOverScroll));
		}
		mScroller.setStackScroll(curStackScroll + deltaP);
		if (mScroller.isScrollOutOfBounds()) {
		mVelocityTracker.clear();
		} else {
		mVelocityTracker.addMovement(createMotionEventForStackScroll(ev));
		}
		}
		mLastMotionX = x;
		mLastMotionY = y;