commit 33d1c3c0eae31abbaffb8617827f986ecba88708
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Feb 23 23:13:17 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 23 23:13:17 2018 +0000
tree 7c1f1872e5098ffe8de132fa99241fe918004b37
parent a52d2eca83d7c594fc0ec25a581980517182b062
parent 338d15d2328d47ad9095bfc3710365e0e13d1859

Merge "Normalizing icons in recents view" 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 012afb2..528fd72 100644
--- a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
+++ b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
@@ -290,12 +290,11 @@
         mSourceRect.set(scaledTargetRect);
 
         Rect targetInsets = dp.getInsets();
-        mTransitionDragLength = dp.hotseatBarSizePx;
         if (dp.isVerticalBarLayout()) {
             int hotseatInset = dp.isSeascape() ? targetInsets.left : targetInsets.right;
-            mTransitionDragLength += dp.hotseatBarSidePaddingPx + hotseatInset;
+            mTransitionDragLength = dp.hotseatBarSizePx + dp.hotseatBarSidePaddingPx + hotseatInset;
         } else {
-            mTransitionDragLength += targetInsets.bottom;
+            mTransitionDragLength = dp.heightPx - tempRect.bottom;
         }
     }