Merge "Peek overview on motion pause, then animate fully on touch up" into ub-launcher3-master (bd9bd70d) · Commits · e / os / BlissLauncher3

go/quickstep/src/com/android/launcher3/uioverrides/BackgroundAppState.java

deleted100644 → 0

+0 −26

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package com.android.launcher3.uioverrides;

		/**
		* State indicating that the Launcher is behind an app. Same as {@link OverviewState} for Go as we
		* do not support swipe to overview or swipe to home.
		*/
		public final class BackgroundAppState extends OverviewState {
		public BackgroundAppState(int id) {
		super(id);
		}
		}

go/quickstep/src/com/android/launcher3/uioverrides/OverviewState.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -91,4 +91,13 @@ public class OverviewState extends LauncherState {
		public static float getDefaultSwipeHeight(DeviceProfile dp) {
		return dp.allAppsCellHeightPx - dp.allAppsIconTextSizePx;
		}


		public static OverviewState newBackgroundState(int id) {
		return new OverviewState(id);
		}

		public static OverviewState newPeekState(int id) {
		return new OverviewState(id);
		}
		}

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/FlingAndHoldTouchController.java

+50 −27

Original line number	Diff line number	Diff line
		@@ -18,11 +18,18 @@ package com.android.launcher3.uioverrides;

		import static com.android.launcher3.LauncherState.NORMAL;
		import static com.android.launcher3.LauncherState.OVERVIEW;
		import static com.android.launcher3.LauncherStateManager.NON_ATOMIC_COMPONENT;
		import static com.android.launcher3.LauncherState.OVERVIEW_PEEK;
		import static com.android.launcher3.LauncherStateManager.ANIM_ALL;
		import static com.android.launcher3.LauncherStateManager.ATOMIC_OVERVIEW_PEEK_COMPONENT;
		import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2;

		import android.animation.ValueAnimator;
		import android.animation.Animator;
		import android.animation.AnimatorListenerAdapter;
		import android.animation.AnimatorSet;
		import android.view.HapticFeedbackConstants;

		import com.android.launcher3.Launcher;
		import com.android.launcher3.LauncherState;
		import com.android.launcher3.anim.AnimatorSetBuilder;
		import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
		import com.android.quickstep.util.MotionPauseDetector;
		@@ -33,13 +40,22 @@ import com.android.quickstep.views.RecentsView;
		*/
		public class FlingAndHoldTouchController extends PortraitStatesTouchController {

		private static final long PEEK_ANIM_DURATION = 100;

		private final MotionPauseDetector mMotionPauseDetector;

		private AnimatorSet mPeekAnim;

		public FlingAndHoldTouchController(Launcher l) {
		super(l, false /* allowDragToOverview */);
		mMotionPauseDetector = new MotionPauseDetector(l);
		}

		@Override
		protected long getAtomicDuration() {
		return 300;
		}

		@Override
		public void onDragStart(boolean start) {
		mMotionPauseDetector.clear();
		@@ -50,7 +66,23 @@ public class FlingAndHoldTouchController extends PortraitStatesTouchController {
		mMotionPauseDetector.setOnMotionPauseListener(isPaused -> {
		RecentsView recentsView = mLauncher.getOverviewPanel();
		recentsView.setOverviewStateEnabled(isPaused);
		maybeUpdateAtomicAnim(NORMAL, OVERVIEW, isPaused ? 1 : 0);
		if (mPeekAnim != null) {
		mPeekAnim.cancel();
		}
		LauncherState fromState = isPaused ? NORMAL : OVERVIEW_PEEK;
		LauncherState toState = isPaused ? OVERVIEW_PEEK : NORMAL;
		mPeekAnim = mLauncher.getStateManager().createAtomicAnimation(fromState, toState,
		new AnimatorSetBuilder(), ATOMIC_OVERVIEW_PEEK_COMPONENT,
		PEEK_ANIM_DURATION);
		mPeekAnim.addListener(new AnimatorListenerAdapter() {
		@Override
		public void onAnimationEnd(Animator animation) {
		mPeekAnim = null;
		}
		});
		mPeekAnim.start();
		recentsView.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY,
		HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING);
		});
		}
		}
		@@ -72,30 +104,21 @@ public class FlingAndHoldTouchController extends PortraitStatesTouchController {
		@Override
		public void onDragEnd(float velocity, boolean fling) {
		if (mMotionPauseDetector.isPaused() && handlingOverviewAnim()) {
		float range = getShiftRange();
		long maxAccuracy = (long) (2 * range);

		// Let the state manager know that the animation didn't go to the target state,
		// but don't cancel ourselves (we already clean up when the animation completes).
		Runnable onCancel = mCurrentAnimation.getOnCancelRunnable();
		mCurrentAnimation.setOnCancelRunnable(null);
		mCurrentAnimation.dispatchOnCancel();
		mCurrentAnimation = mLauncher.getStateManager()
		.createAnimationToNewWorkspace(OVERVIEW, new AnimatorSetBuilder(), maxAccuracy,
		onCancel, NON_ATOMIC_COMPONENT);

		final int logAction = fling ? Touch.FLING : Touch.SWIPE;
		mCurrentAnimation.setEndAction(() -> onSwipeInteractionCompleted(OVERVIEW, logAction));


		ValueAnimator anim = mCurrentAnimation.getAnimationPlayer();
		maybeUpdateAtomicAnim(NORMAL, OVERVIEW, 1f);
		mCurrentAnimation.dispatchOnStartWithVelocity(1, velocity);

		// TODO: Find a better duration
		anim.setDuration(100);
		anim.start();
		settleAtomicAnimation(1f, anim.getDuration());
		if (mPeekAnim != null) {
		mPeekAnim.cancel();
		}

		AnimatorSetBuilder builder = new AnimatorSetBuilder();
		builder.setInterpolator(AnimatorSetBuilder.ANIM_VERTICAL_PROGRESS, OVERSHOOT_1_2);
		AnimatorSet overviewAnim = mLauncher.getStateManager().createAtomicAnimation(
		NORMAL, OVERVIEW, builder, ANIM_ALL, ATOMIC_DURATION);
		overviewAnim.addListener(new AnimatorListenerAdapter() {
		@Override
		public void onAnimationEnd(Animator animation) {
		onSwipeInteractionCompleted(OVERVIEW, Touch.SWIPE);
		}
		});
		overviewAnim.start();
		} else {
		super.onDragEnd(velocity, fling);
		}

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/OverviewPeekState.java

0 → 100644

+18 −0

Original line number	Diff line number	Diff line
		package com.android.launcher3.uioverrides;

		import com.android.launcher3.Launcher;
		import com.android.launcher3.R;

		public class OverviewPeekState extends OverviewState {
		public OverviewPeekState(int id) {
		super(id);
		}

		@Override
		public ScaleAndTranslation getOverviewScaleAndTranslation(Launcher launcher) {
		ScaleAndTranslation result = super.getOverviewScaleAndTranslation(launcher);
		result.translationX = NORMAL.getOverviewScaleAndTranslation(launcher).translationX
		- launcher.getResources().getDimension(R.dimen.overview_peek_distance);
		return result;
		}
		}

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/OverviewState.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -151,4 +151,12 @@ public class OverviewState extends LauncherState {
		super.onBackPressed(launcher);
		}
		}

		public static OverviewState newBackgroundState(int id) {
		return new BackgroundAppState(id);
		}

		public static OverviewState newPeekState(int id) {
		return new OverviewPeekState(id);
		}
		}