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

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

Merge "Don't animate hotseat when launching if swipe up disabled" into ub-launcher3-edmonton

parents 87249707 4923c055

quickstep/src/com/android/quickstep/views/LauncherRecentsView.java

+7 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import android.view.ViewDebug; 
import com.android.launcher3.DeviceProfile;

import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherState;

import com.android.quickstep.OverviewInteractionState;

import com.android.quickstep.util.LayoutUtils;



/**
@@ -118,6 +119,12 @@ public class LauncherRecentsView extends RecentsView<Launcher> { 
    public AnimatorSet createAdjacentPageAnimForTaskLaunch(TaskView tv) {

        AnimatorSet anim = super.createAdjacentPageAnimForTaskLaunch(tv);



        if (!OverviewInteractionState.getInstance(mActivity).isSwipeUpGestureEnabled()) {

            // Hotseat doesn't move when opening recents with the button,

            // so don't animate it here either.

            return anim;

        }



        float allAppsProgressOffscreen = ALL_APPS_PROGRESS_OFF_SCREEN;

        LauncherState state = mActivity.getStateManager().getState();

        if ((state.getVisibleElements(mActivity) & ALL_APPS_HEADER_EXTRA) != 0) {