From 05ff09c52c93bd78535a8cf97c39799cc105bd90 Mon Sep 17 00:00:00 2001 From: Pat Manning Date: Fri, 28 Jan 2022 12:22:17 +0000 Subject: [PATCH] Do not translate taskbar icons in kids mode when IME present. Test: manual Bug: 203749295 Change-Id: I6958ed95f1199c1178487134b92ff3ef0f15da2e --- .../launcher3/taskbar/NavbarButtonsViewController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java index 224c05e89e..0a22bbcb00 100644 --- a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java @@ -204,8 +204,8 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT // For gesture nav, nav buttons only show for IME anyway so keep them translated down. float defaultButtonTransY = alwaysShowButtons ? 0 : transForIme; mPropertyHolders.add(new StatePropertyHolder(mTaskbarNavButtonTranslationYForIme, - flags -> (flags & FLAG_IME_VISIBLE) != 0, AnimatedFloat.VALUE, transForIme, - defaultButtonTransY)); + flags -> (flags & FLAG_IME_VISIBLE) != 0 && !isInKidsMode, AnimatedFloat.VALUE, + transForIme, defaultButtonTransY)); if (alwaysShowButtons) { initButtons(mNavButtonContainer, mEndContextualContainer,