diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-11-20 19:02:45 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-11-20 19:02:45 +0000 |
commit | f3761296a1a94086a3f7bc37cc6d3cada73d5d87 (patch) | |
tree | 91557b83fd4e8d4808da52bd92452aec4d12570e /quickstep | |
parent | ced2347289276c7f3bbaa05bc8a709bb685b09a0 (diff) | |
parent | 09c09bba1e8e06d805eb450b21bd16223dfc2036 (diff) | |
download | packages_apps_Trebuchet-f3761296a1a94086a3f7bc37cc6d3cada73d5d87.tar.gz packages_apps_Trebuchet-f3761296a1a94086a3f7bc37cc6d3cada73d5d87.tar.bz2 packages_apps_Trebuchet-f3761296a1a94086a3f7bc37cc6d3cada73d5d87.zip |
Merge "Fix recents scale sometimes lagging behind window scale" into ub-launcher3-qt-future-dev
Diffstat (limited to 'quickstep')
2 files changed, 2 insertions, 7 deletions
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java index 23db5df2e..f82af62aa 100644 --- a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java +++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java @@ -276,7 +276,7 @@ public class PredictionRowView extends LinearLayout implements boolean predictionsEnabled = predictionCount > 0; if (predictionsEnabled != mPredictionsEnabled) { mPredictionsEnabled = predictionsEnabled; - mLauncher.reapplyUi(); + mLauncher.reapplyUi(false /* cancelCurrentAnimation */); updateVisibility(); } mParent.onHeightUpdated(); 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 ea53364c2..2fa4feb33 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java @@ -206,8 +206,6 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> private boolean mIsShelfPeeking; private boolean mContinuingLastGesture; - // To avoid UI jump when gesture is started, we offset the animation by the threshold. - private float mShiftAtGestureStart = 0; private ThumbnailData mTaskSnapshot; @@ -580,9 +578,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> // Normalize the progress to 0 to 1, as the animation controller will clamp it to that // anyway. The controller mimics the drag length factor by applying it to its interpolators. float progress = mCurrentShift.value / mDragLengthFactor; - mLauncherTransitionController.setPlayFraction( - progress <= mShiftAtGestureStart || mShiftAtGestureStart >= 1 - ? 0 : (progress - mShiftAtGestureStart) / (1 - mShiftAtGestureStart)); + mLauncherTransitionController.setPlayFraction(progress); } /** @@ -622,7 +618,6 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> @Override public void onGestureStarted() { notifyGestureStartedAsync(); - mShiftAtGestureStart = mCurrentShift.value; setStateOnUiThread(STATE_GESTURE_STARTED); mGestureStarted = true; } |