PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix mode icon sharing in modes list

Browse Source 
Modes sharing the same icon would also share the applied tint (e.g. all with the "active" tint even if only the last one of them is active).

(Although it should never happen, also removed a potential NPE for mode icons without ConstantState).

Fixes: 367131481
Test: manual
Flag: android.app.modes_ui
Change-Id: I56867783310ea57f2e92c866ff0b5b53ac86bf37
This commit is contained in:
Matías Hernández
2024-09-20 11:40:17 +02:00
parent 301a898b72
commit 58b04ae7cf
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/notification/modes/IconUtil.java
View File

@@ -60,7 +60,7 @@ class IconUtil {
private static Drawable applyTint(@NonNull Context context, @NonNull Drawable icon, private static Drawable applyTint(@NonNull Context context, @NonNull Drawable icon,
@AttrRes int colorAttr) { @AttrRes int colorAttr) {
icon = icon.mutate(); icon = mutateDrawable(context.getResources(), icon);
icon.setTintList(Utils.getColorAttr(context, colorAttr)); icon.setTintList(Utils.getColorAttr(context, colorAttr));
return icon; return icon;
} }
@@ -218,9 +218,9 @@ class IconUtil {
private static Drawable composeIcons(Resources res, Drawable outer, ColorStateList outerColor, private static Drawable composeIcons(Resources res, Drawable outer, ColorStateList outerColor,
@Px int outerSizePx, Drawable icon, ColorStateList iconColor, @Px int iconSizePx) { @Px int outerSizePx, Drawable icon, ColorStateList iconColor, @Px int iconSizePx) {
Drawable background = checkNotNull(outer.getConstantState()).newDrawable(res).mutate(); Drawable background = mutateDrawable(res, outer);
background.setTintList(outerColor); background.setTintList(outerColor);
Drawable foreground = checkNotNull(icon.getConstantState()).newDrawable(res).mutate(); Drawable foreground = mutateDrawable(res, icon);
foreground.setTintList(iconColor); foreground.setTintList(iconColor);
LayerDrawable layerDrawable = new LayerDrawable(new Drawable[] { background, foreground }); LayerDrawable layerDrawable = new LayerDrawable(new Drawable[] { background, foreground });
@@ -232,4 +232,13 @@ class IconUtil {
layerDrawable.setBounds(0, 0, outerSizePx, outerSizePx); layerDrawable.setBounds(0, 0, outerSizePx, outerSizePx);
return layerDrawable; return layerDrawable;
} }
private static Drawable mutateDrawable(Resources res, Drawable drawable) {
Drawable.ConstantState cs = drawable.getConstantState();
if (cs != null) {
return cs.newDrawable(res).mutate();
} else {
return drawable.mutate();
}
}
} }