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

Commit 715e25ad authored by Jordan Silva's avatar Jordan Silva
Browse files

Refactoring PagedOrientationHandler to extract functions from to quickstep 

This CL extracts RecentsView methods from PagedOrientationHandler to RecentsPagedOrientationHandler. It will allow to have quickstep specific components in the newer interface, like IconAppChipView.

Bug: 320633351
Flag: N/A
Test: atest NexusLauncherTests
Test: atest TaplTestsSplitscreen
Test: atest TaplTestsQuickstep
Change-Id: Ie7de23bddccbdb8eac93eff66a5d929f5bf0ee3a
parent e96d30bd

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

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ import com.android.launcher3.anim.AnimatorListeners; 
import com.android.launcher3.anim.PendingAnimation;

import com.android.launcher3.anim.PropertySetter;

import com.android.launcher3.states.StateAnimationConfig;

import com.android.launcher3.touch.PagedOrientationHandler;

import com.android.quickstep.orientation.RecentsPagedOrientationHandler;

import com.android.quickstep.util.AnimUtils;

import com.android.quickstep.util.SplitAnimationTimings;

import com.android.quickstep.views.ClearAllButton;
@@ -130,7 +130,7 @@ public final class RecentsViewStateController extends 
        }



        // Create transition animations to split select

        PagedOrientationHandler orientationHandler =

        RecentsPagedOrientationHandler orientationHandler =

                ((RecentsView) mLauncher.getOverviewPanel()).getPagedOrientationHandler();

        Pair<FloatProperty, FloatProperty> taskViewsFloat =

                orientationHandler.getSplitSelectTaskOffset(

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

+9 −5
Original line number Diff line number Diff line
@@ -36,13 +36,13 @@ import com.android.launcher3.Utilities; 
import com.android.launcher3.anim.AnimatorPlaybackController;

import com.android.launcher3.anim.PendingAnimation;

import com.android.launcher3.touch.BaseSwipeDetector;

import com.android.launcher3.touch.PagedOrientationHandler;

import com.android.launcher3.touch.SingleAxisSwipeDetector;

import com.android.launcher3.util.DisplayController;

import com.android.launcher3.util.FlingBlockCheck;

import com.android.launcher3.util.TouchController;

import com.android.launcher3.util.VibratorWrapper;

import com.android.launcher3.views.BaseDragLayer;

import com.android.quickstep.orientation.RecentsPagedOrientationHandler;

import com.android.quickstep.util.VibrationConstants;

import com.android.quickstep.views.RecentsView;

import com.android.quickstep.views.TaskView;
@@ -225,7 +225,8 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity> 
            mCurrentAnimation.dispatchOnCancel();

        }



        PagedOrientationHandler orientationHandler = mRecentsView.getPagedOrientationHandler();

        RecentsPagedOrientationHandler orientationHandler =

                mRecentsView.getPagedOrientationHandler();

        mCurrentAnimationIsGoingUp = goingUp;

        BaseDragLayer dl = mActivity.getDragLayer();

        final int secondaryLayerDimension = orientationHandler.getSecondaryDimension(dl);
