Merge "Revert "Update overview from home transitions"" into ub-launcher3-master (a2c6c973) · Commits · e / os / android_packages_apps_Trebuchet

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

+4 −7

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@ package com.android.launcher3.uioverrides;

		import static com.android.launcher3.LauncherState.OVERVIEW_BUTTONS;
		import static com.android.launcher3.anim.Interpolators.LINEAR;
		import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_ACTIONS_FADE;
		import static com.android.quickstep.views.RecentsView.CONTENT_ALPHA;
		import static com.android.quickstep.views.RecentsView.FULLSCREEN_PROGRESS;
		import static com.android.quickstep.views.RecentsView.TASK_MODALNESS;
		@@ -58,7 +57,7 @@ public final class RecentsViewStateController extends
		mRecentsView.updateEmptyMessage();
		mRecentsView.resetTaskVisuals();
		}
		setAlphas(PropertySetter.NO_ANIM_PROPERTY_SETTER, new StateAnimationConfig(), state);
		setAlphas(PropertySetter.NO_ANIM_PROPERTY_SETTER, state);
		mRecentsView.setFullscreenProgress(state.getOverviewFullscreenProgress());
		}

		@@ -76,19 +75,17 @@ public final class RecentsViewStateController extends
		AnimationSuccessListener.forRunnable(mRecentsView::resetTaskVisuals));
		}

		setAlphas(builder, config, toState);
		setAlphas(builder, toState);
		builder.setFloat(mRecentsView, FULLSCREEN_PROGRESS,
		toState.getOverviewFullscreenProgress(), LINEAR);
		}

		private void setAlphas(PropertySetter propertySetter, StateAnimationConfig config,
		LauncherState state) {
		private void setAlphas(PropertySetter propertySetter, LauncherState state) {
		float buttonAlpha = (state.getVisibleElements(mLauncher) & OVERVIEW_BUTTONS) != 0 ? 1 : 0;
		propertySetter.setFloat(mRecentsView.getClearAllButton(), ClearAllButton.VISIBILITY_ALPHA,
		buttonAlpha, LINEAR);
		propertySetter.setFloat(mLauncher.getActionsView().getVisibilityAlpha(),
		MultiValueAlpha.VALUE, buttonAlpha, config.getInterpolator(
		ANIM_OVERVIEW_ACTIONS_FADE, LINEAR));
		MultiValueAlpha.VALUE, buttonAlpha, LINEAR);
		}

		@Override

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java

