commit f9fafe7a92839e88771942f16a3cbe6ad6fb7945
author Tracy Zhou <tracyzhou@google.com> Sat Jun 25 06:36:39 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jun 25 06:36:39 2022 +0000
tree 49d9e6840bc2c85d9c274d8e97a3e7a321eac834
parent ce12869fad3200585122a5aed2a0f09ccc35fb05
parent 804feb76e7223462b99a7f51cefb775a3e602d25

Merge "Fix ime switcher not showing for 3-button nav" into tm-qpr-dev

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 01cf23b..b363803 100644
--- a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java
@@ -191,7 +191,7 @@
                     isThreeButtonNav ? mStartContextualContainer : mEndContextualContainer,
                     mControllers.navButtonController, R.id.ime_switcher);
             mPropertyHolders.add(new StatePropertyHolder(imeSwitcherButton,
-                    flags -> ((flags & MASK_IME_SWITCHER_VISIBLE) == MASK_IME_SWITCHER_VISIBLE)
+                    flags -> ((flags & MASK_IME_SWITCHER_VISIBLE) != 0)
                             && ((flags & FLAG_ROTATION_BUTTON_VISIBLE) == 0)));
         }