From fe00c0907629cbbc3d1e0d59abf91a790bc7601b Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Sun, 26 Jul 2020 15:11:10 -0700 Subject: [PATCH] Unifying handler (#1) BaseSwipeUpHandlerV2 => AbsSwipeUpHandler Change-Id: I34647ced0e96e63cdbba35f6eb3bdc3f86810ebe --- .../{BaseSwipeUpHandlerV2.java => AbsSwipeUpHandler.java} | 8 ++++---- .../src/com/android/quickstep/FallbackSwipeHandler.java | 2 +- .../src/com/android/quickstep/LauncherSwipeHandlerV2.java | 2 +- .../inputconsumers/DeviceLockedInputConsumer.java | 2 +- .../src/com/android/quickstep/BaseActivityInterface.java | 2 +- .../interaction/SwipeUpGestureTutorialController.java | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) rename quickstep/recents_ui_overrides/src/com/android/quickstep/{BaseSwipeUpHandlerV2.java => AbsSwipeUpHandler.java} (99%) diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java similarity index 99% rename from quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java rename to quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java index 411d74f7f1..5afbed3619 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java @@ -99,10 +99,10 @@ import com.android.systemui.shared.system.TaskStackChangeListener; * Handles the navigation gestures when Launcher is the default home activity. * TODO: Merge this with BaseSwipeUpHandler */ -@TargetApi(Build.VERSION_CODES.O) -public abstract class BaseSwipeUpHandlerV2, Q extends RecentsView> +@TargetApi(Build.VERSION_CODES.R) +public abstract class AbsSwipeUpHandler, Q extends RecentsView> extends BaseSwipeUpHandler implements OnApplyWindowInsetsListener { - private static final String TAG = BaseSwipeUpHandlerV2.class.getSimpleName(); + private static final String TAG = "AbsSwipeUpHandler"; private static final String[] STATE_NAMES = DEBUG_STATES ? new String[16] : null; @@ -201,7 +201,7 @@ public abstract class BaseSwipeUpHandlerV2, Q exte private final Runnable mOnDeferredActivityLaunch = this::onDeferredActivityLaunch; - public BaseSwipeUpHandlerV2(Context context, RecentsAnimationDeviceState deviceState, + public AbsSwipeUpHandler(Context context, RecentsAnimationDeviceState deviceState, TaskAnimationManager taskAnimationManager, GestureState gestureState, long touchTimeMs, boolean continuingLastGesture, InputConsumerController inputConsumer) { diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackSwipeHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackSwipeHandler.java index f60a50bb43..ffb05dfed7 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackSwipeHandler.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackSwipeHandler.java @@ -71,7 +71,7 @@ import java.util.function.Consumer; */ @TargetApi(Build.VERSION_CODES.R) public class FallbackSwipeHandler extends - BaseSwipeUpHandlerV2 { + AbsSwipeUpHandler { /** * Message used for receiving gesture nav contract information. We use a static messenger to diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandlerV2.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandlerV2.java index 052d0a68a6..44114558e5 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandlerV2.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandlerV2.java @@ -39,7 +39,7 @@ import com.android.systemui.shared.system.InputConsumerController; * Temporary class to allow easier refactoring */ public class LauncherSwipeHandlerV2 extends - BaseSwipeUpHandlerV2 { + AbsSwipeUpHandler { public LauncherSwipeHandlerV2(Context context, RecentsAnimationDeviceState deviceState, TaskAnimationManager taskAnimationManager, GestureState gestureState, long touchTimeMs, diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java index a676390ce3..db1948b9f3 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java @@ -21,7 +21,7 @@ import static android.view.MotionEvent.ACTION_UP; import static com.android.launcher3.Utilities.squaredHypot; import static com.android.launcher3.Utilities.squaredTouchSlop; -import static com.android.quickstep.BaseSwipeUpHandlerV2.MIN_PROGRESS_FOR_OVERVIEW; +import static com.android.quickstep.AbsSwipeUpHandler.MIN_PROGRESS_FOR_OVERVIEW; import static com.android.quickstep.MultiStateCallback.DEBUG_STATES; import static com.android.quickstep.util.ActiveGestureLog.INTENT_EXTRA_LOG_TRACE_ID; diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java index f4a394a4f6..0ae386f39a 100644 --- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java +++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java @@ -20,7 +20,7 @@ import static com.android.launcher3.anim.Interpolators.ACCEL_2; import static com.android.launcher3.anim.Interpolators.INSTANT; import static com.android.launcher3.anim.Interpolators.LINEAR; import static com.android.launcher3.config.FeatureFlags.ENABLE_OVERVIEW_ACTIONS; -import static com.android.quickstep.BaseSwipeUpHandlerV2.RECENTS_ATTACH_DURATION; +import static com.android.quickstep.AbsSwipeUpHandler.RECENTS_ATTACH_DURATION; import static com.android.quickstep.SysUINavigationMode.getMode; import static com.android.quickstep.SysUINavigationMode.hideShelfInTwoButtonLandscape; import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview; diff --git a/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java index 4110b33d24..044e010b3c 100644 --- a/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java +++ b/quickstep/src/com/android/quickstep/interaction/SwipeUpGestureTutorialController.java @@ -18,7 +18,7 @@ package com.android.quickstep.interaction; import static com.android.launcher3.anim.Interpolators.ACCEL; import static com.android.launcher3.util.DefaultDisplay.getSingleFrameMs; import static com.android.launcher3.views.FloatingIconView.SHAPE_PROGRESS_DURATION; -import static com.android.quickstep.BaseSwipeUpHandlerV2.MAX_SWIPE_DURATION; +import static com.android.quickstep.AbsSwipeUpHandler.MAX_SWIPE_DURATION; import static com.android.quickstep.interaction.TutorialController.TutorialType.HOME_NAVIGATION_COMPLETE; import static com.android.quickstep.interaction.TutorialController.TutorialType.OVERVIEW_NAVIGATION_COMPLETE;