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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19459614

Change-Id: Ibe89336449a0dd3f0167e3934847daa82ad4d18c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Pat Manning
2022-08-06 01:49:31 +00:00
committed by Automerger Merge Worker

View File

@@ -676,9 +676,11 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT
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();