commit 80d33f35a93a9058f06b6ea7c6d5e052a1ffe2a1
author Pat Manning <patmanning@google.com> Fri Aug 05 23:29:24 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 05 23:29:24 2022 +0000
tree 7661383898ce8badc96a5601a0259538ad65d6e6
parent 0c0fb6bc0828195922f17e84f97f941b2c66cddd
parent f3783291ec1811054983d0161abf1a129157c591

Merge "Skip button layout spacing call when kids nav bar is active." into tm-qpr-dev

quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java

diff --git a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java
index b01168d..55c3c20 100644
--- a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java
@@ -676,9 +676,11 @@
         updateButtonLayoutSpacing();
     }
 
-    /** Adds the correct spacing to 3 button nav container. No-op if using gesture nav */
+    /**
+     * Adds the correct spacing to 3 button nav container. No-op if using gesture nav or kids mode.
+     */
     private void updateButtonLayoutSpacing() {
-        if (!mContext.isThreeButtonNav()) {
+        if (!mContext.isThreeButtonNav() || mContext.isNavBarKidsModeActive()) {
             return;
         }
         DeviceProfile dp = mContext.getDeviceProfile();