Snap for 8005451 from 80aa8da7e353824b4e5c8da9eab7eb1f316b9145 to sc-v2-release (41b90290) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -320,6 +320,11 @@ public abstract class BaseQuickstepLauncher extends Launcher
		mOverviewCommandHelper = binder.getOverviewCommandHelper();
		}

		@Override
		public void runOnBindToTouchInteractionService(Runnable r) {
		mTISBindHelper.runOnBindToTouchInteractionService(r);
		}

		private void initUnfoldTransitionProgressProvider() {
		final UnfoldTransitionConfig config = UnfoldTransitionFactory.createConfig(this);
		if (config.isEnabled()) {

quickstep/src/com/android/launcher3/QuickstepTransitionManager.java

+43 −11

Original line number	Diff line number	Diff line
		@@ -660,10 +660,10 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
		AnimOpenProperties prop = new AnimOpenProperties(mLauncher.getResources(), mDeviceProfile,
		windowTargetBounds, launcherIconBounds, v, dragLayerBounds[0], dragLayerBounds[1],
		hasSplashScreen, floatingView.isDifferentFromAppIcon());
		int left = (int) (prop.cropCenterXStart - prop.cropWidthStart / 2);
		int top = (int) (prop.cropCenterYStart - prop.cropHeightStart / 2);
		int right = (int) (left + prop.cropWidthStart);
		int bottom = (int) (top + prop.cropHeightStart);
		int left = prop.cropCenterXStart - prop.cropWidthStart / 2;
		int top = prop.cropCenterYStart - prop.cropHeightStart / 2;
		int right = left + prop.cropWidthStart;
		int bottom = top + prop.cropHeightStart;
		// Set the crop here so we can calculate the corner radius below.
		crop.set(left, top, right, bottom);

		@@ -1329,6 +1329,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
		mDeviceProfile);

		// Hook up floating views to the closing window animators.
		final int rotationChange = getRotationChange(targets);
		Rect windowTargetBounds = getWindowTargetBounds(targets, rotationChange);
		if (floatingIconView != null) {
		anim.addAnimatorListener(floatingIconView);
		floatingIconView.setOnTargetChangeListener(anim::onTargetPositionChanged);
		@@ -1339,7 +1341,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
		// FolderIconView can be seen morphing into the icon shape.
		final float windowAlphaThreshold = 1f - SHAPE_PROGRESS_DURATION;

		RectFSpringAnim.OnUpdateListener runner = new SpringAnimRunner(targets, targetRect) {
		RectFSpringAnim.OnUpdateListener runner = new SpringAnimRunner(targets, targetRect,
		windowTargetBounds) {
		@Override
		public void onUpdate(RectF currentRectF, float progress) {
		finalFloatingIconView.update(1f, 255 /* fgAlpha */, currentRectF, progress,
		@@ -1356,7 +1359,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener

		final float floatingWidgetAlpha = isTransluscent ? 0 : 1;
		FloatingWidgetView finalFloatingWidget = floatingWidget;
		RectFSpringAnim.OnUpdateListener runner = new SpringAnimRunner(targets, targetRect) {
		RectFSpringAnim.OnUpdateListener runner = new SpringAnimRunner(targets, targetRect,
		windowTargetBounds) {
		@Override
		public void onUpdate(RectF currentRectF, float progress) {
		final float fallbackBackgroundAlpha =
		@@ -1767,12 +1771,17 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
		private final float mStartRadius;
		private final float mEndRadius;
		private final SurfaceTransactionApplier mSurfaceApplier;
		private final Rect mWindowTargetBounds = new Rect();

		SpringAnimRunner(RemoteAnimationTargetCompat[] appTargets, RectF targetRect) {
		private final Rect mTmpRect = new Rect();

		SpringAnimRunner(RemoteAnimationTargetCompat[] appTargets, RectF targetRect,
		Rect windowTargetBounds) {
		mAppTargets = appTargets;
		mStartRadius = QuickStepContract.getWindowCornerRadius(mLauncher);
		mEndRadius = Math.max(1, targetRect.width()) / 2f;
		mSurfaceApplier = new SurfaceTransactionApplier(mDragLayer);
		mWindowTargetBounds.set(windowTargetBounds);
		}

		public float getCornerRadius(float progress) {
		@@ -1793,13 +1802,36 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
		}

		if (target.mode == MODE_CLOSING) {
		float alpha = getWindowAlpha(progress);
		currentRectF.round(mCurrentRect);

		// Scale the target window to match the currentRectF.
		final float scale;

		// We need to infer the crop (we crop the window to match the currentRectF).
		if (mWindowTargetBounds.height() > mWindowTargetBounds.width()) {
		scale = Math.min(1f, currentRectF.width() / mWindowTargetBounds.width());

		int unscaledHeight = (int) (mCurrentRect.height() * (1f / scale));
		int croppedHeight = mWindowTargetBounds.height() - unscaledHeight;
		mTmpRect.set(0, 0, mWindowTargetBounds.width(),
		mWindowTargetBounds.height() - croppedHeight);
		} else {
		scale = Math.min(1f, currentRectF.height() / mWindowTargetBounds.height());

		int unscaledWidth = (int) (mCurrentRect.width() * (1f / scale));
		int croppedWidth = mWindowTargetBounds.width() - unscaledWidth;
		mTmpRect.set(0, 0, mWindowTargetBounds.width() - croppedWidth,
		mWindowTargetBounds.height());
		}

		// Match size and position of currentRect.
		mMatrix.setScale(scale, scale);
		mMatrix.postTranslate(mCurrentRect.left, mCurrentRect.top);

		builder.withMatrix(mMatrix)
		.withWindowCrop(mCurrentRect)
		.withAlpha(alpha)
		.withCornerRadius(getCornerRadius(progress));
		.withWindowCrop(mTmpRect)
		.withAlpha(getWindowAlpha(progress))
		.withCornerRadius(getCornerRadius(progress) / scale);
		} else if (target.mode == MODE_OPENING) {
		mMatrix.setTranslate(mTmpPos.x, mTmpPos.y);
		builder.withMatrix(mMatrix)

quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -111,6 +111,11 @@ import java.util.function.Supplier;
		onIconAlignmentRatioChangedForAppAndHomeTransition();

		mLauncher.getStateManager().addStateListener(mStateListener);

		// Initialize to the current launcher state
		updateStateForFlag(FLAG_RESUMED, launcher.hasBeenResumed());
		mLauncherState = launcher.getStateManager().getState();
		applyState(0);
		}

		public void onDestroy() {

quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -171,9 +171,13 @@ public class TaskbarStashController {

		boolean isManuallyStashedInApp = supportsManualStashing()
		&& mPrefs.getBoolean(SHARED_PREFS_STASHED_KEY, DEFAULT_STASHED_PREF);
		boolean isInSetup = !mActivity.isUserSetupComplete() \|\| sharedState.setupUIVisible;
		updateStateForFlag(FLAG_STASHED_IN_APP_MANUAL, isManuallyStashedInApp);
		updateStateForFlag(FLAG_STASHED_IN_APP_SETUP,
		!mActivity.isUserSetupComplete() \|\| sharedState.setupUIVisible);
		updateStateForFlag(FLAG_STASHED_IN_APP_SETUP, isInSetup);
		if (isInSetup) {
		// Update the in-app state to ensure isStashed() reflects right state during SUW
		updateStateForFlag(FLAG_IN_APP, true);
		}
		applyState();

		notifyStashChange(/* visible / false, / stashed */ isStashedInApp());

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

+51 −32

Original line number	Diff line number	Diff line
		@@ -180,45 +180,51 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
		getFlagForIndex(0, "STATE_LAUNCHER_PRESENT");
		protected static final int STATE_LAUNCHER_STARTED =
		getFlagForIndex(1, "STATE_LAUNCHER_STARTED");
		protected static final int STATE_LAUNCHER_DRAWN = getFlagForIndex(2, "STATE_LAUNCHER_DRAWN");
		protected static final int STATE_LAUNCHER_DRAWN =
		getFlagForIndex(2, "STATE_LAUNCHER_DRAWN");
		// Called when the Launcher has connected to the touch interaction service (and the taskbar
		// ui controller is initialized)
		protected static final int STATE_LAUNCHER_BIND_TO_SERVICE =
		getFlagForIndex(3, "STATE_LAUNCHER_BIND_TO_SERVICE");

		// Internal initialization states
		private static final int STATE_APP_CONTROLLER_RECEIVED =
		getFlagForIndex(3, "STATE_APP_CONTROLLER_RECEIVED");
		getFlagForIndex(4, "STATE_APP_CONTROLLER_RECEIVED");

		// Interaction finish states
		private static final int STATE_SCALED_CONTROLLER_HOME =
		getFlagForIndex(4, "STATE_SCALED_CONTROLLER_HOME");
		getFlagForIndex(5, "STATE_SCALED_CONTROLLER_HOME");
		private static final int STATE_SCALED_CONTROLLER_RECENTS =
		getFlagForIndex(5, "STATE_SCALED_CONTROLLER_RECENTS");
		getFlagForIndex(6, "STATE_SCALED_CONTROLLER_RECENTS");

		protected static final int STATE_HANDLER_INVALIDATED =
		getFlagForIndex(6, "STATE_HANDLER_INVALIDATED");
		getFlagForIndex(7, "STATE_HANDLER_INVALIDATED");
		private static final int STATE_GESTURE_STARTED =
		getFlagForIndex(7, "STATE_GESTURE_STARTED");
		getFlagForIndex(8, "STATE_GESTURE_STARTED");
		private static final int STATE_GESTURE_CANCELLED =
		getFlagForIndex(8, "STATE_GESTURE_CANCELLED");
		getFlagForIndex(9, "STATE_GESTURE_CANCELLED");
		private static final int STATE_GESTURE_COMPLETED =
		getFlagForIndex(9, "STATE_GESTURE_COMPLETED");
		getFlagForIndex(10, "STATE_GESTURE_COMPLETED");

		private static final int STATE_CAPTURE_SCREENSHOT =
		getFlagForIndex(10, "STATE_CAPTURE_SCREENSHOT");
		getFlagForIndex(11, "STATE_CAPTURE_SCREENSHOT");
		protected static final int STATE_SCREENSHOT_CAPTURED =
		getFlagForIndex(11, "STATE_SCREENSHOT_CAPTURED");
		getFlagForIndex(12, "STATE_SCREENSHOT_CAPTURED");
		private static final int STATE_SCREENSHOT_VIEW_SHOWN =
		getFlagForIndex(12, "STATE_SCREENSHOT_VIEW_SHOWN");
		getFlagForIndex(13, "STATE_SCREENSHOT_VIEW_SHOWN");

		private static final int STATE_RESUME_LAST_TASK =
		getFlagForIndex(13, "STATE_RESUME_LAST_TASK");
		getFlagForIndex(14, "STATE_RESUME_LAST_TASK");
		private static final int STATE_START_NEW_TASK =
		getFlagForIndex(14, "STATE_START_NEW_TASK");
		getFlagForIndex(15, "STATE_START_NEW_TASK");
		private static final int STATE_CURRENT_TASK_FINISHED =
		getFlagForIndex(15, "STATE_CURRENT_TASK_FINISHED");
		getFlagForIndex(16, "STATE_CURRENT_TASK_FINISHED");
		private static final int STATE_FINISH_WITH_NO_END =
		getFlagForIndex(16, "STATE_FINISH_WITH_NO_END");
		getFlagForIndex(17, "STATE_FINISH_WITH_NO_END");

		private static final int LAUNCHER_UI_STATES =
		STATE_LAUNCHER_PRESENT \| STATE_LAUNCHER_DRAWN \| STATE_LAUNCHER_STARTED;
		STATE_LAUNCHER_PRESENT \| STATE_LAUNCHER_DRAWN \| STATE_LAUNCHER_STARTED \|
		STATE_LAUNCHER_BIND_TO_SERVICE;

		public static final long MAX_SWIPE_DURATION = 350;
		public static final long HOME_DURATION = StaggeredWorkspaceAnim.DURATION_MS;
		@@ -429,6 +435,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,

		setupRecentsViewUi();
		linkRecentsViewScroll();
		activity.runOnBindToTouchInteractionService(this::onLauncherBindToService);

		mActivity.registerActivityLifecycleCallbacks(mLifecycleCallbacks);
		return true;
		@@ -510,6 +517,11 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
		mStateCallback.setState(STATE_LAUNCHER_STARTED);
		}

		private void onLauncherBindToService() {
		mStateCallback.setState(STATE_LAUNCHER_BIND_TO_SERVICE);
		flushOnRecentsAnimationAndLauncherBound();
		}

		private void onLauncherPresentAndGestureStarted() {
		// Re-setup the recents UI when gesture starts, as the state could have been changed during
		// that time by a previous window transition.
		@@ -812,12 +824,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
		}

		// Notify when the animation starts
		if (!mRecentsAnimationStartCallbacks.isEmpty()) {
		for (Runnable action : new ArrayList<>(mRecentsAnimationStartCallbacks)) {
		action.run();
		}
		mRecentsAnimationStartCallbacks.clear();
		}
		flushOnRecentsAnimationAndLauncherBound();

		TaskViewUtils.setSplitAuxiliarySurfacesShown(mRecentsAnimationTargets.nonApps, false);

		@@ -1195,7 +1202,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
		@UiThread
		private void animateToProgress(float start, float end, long duration, Interpolator interpolator,
		GestureEndTarget target, PointF velocityPxPerMs) {
		runOnRecentsAnimationStart(() -> animateToProgressInternal(start, end, duration,
		runOnRecentsAnimationAndLauncherBound(() -> animateToProgressInternal(start, end, duration,
		interpolator, target, velocityPxPerMs));
		}

		@@ -1820,12 +1827,12 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
		SurfaceTransactionApplier.create(mRecentsView, applier -> {
		runActionOnRemoteHandles(remoteTargetHandle -> remoteTargetHandle.getTransformParams()
		.setSyncTransactionApplier(applier));
		runOnRecentsAnimationStart(() ->
		runOnRecentsAnimationAndLauncherBound(() ->
		mRecentsAnimationTargets.addReleaseCheck(applier));
		});

		mRecentsView.addOnScrollChangedListener(mOnRecentsScrollListener);
		runOnRecentsAnimationStart(() ->
		runOnRecentsAnimationAndLauncherBound(() ->
		mRecentsView.setRecentsAnimationTargets(mRecentsAnimationController,
		mRecentsAnimationTargets));
		mRecentsViewScrollLinked = true;
		@@ -1871,15 +1878,27 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
		}

		/**
		* Runs the given {@param action} if the recents animation has already started, or queues it to
		* be run when it is next started.
		* Runs the given {@param action} if the recents animation has already started and Launcher has
		* been created and bound to the TouchInteractionService, or queues it to be run when it this
		* next happens.
		*/
		protected void runOnRecentsAnimationStart(Runnable action) {
		if (mRecentsAnimationTargets == null) {
		private void runOnRecentsAnimationAndLauncherBound(Runnable action) {
		mRecentsAnimationStartCallbacks.add(action);
		} else {
		flushOnRecentsAnimationAndLauncherBound();
		}

		private void flushOnRecentsAnimationAndLauncherBound() {
		if (mRecentsAnimationTargets == null \|\|
		!mStateCallback.hasStates(STATE_LAUNCHER_BIND_TO_SERVICE)) {
		return;
		}

		if (!mRecentsAnimationStartCallbacks.isEmpty()) {
		for (Runnable action : new ArrayList<>(mRecentsAnimationStartCallbacks)) {
		action.run();
		}
		mRecentsAnimationStartCallbacks.clear();
		}
		}

		/**