From 8e2b36126617748c20dad975d0c1f8facaa3d11e Mon Sep 17 00:00:00 2001 From: d34d Date: Wed, 18 Mar 2015 14:07:24 -0700 Subject: Fix icons with filters not being generated If a theme has composed icons that only use color filters, they would not get generated. This patch resolves that issue. Change-Id: If9076eca8cce1a85beed54ce30f0dfb8bbcd3188 REF: CHOOSER-63 --- src/org/cyanogenmod/themes/provider/util/IconPreviewHelper.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/org/cyanogenmod/themes') diff --git a/src/org/cyanogenmod/themes/provider/util/IconPreviewHelper.java b/src/org/cyanogenmod/themes/provider/util/IconPreviewHelper.java index 484136c..03aef59 100644 --- a/src/org/cyanogenmod/themes/provider/util/IconPreviewHelper.java +++ b/src/org/cyanogenmod/themes/provider/util/IconPreviewHelper.java @@ -156,8 +156,7 @@ public class IconPreviewHelper { private Drawable getComposedIcon(Resources res, Drawable baseIcon) { ComposedIconInfo iconInfo = mIconPackHelper.getComposedIconInfo(); - if (res != null && iconInfo != null && (iconInfo.iconBacks != null || - iconInfo.iconMask != 0 || iconInfo.iconUpon != 0)) { + if (res != null && IconPackHelper.shouldComposeIcon(iconInfo)) { return IconPackHelper.IconCustomizer.getComposedIconDrawable(baseIcon, res, iconInfo); } return baseIcon; -- cgit v1.2.3