commit cd7078372a1b1e7f4b56acbc3210ed39588f89f4
author Brian Isganitis <brianji@google.com> Thu May 04 18:55:42 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 04 18:55:42 2023 +0000
tree fa4e311bd6e3401c6ac09a57b5a59142bce98210
parent 178802d35cdc539759b36d0f944581fae12cc80c
parent 1fbae12a98bb37be952daa4c97b1cdf2a2771a69

Merge "Only close overlays onTaskMovedToFront for desktop prototype." into udc-dev

quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayController.java

diff --git a/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayController.java b/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayController.java
index 476e0a8..8de0e40 100644
--- a/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayController.java
@@ -36,6 +36,7 @@
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.taskbar.TaskbarActivityContext;
 import com.android.launcher3.taskbar.TaskbarControllers;
+import com.android.quickstep.views.DesktopTaskView;
 import com.android.systemui.shared.system.TaskStackChangeListener;
 import com.android.systemui.shared.system.TaskStackChangeListeners;
 
@@ -65,7 +66,9 @@
 
         @Override
         public void onTaskMovedToFront(int taskId) {
-            mProxyView.close(false);
+            if (DesktopTaskView.DESKTOP_MODE_SUPPORTED) {
+                mProxyView.close(false);
+            }
         }
     };