From 4df80700c4363561f06f2f75c07743ab4b8aa181 Mon Sep 17 00:00:00 2001 From: Matthew Ng Date: Thu, 26 Apr 2018 11:25:47 -0700 Subject: [PATCH] Shared touch and drag slops for quick step changes with density (2/3) All shared touch and drag slops are not static anymore but are computed for the current system density if the user were to switch density of device. Test: change density and use quick scrub Fixes: 78244075 Change-Id: Idc35e78bdd9c6d9b31a1ccbdd9cd0e7fec87185f --- quickstep/libs/sysui_shared.jar | Bin 124201 -> 123276 bytes .../quickstep/OtherActivityTouchConsumer.java | 7 +++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/quickstep/libs/sysui_shared.jar b/quickstep/libs/sysui_shared.jar index 0adc83aa23dfbb8741ad7fbad555562d1597948f..13f41ee5fc747449057d6cd5927e53f4ac10815a 100644 GIT binary patch delta 3774 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 Oa;j|tMIB=Mrv3{mTV>Y( delta 4451 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 BOH%*< diff --git a/quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java b/quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java index f7e45d38b1..6ce9372be2 100644 --- a/quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java +++ b/quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java @@ -22,7 +22,6 @@ import static android.view.MotionEvent.ACTION_POINTER_UP; import static android.view.MotionEvent.ACTION_UP; import static android.view.MotionEvent.INVALID_POINTER_ID; -import static com.android.systemui.shared.system.NavigationBarCompat.QUICK_STEP_DRAG_SLOP_PX; import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_CLOSING; import android.annotation.TargetApi; @@ -50,6 +49,7 @@ import com.android.quickstep.util.RemoteAnimationTargetSet; import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.shared.system.AssistDataReceiver; import com.android.systemui.shared.system.BackgroundExecutor; +import com.android.systemui.shared.system.NavigationBarCompat; import com.android.systemui.shared.system.NavigationBarCompat.HitTarget; import com.android.systemui.shared.system.RecentsAnimationControllerCompat; import com.android.systemui.shared.system.RecentsAnimationListener; @@ -79,6 +79,7 @@ public class OtherActivityTouchConsumer extends ContextWrapper implements TouchC private final PointF mLastPos = new PointF(); private int mActivePointerId = INVALID_POINTER_ID; private boolean mPassedInitialSlop; + private int mQuickStepDragSlop; private float mStartDisplacement; private WindowTransformSwipeHandler mInteractionHandler; private int mDisplayRotation; @@ -120,6 +121,7 @@ public class OtherActivityTouchConsumer extends ContextWrapper implements TouchC mDownPos.set(ev.getX(), ev.getY()); mLastPos.set(mDownPos); mPassedInitialSlop = false; + mQuickStepDragSlop = NavigationBarCompat.getQuickStepDragSlopPx(); // Start the window animation on down to give more time for launcher to draw if the // user didn't start the gesture over the back button @@ -152,7 +154,8 @@ public class OtherActivityTouchConsumer extends ContextWrapper implements TouchC } mLastPos.set(ev.getX(pointerIndex), ev.getY(pointerIndex)); float displacement = getDisplacement(ev); - if (!mPassedInitialSlop && Math.abs(displacement) > QUICK_STEP_DRAG_SLOP_PX) { + if (!mPassedInitialSlop + && Math.abs(displacement) > mQuickStepDragSlop) { mPassedInitialSlop = true; mStartDisplacement = displacement;