diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-04-26 20:57:42 +0000 |
|---|---|---|
| committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-04-26 20:57:42 +0000 |
| commit | 453e0cd3dda03929523b6c734c38d4e4538ccae8 (patch) | |
| tree | f75ae1b6bb1dfa58e6146b3c1ea5c907de52355f | |
| parent | e30b4fbe958a942d384759fef4a8c72bae9d76e5 (diff) | |
| parent | 4df80700c4363561f06f2f75c07743ab4b8aa181 (diff) | |
| download | android_packages_apps_Trebuchet-453e0cd3dda03929523b6c734c38d4e4538ccae8.tar.gz android_packages_apps_Trebuchet-453e0cd3dda03929523b6c734c38d4e4538ccae8.tar.bz2 android_packages_apps_Trebuchet-453e0cd3dda03929523b6c734c38d4e4538ccae8.zip | |
[automerger] Shared touch and drag slops for quick step changes with density (2/3) am: 4df80700c4
Change-Id: I0327af0fa3f7c032c0b20de6c42c747493cc98bd
| -rw-r--r-- | quickstep/libs/sysui_shared.jar | bin | 124201 -> 123276 bytes | |||
| -rw-r--r-- | quickstep/src/com/android/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 Binary files differindex 0adc83aa2..13f41ee5f 100644 --- a/quickstep/libs/sysui_shared.jar +++ b/quickstep/libs/sysui_shared.jar diff --git a/quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java b/quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java index f7e45d38b..6ce9372be 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; |