Merge "Introduces haptic feedback to launcher overview" into sc-v2-dev (8f0de5d7) · Commits · e / os / BlissLauncher3

quickstep/res/values/config.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@
		determines how many thumbnails will be fetched in the background. -->
		<integer name="recentsThumbnailCacheSize">3</integer>
		<integer name="recentsIconCacheSize">12</integer>
		<integer name="recentsScrollHapticMinGapMillis">20</integer>

		<!-- Assistant Gesture -->
		<integer name="assistant_gesture_min_time_threshold">200</integer>

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -24,7 +24,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.launcher3.util.VibratorWrapper.OVERVIEW_HAPTIC;
		import static com.android.quickstep.util.VibratorWrapper.OVERVIEW_HAPTIC;
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;

		import android.animation.ObjectAnimator;
		@@ -38,11 +38,11 @@ import com.android.launcher3.LauncherState;
		import com.android.launcher3.Utilities;
		import com.android.launcher3.anim.AnimatorPlaybackController;
		import com.android.launcher3.states.StateAnimationConfig;
		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

+11 −2

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ 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.DisplayController.getSingleFrameMs;
		import static com.android.launcher3.util.VibratorWrapper.OVERVIEW_HAPTIC;
		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;
		@@ -67,14 +67,15 @@ import com.android.launcher3.states.StateAnimationConfig;
		import com.android.launcher3.touch.BaseSwipeDetector;
		import com.android.launcher3.touch.BothAxesSwipeDetector;
		import com.android.launcher3.util.TouchController;
		import com.android.launcher3.util.VibratorWrapper;
		import com.android.quickstep.AnimatedFloat;
		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;

		/**
		* Handles quick switching to a recent task from the home screen. To give as much flexibility to
		@@ -398,6 +399,14 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
		nonOverviewAnim.setFloatValues(startProgress, endProgress);
		mNonOverviewAnim.dispatchOnStart();
		}
		if (targetState == QUICK_SWITCH) {
		// Navigating to quick switch, add scroll feedback since the first time is not
		// considered a scroll by the RecentsView.
		VibratorWrapper.INSTANCE.get(mLauncher).vibrate(
		RecentsView.SCROLL_VIBRATION_PRIMITIVE,
		RecentsView.SCROLL_VIBRATION_PRIMITIVE_SCALE,
		RecentsView.SCROLL_VIBRATION_FALLBACK);
		}

		nonOverviewAnim.setDuration(Math.max(xDuration, yDuration));
		mNonOverviewAnim.setEndAction(() -> onAnimationToStateCompleted(targetState));

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

+13 −1

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import static com.android.launcher3.touch.SingleAxisSwipeDetector.DIRECTION_BOTH
		import android.animation.Animator;
		import android.animation.AnimatorListenerAdapter;
		import android.os.SystemClock;
		import android.os.VibrationEffect;
		import android.view.MotionEvent;
		import android.view.View;
		import android.view.animation.Interpolator;
		@@ -41,6 +42,7 @@ import com.android.launcher3.util.FlingBlockCheck;
		import com.android.launcher3.util.TouchController;
		import com.android.launcher3.views.BaseDragLayer;
		import com.android.quickstep.SysUINavigationMode;
		import com.android.quickstep.util.VibratorWrapper;
		import com.android.quickstep.views.RecentsView;
		import com.android.quickstep.views.TaskView;

		@@ -55,6 +57,12 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
		private static final long MIN_TASK_DISMISS_ANIMATION_DURATION = 300;
		private static final long MAX_TASK_DISMISS_ANIMATION_DURATION = 600;

		public static final int TASK_DISMISS_VIBRATION_PRIMITIVE =
		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;

		protected final T mActivity;
		private final SingleAxisSwipeDetector mDetector;
		private final RecentsView mRecentsView;
		@@ -334,10 +342,10 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
		fling = false;
		}
		PagedOrientationHandler orientationHandler = mRecentsView.getPagedOrientationHandler();
		boolean goingUp = orientationHandler.isGoingUp(velocity, mIsRtl);
		float progress = mCurrentAnimation.getProgressFraction();
		float interpolatedProgress = mCurrentAnimation.getInterpolatedProgress();
		if (fling) {
		boolean goingUp = orientationHandler.isGoingUp(velocity, mIsRtl);
		goingToEnd = goingUp == mCurrentAnimationIsGoingUp;
		} else {
		goingToEnd = interpolatedProgress > SUCCESS_TRANSITION_PROGRESS;
		@@ -357,6 +365,10 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
		mCurrentAnimation.startWithVelocity(mActivity, goingToEnd,
		velocity * orientationHandler.getSecondaryTranslationDirectionFactor(),
		mEndDisplacement, animationDuration);
		if (goingUp && goingToEnd) {
		VibratorWrapper.INSTANCE.get(mActivity).vibrate(TASK_DISMISS_VIBRATION_PRIMITIVE,
		TASK_DISMISS_VIBRATION_PRIMITIVE_SCALE, TASK_DISMISS_VIBRATION_FALLBACK);
		}
		}

		private void clearState() {

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -36,7 +36,6 @@ import static com.android.launcher3.util.DisplayController.getSingleFrameMs;
		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.quickstep.GestureState.GestureEndTarget.HOME;
		import static com.android.quickstep.GestureState.GestureEndTarget.LAST_TASK;
		import static com.android.quickstep.GestureState.GestureEndTarget.NEW_TASK;
		@@ -46,6 +45,7 @@ import static com.android.quickstep.GestureState.STATE_END_TARGET_SET;
		import static com.android.quickstep.GestureState.STATE_RECENTS_ANIMATION_CANCELED;
		import static com.android.quickstep.GestureState.STATE_RECENTS_SCROLLING_FINISHED;
		import static com.android.quickstep.MultiStateCallback.DEBUG_STATES;
		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;
		import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.ACTIVITY_TYPE_HOME;
		@@ -92,7 +92,6 @@ import com.android.launcher3.testing.TestProtocol;
		import com.android.launcher3.tracing.InputConsumerProto;
		import com.android.launcher3.tracing.SwipeHandlerProto;
		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;
		@@ -112,6 +111,7 @@ import com.android.quickstep.util.SurfaceTransactionApplier;
		import com.android.quickstep.util.SwipePipToHomeAnimator;
		import com.android.quickstep.util.TaskViewSimulator;
		import com.android.quickstep.util.TransformParams;
		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.ThumbnailData;