Merge "Fix bug where preview item icon fades/disappears for a frame during" into sc-dev (0bf00010) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -34,7 +34,6 @@ public class ClippedFolderIconLayoutRule {
		float totalScale = scaleForItem(curNumItems);
		float transX;
		float transY;
		float overlayAlpha = 0;

		if (index == EXIT_INDEX) {
		// 0 1 * <-- Exit position (row 0, col 2)
		@@ -55,10 +54,9 @@ public class ClippedFolderIconLayoutRule {
		transY = mTmpPoint[1];

		if (params == null) {
		params = new PreviewItemDrawingParams(transX, transY, totalScale, overlayAlpha);
		params = new PreviewItemDrawingParams(transX, transY, totalScale);
		} else {
		params.update(transX, transY, totalScale);
		params.overlayAlpha = overlayAlpha;
		}
		return params;
		}

src/com/android/launcher3/folder/FolderAnimationManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -79,7 +79,7 @@ public class FolderAnimationManager {
		private final TimeInterpolator mLargeFolderPreviewItemOpenInterpolator;
		private final TimeInterpolator mLargeFolderPreviewItemCloseInterpolator;

		private final PreviewItemDrawingParams mTmpParams = new PreviewItemDrawingParams(0, 0, 0, 0);
		private final PreviewItemDrawingParams mTmpParams = new PreviewItemDrawingParams(0, 0, 0);
		private final FolderGridOrganizer mPreviewVerifier;

		private ObjectAnimator mBgColorAnimator;

src/com/android/launcher3/folder/FolderIcon.java

+7 −6

Original line number	Diff line number	Diff line
		@@ -113,7 +113,7 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
		FolderGridOrganizer mPreviewVerifier;
		ClippedFolderIconLayoutRule mPreviewLayoutRule;
		private PreviewItemManager mPreviewItemManager;
		private PreviewItemDrawingParams mTmpParams = new PreviewItemDrawingParams(0, 0, 0, 0);
		private PreviewItemDrawingParams mTmpParams = new PreviewItemDrawingParams(0, 0, 0);
		private List<WorkspaceItemInfo> mCurrentPreviewItems = new ArrayList<>();

		boolean mAnimating = false;
		@@ -391,7 +391,7 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
		to.offset(center[0] - animateView.getMeasuredWidth() / 2,
		center[1] - animateView.getMeasuredHeight() / 2);

		float finalAlpha = index < MAX_NUM_ITEMS_IN_PREVIEW ? 0.5f : 0f;
		float finalAlpha = index < MAX_NUM_ITEMS_IN_PREVIEW ? 1f : 0f;

		float finalScale = scale * scaleRelativeToDragLayer;

		@@ -402,15 +402,18 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
		finalScale *= containerScale;
		}

		final int finalIndex = index;
		dragLayer.animateView(animateView, from, to, finalAlpha,
		1, 1, finalScale, finalScale, DROP_IN_ANIMATION_DURATION,
		Interpolators.DEACCEL_2, Interpolators.ACCEL_2,
		null, DragLayer.ANIMATION_END_DISAPPEAR, null);
		() -> {
		mPreviewItemManager.hidePreviewItem(finalIndex, false);
		mFolder.showItem(item);
		}, DragLayer.ANIMATION_END_DISAPPEAR, null);

		mFolder.hideItem(item);

		if (!itemAdded) mPreviewItemManager.hidePreviewItem(index, true);
		final int finalIndex = index;

		FolderNameInfos nameInfos = new FolderNameInfos();
		if (FeatureFlags.FOLDER_NAME_SUGGEST.get()) {
		@@ -430,8 +433,6 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
		private void showFinalView(int finalIndex, final WorkspaceItemInfo item,
		FolderNameInfos nameInfos, InstanceId instanceId) {
		postDelayed(() -> {
		mPreviewItemManager.hidePreviewItem(finalIndex, false);
		mFolder.showItem(item);
		setLabelSuggestion(nameInfos, instanceId);
		invalidate();
		}, DROP_IN_ANIMATION_DURATION);

src/com/android/launcher3/folder/FolderPreviewItemAnim.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ class FolderPreviewItemAnim {
		};

		private static final PreviewItemDrawingParams sTmpParams =
		new PreviewItemDrawingParams(0, 0, 0, 0);
		new PreviewItemDrawingParams(0, 0, 0);
		private static final float[] sTempParamsArray = new float[3];

		private final ObjectAnimator mAnimator;

src/com/android/launcher3/folder/PreviewItemDrawingParams.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -27,17 +27,15 @@ class PreviewItemDrawingParams {
		float transX;
		float transY;
		float scale;
		float overlayAlpha;
		public FolderPreviewItemAnim anim;
		public boolean hidden;
		public Drawable drawable;
		public WorkspaceItemInfo item;

		PreviewItemDrawingParams(float transX, float transY, float scale, float overlayAlpha) {
		PreviewItemDrawingParams(float transX, float transY, float scale) {
		this.transX = transX;
		this.transY = transY;
		this.scale = scale;
		this.overlayAlpha = overlayAlpha;
		}

		public void update(float transX, float transY, float scale) {