commit 15852dc121c7dff20c1960bf98b16e980a88b794
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 397a78025ad2b267d87371197b594a70f9b1693a
parent bd88f396dc812f7c90df74e79830fd1948225cfa
parent 7f300e3dfff8712483991ec81696f324e2f2b61e

Merge "Track shelf rather than app window" into ub-launcher3-edmonton-polish

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