Enable working springs. Move unstable springs to a seperate feature flag. (40f0eb21) · Commits · e / os / android_packages_apps_Trebuchet

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ package com.android.launcher3.uioverrides.touchcontrollers;
		import static com.android.launcher3.AbstractFloatingView.TYPE_ACCESSIBLE;
		import static com.android.launcher3.anim.Interpolators.scrollInterpolatorForVelocity;
		import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
		import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS;
		import static com.android.launcher3.config.FeatureFlags.UNSTABLE_SPRINGS;
		import static com.android.launcher3.touch.SingleAxisSwipeDetector.DIRECTION_BOTH;
		import static com.android.launcher3.touch.SingleAxisSwipeDetector.DIRECTION_NEGATIVE;
		import static com.android.launcher3.touch.SingleAxisSwipeDetector.DIRECTION_POSITIVE;
		@@ -286,7 +286,7 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
		}
		});
		}
		if (QUICKSTEP_SPRINGS.get()) {
		if (UNSTABLE_SPRINGS.get()) {
		mCurrentAnimation.dispatchOnStartWithVelocity(goingToEnd ? 1f : 0f, velocity);
		}
		anim.start();

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@ import static com.android.launcher3.anim.Interpolators.DEACCEL;
		import static com.android.launcher3.anim.Interpolators.LINEAR;
		import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2;
		import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
		import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS;
		import static com.android.launcher3.config.FeatureFlags.UNSTABLE_SPRINGS;
		import static com.android.launcher3.util.DefaultDisplay.getSingleFrameMs;
		import static com.android.launcher3.util.SystemUiController.UI_STATE_OVERVIEW;
		import static com.android.quickstep.GestureState.GestureEndTarget.HOME;
		@@ -973,7 +973,7 @@ public class LauncherSwipeHandler<T extends BaseDraggingActivity>
		}
		mLauncherTransitionController.getAnimationPlayer().setDuration(Math.max(0, duration));

		if (QUICKSTEP_SPRINGS.get()) {
		if (UNSTABLE_SPRINGS.get()) {
		mLauncherTransitionController.dispatchOnStartWithVelocity(end, velocityPxPerMs.y);
		}
		mLauncherTransitionController.getAnimationPlayer().start();

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import static com.android.launcher3.config.FeatureFlags.ENABLE_HINTS_IN_OVERVIEW
		import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
		import static com.android.launcher3.config.FeatureFlags.FAKE_LANDSCAPE_UI;
		import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS;
		import static com.android.launcher3.config.FeatureFlags.UNSTABLE_SPRINGS;
		import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
		import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
		import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_INPUT_MONITOR;
		@@ -715,6 +716,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
		pw.println("FeatureFlags:");
		pw.println(" APPLY_CONFIG_AT_RUNTIME=" + APPLY_CONFIG_AT_RUNTIME.get());
		pw.println(" QUICKSTEP_SPRINGS=" + QUICKSTEP_SPRINGS.get());
		pw.println(" UNSTABLE_SPRINGS=" + UNSTABLE_SPRINGS.get());
		pw.println(" ADAPTIVE_ICON_WINDOW_ANIM=" + ADAPTIVE_ICON_WINDOW_ANIM.get());
		pw.println(" ENABLE_QUICKSTEP_LIVE_TILE=" + ENABLE_QUICKSTEP_LIVE_TILE.get());
		pw.println(" ENABLE_HINTS_IN_OVERVIEW=" + ENABLE_HINTS_IN_OVERVIEW.get());

quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ import static com.android.launcher3.anim.Interpolators.ACCEL_2;
		import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
		import static com.android.launcher3.anim.Interpolators.LINEAR;
		import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
		import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS;
		import static com.android.launcher3.config.FeatureFlags.UNSTABLE_SPRINGS;
		import static com.android.launcher3.uioverrides.touchcontrollers.TaskViewTouchController.SUCCESS_TRANSITION_PROGRESS;
		import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch.TAP;
		import static com.android.launcher3.userevent.nano.LauncherLogProto.ControlType.CLEAR_ALL_BUTTON;
		@@ -1105,13 +1105,13 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl

		private void addDismissedTaskAnimations(View taskView, AnimatorSet anim, long duration) {
		addAnim(ObjectAnimator.ofFloat(taskView, ALPHA, 0), duration, ACCEL_2, anim);
		if (QUICKSTEP_SPRINGS.get() && taskView instanceof TaskView)
		if (UNSTABLE_SPRINGS.get() && taskView instanceof TaskView) {
		addAnim(new SpringObjectAnimator<>(taskView, VIEW_TRANSLATE_Y,
		MIN_VISIBLE_CHANGE_PIXELS, SpringForce.DAMPING_RATIO_MEDIUM_BOUNCY,
		SpringForce.STIFFNESS_MEDIUM,
		0, -taskView.getHeight()),
		duration, LINEAR, anim);
		else {
		} else {
		addAnim(ObjectAnimator.ofFloat(taskView, TRANSLATION_Y, -taskView.getHeight()),
		duration, LINEAR, anim);
		}
		@@ -1185,7 +1185,7 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl
		}
		int scrollDiff = newScroll[i] - oldScroll[i] + offset;
		if (scrollDiff != 0) {
		if (QUICKSTEP_SPRINGS.get() && child instanceof TaskView) {
		if (UNSTABLE_SPRINGS.get() && child instanceof TaskView) {
		addAnim(new SpringObjectAnimator<>(child, VIEW_TRANSLATE_X,
		MIN_VISIBLE_CHANGE_PIXELS, SpringForce.DAMPING_RATIO_MEDIUM_BOUNCY,
		SpringForce.STIFFNESS_MEDIUM,

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_VERTICAL_PROGRE
		import static com.android.launcher3.anim.Interpolators.ACCEL;
		import static com.android.launcher3.anim.Interpolators.DEACCEL;
		import static com.android.launcher3.anim.Interpolators.LINEAR;
		import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS;
		import static com.android.launcher3.config.FeatureFlags.UNSTABLE_SPRINGS;
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;

		import android.animation.TimeInterpolator;
		@@ -277,7 +277,7 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
		private void handleFirstSwipeToOverview(final ValueAnimator animator,
		final long expectedDuration, final LauncherState targetState, final float velocity,
		final boolean isFling) {
		if (QUICKSTEP_SPRINGS.get() && mFromState == OVERVIEW && mToState == ALL_APPS
		if (UNSTABLE_SPRINGS.get() && mFromState == OVERVIEW && mToState == ALL_APPS
		&& targetState == OVERVIEW) {
		mFinishFastOnSecondTouch = true;
		} else if (mFromState == NORMAL && mToState == OVERVIEW && targetState == OVERVIEW) {