From 602f3074f94c6e72bf3f6429bf822d70e218b75d Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Fri, 27 Jan 2023 17:20:51 +0000 Subject: [PATCH] Remove ALPHA_INDEX_IME_BUTTON_NAV Taskbar already stashes when IME is showing, which hides the taskbar icons in 3 button mode. Hence this extra flag seems redundant and breaks Transient Taskbar, which allows unstashing taskbar over IME Test: Install 3P keyboard, swiping taskbar up over IME still shows icons Test: Connect physical keyboard, icons still hide in 3 button nav when the IME switcher is showing Fixes: 264723145 Change-Id: Iafb89e765668d70a1bfad2e136957a2ef8924514 --- .../taskbar/NavbarButtonsViewController.java | 7 ------- .../launcher3/taskbar/TaskbarActivityContext.java | 2 -- .../launcher3/taskbar/TaskbarViewController.java | 13 ++----------- 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java index 2b976df802..2e2023d1cf 100644 --- a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java @@ -485,13 +485,6 @@ 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_SHOWING) != 0; - } - /** * Returns true if the home button is disabled */ diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java index 8a5b2c5e17..22c9756a5b 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java @@ -555,8 +555,6 @@ public class TaskbarActivityContext extends BaseTaskbarContext { fromInit); mControllers.taskbarViewController.setImeIsVisible( mControllers.navbarButtonsViewController.isImeVisible()); - mControllers.taskbarViewController.setIsImeSwitcherVisible( - mControllers.navbarButtonsViewController.isImeSwitcherVisible()); int shadeExpandedFlags = SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED | SYSUI_STATE_QUICK_SETTINGS_EXPANDED; onNotificationShadeExpandChanged((systemUiStateFlags & shadeExpandedFlags) != 0, fromInit); diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java index 168c353273..69f79baa75 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java @@ -79,9 +79,8 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar public static final int ALPHA_INDEX_RECENTS_DISABLED = 3; public static final int ALPHA_INDEX_NOTIFICATION_EXPANDED = 4; public static final int ALPHA_INDEX_ASSISTANT_INVOKED = 5; - public static final int ALPHA_INDEX_IME_BUTTON_NAV = 6; - public static final int ALPHA_INDEX_SMALL_SCREEN = 7; - private static final int NUM_ALPHA_CHANNELS = 8; + public static final int ALPHA_INDEX_SMALL_SCREEN = 6; + private static final int NUM_ALPHA_CHANNELS = 7; private final TaskbarActivityContext mActivity; private final TaskbarView mTaskbarView; @@ -200,14 +199,6 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar || DisplayController.isTransientTaskbar(mActivity)); } - /** - * Should be called when the IME switcher visibility changes. - */ - public void setIsImeSwitcherVisible(boolean isImeSwitcherVisible) { - mTaskbarIconAlpha.get(ALPHA_INDEX_IME_BUTTON_NAV).setValue( - isImeSwitcherVisible ? 0 : 1); - } - /** * Should be called when the recents button is disabled, so we can hide taskbar icons as well. */