Merge "Fix wrong initial staged split position" into tm-dev (fec75c5a) · Commits · e / os / BlissLauncher3

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -118,8 +118,8 @@ public final class RecentsViewStateController extends

	if (isSplitSelectionState(currentState, toState)) {		if (isSplitSelectionState(currentState, toState)) {
	// Animation to "dismiss" selected taskView		// Animation to "dismiss" selected taskView
	PendingAnimation splitSelectInitAnimation =		PendingAnimation splitSelectInitAnimation = mRecentsView.createSplitSelectInitAnimation(
	mRecentsView.createSplitSelectInitAnimation();		toState.getTransitionDuration(mLauncher));
	// Add properties to shift remaining taskViews to get out of placeholder view		// Add properties to shift remaining taskViews to get out of placeholder view
	splitSelectInitAnimation.setFloat(mRecentsView, taskViewsFloat.first,		splitSelectInitAnimation.setFloat(mRecentsView, taskViewsFloat.first,
	toState.getSplitSelectTranslation(mLauncher), LINEAR);		toState.getSplitSelectTranslation(mLauncher), LINEAR);

quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -111,7 +111,8 @@ public class FallbackRecentsStateController implements StateHandler<RecentsState

	RecentsState currentState = mActivity.getStateManager().getState();		RecentsState currentState = mActivity.getStateManager().getState();
	if (isSplitSelectionState(state) && !isSplitSelectionState(currentState)) {		if (isSplitSelectionState(state) && !isSplitSelectionState(currentState)) {
	setter.add(mRecentsView.createSplitSelectInitAnimation().buildAnim());		setter.add(mRecentsView.createSplitSelectInitAnimation(
			state.getTransitionDuration(mActivity)).buildAnim());
	}		}

	Pair<FloatProperty, FloatProperty> taskViewsFloat =		Pair<FloatProperty, FloatProperty> taskViewsFloat =

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

+2 −5

Original line number	Original line	Diff line number	Diff line
	@@ -28,7 +28,6 @@ import static com.android.launcher3.LauncherAnimUtils.SUCCESS_TRANSITION_PROGRES
	import static com.android.launcher3.LauncherAnimUtils.VIEW_ALPHA;		import static com.android.launcher3.LauncherAnimUtils.VIEW_ALPHA;
	import static com.android.launcher3.LauncherState.BACKGROUND_APP;		import static com.android.launcher3.LauncherState.BACKGROUND_APP;
	import static com.android.launcher3.QuickstepTransitionManager.RECENTS_LAUNCH_DURATION;		import static com.android.launcher3.QuickstepTransitionManager.RECENTS_LAUNCH_DURATION;
	import static com.android.launcher3.QuickstepTransitionManager.SPLIT_LAUNCH_DURATION;
	import static com.android.launcher3.Utilities.EDGE_NAV_BAR;		import static com.android.launcher3.Utilities.EDGE_NAV_BAR;
	import static com.android.launcher3.Utilities.mapToRange;		import static com.android.launcher3.Utilities.mapToRange;
	import static com.android.launcher3.Utilities.squaredHypot;		import static com.android.launcher3.Utilities.squaredHypot;
	@@ -3984,14 +3983,12 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
	splitSelectSource.position.stagePosition);		splitSelectSource.position.stagePosition);
	}		}

	public PendingAnimation createSplitSelectInitAnimation() {		public PendingAnimation createSplitSelectInitAnimation(int duration) {
	if (mSplitHiddenTaskView != null) {		if (mSplitHiddenTaskView != null) {
	int duration = mActivity.getStateManager().getState().getTransitionDuration(
	getContext());
	return createTaskDismissAnimation(mSplitHiddenTaskView, true, false, duration,		return createTaskDismissAnimation(mSplitHiddenTaskView, true, false, duration,
	true /* dismissingForSplitSelection*/);		true /* dismissingForSplitSelection*/);
	} else {		} else {
	PendingAnimation anim = new PendingAnimation(SPLIT_LAUNCH_DURATION);		PendingAnimation anim = new PendingAnimation(duration);
	createInitialSplitSelectAnimation(anim);		createInitialSplitSelectAnimation(anim);
	return anim;		return anim;
	}		}