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

This commit is contained in:
TreeHugger Robot
2022-01-28 15:05:15 +00:00
committed by Android (Google) Code Review

View File

@@ -214,8 +214,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,