diff options
author | d34d <clark@cyngn.com> | 2015-03-18 14:07:24 -0700 |
---|---|---|
committer | Michael Bestas <mikeioannina@gmail.com> | 2015-04-17 03:56:12 +0300 |
commit | 8e2b36126617748c20dad975d0c1f8facaa3d11e (patch) | |
tree | b5f3953ba56b9495a9da5c88a527101216a4329c /src/org/cyanogenmod | |
parent | 66f360cc1fba7e6f5126df41c556e734058f7871 (diff) | |
download | android_packages_providers_ThemesProvider-8e2b36126617748c20dad975d0c1f8facaa3d11e.tar.gz android_packages_providers_ThemesProvider-8e2b36126617748c20dad975d0c1f8facaa3d11e.tar.bz2 android_packages_providers_ThemesProvider-8e2b36126617748c20dad975d0c1f8facaa3d11e.zip |
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
Diffstat (limited to 'src/org/cyanogenmod')
-rw-r--r-- | src/org/cyanogenmod/themes/provider/util/IconPreviewHelper.java | 3 |
1 files changed, 1 insertions, 2 deletions
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; |