+4 −11

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ import static com.android.launcher3.LauncherState.OVERVIEW;
		import static com.android.launcher3.LauncherState.OVERVIEW_PEEK;
		import static com.android.launcher3.WorkspaceStateTransitionAnimation.getSpringScaleAnimator;
		import static com.android.launcher3.anim.Interpolators.ACCEL;
		import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
		import static com.android.launcher3.anim.Interpolators.DEACCEL;
		import static com.android.launcher3.anim.Interpolators.DEACCEL_1_7;
		import static com.android.launcher3.anim.Interpolators.DEACCEL_3;
		@@ -164,15 +163,10 @@ public class QuickstepAtomicAnimationFactory extends
		config.setInterpolator(ANIM_WORKSPACE_FADE, ACCEL);
		config.setInterpolator(ANIM_ALL_APPS_FADE, ACCEL);
		config.setInterpolator(ANIM_OVERVIEW_SCALE, clampToProgress(ACCEL, 0, 0.9f));
		config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, ACCEL_DEACCEL);

		if (SysUINavigationMode.getMode(mActivity) == NO_BUTTON) {
		config.setInterpolator(ANIM_OVERVIEW_FADE, FINAL_FRAME);
		} else {
		config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, ACCEL);
		config.setInterpolator(ANIM_OVERVIEW_FADE, DEACCEL_1_7);
		}

		Workspace workspace = mActivity.getWorkspace();

		// Start from a higher workspace scale, but only if we're invisible so we don't jump.
		boolean isWorkspaceVisible = workspace.getVisibility() == VISIBLE;
		if (isWorkspaceVisible) {
		@@ -212,10 +206,8 @@ public class QuickstepAtomicAnimationFactory extends
		config.setInterpolator(ANIM_WORKSPACE_SCALE,
		fromState == NORMAL ? ACCEL : OVERSHOOT_1_2);
		config.setInterpolator(ANIM_WORKSPACE_TRANSLATE, ACCEL);
		config.setInterpolator(ANIM_OVERVIEW_FADE, INSTANT);
		} else {
		config.setInterpolator(ANIM_WORKSPACE_SCALE, OVERSHOOT_1_2);
		config.setInterpolator(ANIM_OVERVIEW_FADE, OVERSHOOT_1_2);

		// Scale up the recents, if it is not coming from the side
		RecentsView overview = mActivity.getOverviewPanel();
		@@ -233,6 +225,7 @@ public class QuickstepAtomicAnimationFactory extends
		: OVERSHOOT_1_7;
		config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, translationInterpolator);
		config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, translationInterpolator);
		config.setInterpolator(ANIM_OVERVIEW_FADE, OVERSHOOT_1_2);
		} else if (fromState == HINT_STATE && toState == NORMAL) {
		config.setInterpolator(ANIM_DEPTH, DEACCEL_3);
		if (mHintToNormalDuration == -1) {

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

+5 −20

Original line number	Diff line number	Diff line
		@@ -19,13 +19,13 @@ import static com.android.launcher3.AbstractFloatingView.TYPE_ALL;
		import static com.android.launcher3.AbstractFloatingView.TYPE_ALL_APPS_EDU;
		import static com.android.launcher3.LauncherState.ALL_APPS;
		import static com.android.launcher3.LauncherState.NORMAL;
		import static com.android.launcher3.LauncherState.OVERVIEW;
		import static com.android.launcher3.allapps.AllAppsTransitionController.ALL_APPS_PROGRESS;
		import static com.android.launcher3.anim.Interpolators.DEACCEL_3;
		import static com.android.launcher3.config.FeatureFlags.ENABLE_ALL_APPS_EDU;
		import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
		import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_GESTURE;
		import static com.android.launcher3.touch.AbstractStateChangeTouchController.SUCCESS_TRANSITION_PROGRESS;
		import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_OFFSET;
		import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;

		import android.animation.ValueAnimator;
		@@ -45,7 +45,6 @@ import com.android.launcher3.anim.Interpolators;
		import com.android.launcher3.anim.PendingAnimation;
		import com.android.launcher3.compat.AccessibilityManagerCompat;
		import com.android.launcher3.config.FeatureFlags;
		import com.android.launcher3.graphics.OverviewScrim;
		import com.android.launcher3.logging.StatsLogManager;
		import com.android.launcher3.states.StateAnimationConfig;
		import com.android.launcher3.testing.TestProtocol;
		@@ -53,9 +52,7 @@ import com.android.launcher3.touch.SingleAxisSwipeDetector;
		import com.android.launcher3.userevent.nano.LauncherLogProto;
		import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
		import com.android.launcher3.util.TouchController;
		import com.android.quickstep.util.AnimatorControllerWithResistance;
		import com.android.quickstep.util.AssistantUtilities;
		import com.android.quickstep.util.OverviewToHomeAnim;
		import com.android.quickstep.views.RecentsView;
		import com.android.systemui.shared.system.ActivityManagerWrapper;

		@@ -66,8 +63,6 @@ public class NavBarToHomeTouchController implements TouchController,
		SingleAxisSwipeDetector.Listener {

		private static final Interpolator PULLBACK_INTERPOLATOR = DEACCEL_3;
		// How much of the overview scrim we can remove during the transition.
		private static final float OVERVIEW_TO_HOME_SCRIM_PROGRESS = 0.5f;

		private final Launcher mLauncher;
		private final SingleAxisSwipeDetector mSwipeDetector;
		@@ -161,13 +156,8 @@ public class NavBarToHomeTouchController implements TouchController,
		final PendingAnimation builder = new PendingAnimation(accuracy);
		if (mStartState.overviewUi) {
		RecentsView recentsView = mLauncher.getOverviewPanel();
		AnimatorControllerWithResistance.createRecentsResistanceFromOverviewAnim(mLauncher,
		builder);
		float endScrimAlpha = Utilities.mapRange(OVERVIEW_TO_HOME_SCRIM_PROGRESS,
		mStartState.getOverviewScrimAlpha(mLauncher),
		mEndState.getOverviewScrimAlpha(mLauncher));
		builder.setFloat(mLauncher.getDragLayer().getOverviewScrim(),
		OverviewScrim.SCRIM_PROGRESS, endScrimAlpha, PULLBACK_INTERPOLATOR);
		builder.setFloat(recentsView, ADJACENT_PAGE_OFFSET,
		-mPullbackDistance / recentsView.getPageOffsetScale(), PULLBACK_INTERPOLATOR);
		if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
		builder.addOnFrameCallback(recentsView::redrawLiveTile);
		}
		@@ -221,13 +211,8 @@ public class NavBarToHomeTouchController implements TouchController,
		recentsView.switchToScreenshot(null,
		() -> recentsView.finishRecentsAnimation(true /* toRecents */, null));
		}
		if (mStartState == OVERVIEW) {
		new OverviewToHomeAnim(mLauncher, () -> onSwipeInteractionCompleted(mEndState))
		.animateWithVelocity(velocity);
		} else {
		mLauncher.getStateManager().goToState(mEndState, true,
		() -> onSwipeInteractionCompleted(mEndState));
		}
		if (mStartState != mEndState) {
		logStateChange(mStartState.containerType, logAction);
		}

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

+50 −23

Original line number	Diff line number	Diff line
		@@ -21,8 +21,11 @@ import static com.android.launcher3.LauncherState.NORMAL;
		import static com.android.launcher3.LauncherState.OVERVIEW;
		import static com.android.launcher3.Utilities.EDGE_NAV_BAR;
		import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
		import static com.android.launcher3.states.StateAnimationConfig.PLAY_ATOMIC_OVERVIEW_PEEK;
		import static com.android.launcher3.util.VibratorWrapper.OVERVIEW_HAPTIC;

		import android.animation.Animator;
		import android.animation.AnimatorSet;
		import android.animation.ObjectAnimator;
		import android.animation.ValueAnimator;
		import android.graphics.PointF;
		@@ -32,14 +35,14 @@ import android.view.MotionEvent;
		import com.android.launcher3.Launcher;
		import com.android.launcher3.LauncherState;
		import com.android.launcher3.Utilities;
		import com.android.launcher3.anim.AnimatorPlaybackController;
		import com.android.launcher3.anim.AnimationSuccessListener;
		import com.android.launcher3.graphics.OverviewScrim;
		import com.android.launcher3.statemanager.StateManager;
		import com.android.launcher3.states.StateAnimationConfig;
		import com.android.launcher3.testing.TestProtocol;
		import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
		import com.android.launcher3.util.VibratorWrapper;
		import com.android.quickstep.util.AnimatorControllerWithResistance;
		import com.android.quickstep.util.OverviewToHomeAnim;
		import com.android.quickstep.util.StaggeredWorkspaceAnim;
		import com.android.quickstep.views.RecentsView;

		/**
		@@ -59,10 +62,10 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo

		private boolean mDidTouchStartInNavBar;
		private boolean mReachedOverview;
		private boolean mIsOverviewRehidden;
		private boolean mIsHomeStaggeredAnimFinished;
		// The last recorded displacement before we reached overview.
		private PointF mStartDisplacement = new PointF();
		private float mStartY;
		private AnimatorPlaybackController mOverviewResistYAnim;

		// Normal to Hint animation has flag SKIP_OVERVIEW, so we update this scrim with this animator.
		private ObjectAnimator mNormalToHintOverviewScrimAnimator;
		@@ -120,7 +123,6 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo
		mToState.getOverviewScrimAlpha(mLauncher));
		}
		mReachedOverview = false;
		mOverviewResistYAnim = null;
		}

		@Override
		@@ -158,9 +160,6 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo
		mNormalToHintOverviewScrimAnimator = null;
		mCurrentAnimation.dispatchOnCancelWithoutCancelRunnable(() -> {
		mLauncher.getStateManager().goToState(OVERVIEW, true, () -> {
		mOverviewResistYAnim = AnimatorControllerWithResistance
		.createRecentsResistanceFromOverviewAnim(mLauncher, null)
		.createPlaybackController();
		mReachedOverview = true;
		maybeSwipeInteractionToOverviewComplete();
		});
		@@ -174,6 +173,13 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo
		}
		}

		// Used if flinging back to home after reaching overview
		private void maybeSwipeInteractionToHomeComplete() {
		if (mIsHomeStaggeredAnimFinished && mIsOverviewRehidden) {
		onSwipeInteractionCompleted(NORMAL, Touch.FLING);
		}
		}

		@Override
		protected boolean handlingOverviewAnim() {
		return mDidTouchStartInNavBar && super.handlingOverviewAnim();
		@@ -187,18 +193,12 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo
		if (mMotionPauseDetector.isPaused()) {
		if (!mReachedOverview) {
		mStartDisplacement.set(xDisplacement, yDisplacement);
		mStartY = event.getY();
		} else {
		mRecentsView.setTranslationX((xDisplacement - mStartDisplacement.x)
		* OVERVIEW_MOVEMENT_FACTOR);
		float yProgress = (mStartDisplacement.y - yDisplacement) / mStartY;
		if (yProgress > 0 && mOverviewResistYAnim != null) {
		mOverviewResistYAnim.setPlayFraction(yProgress);
		} else {
		mRecentsView.setTranslationY((yDisplacement - mStartDisplacement.y)
		* OVERVIEW_MOVEMENT_FACTOR);
		}
		}
		// Stay in Overview.
		return true;
		}
		@@ -212,10 +212,37 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo
		StateManager<LauncherState> stateManager = mLauncher.getStateManager();
		boolean goToHomeInsteadOfOverview = isFling;
		if (goToHomeInsteadOfOverview) {
		new OverviewToHomeAnim(mLauncher, ()-> onSwipeInteractionCompleted(NORMAL, Touch.FLING))
		.animateWithVelocity(velocity);
		if (velocity > 0) {
		stateManager.goToState(NORMAL, true,
		() -> onSwipeInteractionCompleted(NORMAL, Touch.FLING));
		} else {
		mIsHomeStaggeredAnimFinished = mIsOverviewRehidden = false;

		StaggeredWorkspaceAnim staggeredWorkspaceAnim = new StaggeredWorkspaceAnim(
		mLauncher, velocity, false /* animateOverviewScrim */);
		staggeredWorkspaceAnim.addAnimatorListener(new AnimationSuccessListener() {
		@Override
		public void onAnimationSuccess(Animator animator) {
		mIsHomeStaggeredAnimFinished = true;
		maybeSwipeInteractionToHomeComplete();
		}
		}).start();

		// StaggeredWorkspaceAnim doesn't animate overview, so we handle it here.
		stateManager.cancelAnimation();
		StateAnimationConfig config = new StateAnimationConfig();
		config.duration = OVERVIEW.getTransitionDuration(mLauncher);
		config.animFlags = PLAY_ATOMIC_OVERVIEW_PEEK;
		AnimatorSet anim = stateManager.createAtomicAnimation(
		stateManager.getState(), NORMAL, config);
		anim.addListener(AnimationSuccessListener.forRunnable(() -> {
		mIsOverviewRehidden = true;
		maybeSwipeInteractionToHomeComplete();
		}));
		anim.start();
		}
		}
		if (mReachedOverview && !goToHomeInsteadOfOverview) {
		if (mReachedOverview) {
		float distanceDp = dpiFromPx(Math.max(
		Math.abs(mRecentsView.getTranslationX()),
		Math.abs(mRecentsView.getTranslationY())));
		@@ -224,11 +251,11 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo
		mRecentsView.animate()
		.translationX(0)
		.translationY(0)
		.scaleX(1)
		.scaleY(1)
		.setInterpolator(ACCEL_DEACCEL)
		.setDuration(duration)
		.withEndAction(this::maybeSwipeInteractionToOverviewComplete);
		.withEndAction(goToHomeInsteadOfOverview
		? null
		: this::maybeSwipeInteractionToOverviewComplete);
		}
		}

