From 27289bbe409643a0e673350304a28da20f0e1644 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Wed, 16 May 2018 14:03:20 -0700
Subject: [PATCH] First task should launch when tapped. Broken from previous
 CL. Bug: 79539824

Change-Id: I9c4b00731afeeb815d2c7f3dcaf4ae4f029dec30
---
 .../src/com/android/quickstep/views/RecentsView.java | 12 ------------
 .../src/com/android/quickstep/views/TaskView.java    |  9 +++++++++
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 68432abfc0..6a4698f926 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -418,7 +418,6 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl
         final int requiredChildCount = tasks.size();
         for (int i = getChildCount(); i < requiredChildCount; i++) {
             final TaskView taskView = (TaskView) inflater.inflate(R.layout.task, this, false);
-            taskView.setOnClickListener(this::onTaskClicked);
             addView(taskView);
         }
         while (getChildCount() > requiredChildCount) {
@@ -444,17 +443,6 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl
         onTaskStackUpdated();
     }
 
-    private void onTaskClicked(View v) {
-        TaskView taskView = (TaskView) v;
-        if (taskView.getTask() == null) {
-            return;
-        }
-        taskView.launchTask(true /* animate */);
-        mActivity.getUserEventDispatcher().logTaskLaunchOrDismiss(
-                Touch.TAP, Direction.NONE, indexOfChild(taskView),
-                TaskUtils.getComponentKeyForTask(taskView.getTask().key));
-    }
-
     protected void onTaskStackUpdated() { }
 
     public void resetTaskVisuals() {
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 0ddeae73d5..82aa45a18c 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -110,6 +110,15 @@ public class TaskView extends FrameLayout implements TaskCallbacks, PageCallback
 
     public TaskView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
+        setOnClickListener((view) -> {
+            if (getTask() == null) {
+                return;
+            }
+            launchTask(true /* animate */);
+            BaseActivity.fromContext(context).getUserEventDispatcher().logTaskLaunchOrDismiss(
+                    Touch.TAP, Direction.NONE, ((RecentsView) getParent()).indexOfChild(this),
+                    TaskUtils.getComponentKeyForTask(getTask().key));
+        });
         setOutlineProvider(new TaskOutlineProvider(getResources()));
     }