Merge "For archived apps, reset icon span as soon as BubbleTextView starts unarchiving" into main (4609d53e) · Commits · e / os / BlissLauncher3

src/com/android/launcher3/BubbleTextView.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -1043,12 +1043,11 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
		/** Applies the given progress level to the this icon's progress bar. */
		@Nullable
		public PreloadIconDrawable applyProgressLevel() {
		if (!(getTag() instanceof ItemInfoWithIcon)
		if (!(getTag() instanceof ItemInfoWithIcon info)
		\|\| ((ItemInfoWithIcon) getTag()).isInactiveArchive()) {
		return null;
		}

		ItemInfoWithIcon info = (ItemInfoWithIcon) getTag();
		int progressLevel = info.getProgressLevel();
		if (progressLevel >= 100) {
		setContentDescription(info.contentDescription != null
		@@ -1068,6 +1067,10 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
		} else {
		preloadIconDrawable = makePreloadIcon();
		setIcon(preloadIconDrawable);
		if (info.isArchived() && Flags.useNewIconForArchivedApps()) {
		// reapply text without cloud icon as soon as unarchiving is triggered
		applyLabel(info);
		}
		}
		return preloadIconDrawable;
		}