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

Commit ced23472 authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge "Improve quick switch from home by tracking both x and y motion" into... 

Merge "Improve quick switch from home by tracking both x and y motion" into ub-launcher3-qt-future-dev
parents 70a2a7dc 2785a599

go/quickstep/src/com/android/quickstep/util/ShelfPeekAnim.java

+4 −0
Original line number Diff line number Diff line
@@ -24,4 +24,8 @@ public class ShelfPeekAnim { 


    public enum ShelfAnimState {

    }



    public boolean isPeeking() {

        return false;

    }

}

quickstep/recents_ui_overrides/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java

+26 −1
Original line number Diff line number Diff line
@@ -21,8 +21,15 @@ import static com.android.launcher3.LauncherState.BACKGROUND_APP; 
import static com.android.launcher3.LauncherState.HOTSEAT_ICONS;

import static com.android.launcher3.LauncherState.NORMAL;

import static com.android.launcher3.LauncherState.OVERVIEW;

import static com.android.launcher3.LauncherStateManager.ANIM_ALL;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_ALL_APPS_FADE;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_HOTSEAT_SCALE;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_HOTSEAT_TRANSLATE;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_VERTICAL_PROGRESS;

import static com.android.launcher3.anim.Interpolators.AGGRESSIVE_EASE;

import static com.android.launcher3.anim.Interpolators.DEACCEL_3;

import static com.android.launcher3.anim.Interpolators.LINEAR;

import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2;

import static com.android.quickstep.TaskViewUtils.findTaskViewToLaunch;

import static com.android.quickstep.TaskViewUtils.getRecentsWindowAnimator;
@@ -40,6 +47,7 @@ import androidx.annotation.Nullable; 
import com.android.launcher3.LauncherState.ScaleAndTranslation;

import com.android.launcher3.allapps.AllAppsTransitionController;

import com.android.launcher3.anim.AnimatorPlaybackController;

import com.android.launcher3.anim.AnimatorSetBuilder;

import com.android.launcher3.anim.Interpolators;

import com.android.launcher3.anim.SpringAnimationBuilder;

import com.android.quickstep.util.ClipAnimationHelper;
@@ -56,6 +64,9 @@ public final class LauncherAppTransitionManagerImpl extends QuickstepAppTransiti 
    public static final int INDEX_SHELF_ANIM = 0;

    public static final int INDEX_RECENTS_FADE_ANIM = 1;

    public static final int INDEX_RECENTS_TRANSLATE_X_ANIM = 2;

    public static final int INDEX_PAUSE_TO_OVERVIEW_ANIM = 3;



    public static final long ATOMIC_DURATION_FROM_PAUSED_TO_OVERVIEW = 300;



    public LauncherAppTransitionManagerImpl(Context context) {

        super(context);
@@ -144,7 +155,7 @@ public final class LauncherAppTransitionManagerImpl extends QuickstepAppTransiti 


    @Override

    public int getStateElementAnimationsCount() {

        return 3;

        return 4;

    }



    @Override
@@ -190,6 +201,20 @@ public final class LauncherAppTransitionManagerImpl extends QuickstepAppTransiti 
                        .setStiffness(250)

                        .setValues(values)

                        .build(mLauncher);

            case INDEX_PAUSE_TO_OVERVIEW_ANIM: {

                AnimatorSetBuilder builder = new AnimatorSetBuilder();

                builder.setInterpolator(ANIM_VERTICAL_PROGRESS, OVERSHOOT_1_2);

                builder.setInterpolator(ANIM_ALL_APPS_FADE, DEACCEL_3);

                if ((OVERVIEW.getVisibleElements(mLauncher) & HOTSEAT_ICONS) != 0) {

                    builder.setInterpolator(ANIM_HOTSEAT_SCALE, OVERSHOOT_1_2);

                    builder.setInterpolator(ANIM_HOTSEAT_TRANSLATE, OVERSHOOT_1_2);

                }

                LauncherStateManager stateManager = mLauncher.getStateManager();

                return stateManager.createAtomicAnimation(

                        stateManager.getCurrentStableState(), OVERVIEW, builder,

                        ANIM_ALL, ATOMIC_DURATION_FROM_PAUSED_TO_OVERVIEW);

            }



            default:

                return super.createStateElementAnimation(index, values);

        }

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsUiFactory.java

+3 −3
Original line number Diff line number Diff line
@@ -28,17 +28,17 @@ import com.android.launcher3.DeviceProfile; 
import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherState;

import com.android.launcher3.LauncherStateManager.StateHandler;

import com.android.launcher3.Utilities;

import com.android.launcher3.anim.AnimatorPlaybackController;

import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.graphics.RotationMode;

import com.android.launcher3.uioverrides.touchcontrollers.FlingAndHoldTouchController;

import com.android.launcher3.uioverrides.touchcontrollers.LandscapeEdgeSwipeController;

import com.android.launcher3.uioverrides.touchcontrollers.NavBarToHomeTouchController;

import com.android.launcher3.uioverrides.touchcontrollers.NoButtonQuickSwitchTouchController;

import com.android.launcher3.uioverrides.touchcontrollers.OverviewToAllAppsTouchController;

import com.android.launcher3.uioverrides.touchcontrollers.PortraitStatesTouchController;

