commit 8a1749f0d912084ecd91e66dd96254a80afb334d
author Vinit Nayak <peanutbutter@google.com> Fri Sep 24 00:27:02 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Sep 24 00:27:02 2021 +0000
tree 4d94a18554a78add9af6a9e1d00bca6fda5e751b
parent 59409155026f054a11a3a94f96003dcb84b9b9ce
parent 03396d4fbabdc4fffe7234f8ce379a14b1c4c332

Merge "Allow tapping on app icon for second split app." into sc-v2-dev am: 03396d4fba

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15900195

Change-Id: I61cbf3b9cd07c148019b85c6c7b070fd69bfa816

quickstep/src/com/android/quickstep/views/TaskView.java

diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 053d07c..b3e0dce 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -847,6 +847,9 @@
         if (icon != null) {
             iconView.setDrawable(icon);
             iconView.setOnClickListener(v -> {
+                if (confirmSecondSplitSelectApp()) {
+                    return;
+                }
                 if (ENABLE_QUICKSTEP_LIVE_TILE.get() && isRunningTask()) {
                     RecentsView recentsView = getRecentsView();
                     recentsView.switchToScreenshot(