commit cd8fb0fb7f685f945ace2bacbcb214674e09e85a
author Tony Wickham <twickham@google.com> Fri Jun 08 18:32:38 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 08 18:32:38 2018 +0000
tree 0737c528e7ae4aa8bf6bb303545e57fdbee75608
parent 7f46327c04a5e36fde4a2143f3c7269ba1bc873a
parent d11b60855ca3c66a8b1e26eff583f76c8ed69ec5

Merge changes from topic "am-a4912ede-7663-4592-a9fd-02d7d5e05de7" into ub-launcher3-master

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

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;
             }
         }