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

Commit 11aef9ef authored by Winson Chung's avatar Winson Chung
Browse files

16/ Renaming the swipe handlers 

- FallbackNoButtonInputConsumer -> FallbackSwipeHandler
- WindowTransformSwipeHandler -> LauncherSwipeHandler

Bug: 141886704
Change-Id: I6ccfab861eac2a4b49b8981acfac09e85301d825
parent a4f3ffef

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

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ import com.android.quickstep.views.TaskView; 


/**

 * State to indicate we are about to launch a recent task. Note that this state is only used when

 * quick switching from launcher; quick switching from an app uses WindowTransformSwipeHelper.

 * quick switching from launcher; quick switching from an app uses LauncherSwipeHandler.

 * @see GestureState.GestureEndTarget#NEW_TASK

 */

public class QuickSwitchState extends BackgroundAppState {

quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/FallbackNoButtonInputConsumer.java→quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackSwipeHandler.java

+7 −14
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.quickstep.inputconsumers;

package com.android.quickstep;



import static com.android.quickstep.GestureState.GestureEndTarget.HOME;

import static com.android.quickstep.GestureState.GestureEndTarget.LAST_TASK;
@@ -22,7 +22,7 @@ import static com.android.quickstep.GestureState.GestureEndTarget.RECENTS; 
import static com.android.quickstep.MultiStateCallback.DEBUG_STATES;

import static com.android.quickstep.RecentsActivity.EXTRA_TASK_ID;

import static com.android.quickstep.RecentsActivity.EXTRA_THUMBNAIL;

import static com.android.quickstep.WindowTransformSwipeHandler.MIN_PROGRESS_FOR_OVERVIEW;

import static com.android.quickstep.LauncherSwipeHandler.MIN_PROGRESS_FOR_OVERVIEW;

import static com.android.quickstep.views.RecentsView.UPDATE_SYSUI_FLAGS_THRESHOLD;



import android.animation.Animator;
@@ -40,26 +40,19 @@ import com.android.launcher3.anim.AnimationSuccessListener; 
import com.android.launcher3.anim.AnimatorPlaybackController;

import com.android.launcher3.util.ObjectWrapper;

import com.android.quickstep.BaseActivityInterface.HomeAnimationFactory;

import com.android.quickstep.AnimatedFloat;

import com.android.quickstep.BaseSwipeUpHandler;

import com.android.quickstep.GestureState;

import com.android.quickstep.GestureState.GestureEndTarget;

import com.android.quickstep.InputConsumer;

import com.android.quickstep.MultiStateCallback;

import com.android.quickstep.RecentsActivity;

import com.android.quickstep.RecentsAnimationController;

import com.android.quickstep.RecentsAnimationDeviceState;

import com.android.quickstep.fallback.FallbackRecentsView;

import com.android.quickstep.util.RectFSpringAnim;

import com.android.quickstep.RecentsAnimationTargets;

import com.android.quickstep.views.TaskView;

import com.android.systemui.shared.recents.model.ThumbnailData;

import com.android.systemui.shared.system.ActivityManagerWrapper;

import com.android.systemui.shared.system.ActivityOptionsCompat;

import com.android.systemui.shared.system.InputConsumerController;



public class FallbackNoButtonInputConsumer extends

