Merge "Fix issue with IconAppChipView animated states" into main (8b997289) · Commits · e / os / android_packages_apps_Trebuchet

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

+23 −10

Original line number	Diff line number	Diff line
		@@ -86,6 +86,7 @@ public class IconAppChipView extends FrameLayout implements TaskViewIcon {
		private final int mMinIconBackgroundHeight;
		private final int mMaxIconBackgroundCornerRadius;
		private final float mMinIconBackgroundCornerRadius;
		private AnimatorSet mAnimator;

		private int mMaxWidth = Integer.MAX_VALUE;

		@@ -316,11 +317,13 @@ public class IconAppChipView extends FrameLayout implements TaskViewIcon {
		}

		protected void revealAnim(boolean isRevealing) {
		cancelInProgressAnimations();

		if (isRevealing) {
		boolean isRtl = isLayoutRtl();
		bringToFront();
		((AnimatedVectorDrawable) mIconArrowView.getDrawable()).start();
		AnimatorSet anim = new AnimatorSet();
		mAnimator = new AnimatorSet();
		float backgroundScaleY = mMaxIconBackgroundHeight / (float) mMinIconBackgroundHeight;
		float maxCornerSize = Math.min(mMaxIconBackgroundHeight / 2f,
		mMaxIconBackgroundCornerRadius);
		@@ -341,7 +344,7 @@ public class IconAppChipView extends FrameLayout implements TaskViewIcon {
		mIconTextMaxWidth + maxCornerSize);
		}
		});
		anim.playTogether(
		mAnimator.playTogether(
		expandedTextRevealAnim,
		ObjectAnimator.ofFloat(mIconViewBackgroundCornersStart, SCALE_Y,
		backgroundScaleY),
		@@ -367,9 +370,9 @@ public class IconAppChipView extends FrameLayout implements TaskViewIcon {
		ObjectAnimator.ofFloat(mIconTextExpandedView, ALPHA, 1),
		ObjectAnimator.ofFloat(mIconArrowView, TRANSLATION_X,
		isRtl ? -arrowTranslationX : arrowTranslationX));
		anim.setDuration(MENU_BACKGROUND_REVEAL_DURATION);
		anim.setInterpolator(EMPHASIZED);
		anim.start();
		mAnimator.setDuration(MENU_BACKGROUND_REVEAL_DURATION);
		mAnimator.setInterpolator(EMPHASIZED);
		mAnimator.start();
		} else {
		((AnimatedVectorDrawable) mIconArrowView.getDrawable()).reverse();
		float maxCornerSize = Math.min(mMaxIconBackgroundHeight / 2f,
		@@ -386,8 +389,8 @@ public class IconAppChipView extends FrameLayout implements TaskViewIcon {
		mIconTextExpandedView.getHeight() / 2f, 0);
		}
		});
		AnimatorSet anim = new AnimatorSet();
		anim.playTogether(
		mAnimator = new AnimatorSet();
		mAnimator.playTogether(
		expandedTextClipAnim,
		ObjectAnimator.ofFloat(mIconViewBackgroundCornersStart, SCALE_X, 1),
		ObjectAnimator.ofFloat(mIconViewBackgroundCornersStart, SCALE_Y, 1),
		@@ -403,9 +406,9 @@ public class IconAppChipView extends FrameLayout implements TaskViewIcon {
		ObjectAnimator.ofFloat(mIconTextCollapsedView, ALPHA, 1),
		ObjectAnimator.ofFloat(mIconTextExpandedView, ALPHA, 0),
		ObjectAnimator.ofFloat(mIconArrowView, TRANSLATION_X, 0));
		anim.setDuration(MENU_BACKGROUND_HIDE_DURATION);
		anim.setInterpolator(EMPHASIZED);
		anim.start();
		mAnimator.setDuration(MENU_BACKGROUND_HIDE_DURATION);
		mAnimator.setInterpolator(EMPHASIZED);
		mAnimator.start();
		}
		}

		@@ -425,6 +428,16 @@ public class IconAppChipView extends FrameLayout implements TaskViewIcon {
		mIconTextExpandedView.setAlpha(0);
		mIconArrowView.setTranslationX(0);
		((AnimatedVectorDrawable) mIconArrowView.getDrawable()).reset();
		mAnimator = null;
		}

		private void cancelInProgressAnimations() {
		// We null the `AnimatorSet` because it holds references to the `Animators` which aren't
		// expecting to be mutable and will cause a crash if they are re-used.
		if (mAnimator != null && mAnimator.isStarted()) {
		mAnimator.cancel();
		mAnimator = null;
		}
		}

		@Override

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

