Merge "Enable new open app transitions when in multiwindow mode." into ub-launcher3-edmonton (c0928c3b) · Commits · e / os / android_packages_apps_Trebuchet

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

+50 −26

Original line number	Diff line number	Diff line
		@@ -184,7 +184,8 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag
		// before our internal listeners.
		mLauncher.getStateManager().setCurrentAnimation(anim);

		anim.play(getIconAnimator(v));
		Rect windowTargetBounds = getWindowTargetBounds(targetCompats);
		anim.play(getIconAnimator(v, windowTargetBounds));
		if (launcherClosing) {
		Pair<AnimatorSet, Runnable> launcherContentAnimator =
		getLauncherContentAnimator(true /* isAppOpening */);
		@@ -196,7 +197,7 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag
		}
		});
		}
		anim.play(getOpeningWindowAnimators(v, targetCompats));
		anim.play(getOpeningWindowAnimators(v, targetCompats, windowTargetBounds));
		}

		if (launcherClosing) {
		@@ -213,7 +214,26 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag
		return ActivityOptionsCompat.makeRemoteAnimation(new RemoteAnimationAdapterCompat(
		runner, duration, statusBarTransitionDelay));
		}
		return getDefaultActivityLaunchOptions(launcher, v);
		return super.getActivityLaunchOptions(launcher, v);
		}

		/**
		* Return the window bounds of the opening target.
		* In multiwindow mode, we need to get the final size of the opening app window target to help
		* figure out where the floating view should animate to.
		*/
		private Rect getWindowTargetBounds(RemoteAnimationTargetCompat[] targets) {
		Rect bounds = new Rect(0, 0, mDeviceProfile.widthPx, mDeviceProfile.heightPx);
		if (mLauncher.isInMultiWindowModeCompat()) {
		for (RemoteAnimationTargetCompat target : targets) {
		if (target.mode == MODE_OPENING) {
		bounds.set(target.sourceContainerBounds);
		bounds.offsetTo(target.position.x, target.position.y);
		return bounds;
		}
		}
		}
		return bounds;
		}

		public void setRemoteAnimationProvider(RemoteAnimationProvider animationProvider) {
		@@ -382,7 +402,7 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag
		/**
		* @return Animator that controls the icon used to launch the target.
		*/
		private AnimatorSet getIconAnimator(View v) {
		private AnimatorSet getIconAnimator(View v, Rect windowTargetBounds) {
		final boolean isBubbleTextView = v instanceof BubbleTextView;
		mFloatingView = new View(mLauncher);
		if (isBubbleTextView && v.getTag() instanceof ItemInfoWithIcon ) {
		@@ -418,7 +438,7 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag
		viewLocationLeft += rect.left;
		viewLocationTop += rect.top;
		int viewLocationStart = mIsRtl
		? mDeviceProfile.widthPx - rect.right
		? windowTargetBounds.width() - rect.right
		: viewLocationLeft;
		LayoutParams lp = new LayoutParams(rect.width(), rect.height());
		lp.ignoreInsets = true;
		@@ -438,12 +458,15 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag
		v.setVisibility(View.INVISIBLE);

		AnimatorSet appIconAnimatorSet = new AnimatorSet();
		// Animate the app icon to the center
		float centerX = mDeviceProfile.widthPx / 2;
		float centerY = mDeviceProfile.heightPx / 2;
		int[] dragLayerBounds = new int[2];
		mDragLayer.getLocationOnScreen(dragLayerBounds);

		// Animate the app icon to the center of the window bounds in screen coordinates.
		float centerX = windowTargetBounds.centerX() - dragLayerBounds[0];
		float centerY = windowTargetBounds.centerY() - dragLayerBounds[1];

		float xPosition = mIsRtl
		? mDeviceProfile.widthPx - lp.getMarginStart() - rect.width()
		? windowTargetBounds.width() - lp.getMarginStart() - rect.width()
		: lp.getMarginStart();
		float dX = centerX - xPosition - (lp.width / 2);
		float dY = centerY - lp.topMargin - (lp.height / 2);
		@@ -469,8 +492,8 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag

		// Scale the app icon to take up the entire screen. This simplifies the math when
		// animating the app window position / scale.
		float maxScaleX = mDeviceProfile.widthPx / (float) rect.width();
		float maxScaleY = mDeviceProfile.heightPx / (float) rect.height();
		float maxScaleX = windowTargetBounds.width() / (float) rect.width();
		float maxScaleY = windowTargetBounds.height() / (float) rect.height();
		float scale = Math.max(maxScaleX, maxScaleY);
		ObjectAnimator scaleAnim = ObjectAnimator
		.ofFloat(mFloatingView, SCALE_PROPERTY, startScale, scale);
		@@ -505,7 +528,8 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag
		/**
		* @return Animator that controls the window of the opening targets.
		*/
		private ValueAnimator getOpeningWindowAnimators(View v, RemoteAnimationTargetCompat[] targets) {
		private ValueAnimator getOpeningWindowAnimators(View v, RemoteAnimationTargetCompat[] targets,
		Rect windowTargetBounds) {
		Rect bounds = new Rect();
		if (v.getParent() instanceof DeepShortcutView) {
		// Deep shortcut views have their icon drawn in a separate view.
		@@ -544,31 +568,35 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag
		float iconHeight = bounds.height() * mFloatingView.getScaleY();

		// Scale the app window to match the icon size.
		float scaleX = iconWidth / mDeviceProfile.widthPx;
		float scaleY = iconHeight / mDeviceProfile.heightPx;
		float scaleX = iconWidth / windowTargetBounds.width();
		float scaleY = iconHeight / windowTargetBounds.height();
		float scale = Math.min(1f, Math.min(scaleX, scaleY));
		matrix.setScale(scale, scale);

		// Position the scaled window on top of the icon
		int deviceWidth = mDeviceProfile.widthPx;
		int deviceHeight = mDeviceProfile.heightPx;
		float scaledWindowWidth = deviceWidth * scale;
		float scaledWindowHeight = deviceHeight * scale;
		int windowWidth = windowTargetBounds.width();
		int windowHeight = windowTargetBounds.height();
		float scaledWindowWidth = windowWidth * scale;
		float scaledWindowHeight = windowHeight * scale;

		float offsetX = (scaledWindowWidth - iconWidth) / 2;
		float offsetY = (scaledWindowHeight - iconHeight) / 2;
		if (mLauncher.isInMultiWindowModeCompat()) {
		mFloatingView.getLocationOnScreen(floatingViewBounds);
		} else {
		mFloatingView.getLocationInWindow(floatingViewBounds);
		}
		float transX0 = floatingViewBounds[0] - offsetX;
		float transY0 = floatingViewBounds[1] - offsetY;
		matrix.postTranslate(transX0, transY0);

		// Animate the window crop so that it starts off as a square, and then reveals
		// horizontally.
		float cropHeight = deviceHeight * easePercent + deviceWidth * (1 - easePercent);
		float initialTop = (deviceHeight - deviceWidth) / 2f;
		float cropHeight = windowHeight * easePercent + windowWidth * (1 - easePercent);
		float initialTop = (windowHeight - windowWidth) / 2f;
		crop.left = 0;
		crop.top = (int) (initialTop * (1 - easePercent));
		crop.right = deviceWidth;
		crop.right = windowWidth;
		crop.bottom = (int) (crop.top + cropHeight);

		TransactionCompat t = new TransactionCompat();
		@@ -579,10 +607,6 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag
		for (RemoteAnimationTargetCompat target : targets) {
		if (target.mode == MODE_OPENING) {
		t.setAlpha(target.leash, mAlpha.value);

		// TODO: This isn't correct at the beginning of the animation, but better
		// than nothing.
		matrix.postTranslate(target.position.x, target.position.y);
		t.setMatrix(target.leash, matrix);
		t.setWindowCrop(target.leash, crop);
		t.deferTransactionUntil(target.leash, surface, getNextFrameNumber(surface));

quickstep/src/com/android/quickstep/RecentsActivity.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -176,8 +176,8 @@ public class RecentsActivity extends BaseDraggingActivity {
		}

		@Override
		public ActivityOptions getActivityLaunchOptions(final View v, boolean useDefaultLaunchOptions) {
		if (useDefaultLaunchOptions \|\| !(v instanceof TaskView)) {
		public ActivityOptions getActivityLaunchOptions(final View v) {
		if (!(v instanceof TaskView)) {
		return null;
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -169,7 +169,7 @@ public class TaskView extends FrameLayout implements TaskCallbacks, PageCallback
		final ActivityOptions opts;
		if (animate) {
		opts = BaseDraggingActivity.fromContext(getContext())
		.getActivityLaunchOptions(this, false);
		.getActivityLaunchOptions(this);
		} else {
		opts = ActivityOptions.makeCustomAnimation(getContext(), 0, 0);
		}

src/com/android/launcher3/BaseDraggingActivity.java

+4 −5

Original line number	Diff line number	Diff line
		@@ -141,13 +141,12 @@ public abstract class BaseDraggingActivity extends BaseActivity
		return new Rect(pos[0], pos[1], pos[0] + v.getWidth(), pos[1] + v.getHeight());
		}

		public final Bundle getActivityLaunchOptionsAsBundle(View v, boolean useDefaultLaunchOptions) {
		ActivityOptions activityOptions = getActivityLaunchOptions(v, useDefaultLaunchOptions);
		public final Bundle getActivityLaunchOptionsAsBundle(View v) {
		ActivityOptions activityOptions = getActivityLaunchOptions(v);
		return activityOptions == null ? null : activityOptions.toBundle();
		}

		public abstract ActivityOptions getActivityLaunchOptions(
		View v, boolean useDefaultLaunchOptions);
		public abstract ActivityOptions getActivityLaunchOptions(View v);

		public boolean startActivitySafely(View v, Intent intent, ItemInfo item) {
		if (mIsSafeModeEnabled && !Utilities.isSystemApp(this, intent)) {
		@@ -160,7 +159,7 @@ public abstract class BaseDraggingActivity extends BaseActivity
		boolean useLaunchAnimation = (v != null) &&
		!intent.hasExtra(INTENT_EXTRA_IGNORE_LAUNCH_ANIMATION);
		Bundle optsBundle = useLaunchAnimation
		? getActivityLaunchOptionsAsBundle(v, isInMultiWindowModeCompat())
		? getActivityLaunchOptionsAsBundle(v)
		: null;

		UserHandle user = item == null ? null : item.user;

src/com/android/launcher3/Launcher.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -1614,10 +1614,8 @@ public class Launcher extends BaseDraggingActivity

		@TargetApi(Build.VERSION_CODES.M)
		@Override
		public ActivityOptions getActivityLaunchOptions(View v, boolean useDefaultLaunchOptions) {
		return useDefaultLaunchOptions
		? mAppTransitionManager.getDefaultActivityLaunchOptions(this, v)
		: mAppTransitionManager.getActivityLaunchOptions(this, v);
		public ActivityOptions getActivityLaunchOptions(View v) {
		return mAppTransitionManager.getActivityLaunchOptions(this, v);
		}

		public LauncherAppTransitionManager getAppTransitionManager() {