Merge "Show IME switcher only when physical keyboard is connected in 3 button nav (instead of also when virtual keyboard is visible)" into tm-qpr-dev am: 1092ccacbf am: dc8edee14d

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19072234

Change-Id: I7cb11a850f9101dfb226b2bdc4ec2685572e2b1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tracy Zhou authored and Automerger Merge Worker committed 2022-06-29 22:32:47 +00:00
commit 282a504f1d
3 files changed
+20 -4

No files matched your search

@@ -108,8 +108,6 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT
private static final int FLAG_SCREEN_PINNING_ACTIVE = 1 << 11;
private static final int FLAG_VOICE_INTERACTION_WINDOW_SHOWING = 1 << 12;
private static final int MASK_IME_SWITCHER_VISIBLE = FLAG_SWITCHER_SUPPORTED | FLAG_IME_VISIBLE;
private static final String NAV_BUTTONS_SEPARATE_WINDOW_TITLE = "Taskbar Nav Buttons";
public static final int ALPHA_INDEX_IMMERSIVE_MODE = 0;
@@ -191,7 +189,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) != 0)
flags -> ((flags & FLAG_SWITCHER_SUPPORTED) != 0)
&& ((flags & FLAG_ROTATION_BUTTON_VISIBLE) == 0)));
}
@@ -512,6 +510,13 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT
return (mState & FLAG_IME_VISIBLE) != 0;
}
/**
* Returns true if IME switcher is visible
*/
public boolean isImeSwitcherVisible() {
return (mState & FLAG_SWITCHER_SUPPORTED) != 0;
}
/**
* Returns true if the home button is disabled
*/