@@ -269,7 +270,8 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity> 


    @Override

    public void onDragStart(boolean start, float startDisplacement) {

        PagedOrientationHandler orientationHandler = mRecentsView.getPagedOrientationHandler();

        RecentsPagedOrientationHandler orientationHandler =

                mRecentsView.getPagedOrientationHandler();

        if (mCurrentAnimation == null) {

            reInitAnimationController(orientationHandler.isGoingUp(startDisplacement, mIsRtl));

            mDisplacementShift = 0;
@@ -283,7 +285,8 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity> 


    @Override

    public boolean onDrag(float displacement) {

        PagedOrientationHandler orientationHandler = mRecentsView.getPagedOrientationHandler();

        RecentsPagedOrientationHandler orientationHandler =

                mRecentsView.getPagedOrientationHandler();

        float totalDisplacement = displacement + mDisplacementShift;

        boolean isGoingUp = totalDisplacement == 0 ? mCurrentAnimationIsGoingUp :

                orientationHandler.isGoingUp(totalDisplacement, mIsRtl);
@@ -346,7 +349,8 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity> 
        if (blockedFling) {

            fling = false;

        }

        PagedOrientationHandler orientationHandler = mRecentsView.getPagedOrientationHandler();

        RecentsPagedOrientationHandler orientationHandler =

                mRecentsView.getPagedOrientationHandler();

        boolean goingUp = orientationHandler.isGoingUp(velocity, mIsRtl);

        float progress = mCurrentAnimation.getProgressFraction();

        float interpolatedProgress = mCurrentAnimation.getInterpolatedProgress();

quickstep/src/com/android/quickstep/BaseActivityInterface.java

+2 −1
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ import com.android.launcher3.touch.PagedOrientationHandler; 
import com.android.launcher3.util.DisplayController;

import com.android.launcher3.util.NavigationMode;

import com.android.launcher3.views.ScrimView;

import com.android.quickstep.orientation.RecentsPagedOrientationHandler;

import com.android.quickstep.util.ActivityInitListener;

import com.android.quickstep.util.AnimatorControllerWithResistance;

import com.android.quickstep.views.RecentsView;
@@ -128,7 +129,7 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T 


    public abstract int getSwipeUpDestinationAndLength(

            DeviceProfile dp, Context context, Rect outRect,

            PagedOrientationHandler orientationHandler);

            RecentsPagedOrientationHandler orientationHandler);



    /** Called when the animation to home has fully settled. */

    public void onSwipeUpToHomeComplete(RecentsAnimationDeviceState deviceState) {}

quickstep/src/com/android/quickstep/FallbackActivityInterface.java

+2 −2
Original line number Diff line number Diff line
@@ -32,10 +32,10 @@ import androidx.annotation.Nullable; 
import com.android.launcher3.DeviceProfile;

import com.android.launcher3.statemanager.StateManager;

import com.android.launcher3.taskbar.FallbackTaskbarUIController;

import com.android.launcher3.touch.PagedOrientationHandler;

import com.android.launcher3.util.DisplayController;

import com.android.quickstep.GestureState.GestureEndTarget;

import com.android.quickstep.fallback.RecentsState;

import com.android.quickstep.orientation.RecentsPagedOrientationHandler;

import com.android.quickstep.util.ActivityInitListener;

import com.android.quickstep.util.AnimatorControllerWithResistance;

import com.android.quickstep.views.RecentsView;
@@ -60,7 +60,7 @@ public final class FallbackActivityInterface extends 
    /** 2 */

    @Override

    public int getSwipeUpDestinationAndLength(DeviceProfile dp, Context context, Rect outRect,

            PagedOrientationHandler orientationHandler) {

            RecentsPagedOrientationHandler orientationHandler) {

        calculateTaskSize(context, dp, outRect, orientationHandler);

        if (dp.isVerticalBarLayout() && DisplayController.getNavigationMode(context) != NO_BUTTON) {

            return dp.isSeascape() ? outRect.left : (dp.widthPx - outRect.right);

quickstep/src/com/android/quickstep/LauncherActivityInterface.java

+2 −2
Original line number Diff line number Diff line
@@ -46,11 +46,11 @@ import com.android.launcher3.statehandlers.DepthController; 
import com.android.launcher3.statehandlers.DesktopVisibilityController;

import com.android.launcher3.statemanager.StateManager;

import com.android.launcher3.taskbar.LauncherTaskbarUIController;

import com.android.launcher3.touch.PagedOrientationHandler;

import com.android.launcher3.uioverrides.QuickstepLauncher;

import com.android.launcher3.util.DisplayController;

import com.android.launcher3.util.NavigationMode;

import com.android.quickstep.GestureState.GestureEndTarget;

import com.android.quickstep.orientation.RecentsPagedOrientationHandler;

import com.android.quickstep.util.ActivityInitListener;

import com.android.quickstep.util.AnimatorControllerWithResistance;

import com.android.quickstep.util.LayoutUtils;
@@ -74,7 +74,7 @@ public final class LauncherActivityInterface extends 


    @Override

    public int getSwipeUpDestinationAndLength(DeviceProfile dp, Context context, Rect outRect,

            PagedOrientationHandler orientationHandler) {

            RecentsPagedOrientationHandler orientationHandler) {

        calculateTaskSize(context, dp, outRect, orientationHandler);

        if (dp.isVerticalBarLayout()

                && DisplayController.getNavigationMode(context) != NavigationMode.NO_BUTTON) {