diff options
| author | Tony Wickham <twickham@google.com> | 2018-08-09 16:37:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-08-09 16:37:53 +0000 |
| commit | 9c80147e7064e82de67454cfade0569aa3e0eaaa (patch) | |
| tree | 425d72d9e8e889d3edeb77338ba814c780d5fa81 /quickstep | |
| parent | af82a882d77842a028d68d486ad2d49ddd0bb98b (diff) | |
| parent | 9756df45646246fa09cf3c82d6cd676e601927b8 (diff) | |
| download | android_packages_apps_Trebuchet-9c80147e7064e82de67454cfade0569aa3e0eaaa.tar.gz android_packages_apps_Trebuchet-9c80147e7064e82de67454cfade0569aa3e0eaaa.tar.bz2 android_packages_apps_Trebuchet-9c80147e7064e82de67454cfade0569aa3e0eaaa.zip | |
Merge "Use default animation when launching a TaskView that's off screen" into ub-launcher3-master
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. |