Use a bottom margin when a software navigation bar is not in use

amirzaidi · Jan 25, 2018 · 9f3c3d6 · 9f3c3d6
1 parent 2bfd198
commit 9f3c3d6
Showing 1 changed file with 19 additions and 0 deletions.
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
@@ -144,6 +144,8 @@ public interface LauncherLayoutChangeListener {
     // Insets
     private Rect mInsets = new Rect();
 
+    private final int mBottomMarginHw;
+
     // Listeners
     private ArrayList<LauncherLayoutChangeListener> mListeners = new ArrayList<>();
 
@@ -231,6 +233,12 @@ public DeviceProfile(Context context, InvariantDeviceProfile inv,
                 : res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_size)
                         + hotseatBarTopPaddingPx + hotseatBarBottomPaddingPx;
 
+        mBottomMarginHw = res.getDimensionPixelSize(R.dimen.qsb_hotseat_bottom_margin_hw);
+        if (!isVerticalBarLayout()) {
+            hotseatBarSizePx += mBottomMarginHw;
+            hotseatBarBottomPaddingPx += mBottomMarginHw;
+        }
+
         // Determine sizes.
         widthPx = width;
         heightPx = height;
@@ -440,6 +448,17 @@ private void updateFolderCellSize(float scale, DisplayMetrics dm, Resources res)
     }
 
     public void updateInsets(Rect insets) {
+        if (!isVerticalBarLayout()) {
+            if (mInsets.bottom == 0 && insets.bottom != 0) {
+                //Navbar is now shown, remove padding
+                hotseatBarSizePx -= mBottomMarginHw;
+                hotseatBarBottomPaddingPx -= mBottomMarginHw;
+            } else if (mInsets.bottom != 0 && insets.bottom == 0) {
+                //Navbar is now hidden, show padding
+                hotseatBarSizePx += mBottomMarginHw;
+                hotseatBarBottomPaddingPx += mBottomMarginHw;
+            }
+        }
         mInsets.set(insets);
     }