commit a03bec439e6b505bc16110820dfcda85a9fef2a5
author TreeHugger Robot <treehugger-gerrit@google.com> Fri May 17 00:29:04 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 17 00:29:04 2019 +0000
tree e4ecca3c4308dd44cd6e006f5ab183d8c1f4c496
parent fcfac8156d839937ff5aea55b8188b8d37d41787
parent 3f411e7ae4a240b7756016af57b49f1015faa838

Merge "Add padding between nav bar and hotseat in vertical bar layout." into ub-launcher3-qt-dev

src/com/android/launcher3/DeviceProfile.java

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index d098b8c..c1f898c 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -210,9 +210,8 @@
                 + res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_bottom_padding);
         hotseatBarSidePaddingEndPx =
                 res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_side_padding);
-        // Add a bit of space between nav bar and hotseat in multi-window vertical bar layout.
-        hotseatBarSidePaddingStartPx = isMultiWindowMode && isVerticalBarLayout()
-                ? edgeMarginPx : 0;
+        // Add a bit of space between nav bar and hotseat in vertical bar layout.
+        hotseatBarSidePaddingStartPx = isVerticalBarLayout() ? verticalDragHandleSizePx : 0;
         hotseatBarSizePx = ResourceUtils.pxFromDp(inv.iconSize, dm) + (isVerticalBarLayout()
                 ? (hotseatBarSidePaddingStartPx + hotseatBarSidePaddingEndPx)
                 : (res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_extra_vertical_size)