import com.android.launcher3.uioverrides.touchcontrollers.StatusBarTouchController;

import com.android.launcher3.uioverrides.touchcontrollers.QuickSwitchTouchController;

import com.android.launcher3.uioverrides.touchcontrollers.StatusBarTouchController;

import com.android.launcher3.uioverrides.touchcontrollers.TaskViewTouchController;

import com.android.launcher3.uioverrides.touchcontrollers.TransposedQuickSwitchTouchController;

import com.android.launcher3.util.TouchController;
@@ -145,7 +145,7 @@ public abstract class RecentsUiFactory { 
        ArrayList<TouchController> list = new ArrayList<>();

        list.add(launcher.getDragController());

        if (mode == NO_BUTTON) {

            list.add(new QuickSwitchTouchController(launcher));

            list.add(new NoButtonQuickSwitchTouchController(launcher));

            list.add(new NavBarToHomeTouchController(launcher));

            list.add(new FlingAndHoldTouchController(launcher));

        } else {

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/OverviewState.java

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY; 
import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_OVERVIEW_FADE;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_OVERVIEW_SCALE;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_OVERVIEW_TRANSLATE_X;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_OVERVIEW_TRANSLATE_Y;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_WORKSPACE_FADE;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_WORKSPACE_SCALE;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_WORKSPACE_TRANSLATE;
@@ -205,6 +206,7 @@ public class OverviewState extends LauncherState { 
            builder.setInterpolator(ANIM_WORKSPACE_FADE, OVERSHOOT_1_2);

            builder.setInterpolator(ANIM_OVERVIEW_SCALE, OVERSHOOT_1_2);

            builder.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, OVERSHOOT_1_7);

            builder.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, OVERSHOOT_1_7);

            builder.setInterpolator(ANIM_OVERVIEW_FADE, OVERSHOOT_1_2);

        }

    }

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/FlingAndHoldTouchController.java

+5 −16
Original line number Diff line number Diff line
@@ -16,25 +16,20 @@ 


package com.android.launcher3.uioverrides.touchcontrollers;



import static com.android.launcher3.LauncherAppTransitionManagerImpl.INDEX_PAUSE_TO_OVERVIEW_ANIM;

import static com.android.launcher3.LauncherState.ALL_APPS;

import static com.android.launcher3.LauncherState.HOTSEAT_ICONS;

import static com.android.launcher3.LauncherState.NORMAL;

import static com.android.launcher3.LauncherState.OVERVIEW;

import static com.android.launcher3.LauncherState.OVERVIEW_PEEK;

import static com.android.launcher3.LauncherStateManager.ANIM_ALL;

import static com.android.launcher3.LauncherStateManager.ATOMIC_OVERVIEW_PEEK_COMPONENT;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_ALL_APPS_FADE;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_ALL_APPS_HEADER_FADE;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_HOTSEAT_SCALE;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_HOTSEAT_TRANSLATE;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_VERTICAL_PROGRESS;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_WORKSPACE_FADE;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_WORKSPACE_SCALE;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_WORKSPACE_TRANSLATE;

import static com.android.launcher3.anim.Interpolators.ACCEL;

import static com.android.launcher3.anim.Interpolators.DEACCEL;

import static com.android.launcher3.anim.Interpolators.DEACCEL_3;

import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2;

import static com.android.launcher3.util.VibratorWrapper.OVERVIEW_HAPTIC;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;
@@ -46,6 +41,7 @@ import android.view.View; 
import android.view.ViewConfiguration;



import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherAppTransitionManagerImpl;

import com.android.launcher3.LauncherState;

import com.android.launcher3.anim.AnimatorSetBuilder;

import com.android.launcher3.anim.Interpolators;
@@ -79,7 +75,7 @@ public class FlingAndHoldTouchController extends PortraitStatesTouchController { 


    @Override

    protected long getAtomicDuration() {

        return 300;

        return LauncherAppTransitionManagerImpl.ATOMIC_DURATION_FROM_PAUSED_TO_OVERVIEW;

    }



    @Override
@@ -179,15 +175,8 @@ public class FlingAndHoldTouchController extends PortraitStatesTouchController { 
                mPeekAnim.cancel();

            }



            AnimatorSetBuilder builder = new AnimatorSetBuilder();

            builder.setInterpolator(ANIM_VERTICAL_PROGRESS, OVERSHOOT_1_2);

            builder.setInterpolator(ANIM_ALL_APPS_FADE, DEACCEL_3);

            if ((OVERVIEW.getVisibleElements(mLauncher) & HOTSEAT_ICONS) != 0) {

                builder.setInterpolator(ANIM_HOTSEAT_SCALE, OVERSHOOT_1_2);

                builder.setInterpolator(ANIM_HOTSEAT_TRANSLATE, OVERSHOOT_1_2);

            }

            AnimatorSet overviewAnim = mLauncher.getStateManager().createAtomicAnimation(

                    NORMAL, OVERVIEW, builder, ANIM_ALL, ATOMIC_DURATION);

            Animator overviewAnim = mLauncher.getAppTransitionManager().createStateElementAnimation(

                    INDEX_PAUSE_TO_OVERVIEW_ANIM);

            overviewAnim.addListener(new AnimatorListenerAdapter() {

                @Override

                public void onAnimationEnd(Animator animation) {