From 804feb76e7223462b99a7f51cefb775a3e602d25 Mon Sep 17 00:00:00 2001 From: Tracy Zhou Date: Fri, 24 Jun 2022 11:17:40 -0700 Subject: [PATCH] Fix ime switcher not showing for 3-button nav Bug: 226489759 Test: connect to a physical keyboard in 3 button nav and make sure the ime switcher shows Change-Id: Iabde149e8bcd1edacff8e039f956628c69341ecb --- .../android/launcher3/taskbar/NavbarButtonsViewController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java index 01cf23bffd..b363803ef3 100644 --- a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java @@ -191,7 +191,7 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT 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))); }