Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8035e18 authored by Jonathan Miranda's avatar Jonathan Miranda Committed by Android (Google) Code Review
Browse files

Merge "Turn off app close flag, Revert back to R implementation." into sc-dev

parents 920b6e7f 62769f10

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

+2 −2
Original line number Diff line number Diff line
@@ -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<T extends StatefulActivity<S>, 
            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 =

src/com/android/launcher3/config/FeatureFlags.java

+1 −1
Original line number Diff line number Diff line
@@ -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,