From 3cc3df59affc0a0570c39c388e2221f1f797e383 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Tue, 5 Jun 2018 13:07:37 -0700 Subject: [PATCH] Log source component instead of current task base intent - Report original launch source component to ensure app relaunches can be associated with the same app for predictions. Bug: 109698096 Bug: 109675704 Change-Id: Icc5e95560777ad827fd2430cf3b3b052b65eb1b6 --- quickstep/libs/sysui_shared.jar | Bin 132159 -> 133150 bytes .../quickstep/QuickScrubController.java | 2 +- .../src/com/android/quickstep/TaskUtils.java | 7 +++++-- .../android/quickstep/views/RecentsView.java | 11 ++++++----- .../com/android/quickstep/views/TaskView.java | 2 +- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/quickstep/libs/sysui_shared.jar b/quickstep/libs/sysui_shared.jar index 308e92f666c2170ee3ba2fa5c365528ef60cac89..27de1e9075d3b2e5504f8e714234365355592f3f 100644 GIT binary patch delta 14126 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 WzkG%(mME4evK%NV^WUHdQT`8tSXd extends PagedView impl // The temporary running task is only used for the duration between the start of the // gesture and the task list is loaded and applied - mTmpRunningTask = new Task(new Task.TaskKey(runningTaskId, 0, new Intent(), 0, 0), null, - null, "", "", 0, 0, false, true, false, false, - new ActivityManager.TaskDescription(), 0, new ComponentName("", ""), false); + mTmpRunningTask = new Task(new Task.TaskKey(runningTaskId, 0, new Intent(), + new ComponentName(getContext(), getClass()), 0, 0), null, null, "", "", 0, 0, + false, true, false, false, new ActivityManager.TaskDescription(), 0, + new ComponentName("", ""), false); taskView.bind(mTmpRunningTask); } setCurrentTask(runningTaskId); @@ -792,7 +793,7 @@ public abstract class RecentsView extends PagedView impl if (shouldLog) { mActivity.getUserEventDispatcher().logTaskLaunchOrDismiss( onEndListener.logAction, Direction.UP, index, - TaskUtils.getComponentKeyForTask(task.key)); + TaskUtils.getLaunchComponentKeyForTask(task.key)); } } } @@ -1229,7 +1230,7 @@ public abstract class RecentsView extends PagedView impl if (task != null) { mActivity.getUserEventDispatcher().logTaskLaunchOrDismiss( onEndListener.logAction, Direction.DOWN, indexOfChild(tv), - TaskUtils.getComponentKeyForTask(task.key)); + TaskUtils.getLaunchComponentKeyForTask(task.key)); } } else { onTaskLaunchFinish.accept(false); diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java index b5f31b8e2e..a7690e1e38 100644 --- a/quickstep/src/com/android/quickstep/views/TaskView.java +++ b/quickstep/src/com/android/quickstep/views/TaskView.java @@ -118,7 +118,7 @@ public class TaskView extends FrameLayout implements TaskCallbacks, PageCallback launchTask(true /* animate */); BaseActivity.fromContext(context).getUserEventDispatcher().logTaskLaunchOrDismiss( Touch.TAP, Direction.NONE, getRecentsView().indexOfChild(this), - TaskUtils.getComponentKeyForTask(getTask().key)); + TaskUtils.getLaunchComponentKeyForTask(getTask().key)); }); setOutlineProvider(new TaskOutlineProvider(getResources())); }