quickstep/recents_ui_overrides/src/com/android/quickstep/util/OverviewToHomeAnim.java

deleted100644 → 0

+0 −130

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2020 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.quickstep.util;

		import static com.android.launcher3.LauncherState.NORMAL;
		import static com.android.launcher3.LauncherState.OVERVIEW;
		import static com.android.launcher3.anim.Interpolators.DEACCEL;
		import static com.android.launcher3.anim.Interpolators.FINAL_FRAME;
		import static com.android.launcher3.anim.Interpolators.INSTANT;
		import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_COMPONENTS;
		import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_ACTIONS_FADE;
		import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE;
		import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_X;
		import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_Y;
		import static com.android.launcher3.states.StateAnimationConfig.PLAY_ATOMIC_OVERVIEW_PEEK;

		import android.animation.Animator;
		import android.animation.AnimatorSet;
		import android.util.Log;

		import com.android.launcher3.Launcher;
		import com.android.launcher3.LauncherState;
		import com.android.launcher3.anim.AnimationSuccessListener;
		import com.android.launcher3.statemanager.StateManager;
		import com.android.launcher3.states.StateAnimationConfig;
		import com.android.quickstep.views.RecentsView;

		/**
		* Runs an animation from overview to home. Currently, this animation is just a wrapper around the
		* normal state transition, in order to keep RecentsView at the same scale and translationY that
		* it started out at as it translates offscreen. It also scrolls RecentsView to page 0 and may play
		* a {@link StaggeredWorkspaceAnim} if we're starting from an upward fling.
		*/
		public class OverviewToHomeAnim {

		private static final String TAG = "OverviewToHomeAnim";

		// Constants to specify how to scroll RecentsView to the default page if it's not already there.
		private static final int DEFAULT_PAGE = 0;
		private static final int PER_PAGE_SCROLL_DURATION = 150;
		private static final int MAX_PAGE_SCROLL_DURATION = 750;

		private final Launcher mLauncher;
		private final Runnable mOnReachedHome;

		// Only run mOnReachedHome when both of these are true.
		private boolean mIsHomeStaggeredAnimFinished;
		private boolean mIsOverviewHidden;

		public OverviewToHomeAnim(Launcher launcher, Runnable onReachedHome) {
		mLauncher = launcher;
		mOnReachedHome = onReachedHome;
		}

		/**
		* Starts the animation. If velocity < 0 (i.e. upwards), also plays a
		* {@link StaggeredWorkspaceAnim}.
		*/
		public void animateWithVelocity(float velocity) {
		StateManager<LauncherState> stateManager = mLauncher.getStateManager();
		LauncherState startState = stateManager.getState();
		if (startState != OVERVIEW) {
		Log.e(TAG, "animateFromOverviewToHome: unexpected start state " + startState);
		}

		boolean playStaggeredWorkspaceAnim = velocity < 0;
		if (playStaggeredWorkspaceAnim) {
		StaggeredWorkspaceAnim staggeredWorkspaceAnim = new StaggeredWorkspaceAnim(
		mLauncher, velocity, false /* animateOverviewScrim */);
		staggeredWorkspaceAnim.addAnimatorListener(new AnimationSuccessListener() {
		@Override
		public void onAnimationSuccess(Animator animator) {
		mIsHomeStaggeredAnimFinished = true;
		maybeOverviewToHomeAnimComplete();
		}
		}).start();
		} else {
		mIsHomeStaggeredAnimFinished = true;
		}

		RecentsView recentsView = mLauncher.getOverviewPanel();
		int numPagesToScroll = recentsView.getNextPage() - DEFAULT_PAGE;
		int scrollDuration = Math.min(MAX_PAGE_SCROLL_DURATION,
		numPagesToScroll * PER_PAGE_SCROLL_DURATION);
		int duration = Math.max(scrollDuration, startState.getTransitionDuration(mLauncher));

		StateAnimationConfig config = new StateAnimationConfig();
		config.duration = duration;
		config.animFlags = playStaggeredWorkspaceAnim
		// StaggeredWorkspaceAnim doesn't animate overview, so we handle it here.
		? PLAY_ATOMIC_OVERVIEW_PEEK
		: ANIM_ALL_COMPONENTS;
		AnimatorSet anim = stateManager.createAtomicAnimation(
		startState, NORMAL, config, overrideConfig -> {
		overrideConfig.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, DEACCEL);
		overrideConfig.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, FINAL_FRAME);
		overrideConfig.setInterpolator(ANIM_OVERVIEW_SCALE, FINAL_FRAME);
		overrideConfig.setInterpolator(ANIM_OVERVIEW_ACTIONS_FADE, INSTANT);
		});
		anim.addListener(new AnimationSuccessListener() {
		@Override
		public void onAnimationSuccess(Animator animator) {
		mIsOverviewHidden = true;
		maybeOverviewToHomeAnimComplete();
		}
		});
		stateManager.cancelAnimation();
		anim.start();
		recentsView.snapToPage(DEFAULT_PAGE, duration);
		}

		private void maybeOverviewToHomeAnimComplete() {
		if (mIsHomeStaggeredAnimFinished && mIsOverviewHidden) {
		mOnReachedHome.run();
		}
		}
		}