From 00cccdca4c4e7e0fb4609cdef78341ebceba14b4 Mon Sep 17 00:00:00 2001 From: Sukesh Ram Date: Fri, 14 Feb 2025 12:46:28 -0800 Subject: [PATCH] [CD Taskbar] Fix - Make Taskbar Icons Launch The base TaskbarUIController returns null for recents view.This makes icons on external display's taskbar unable to launch on external displays. Test: m Bug: 395954042 Flag: com.android.window.flags.enable_taskbar_connected_displays Change-Id: I389a0fa102f63ab93b8a29de722cce0a446a2ea1 --- .../android/launcher3/taskbar/TaskbarActivityContext.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java index b9d1275f56..aa1a111be4 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java @@ -77,6 +77,7 @@ import android.view.WindowInsets; import android.view.WindowManager; import android.widget.FrameLayout; import android.widget.Toast; +import android.window.DesktopExperienceFlags; import android.window.DesktopModeFlags; import android.window.RemoteTransition; @@ -1558,7 +1559,10 @@ public class TaskbarActivityContext extends BaseTaskbarContext { */ private void launchFromInAppTaskbar(@Nullable RecentsView recents, @Nullable View launchingIconView, List itemInfos) { - if (recents == null) { + boolean launchedFromExternalDisplay = + DesktopExperienceFlags.ENABLE_TASKBAR_CONNECTED_DISPLAYS.isTrue() + && !mIsPrimaryDisplay; + if (recents == null && !launchedFromExternalDisplay) { return; }