Make sure profile badging matches shape
Bug: 398875512 Test: testing different shapes on work profile Flag: com.android.launcher3.enable_launcher_icon_shapes Change-Id: I5cb9e629f711f2fc607ca646d82a8523c0b43d1b
This commit is contained in:
1 parent
f979f6518b
commit
567097eee8
5 files changed
+55
-29
No files matched your search
@@ -18,6 +18,7 @@ package com.android.launcher3;
|
||||
|
||||
import static com.android.launcher3.BuildConfig.WIDGET_ON_FIRST_SCREEN;
|
||||
import static com.android.launcher3.Flags.enableSmartspaceAsAWidget;
|
||||
import static com.android.launcher3.graphics.ShapeDelegate.DEFAULT_PATH_SIZE;
|
||||
import static com.android.launcher3.icons.BitmapInfo.FLAG_THEMED;
|
||||
import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT;
|
||||
import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT;
|
||||
@@ -39,6 +40,7 @@ import android.graphics.ColorFilter;
|
||||
import android.graphics.LightingColorFilter;
|
||||
import android.graphics.Matrix;
|
||||
import android.graphics.Paint;
|
||||
import android.graphics.Path;
|
||||
import android.graphics.Point;
|
||||
import android.graphics.PointF;
|
||||
import android.graphics.Rect;
|
||||
@@ -632,7 +634,7 @@ public final class Utilities {
|
||||
|
||||
Drawable badge = null;
|
||||
if ((info instanceof ItemInfoWithIcon iiwi) && !iiwi.getMatchingLookupFlag().useLowRes()) {
|
||||
badge = iiwi.bitmap.getBadgeDrawable(context, useTheme);
|
||||
badge = iiwi.bitmap.getBadgeDrawable(context, useTheme, getIconShapeOrNull(context));
|
||||
}
|
||||
|
||||
if (info instanceof PendingAddShortcutInfo) {
|
||||
@@ -659,8 +661,11 @@ public final class Utilities {
|
||||
// Only fetch badge if the icon is on workspace
|
||||
if (info.id != ItemInfo.NO_ID && badge == null) {
|
||||
badge = appState.getIconCache().getShortcutInfoBadge(si).newIcon(
|
||||
context, ThemeManager.INSTANCE.get(context).isIconThemeEnabled()
|
||||
? FLAG_THEMED : 0);
|
||||
context,
|
||||
ThemeManager.INSTANCE.get(context).isIconThemeEnabled()
|
||||
? FLAG_THEMED : 0,
|
||||
getIconShapeOrNull(context)
|
||||
);
|
||||
}
|
||||
}
|
||||
} else if (info.itemType == LauncherSettings.Favorites.ITEM_TYPE_FOLDER) {
|
||||
@@ -706,10 +711,11 @@ public final class Utilities {
|
||||
|
||||
if (badge == null) {
|
||||
badge = BitmapInfo.LOW_RES_INFO.withFlags(
|
||||
UserCache.INSTANCE.get(context)
|
||||
.getUserInfo(info.user)
|
||||
.applyBitmapInfoFlags(FlagOp.NO_OP))
|
||||
.getBadgeDrawable(context, useTheme);
|
||||
UserCache.INSTANCE.get(context)
|
||||
.getUserInfo(info.user)
|
||||
.applyBitmapInfoFlags(FlagOp.NO_OP)
|
||||
)
|
||||
.getBadgeDrawable(context, useTheme, getIconShapeOrNull(context));
|
||||
if (badge == null) {
|
||||
badge = new ColorDrawable(Color.TRANSPARENT);
|
||||
}
|
||||
@@ -939,4 +945,18 @@ public final class Utilities {
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns current icon shape to use for badges if flag is on, otherwise null.
|
||||
*/
|
||||
@Nullable
|
||||
public static Path getIconShapeOrNull(Context context) {
|
||||
if (Flags.enableLauncherIconShapes()) {
|
||||
return ThemeManager.INSTANCE.get(context)
|
||||
.getIconShape()
|
||||
.getPath(DEFAULT_PATH_SIZE);
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user