From 12e9f34bd51e2bd64aa4eaef537b591917242d2a Mon Sep 17 00:00:00 2001
From: Tony <twickham@google.com>
Date: Fri, 26 Jan 2018 20:50:55 -0800
Subject: [PATCH] Fix some visual bugs

- Workspace was translating while swiping from overview to all apps
- VerticalSwipeController progress jumped a bit backwards when
  flinging because sign wasn't taken into account for velocity

Change-Id: Ife5e9d87ca9f0b3429dd9045c6569868a65eb0af
---
 quickstep/res/values/dimens.xml                                 | 2 +-
 .../src/com/android/launcher3/uioverrides/WorkspaceCard.java    | 2 +-
 src/com/android/launcher3/util/VerticalSwipeController.java     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index bdc7c36d7f..d8504f19bc 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -29,7 +29,7 @@
     <dimen name="quickstep_fling_threshold_velocity">500dp</dimen>
     <dimen name="quickstep_fling_min_velocity">250dp</dimen>
 
-    <dimen name="workspace_overview_offset_x">-30dp</dimen>
+    <dimen name="workspace_overview_offset_x">-24dp</dimen>
 
     <!-- TODO: This can be calculated using other resource values -->
     <dimen name="all_apps_search_box_full_height">90dp</dimen>
diff --git a/quickstep/src/com/android/launcher3/uioverrides/WorkspaceCard.java b/quickstep/src/com/android/launcher3/uioverrides/WorkspaceCard.java
index 92a09dd56a..8533502b06 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/WorkspaceCard.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/WorkspaceCard.java
@@ -76,7 +76,7 @@ public class WorkspaceCard extends View implements PageCallbacks, OnClickListene
         mTranslateXPage0 = scale[1];
         mTranslateXPage1 = OverviewState
                 .getScaleAndTranslationForPageRect(mLauncher,
-                        getResources().getDimension(R.dimen.workspace_overview_offset_x),
+                        getResources().getDimension(R.dimen.workspace_overview_offset_x) / scale[0],
                         mTempRect)[1];
 
         mExtraScrollShift = 0;
diff --git a/src/com/android/launcher3/util/VerticalSwipeController.java b/src/com/android/launcher3/util/VerticalSwipeController.java
index 5d47cd27ab..29477e3816 100644
--- a/src/com/android/launcher3/util/VerticalSwipeController.java
+++ b/src/com/android/launcher3/util/VerticalSwipeController.java
@@ -259,7 +259,7 @@ public abstract class VerticalSwipeController extends AnimatorListenerAdapter
         });
 
         float nextFrameProgress = Utilities.boundToRange(
-                progress + velocity * SINGLE_FRAME_MS / getShiftRange(), 0f, 1f);
+                progress + velocity * SINGLE_FRAME_MS * mProgressMultiplier, 0f, 1f);
 
         ValueAnimator anim = mCurrentAnimation.getAnimationPlayer();
         anim.setFloatValues(nextFrameProgress, targetState == mToState ? 1f : 0f);