diff options
author | Hyunyoung Song <hyunyoungs@google.com> | 2018-05-16 14:03:20 -0700 |
---|---|---|
committer | Hyunyoung Song <hyunyoungs@google.com> | 2018-05-16 14:03:20 -0700 |
commit | 27289bbe409643a0e673350304a28da20f0e1644 (patch) | |
tree | 07e72bdc578a89e717410028b2ca78e26341f33d /quickstep | |
parent | 0d1db51ce858bcdbe92616460fca2122b9c81dfe (diff) | |
download | android_packages_apps_Trebuchet-27289bbe409643a0e673350304a28da20f0e1644.tar.gz android_packages_apps_Trebuchet-27289bbe409643a0e673350304a28da20f0e1644.tar.bz2 android_packages_apps_Trebuchet-27289bbe409643a0e673350304a28da20f0e1644.zip |
First task should launch when tapped.
Broken from previous CL.
Bug: 79539824
Change-Id: I9c4b00731afeeb815d2c7f3dcaf4ae4f029dec30
Diffstat (limited to 'quickstep')
-rw-r--r-- | quickstep/src/com/android/quickstep/views/RecentsView.java | 12 | ||||
-rw-r--r-- | quickstep/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 68432abfc..6a4698f92 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 0ddeae73d..82aa45a18 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())); } |