commit 73a55f7506f0e5e8d67a58259289ef0b97ccea02
author Mady Mellor <madym@google.com> Mon Mar 27 23:26:47 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 27 23:26:52 2017 +0000
tree cece052b6e2cff343a9c04b7981cceaaf0f88e00
parent 2388f0c81c30274671d9ab28dde8cf36042d3214
parent 84a0f8936d0a993576a0da3a1c703e4f9198bfd3

Merge "Fix for edge swipe/fling to minimize"

packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java

diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java
index 5da3097..a0f491f 100644
--- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java
@@ -580,10 +580,10 @@
                 final float velocity = PointF.length(vel.x, vel.y);
                 final boolean isFling = velocity > mFlingAnimationUtils.getMinVelocityPxPerSecond();
                 final boolean isHorizontal = Math.abs(vel.x) > Math.abs(vel.y);
-                final boolean onLeft = mMotionHelper.getBounds().left < mMovementBounds.centerX();
-                final boolean isFlingToBot = !isHorizontal && mMovementWithinDismiss && vel.y > 0;
-                final boolean isFlingToEdge = isHorizontal && mMovementWithinMinimize
-                        && (onLeft ? vel.x < 0 : vel.x > 0);
+                final boolean isFlingToBot = isFling
+                        && !isHorizontal && mMovementWithinDismiss && vel.y > 0;
+                final boolean isFlingToEdge = isFling && isHorizontal && mMovementWithinMinimize
+                        && (mStartedOnLeft ? vel.x < 0 : vel.x > 0);
 
                 if (ENABLE_DISMISS_DRAG_TO_EDGE
                         && (mMotionHelper.shouldDismissPip() || isFlingToBot)) {