From c8c81a3425d4c6562bf29a902616e9f3268ce3db Mon Sep 17 00:00:00 2001 From: Sam Dubey Date: Wed, 16 Nov 2022 10:22:12 +0000 Subject: [PATCH] Revert "Allow transient taskbar to unstash over soft ime" This reverts commit 9787ae6ad9be6caf2a0d4c5f3ec1a1e950772bda. Reason for revert: Breaking launcher tests on Tablet Bug: 259347305 Change-Id: Idfd9e412f143370b6b8a4c6f86aac94d17bc1846 --- .../launcher3/taskbar/TaskbarStashController.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java index 5b0b3a2219..72ae1d1c31 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java @@ -745,11 +745,6 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba mIsImeShowing = hasAnyFlag(systemUiStateFlags, SYSUI_STATE_IME_SHOWING); mIsImeSwitcherShowing = hasAnyFlag(systemUiStateFlags, SYSUI_STATE_IME_SWITCHER_SHOWING); if (!mIsSystemGestureInProgress) { - if (mIsImeShowing || mIsImeSwitcherShowing) { - // Hide taskbar when IME is shown. - updateStateForFlag(FLAG_STASHED_IN_APP_AUTO, true); - } - updateStateForFlag(FLAG_STASHED_IN_APP_IME, shouldStashForIme()); animDuration = TASKBAR_STASH_DURATION_FOR_IME; startDelay = getTaskbarStashStartDelayForIme(); @@ -763,12 +758,8 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba * * in small screen AND * * 3 button nav AND * * landscape (or seascape) - * We do not stash if taskbar is transient */ private boolean shouldStashForIme() { - if (DisplayController.isTransientTaskbar(mActivity)) { - return false; - } return (mIsImeShowing || mIsImeSwitcherShowing) && !(isPhoneMode() && mActivity.isThreeButtonNav() && mActivity.getDeviceProfile().isLandscape);