commit 23087026877923e2c03646e4fd9d20c1af2ae0e3
author Vinit Nayak <peanutbutter@google.com> Fri Sep 24 00:43:50 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Sep 24 00:43:50 2021 +0000
tree cd38927ec1d14d34885eb06a86fa3f9585fec270
parent 1a1cc95c8f4102543500e6516d535a898a2a2875
parent 8a1749f0d912084ecd91e66dd96254a80afb334d

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

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

Change-Id: I5f03e6346c0c28bdbe28b0e7d49026c166a67cfe

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(