commit 05ff09c52c93bd78535a8cf97c39799cc105bd90
author Pat Manning <patmanning@google.com> Fri Jan 28 12:22:17 2022 +0000
committer Pat Manning <patmanning@google.com> Fri Jan 28 12:22:17 2022 +0000
tree 9c5ec492e033d93ff9141f1e2bd1e7c1c08a0e85
parent 2718fd676742d01b366d1159bf2ce909667beb3b

Do not translate taskbar icons in kids mode when IME present.

Test: manual
Bug: 203749295
Change-Id: I6958ed95f1199c1178487134b92ff3ef0f15da2e

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 224c05e..0a22bbc 100644
--- a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java
@@ -204,8 +204,8 @@
         // 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,