Merge "Only hide back button in SUW when ime is rendering it" into main

2024-02-06 20:24:29 +00:00
parent d1176bccf9 e502cf3a1b
commit b7efb5cb49
1 changed files with 5 additions and 3 deletions
@@ -780,9 +780,11 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT
            handleSetupUi();

            // Hide back button in SUW if keyboard is showing (IME draws its own back).
-            mPropertyHolders.add(new StatePropertyHolder(
-                    mBackButtonAlpha.get(ALPHA_INDEX_SUW),
-                    flags -> (flags & FLAG_IME_VISIBLE) == 0));
+            if (mIsImeRenderingNavButtons) {
+                mPropertyHolders.add(new StatePropertyHolder(
+                        mBackButtonAlpha.get(ALPHA_INDEX_SUW),
+                        flags -> (flags & FLAG_IME_VISIBLE) == 0));
+            }
        } else if (isInKidsMode) {
            int iconSize = res.getDimensionPixelSize(
                    R.dimen.taskbar_icon_size_kids);