commit 790146d1d8a5cdc6c1ec71da062e0168c8ed977c
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jan 28 15:05:15 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 28 15:05:15 2022 +0000
tree f41a055345cc9fd10ae4ee99ec1fb44db753a763
parent 0cc131ffe77b892cbfe7fc47dfdb489799b6978e
parent 05ff09c52c93bd78535a8cf97c39799cc105bd90

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

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 00c58b0..650d4ce 100644
--- a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java
@@ -214,8 +214,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,