Merge "Improve "isActiveArchive" check by moving it a bit earlier into the method." into main (57edffec) · Commits · e / os / BlissLauncher3

src/com/android/launcher3/BubbleTextView.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -916,7 +916,8 @@ 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)
		\|\| !((ItemInfoWithIcon) getTag()).isActiveArchive()) {
		return null;
		}

		@@ -973,6 +974,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
		return info.isDisabled() \|\| info.isPendingDownload();
		}


		public void applyDotState(ItemInfo itemInfo, boolean animate) {
		if (mIcon instanceof FastBitmapDrawable) {
		boolean wasDotted = mDotInfo != null;

+5 −4

Original line number	Diff line number	Diff line
		@@ -160,10 +160,6 @@ public abstract class ItemInfoWithIcon extends ItemInfo {
		* and its install session is active
		*/
		public boolean isPendingDownload() {
		if (isArchived()) {
		return this.getProgressLevel() == 0
		&& (this.runtimeStatusFlags & FLAG_INSTALL_SESSION_ACTIVE) != 0;
		}
		return getProgressLevel() == 0;
		}

		@@ -177,6 +173,11 @@ public abstract class ItemInfoWithIcon extends ItemInfo {
		return (runtimeStatusFlags & FLAG_ARCHIVED) != 0;
		}

		/** Returns true if the app is archived and has an active install session. */
		public boolean isActiveArchive() {
		return isArchived() && (runtimeStatusFlags & FLAG_INSTALL_SESSION_ACTIVE) != 0;
		}

		/**
		* Indicates whether we're using a low res icon
		*/