From 62769f10d75a1bf11e17103857b179ab931282d7 Mon Sep 17 00:00:00 2001 From: Jon Miranda Date: Thu, 27 May 2021 15:13:36 -0700 Subject: [PATCH] Turn off app close flag, Revert back to R implementation. Need more time to experiment with interpolated + springs based approach, will aim for QPR instead. Bug: 189120868 Bug: 173107751 Test: manual Change-Id: I5698bd61c92b4fa719d82f2553125fc7f65b5969 --- quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java | 4 ++-- src/com/android/launcher3/config/FeatureFlags.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java index 92e8268570..f484568068 100644 --- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java +++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java @@ -103,10 +103,10 @@ import com.android.quickstep.util.MotionPauseDetector; import com.android.quickstep.util.ProtoTracer; import com.android.quickstep.util.RecentsOrientedState; import com.android.quickstep.util.RectFSpringAnim; +import com.android.quickstep.util.StaggeredWorkspaceAnim; import com.android.quickstep.util.SurfaceTransactionApplier; import com.android.quickstep.util.SwipePipToHomeAnimator; import com.android.quickstep.util.TransformParams; -import com.android.quickstep.util.WorkspaceRevealAnim; import com.android.quickstep.views.RecentsView; import com.android.quickstep.views.TaskView; import com.android.systemui.shared.recents.model.ThumbnailData; @@ -202,7 +202,7 @@ public abstract class AbsSwipeUpHandler, STATE_LAUNCHER_PRESENT | STATE_LAUNCHER_DRAWN | STATE_LAUNCHER_STARTED; public static final long MAX_SWIPE_DURATION = 350; - public static final long HOME_DURATION = WorkspaceRevealAnim.DURATION_MS; + public static final long HOME_DURATION = StaggeredWorkspaceAnim.DURATION_MS; public static final float MIN_PROGRESS_FOR_OVERVIEW = 0.7f; private static final float SWIPE_DURATION_MULTIPLIER = diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index 0c0c92ed04..7ef43ed4be 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -238,7 +238,7 @@ public final class FeatureFlags { "Sends a notification whenever launcher encounters an uncaught exception."); public static final BooleanFlag PROTOTYPE_APP_CLOSE = getDebugFlag( - "PROTOTYPE_APP_CLOSE", true, "Enables new app close"); + "PROTOTYPE_APP_CLOSE", false, "Enables new app close"); public static final BooleanFlag ENABLE_WALLPAPER_SCRIM = getDebugFlag( "ENABLE_WALLPAPER_SCRIM", false,