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

Commit 1c6f12d1 authored by Tony Wickham's avatar Tony Wickham Committed by Tony
Browse files

Swipe down on hotseat to launch recent task 

If you're ever in overview and swipe down on the hotseat, it will launch
the focused task *unless* you entered overview from the workspace and
have not scrolled past the first task. This is a hidden state to allow
for reversibility of the swipe up from workspace.

Also moved PendingAnimation from quickstep to launcher3.

Change-Id: Iea077bc0ef7c74f6bf7b98d0a638892b9c5fe36c
parent 274b9529

quickstep/src/com/android/launcher3/uioverrides/PortraitStatesTouchController.java

+21 −2
Original line number Diff line number Diff line
@@ -32,12 +32,16 @@ import com.android.launcher3.AbstractFloatingView; 
import com.android.launcher3.DeviceProfile;

import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherState;

import com.android.launcher3.anim.AnimatorPlaybackController;

import com.android.launcher3.anim.AnimatorSetBuilder;

import com.android.launcher3.anim.Interpolators;

import com.android.launcher3.touch.AbstractStateChangeTouchController;

import com.android.launcher3.touch.SwipeDetector;

import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;

import com.android.quickstep.TouchInteractionService;

import com.android.quickstep.util.SysuiEventLogger;

import com.android.quickstep.views.RecentsView;

import com.android.quickstep.views.TaskView;



/**

 * Touch controller for handling various state transitions in portrait UI.
@@ -191,8 +195,23 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr 
            mClampProgressUpdate = -1;

        }



        if (mPendingAnimation != null) {

            mPendingAnimation.finish(false);

            mPendingAnimation = null;

        }



        RecentsView recentsView = mLauncher.getOverviewPanel();

        TaskView taskView = (TaskView) recentsView.getChildAt(recentsView.getNextPage());

        if (recentsView.shouldSwipeDownLaunchApp() && mFromState == OVERVIEW && mToState == NORMAL

                && taskView != null) {

            mPendingAnimation = recentsView.createTaskLauncherAnimation(taskView, maxAccuracy);

            mPendingAnimation.anim.setInterpolator(Interpolators.ZOOM_IN);



            mCurrentAnimation = AnimatorPlaybackController.wrap(mPendingAnimation.anim, maxAccuracy);

        } else {

            mCurrentAnimation = mLauncher.getStateManager()

                    .createAnimationToNewWorkspace(mToState, builder, maxAccuracy);

        }



        if (totalShift == 0) {

            totalShift = Math.signum(mFromState.ordinal - mToState.ordinal)

quickstep/src/com/android/launcher3/uioverrides/TaskViewTouchController.java

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction; 
import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;

import com.android.launcher3.util.TouchController;

import com.android.launcher3.views.BaseDragLayer;

import com.android.quickstep.PendingAnimation;

import com.android.launcher3.util.PendingAnimation;

import com.android.quickstep.views.RecentsView;

import com.android.quickstep.views.TaskView;

quickstep/src/com/android/launcher3/uioverrides/UiFactory.java

+11 −4
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.launcher3.uioverrides;



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

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

import static com.android.launcher3.Utilities.getPrefs;

import static com.android.quickstep.OverviewInteractionState.KEY_SWIPE_UP_ENABLED;
@@ -25,7 +26,9 @@ import android.content.Context; 
import android.content.SharedPreferences;



import com.android.launcher3.AbstractFloatingView;

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.util.TouchController;

import com.android.quickstep.OverviewInteractionState;
@@ -89,11 +92,15 @@ public class UiFactory { 
    }



    public static void onLauncherStateOrResumeChanged(Launcher launcher) {

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

        DeviceProfile profile = launcher.getDeviceProfile();

        WindowManagerWrapper.getInstance().setShelfHeight(

                launcher.getStateManager().getState() != ALL_APPS &&

                        launcher.isUserActive() &&

                        !launcher.getDeviceProfile().isVerticalBarLayout(),

                launcher.getDeviceProfile().hotseatBarSizePx);

                state != ALL_APPS && launcher.isUserActive() && !profile.isVerticalBarLayout(),

                profile.hotseatBarSizePx);



        if (state == NORMAL) {

            launcher.<RecentsView>getOverviewPanel().setSwipeDownShouldLaunchApp(false);

        }

    }



    public static void onTrimMemory(Context context, int level) {

quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java

+2 −0
Original line number Diff line number Diff line
@@ -762,6 +762,8 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> { 
        // Animate the first icon.

        mRecentsView.setFirstTaskIconScaledDown(false /* isScaledDown */, true /* animate */);



        mRecentsView.setSwipeDownShouldLaunchApp(true);



        reset();

    }

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

+13 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ import com.android.launcher3.anim.AnimatorPlaybackController; 
import com.android.launcher3.anim.PropertyListBuilder;

import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.util.Themes;

import com.android.quickstep.PendingAnimation;

import com.android.launcher3.util.PendingAnimation;

import com.android.quickstep.QuickScrubController;

import com.android.quickstep.RecentsAnimationInterpolator;

import com.android.quickstep.RecentsAnimationInterpolator.TaskWindowBounds;
@@ -139,6 +139,7 @@ public abstract class RecentsView<T extends BaseActivity> 
    private boolean mOverviewStateEnabled;

    private boolean mTaskStackListenerRegistered;

    private Runnable mNextPageSwitchRunnable;

    private boolean mSwipeDownShouldLaunchApp;



    private PendingAnimation mPendingAnimation;
@@ -275,6 +276,9 @@ public abstract class RecentsView<T extends BaseActivity> 
            mNextPageSwitchRunnable.run();

            mNextPageSwitchRunnable = null;

        }

        if (getNextPage() > 0) {

            setSwipeDownShouldLaunchApp(true);

        }

    }



    @Override
@@ -601,6 +605,14 @@ public abstract class RecentsView<T extends BaseActivity> 
        }

    }



    public void setSwipeDownShouldLaunchApp(boolean swipeDownShouldLaunchApp) {

        mSwipeDownShouldLaunchApp = swipeDownShouldLaunchApp;

    }



    public boolean shouldSwipeDownLaunchApp() {

        return mSwipeDownShouldLaunchApp;

    }



    public interface PageCallbacks {



        /**