diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-07-16 17:38:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-07-16 17:38:05 +0000 |
| commit | 160134e0b1cdc74148b18087ea33199011e6a0ce (patch) | |
| tree | 2818e91daf1adb539aad8016264a14732f1877f7 /quickstep | |
| parent | 2e4b665933b5c67d062b3c09787a8d42c8586d17 (diff) | |
| parent | 5818f9b3c523d41ba0e399a1513e22bb83d38abc (diff) | |
| download | android_packages_apps_Trebuchet-160134e0b1cdc74148b18087ea33199011e6a0ce.tar.gz android_packages_apps_Trebuchet-160134e0b1cdc74148b18087ea33199011e6a0ce.tar.bz2 android_packages_apps_Trebuchet-160134e0b1cdc74148b18087ea33199011e6a0ce.zip | |
Merge "Fix overshoot velocity in 2-button landscape mode" into ub-launcher3-qt-r1-dev
Diffstat (limited to 'quickstep')
| -rw-r--r-- | quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java | 2 | ||||
| -rw-r--r-- | quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java index 184b8e131..ec16d881a 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java @@ -882,7 +882,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> if (Math.abs(endVelocity) > minFlingVelocity && mTransitionDragLength > 0) { if (endTarget == RECENTS && mMode != Mode.NO_BUTTON) { Interpolators.OvershootParams overshoot = new Interpolators.OvershootParams( - startShift, endShift, endShift, velocityPxPerMs.y, + startShift, endShift, endShift, endVelocity / 1000, mTransitionDragLength); endShift = overshoot.end; interpolator = overshoot.interpolator; diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java index 9e3bf2f56..885fdbf42 100644 --- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java +++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java @@ -17,7 +17,6 @@ package com.android.quickstep; import static com.android.launcher3.ui.TaplTestsLauncher3.getAppPackageName; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -208,7 +207,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { @Test @NavigationModeSwitch -// @PortraitLandscape + @PortraitLandscape public void testBackground() throws Exception { startAppFast(resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR)); final Background background = mLauncher.getBackground(); |