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

Commit 5a31c926 authored by Brandon Dayauon's avatar Brandon Dayauon
Browse files

Move VibratorWrapper to AOSP 

bug: 233751149
test: manually run and presubmit
Change-Id: I89ada0adf7254396238cb96d27bc265e28093f50
parent dcafe99d

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

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import static com.android.launcher3.LauncherState.OVERVIEW; 
import static com.android.launcher3.Utilities.EDGE_NAV_BAR;

import static com.android.launcher3.anim.AnimatorListeners.forSuccessCallback;

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

import static com.android.quickstep.util.VibratorWrapper.OVERVIEW_HAPTIC;

import static com.android.launcher3.util.VibratorWrapper.OVERVIEW_HAPTIC;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_ONE_HANDED_ACTIVE;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;
@@ -42,11 +42,11 @@ import com.android.launcher3.anim.AnimatorPlaybackController; 
import com.android.launcher3.states.StateAnimationConfig;

import com.android.launcher3.taskbar.LauncherTaskbarUIController;

import com.android.launcher3.uioverrides.QuickstepLauncher;

import com.android.launcher3.util.VibratorWrapper;

import com.android.quickstep.SystemUiProxy;

import com.android.quickstep.util.AnimatorControllerWithResistance;

import com.android.quickstep.util.MotionPauseDetector;

import com.android.quickstep.util.OverviewToHomeAnim;

import com.android.quickstep.util.VibratorWrapper;

import com.android.quickstep.views.RecentsView;



/**

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

+2 −2
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW; 
import static com.android.launcher3.states.StateAnimationConfig.SKIP_SCRIM;

import static com.android.launcher3.touch.BothAxesSwipeDetector.DIRECTION_RIGHT;

import static com.android.launcher3.touch.BothAxesSwipeDetector.DIRECTION_UP;

import static com.android.launcher3.util.VibratorWrapper.OVERVIEW_HAPTIC;

import static com.android.launcher3.util.window.RefreshRateTracker.getSingleFrameMs;

import static com.android.quickstep.util.VibratorWrapper.OVERVIEW_HAPTIC;

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

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

import static com.android.quickstep.views.RecentsView.FULLSCREEN_PROGRESS;
@@ -70,11 +70,11 @@ import com.android.launcher3.touch.BaseSwipeDetector; 
import com.android.launcher3.touch.BothAxesSwipeDetector;

import com.android.launcher3.uioverrides.QuickstepLauncher;

import com.android.launcher3.util.TouchController;

import com.android.launcher3.util.VibratorWrapper;

import com.android.quickstep.SystemUiProxy;

import com.android.quickstep.util.AnimatorControllerWithResistance;

import com.android.quickstep.util.LayoutUtils;

import com.android.quickstep.util.MotionPauseDetector;

import com.android.quickstep.util.VibratorWrapper;

import com.android.quickstep.util.WorkspaceRevealAnim;

import com.android.quickstep.views.LauncherRecentsView;

import com.android.quickstep.views.RecentsView;

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

+3 −2
Original line number Diff line number Diff line
@@ -41,8 +41,9 @@ 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.util.VibratorWrapper;

import com.android.quickstep.util.VibrationConstants;

import com.android.quickstep.views.RecentsView;

import com.android.quickstep.views.TaskView;
@@ -61,7 +62,7 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity> 
            Utilities.ATLEAST_R ? VibrationEffect.Composition.PRIMITIVE_TICK : -1;

    public static final float TASK_DISMISS_VIBRATION_PRIMITIVE_SCALE = 1f;

    public static final VibrationEffect TASK_DISMISS_VIBRATION_FALLBACK =

            VibratorWrapper.EFFECT_TEXTURE_TICK;

            VibrationConstants.EFFECT_TEXTURE_TICK;



    protected final T mActivity;

    private final SingleAxisSwipeDetector mDetector;

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

+2 −2
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import static com.android.launcher3.uioverrides.QuickstepLauncher.ENABLE_PIP_KEE 
import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;

import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;

import static com.android.launcher3.util.SystemUiController.UI_STATE_FULLSCREEN_TASK;

import static com.android.launcher3.util.VibratorWrapper.OVERVIEW_HAPTIC;

import static com.android.launcher3.util.window.RefreshRateTracker.getSingleFrameMs;

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

import static com.android.quickstep.GestureState.GestureEndTarget.LAST_TASK;
@@ -51,7 +52,6 @@ import static com.android.quickstep.MultiStateCallback.DEBUG_STATES; 
import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.CANCEL_RECENTS_ANIMATION;

import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.EXPECTING_TASK_APPEARED;

import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.ON_SETTLED_ON_END_TARGET;

import static com.android.quickstep.util.VibratorWrapper.OVERVIEW_HAPTIC;

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

import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
@@ -107,6 +107,7 @@ import com.android.launcher3.tracing.SwipeHandlerProto; 
import com.android.launcher3.util.ActivityLifecycleCallbacksAdapter;

import com.android.launcher3.util.DisplayController;

import com.android.launcher3.util.TraceHelper;

import com.android.launcher3.util.VibratorWrapper;

import com.android.launcher3.util.WindowBounds;

import com.android.quickstep.BaseActivityInterface.AnimationFactory;

import com.android.quickstep.GestureState.GestureEndTarget;
@@ -126,7 +127,6 @@ import com.android.quickstep.util.SurfaceTransaction; 
import com.android.quickstep.util.SurfaceTransactionApplier;

import com.android.quickstep.util.SwipePipToHomeAnimator;

import com.android.quickstep.util.TaskViewSimulator;

import com.android.quickstep.util.VibratorWrapper;

import com.android.quickstep.views.RecentsView;

import com.android.quickstep.views.TaskView;

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

quickstep/src/com/android/quickstep/interaction/EdgeBackGesturePanel.java

+2 −2
Original line number Diff line number Diff line
@@ -41,9 +41,9 @@ import androidx.dynamicanimation.animation.SpringAnimation; 
import androidx.dynamicanimation.animation.SpringForce;



import com.android.launcher3.R;

import com.android.launcher3.testing.shared.ResourceUtils;

import com.android.launcher3.anim.Interpolators;

import com.android.quickstep.util.VibratorWrapper;

import com.android.launcher3.testing.shared.ResourceUtils;

import com.android.launcher3.util.VibratorWrapper;



/** Forked from platform/frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarEdgePanel.java. */

public class EdgeBackGesturePanel extends View {