commit f3783291ec1811054983d0161abf1a129157c591
author Pat Manning <patmanning@google.com> Mon Aug 01 15:10:24 2022 +0100
committer Pat Manning <patmanning@google.com> Fri Aug 05 10:35:07 2022 +0000
tree 2affedb447c6820c81089ef37aa94461313d85d6
parent 67fe05beaf6719abdc9dd843372549cb48dd5f63

Skip button layout spacing call when kids nav bar is active.

Fix: 240530037
Test: manual.
Change-Id: Ibf777dfdaab3c81da8feed581a0297f09a62539d

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();