diff options
| author | d34d <clark@cyngn.com> | 2015-03-18 14:07:24 -0700 |
|---|---|---|
| committer | Clark Scheff <clark@cyngn.com> | 2015-03-20 22:56:00 +0000 |
| commit | 7cd496897fb8b427b3fc7cabfed85ca7ca66bcdf (patch) | |
| tree | 82bc184161b642706056dc10c947b00a5631ec4b | |
| parent | 3438ab19a69440240c39d5ea1469375c9139e84a (diff) | |
| download | android_packages_providers_ThemesProvider-stable/cm-12.0-YNG1TA.tar.gz android_packages_providers_ThemesProvider-stable/cm-12.0-YNG1TA.tar.bz2 android_packages_providers_ThemesProvider-stable/cm-12.0-YNG1TA.zip | |
Fix icons with filters not being generatedstable/cm-12.0-YNG1TA
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
(cherry picked from commit a6afd7e22df46a004d78ad2ed9ec3f1ab2c674b3)
| -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; |