diff options
author | Justin Harrison <astyrrian@google.com> | 2014-12-04 20:05:21 +0000 |
---|---|---|
committer | Justin Harrison <astyrrian@google.com> | 2014-12-04 20:05:21 +0000 |
commit | 31d9837284f5a443b065420e8ebb7fbc9e91bb99 (patch) | |
tree | 5810a0f7eb8af30661dc6cb5f85d5e0ac5f41059 /packages/SystemUI/src/com/android/systemui | |
parent | 3f7dac5a1ccf5d464070c1a067d1d50741bdbd0e (diff) | |
download | frameworks_base-31d9837284f5a443b065420e8ebb7fbc9e91bb99.zip frameworks_base-31d9837284f5a443b065420e8ebb7fbc9e91bb99.tar.gz frameworks_base-31d9837284f5a443b065420e8ebb7fbc9e91bb99.tar.bz2 |
Revert "Revert "Improve fling physics for recents""
This is now BC-triaged, so reverting the revert.
This reverts commit 3f7dac5a1ccf5d464070c1a067d1d50741bdbd0e.
Change-Id: Iae9ffc74a44918a83d9cd4dfb7011810c770e135
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui')
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/recents/views/SwipeHelper.java | 4 | ||||
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java | 19 |
2 files changed, 7 insertions, 16 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/SwipeHelper.java b/packages/SystemUI/src/com/android/systemui/recents/views/SwipeHelper.java index fa44551..0428b48 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/SwipeHelper.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/SwipeHelper.java @@ -50,7 +50,6 @@ 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 @@ -350,8 +349,7 @@ public class SwipeHelper { } private void endSwipe(VelocityTracker velocityTracker) { - float maxVelocity = MAX_DISMISS_VELOCITY * mDensityScale; - velocityTracker.computeCurrentVelocity(1000 /* px/sec */, maxVelocity); + velocityTracker.computeCurrentVelocity(1000 /* px/sec */); float velocity = getVelocity(velocityTracker); float perpendicularVelocity = getPerpendicularVelocity(velocityTracker); float escapeVelocity = SWIPE_ESCAPE_VELOCITY * mDensityScale; diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java index 2b173a9..c59f82c 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java @@ -143,22 +143,21 @@ 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) { @@ -237,6 +236,8 @@ 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); @@ -246,9 +247,6 @@ 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) { @@ -267,11 +265,6 @@ class TaskStackViewTouchHandler implements SwipeHelper.Callback { / maxOverScroll)); } mScroller.setStackScroll(curStackScroll + deltaP); - if (mScroller.isScrollOutOfBounds()) { - mVelocityTracker.clear(); - } else { - mVelocityTracker.addMovement(createMotionEventForStackScroll(ev)); - } } mLastMotionX = x; mLastMotionY = y; |