diff options
| author | Tony Wickham <twickham@google.com> | 2019-07-22 11:57:51 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-22 11:57:51 -0700 |
| commit | d9515f72f5f732c0587b7f4e813ff97e85c71d32 (patch) | |
| tree | 0a7db5835077307a11481d98ea170edf7f1216f6 /quickstep/recents_ui_overrides/src/com/android | |
| parent | 2adbee9a9153953ae152d0905dd44a65be6131c8 (diff) | |
| parent | 3fca6aaec2883c4bb3108fc272589d8f89b59ba0 (diff) | |
| download | android_packages_apps_Trebuchet-d9515f72f5f732c0587b7f4e813ff97e85c71d32.tar.gz android_packages_apps_Trebuchet-d9515f72f5f732c0587b7f4e813ff97e85c71d32.tar.bz2 android_packages_apps_Trebuchet-d9515f72f5f732c0587b7f4e813ff97e85c71d32.zip | |
Finish recents animation when touching during animation to recents
am: 3fca6aaec2
Change-Id: Ibb855543b828a47f110275343d7b18b771c583bd
Diffstat (limited to 'quickstep/recents_ui_overrides/src/com/android')
| -rw-r--r-- | quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java index df37759cc..cc9719b41 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java @@ -56,6 +56,9 @@ import android.view.ViewTreeObserver.OnDrawListener; import android.view.WindowInsets; import android.view.animation.Interpolator; +import androidx.annotation.NonNull; +import androidx.annotation.UiThread; + import com.android.launcher3.AbstractFloatingView; import com.android.launcher3.BaseDraggingActivity; import com.android.launcher3.DeviceProfile; @@ -88,9 +91,6 @@ import com.android.systemui.shared.system.LatencyTrackerCompat; import com.android.systemui.shared.system.RemoteAnimationTargetCompat; import com.android.systemui.shared.system.WindowCallbacksCompat; -import androidx.annotation.NonNull; -import androidx.annotation.UiThread; - @TargetApi(Build.VERSION_CODES.O) public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> extends BaseSwipeUpHandler<T, RecentsView> @@ -677,7 +677,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> @Override protected InputConsumer createNewInputProxyHandler() { - endRunningWindowAnim(true /* cancel */); + endRunningWindowAnim(mGestureEndTarget == HOME /* cancel */); endLauncherTransitionController(); if (!ENABLE_QUICKSTEP_LIVE_TILE.get()) { // Hide the task view, if not already hidden |