+15 −6

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import static com.android.quickstep.views.TaskThumbnailView.DIM_ALPHA;
		import android.animation.Animator;
		import android.animation.AnimatorSet;
		import android.animation.ObjectAnimator;
		import android.animation.ValueAnimator;
		import android.content.Context;
		import android.graphics.Outline;
		import android.graphics.Rect;
		@@ -69,6 +70,8 @@ public class TaskMenuView extends AbstractFloatingView {
		private TextView mTaskName;
		@Nullable
		private AnimatorSet mOpenCloseAnimator;
		@Nullable
		private ValueAnimator mRevealAnimator;
		@Nullable private Runnable mOnClosingStartCallback;
		private TaskView mTaskView;
		private TaskIdAttributeContainer mTaskContainer;
		@@ -290,13 +293,18 @@ public class TaskMenuView extends AbstractFloatingView {

		private void animateOpenOrClosed(boolean closing) {
		if (mOpenCloseAnimator != null && mOpenCloseAnimator.isRunning()) {
		mOpenCloseAnimator.end();
		mOpenCloseAnimator.cancel();
		}
		mOpenCloseAnimator = new AnimatorSet();

		final Animator revealAnimator = createOpenCloseOutlineProvider()
		.createRevealAnimator(this, closing);
		revealAnimator.setInterpolator(enableOverviewIconMenu() ? Interpolators.EMPHASIZED
		// If we're opening, we just start from the beginning as a new `TaskMenuView` is created
		// each time we do the open animation so there will never be a partial value here.
		float revealAnimationStartProgress = 0f;
		if (closing && mRevealAnimator != null) {
		revealAnimationStartProgress = 1f - mRevealAnimator.getAnimatedFraction();
		}
		mRevealAnimator = createOpenCloseOutlineProvider()
		.createRevealAnimator(this, closing, revealAnimationStartProgress);
		mRevealAnimator.setInterpolator(enableOverviewIconMenu() ? Interpolators.EMPHASIZED
		: Interpolators.DECELERATE);

		if (enableOverviewIconMenu()) {
		@@ -349,7 +357,7 @@ public class TaskMenuView extends AbstractFloatingView {
		mOpenCloseAnimator.playTogether(translationXAnim, menuTranslationXAnim);
		}

		mOpenCloseAnimator.playTogether(revealAnimator,
		mOpenCloseAnimator.playTogether(mRevealAnimator,
		ObjectAnimator.ofFloat(
		mTaskContainer.getThumbnailView(), DIM_ALPHA,
		closing ? 0 : TaskView.MAX_PAGE_SCRIM_ALPHA),
		@@ -378,6 +386,7 @@ public class TaskMenuView extends AbstractFloatingView {
		mIsOpen = false;
		resetOverviewIconMenu();
		mActivity.getDragLayer().removeView(this);
		mRevealAnimator = null;
		}

		private void resetOverviewIconMenu() {

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

+2 −3

Original line number	Diff line number	Diff line
		@@ -1137,9 +1137,8 @@ public class TaskView extends FrameLayout implements Reusable {
		DeviceProfile dp = mActivity.getDeviceProfile();
		if (enableOverviewIconMenu() && iconView instanceof IconAppChipView) {
		((IconAppChipView) iconView).revealAnim(/* isRevealing= */ true);
		return TaskMenuView.showForTask(menuContainer, () -> {
		((IconAppChipView) iconView).revealAnim(/* isRevealing= */ false);
		});
		return TaskMenuView.showForTask(menuContainer,
		() -> ((IconAppChipView) iconView).revealAnim(/* isRevealing= */ false));
		} else if (dp.isTablet) {
		int alignedOptionIndex = 0;
		if (getRecentsView().isOnGridBottomRow(menuContainer.getTaskView()) && dp.isLandscape) {