From f641ddd27e82f8d7fb8f0d28aea1c1f115bce55a Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Wed, 16 Nov 2022 16:12:22 +0000
Subject: [PATCH] Revert "Revert "Allow transient taskbar to unstash over soft
 ime""

This reverts commit c8c81a3425d4c6562bf29a902616e9f3268ce3db.

Reason for revert: fix tests by not auto stashing when ime comes up, but still allow taskbar to show if user initiaties it

Bug: 255818649
Change-Id: Id3ab27dcc205e5a72dbd0481e3eabc10b2e1b643
Test: pull up ime, swipe to reveal taskbar
---
 .../com/android/launcher3/taskbar/TaskbarStashController.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java
index 72ae1d1c31..b7f12c1201 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java
@@ -758,8 +758,12 @@ 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);