Merge "Fix landscape app open/close animations." into ub-launcher3-qt-dev (eaed3a7c) · Commits · e / os / android_packages_apps_Trebuchet

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

+30 −9

Original line number	Diff line number	Diff line
		@@ -476,6 +476,16 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans

		float shapeRevealDuration = APP_LAUNCH_DURATION * SHAPE_PROGRESS_DURATION;

		final float startCrop;
		final float endCrop;
		if (mDeviceProfile.isVerticalBarLayout()) {
		startCrop = windowTargetBounds.height();
		endCrop = windowTargetBounds.width();
		} else {
		startCrop = windowTargetBounds.width();
		endCrop = windowTargetBounds.height();
		}

		final float windowRadius = mDeviceProfile.isMultiWindowMode
		? 0 : getWindowCornerRadius(mLauncher.getResources());
		appAnimator.addUpdateListener(new MultiValueUpdateListener() {
		@@ -485,10 +495,10 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
		EXAGGERATED_EASE);
		FloatProp mIconAlpha = new FloatProp(1f, 0f, APP_LAUNCH_ALPHA_START_DELAY,
		alphaDuration, LINEAR);
		FloatProp mCropHeight = new FloatProp(windowTargetBounds.width(),
		windowTargetBounds.height(), 0, APP_LAUNCH_DURATION, EXAGGERATED_EASE);
		FloatProp mWindowRadius = new FloatProp(windowTargetBounds.width() / 2f,
		windowRadius, 0, APP_LAUNCH_DURATION, EXAGGERATED_EASE);
		FloatProp mCroppedSize = new FloatProp(startCrop, endCrop, 0, APP_LAUNCH_DURATION,
		EXAGGERATED_EASE);
		FloatProp mWindowRadius = new FloatProp(startCrop / 2f, windowRadius, 0,
		APP_LAUNCH_DURATION, EXAGGERATED_EASE);

		@Override
		public void onUpdate(float percent) {
		@@ -496,10 +506,16 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
		float iconWidth = bounds.width() * mIconScale.value;
		float iconHeight = bounds.height() * mIconScale.value;

		// Animate the window crop so that it starts off as a square, and then reveals
		// horizontally.
		int windowWidth = windowTargetBounds.width();
		int windowHeight = (int) mCropHeight.value;
		// Animate the window crop so that it starts off as a square.
		final int windowWidth;
		final int windowHeight;
		if (mDeviceProfile.isVerticalBarLayout()) {
		windowWidth = (int) mCroppedSize.value;
		windowHeight = windowTargetBounds.height();
		} else {
		windowWidth = windowTargetBounds.width();
		windowHeight = (int) mCroppedSize.value;
		}
		crop.set(0, 0, windowWidth, windowHeight);

		// Scale the app window to match the icon size.
		@@ -522,6 +538,7 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
		float transY0 = temp.top - offsetY;

		float croppedHeight = (windowTargetBounds.height() - crop.height()) * scale;
		float croppedWidth = (windowTargetBounds.width() - crop.width()) * scale;
		SurfaceParams[] params = new SurfaceParams[targets.length];
		for (int i = targets.length - 1; i >= 0; i--) {
		RemoteAnimationTargetCompat target = targets[i];
		@@ -535,7 +552,11 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
		alpha = 1f - mIconAlpha.value;
		cornerRadius = mWindowRadius.value;
		matrix.mapRect(currentBounds, targetBounds);
		if (mDeviceProfile.isVerticalBarLayout()) {
		currentBounds.right -= croppedWidth;
		} else {
		currentBounds.bottom -= croppedHeight;
		}
		mFloatingView.update(currentBounds, mIconAlpha.value, percent, 0f,
		cornerRadius * scale, true /* isOpening */);
		} else {

src/com/android/launcher3/views/FloatingIconView.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -210,7 +210,12 @@ public class FloatingIconView extends View implements
		Math.max(shapeProgressStart, progress), shapeProgressStart, 1f, 0, toMax,
		LINEAR), 0, 1);

		if (mIsVerticalBarLayout) {
		mOutline.right = (int) (rect.width() / scale);
		} else {
		mOutline.bottom = (int) (rect.height() / scale);
		}

		mTaskCornerRadius = cornerRadius / scale;
		if (mIsAdaptiveIcon) {
		if (!isOpening && shapeRevealProgress >= 0) {
		@@ -230,7 +235,8 @@ public class FloatingIconView extends View implements
		mRevealAnimator.setCurrentFraction(shapeRevealProgress);
		}

		float drawableScale = mOutline.height() / minSize;
		float drawableScale = (mIsVerticalBarLayout ? mOutline.width() : mOutline.height())
		/ minSize;
		setBackgroundDrawableBounds(drawableScale);
		if (isOpening) {
		// Center align foreground