From ce3af8d6908a98fb3c7491a509dc5e633504e342 Mon Sep 17 00:00:00 2001 From: Merissa Tan Date: Thu, 31 Mar 2022 13:43:22 -0700 Subject: [PATCH] Disable taskbar stashing on desktop environment. Bug: 223736439 Test: Manual Change-Id: Iceb349b8a1dbae41e13ef1890a6834d66776c9af (cherry picked from commit 215479443ce0339f75c691195dd14b4e9d5f4da1) --- .../launcher3/taskbar/DesktopTaskbarUIController.java | 6 ++++++ .../android/launcher3/taskbar/TaskbarStashController.java | 2 +- .../com/android/launcher3/taskbar/TaskbarUIController.java | 5 +++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/DesktopTaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/DesktopTaskbarUIController.java index 17e8a49c83..810a3b2764 100644 --- a/quickstep/src/com/android/launcher3/taskbar/DesktopTaskbarUIController.java +++ b/quickstep/src/com/android/launcher3/taskbar/DesktopTaskbarUIController.java @@ -42,4 +42,10 @@ public class DesktopTaskbarUIController extends TaskbarUIController { super.onDestroy(); mLauncher.getHotseat().setIconsAlpha(1f); } + + @Override + /** Disable taskbar stashing in desktop environment. */ + protected boolean supportsVisualStashing() { + return false; + } } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java index 54dd0b2379..d5327bc44b 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java @@ -194,7 +194,7 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba * state. */ public boolean supportsVisualStashing() { - return !mActivity.isThreeButtonNav(); + return mControllers.uiController.supportsVisualStashing(); } /** diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java index d5c399b619..fa185d6804 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java @@ -48,6 +48,11 @@ public class TaskbarUIController { return true; } + protected boolean supportsVisualStashing() { + if (mControllers == null) return false; + return !mControllers.taskbarActivityContext.isThreeButtonNav(); + } + protected void onStashedInAppChanged() { } public Stream getAppIconsForEdu() {