        BaseSwipeUpHandler<RecentsActivity, FallbackRecentsView> {

/**

 * Handles the navigation gestures when a 3rd party launcher is the default home activity.

 */

public class FallbackSwipeHandler extends BaseSwipeUpHandler<RecentsActivity, FallbackRecentsView> {



    private static final String[] STATE_NAMES = DEBUG_STATES ? new String[5] : null;
@@ -108,7 +101,7 @@ public class FallbackNoButtonInputConsumer extends 
    private final PointF mEndVelocityPxPerMs = new PointF(0, 0.5f);

    private RunningWindowAnim mFinishAnimation;



    public FallbackNoButtonInputConsumer(Context context, RecentsAnimationDeviceState deviceState,

    public FallbackSwipeHandler(Context context, RecentsAnimationDeviceState deviceState,

            GestureState gestureState, InputConsumerController inputConsumer,

            boolean isLikelyToStartNewTask, boolean continuingLastGesture) {

        super(context, deviceState, gestureState, inputConsumer);

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

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import static com.android.launcher3.anim.Interpolators.ACCEL_2; 
import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;

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

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

import static com.android.quickstep.WindowTransformSwipeHandler.RECENTS_ATTACH_DURATION;

import static com.android.quickstep.LauncherSwipeHandler.RECENTS_ATTACH_DURATION;



import android.animation.Animator;

import android.animation.AnimatorSet;

quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java→quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java

+7 −4
Original line number Diff line number Diff line
@@ -83,10 +83,13 @@ import com.android.systemui.shared.system.InputConsumerController; 
import com.android.systemui.shared.system.LatencyTrackerCompat;

import com.android.systemui.shared.system.RemoteAnimationTargetCompat;



/**

 * Handles the navigation gestures when Launcher is the default home activity.

 */

@TargetApi(Build.VERSION_CODES.O)

public class WindowTransformSwipeHandler<T extends BaseDraggingActivity>

public class LauncherSwipeHandler<T extends BaseDraggingActivity>

        extends BaseSwipeUpHandler<T, RecentsView> implements OnApplyWindowInsetsListener {

    private static final String TAG = WindowTransformSwipeHandler.class.getSimpleName();

    private static final String TAG = LauncherSwipeHandler.class.getSimpleName();



    private static final String[] STATE_NAMES = DEBUG_STATES ? new String[16] : null;
@@ -189,7 +192,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> 


    private final Runnable mOnDeferredActivityLaunch = this::onDeferredActivityLaunch;



    public WindowTransformSwipeHandler(Context context, RecentsAnimationDeviceState deviceState,

    public LauncherSwipeHandler(Context context, RecentsAnimationDeviceState deviceState,

            TaskAnimationManager taskAnimationManager, GestureState gestureState,

            long touchTimeMs, boolean continuingLastGesture,

            InputConsumerController inputConsumer) {
@@ -666,7 +669,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> 
        endLauncherTransitionController();

        if (!ENABLE_QUICKSTEP_LIVE_TILE.get()) {

            // Hide the task view, if not already hidden

            setTargetAlphaProvider(WindowTransformSwipeHandler::getHiddenTargetAlpha);

            setTargetAlphaProvider(LauncherSwipeHandler::getHiddenTargetAlpha);

        }



        BaseDraggingActivity activity = mActivityInterface.getCreatedActivity();

quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java

+10 −11
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ import com.android.launcher3.util.TraceHelper; 
import com.android.quickstep.inputconsumers.AccessibilityInputConsumer;

import com.android.quickstep.inputconsumers.AssistantInputConsumer;

import com.android.quickstep.inputconsumers.DeviceLockedInputConsumer;

import com.android.quickstep.inputconsumers.FallbackNoButtonInputConsumer;

import com.android.quickstep.inputconsumers.OtherActivityInputConsumer;

import com.android.quickstep.inputconsumers.OverscrollInputConsumer;

import com.android.quickstep.inputconsumers.OverviewInputConsumer;
@@ -242,10 +241,10 @@ public class TouchInteractionService extends Service implements PluginListener<O 
        return sIsInitialized;

    }



    private final BaseSwipeUpHandler.Factory mWindowTransformFactory =

            this::createWindowTransformSwipeHandler;

    private final BaseSwipeUpHandler.Factory mFallbackNoButtonFactory =

            this::createFallbackNoButtonSwipeHandler;

    private final BaseSwipeUpHandler.Factory mLauncherSwipeHandlerFactory =

            this::createLauncherSwipeHandler;

    private final BaseSwipeUpHandler.Factory mFallbackSwipeHandlerFactory =

            this::createFallbackSwipeHandler;



    private ActivityManagerWrapper mAM;

    private OverviewCommandHelper mOverviewCommandHelper;
@@ -564,11 +563,11 @@ public class TouchInteractionService extends Service implements PluginListener<O 
        if (mDeviceState.isFullyGesturalNavMode()

                && !mOverviewComponentObserver.isHomeAndOverviewSame()) {

            shouldDefer = previousGestureState.getFinishingRecentsAnimationTaskId() < 0;

            factory = mFallbackNoButtonFactory;

            factory = mFallbackSwipeHandlerFactory;

        } else {

            shouldDefer = gestureState.getActivityInterface().deferStartingActivity(mDeviceState,

                    event);

            factory = mWindowTransformFactory;

            factory = mLauncherSwipeHandlerFactory;

        }



        final boolean disableHorizontalSwipe = mDeviceState.isInExclusionRegion(event);
@@ -716,15 +715,15 @@ public class TouchInteractionService extends Service implements PluginListener<O 
        }

    }



    private BaseSwipeUpHandler createWindowTransformSwipeHandler(GestureState gestureState,

    private BaseSwipeUpHandler createLauncherSwipeHandler(GestureState gestureState,

            long touchTimeMs, boolean continuingLastGesture, boolean isLikelyToStartNewTask) {

        return  new WindowTransformSwipeHandler(this, mDeviceState, mTaskAnimationManager,

        return  new LauncherSwipeHandler(this, mDeviceState, mTaskAnimationManager,

                gestureState, touchTimeMs, continuingLastGesture, mInputConsumer);

    }



    private BaseSwipeUpHandler createFallbackNoButtonSwipeHandler(GestureState gestureState,

    private BaseSwipeUpHandler createFallbackSwipeHandler(GestureState gestureState,

            long touchTimeMs, boolean continuingLastGesture, boolean isLikelyToStartNewTask) {

        return new FallbackNoButtonInputConsumer(this, mDeviceState, gestureState,

        return new FallbackSwipeHandler(this, mDeviceState, gestureState,

                mInputConsumer, isLikelyToStartNewTask, continuingLastGesture);

    }