diff options
| author | Tony Wickham <twickham@google.com> | 2018-08-08 17:39:15 -0700 |
|---|---|---|
| committer | Tony Wickham <twickham@google.com> | 2018-08-08 17:55:10 -0700 |
| commit | 9756df45646246fa09cf3c82d6cd676e601927b8 (patch) | |
| tree | ad1b8c5229ffb649bc3cb04d73390052d02b09ba /quickstep | |
| parent | 7fee2a82e4d9edbfa53b4abe3e5156afadee84f8 (diff) | |
| download | android_packages_apps_Trebuchet-9756df45646246fa09cf3c82d6cd676e601927b8.tar.gz android_packages_apps_Trebuchet-9756df45646246fa09cf3c82d6cd676e601927b8.tar.bz2 android_packages_apps_Trebuchet-9756df45646246fa09cf3c82d6cd676e601927b8.zip | |
Use default animation when launching a TaskView that's off screen
Now that pressing back launches the previously running task, it's
possible to get TaskView#launch() when the TaskView is not on the
screen (i.e. user scrolled before pressing back). In this case, we
shouldn't use the launch-from-recents animation, as that animation
assumes the task view is the current page or an adjacent one.
Change-Id: I7bec91c9437954061affdedc8cd9e48820ce7357
Diffstat (limited to 'quickstep')
| -rw-r--r-- | quickstep/src/com/android/quickstep/TaskUtils.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/quickstep/src/com/android/quickstep/TaskUtils.java b/quickstep/src/com/android/quickstep/TaskUtils.java index f9b5e30e1..5cae2b919 100644 --- a/quickstep/src/com/android/quickstep/TaskUtils.java +++ b/quickstep/src/com/android/quickstep/TaskUtils.java @@ -18,8 +18,6 @@ package com.android.quickstep; import static com.android.launcher3.anim.Interpolators.LINEAR; import static com.android.launcher3.anim.Interpolators.TOUCH_RESPONSE_INTERPOLATOR; -import static com.android.systemui.shared.recents.utilities.Utilities.getNextFrameNumber; -import static com.android.systemui.shared.recents.utilities.Utilities.getSurface; import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_OPENING; import android.animation.ValueAnimator; @@ -30,7 +28,6 @@ import android.content.pm.PackageManager; import android.graphics.RectF; import android.os.UserHandle; import android.util.Log; -import android.view.Surface; import android.view.View; import com.android.launcher3.BaseDraggingActivity; @@ -92,10 +89,11 @@ public class TaskUtils { */ public static TaskView findTaskViewToLaunch( BaseDraggingActivity activity, View v, RemoteAnimationTargetCompat[] targets) { + RecentsView recentsView = activity.getOverviewPanel(); if (v instanceof TaskView) { - return (TaskView) v; + TaskView taskView = (TaskView) v; + return recentsView.isTaskViewVisible(taskView) ? taskView : null; } - RecentsView recentsView = activity.getOverviewPanel(); // It's possible that the launched view can still be resolved to a visible task view, check // the task id of the opening task and see if we can find a match. |