commit d11b60855ca3c66a8b1e26eff583f76c8ed69ec5
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Fri Jun 08 01:27:38 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Fri Jun 08 01:27:38 2018 +0000
tree 4aade2256ee9ac743c4d0ab5f82c837586c2d2c2
parent a48273b4cb9f8cad0bbd347c523ed10031b2ae4c
parent 7f300e3dfff8712483991ec81696f324e2f2b61e

[automerger] Track shelf rather than app window am: 7f300e3dff

Change-Id: I46442796f81ecb185bf74f2b1a873e08f679a8d1

quickstep/src/com/android/quickstep/ActivityControlHelper.java

diff --git a/quickstep/src/com/android/quickstep/ActivityControlHelper.java b/quickstep/src/com/android/quickstep/ActivityControlHelper.java
index f1aff05..8e4270e 100644
--- a/quickstep/src/com/android/quickstep/ActivityControlHelper.java
+++ b/quickstep/src/com/android/quickstep/ActivityControlHelper.java
@@ -187,7 +187,9 @@
                 int hotseatInset = dp.isSeascape() ? targetInsets.left : targetInsets.right;
                 return dp.hotseatBarSizePx + dp.hotseatBarSidePaddingPx + hotseatInset;
             } else {
-                return dp.heightPx - outRect.rect.bottom;
+                int shelfHeight = dp.hotseatBarSizePx + dp.getInsets().bottom;
+                // Track slightly below the top of the shelf (between top and content).
+                return shelfHeight - dp.edgeMarginPx * 2;
             }
         }