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
2018-06-08 18:32:38 +00:00
parent 7f46327c04 d11b60855c
commit cd8fb0fb7f
1 changed files with 3 additions and 1 deletions
@@ -187,7 +187,9 @@ public interface ActivityControlHelper<T extends BaseDraggingActivity> {
                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;
            }
        }