Merge "Revert "Revert "Fix the badge in badge (triple badging), by simp..."" into main (6ea6ffa9) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/BubbleTextView.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import static com.android.launcher3.Flags.enableCursorHoverStates;
		import static com.android.launcher3.config.FeatureFlags.ENABLE_ICON_LABEL_AUTO_SCALING;
		import static com.android.launcher3.graphics.PreloadIconDrawable.newPendingIcon;
		import static com.android.launcher3.icons.BitmapInfo.FLAG_NO_BADGE;
		import static com.android.launcher3.icons.BitmapInfo.FLAG_SKIP_USER_BADGE;
		import static com.android.launcher3.icons.BitmapInfo.FLAG_THEMED;
		import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;
		import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_INCREMENTAL_DOWNLOAD_ACTIVE;
		@@ -164,6 +165,8 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
		@ViewDebug.ExportedProperty(category = "launcher")
		private boolean mHideBadge = false;
		@ViewDebug.ExportedProperty(category = "launcher")
		private boolean mSkipUserBadge = false;
		@ViewDebug.ExportedProperty(category = "launcher")
		private boolean mIsIconVisible = true;
		@ViewDebug.ExportedProperty(category = "launcher")
		private int mTextColor;
		@@ -268,6 +271,10 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
		mHideBadge = hideBadge;
		}

		public void setSkipUserBadge(boolean skipUserBadge) {
		mSkipUserBadge = skipUserBadge;
		}

		/**
		* Resets the view so it can be recycled.
		*/
		@@ -397,6 +404,9 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
		if (mHideBadge \|\| mDisplay == DISPLAY_SEARCH_RESULT_SMALL) {
		flags \|= FLAG_NO_BADGE;
		}
		if (mSkipUserBadge) {
		flags \|= FLAG_SKIP_USER_BADGE;
		}
		FastBitmapDrawable iconDrawable = info.newIcon(getContext(), flags);
		mDotParams.appColor = iconDrawable.getIconColor();
		mDotParams.dotColor = Themes.getAttrColor(getContext(), R.attr.notificationDotColor);

src/com/android/launcher3/pm/UserCache.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import android.os.UserManager;

		import androidx.annotation.AnyThread;
		import androidx.annotation.NonNull;
		import androidx.annotation.VisibleForTesting;
		import androidx.annotation.WorkerThread;

		import com.android.launcher3.util.MainThreadInitializedObject;
		@@ -154,6 +155,11 @@ public class UserCache implements SafeCloseable {
		.orElse(Process.myUserHandle());
		}

		@VisibleForTesting
		public void putToCache(UserHandle userHandle, UserIconInfo info) {
		mUserToSerialMap.put(userHandle, info);
		}

		/**
		* @see UserManager#getUserProfiles()
		*/