commit 1d3e37ecf244fbdcaad34f906390bbbc770217e4
author Hyunyoung Song <hyunyoungs@google.com> Wed Jan 09 20:13:14 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 09 20:13:14 2019 +0000
tree ca21ec04c3bcb0d01ee1a32f4096133aafa25dd3
parent c8a926941f686e5935511dbd025be781d82bd99f
parent b4d1ca49021dc03f908ee5739bc0e410a4d986e7

Merge "Refresh icon cache for recents when rro overrides the adaptive icon path" into ub-launcher3-master

quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java

diff --git a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
index 610ef04..fd4585b 100644
--- a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
+++ b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
@@ -422,7 +422,9 @@
             mSyncTransactionApplier = applier;
         });
         mRecentsView.setOnScrollChangeListener((v, scrollX, scrollY, oldScrollX, oldScrollY) -> {
-            updateFinalShift();
+            if (!mBgLongSwipeMode) {
+                updateFinalShift();
+            }
         });
         mRecentsView.setRecentsAnimationWrapper(mRecentsAnimationWrapper);
         mRecentsView.setClipAnimationHelper(mClipAnimationHelper);