diff options
Diffstat (limited to 'quickstep/src/com/android/quickstep/views/RecentsView.java')
-rw-r--r-- | quickstep/src/com/android/quickstep/views/RecentsView.java | 44 |
1 files changed, 5 insertions, 39 deletions
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index 5e331e2e86..6bb20fca32 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java @@ -16,7 +16,6 @@ package com.android.quickstep.views; -import static android.app.PendingIntent.FLAG_MUTABLE; import static android.view.Surface.ROTATION_0; import static android.view.View.MeasureSpec.EXACTLY; import static android.view.View.MeasureSpec.makeMeasureSpec; @@ -28,7 +27,6 @@ import static com.android.launcher3.LauncherAnimUtils.SUCCESS_TRANSITION_PROGRES import static com.android.launcher3.LauncherAnimUtils.VIEW_ALPHA; import static com.android.launcher3.LauncherState.BACKGROUND_APP; import static com.android.launcher3.QuickstepTransitionManager.RECENTS_LAUNCH_DURATION; -import static com.android.launcher3.QuickstepTransitionManager.SPLIT_LAUNCH_DURATION; import static com.android.launcher3.Utilities.EDGE_NAV_BAR; import static com.android.launcher3.Utilities.mapToRange; import static com.android.launcher3.Utilities.squaredHypot; @@ -45,7 +43,6 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCH import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_DISMISS_SWIPE_UP; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_LAUNCH_SWIPE_DOWN; import static com.android.launcher3.statehandlers.DepthController.DEPTH; -import static com.android.launcher3.testing.TestProtocol.TASK_VIEW_ID_CRASH; import static com.android.launcher3.touch.PagedOrientationHandler.CANVAS_TRANSLATE; import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; @@ -69,8 +66,6 @@ import android.animation.PropertyValuesHolder; import android.animation.ValueAnimator; import android.annotation.TargetApi; import android.app.ActivityManager.RunningTaskInfo; -import android.app.PendingIntent; -import android.content.ComponentName; import android.content.Context; import android.content.LocusId; import android.content.res.Configuration; @@ -2013,22 +2008,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T return null; } - @Nullable - private TaskView getTaskViewByComponentName(ComponentName componentName) { - if (componentName == null) { - return null; - } - - for (int i = 0; i < getTaskViewCount(); i++) { - TaskView taskView = requireTaskViewAt(i); - if (taskView.getItemInfo().getIntent().getComponent().getPackageName().equals( - componentName.getPackageName())) { - return taskView; - } - } - return null; - } - public int getRunningTaskIndex() { TaskView taskView = getRunningTaskView(); return taskView == null ? -1 : indexOfChild(taskView); @@ -2282,8 +2261,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T * Sets the running task id, cleaning up the old running task if necessary. */ public void setCurrentTask(int runningTaskViewId) { - Log.d(TASK_VIEW_ID_CRASH, "currentRunningTaskViewId: " + mRunningTaskViewId - + " requestedTaskViewId: " + runningTaskViewId); if (mRunningTaskViewId == runningTaskViewId) { return; } @@ -3973,28 +3950,17 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T } public void initiateSplitSelect(QuickstepSystemShortcut.SplitSelectSource splitSelectSource) { - // Remove the task if it exists in Overview - TaskView matchingTaskView = getTaskViewByComponentName( - splitSelectSource.intent.getComponent()); - if (matchingTaskView != null) { - removeTaskInternal(matchingTaskView.getTaskViewId()); - } - mSplitSelectSource = splitSelectSource; - mSplitSelectStateController.setInitialTaskSelect( - PendingIntent.getActivity( - mContext, 0, splitSelectSource.intent, FLAG_MUTABLE), + mSplitSelectStateController.setInitialTaskSelect(splitSelectSource.intent, splitSelectSource.position.stagePosition); } - public PendingAnimation createSplitSelectInitAnimation() { + public PendingAnimation createSplitSelectInitAnimation(int duration) { if (mSplitHiddenTaskView != null) { - int duration = mActivity.getStateManager().getState().getTransitionDuration( - getContext()); return createTaskDismissAnimation(mSplitHiddenTaskView, true, false, duration, true /* dismissingForSplitSelection*/); } else { - PendingAnimation anim = new PendingAnimation(SPLIT_LAUNCH_DURATION); + PendingAnimation anim = new PendingAnimation(duration); createInitialSplitSelectAnimation(anim); return anim; } @@ -4039,8 +4005,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T mSecondFloatingTaskView.addAnimation(pendingAnimation, secondTaskStartingBounds, secondTaskEndingBounds, true /* fadeWithThumbnail */, false /* isInitialSplit */); pendingAnimation.addEndListener(aBoolean -> - mSplitSelectStateController.setSecondTaskId(task.key.id, - aBoolean1 -> RecentsView.this.resetFromSplitSelectionState())); + mSplitSelectStateController.setSecondTask( + task, aBoolean1 -> RecentsView.this.resetFromSplitSelectionState())); if (containerTaskView.containsMultipleTasks()) { // If we are launching from a child task, then only hide the thumbnail itself mSecondSplitHiddenView = thumbnailView; |