diff options
author | Clark Scheff <clark@cyngn.com> | 2014-08-11 09:47:07 -0700 |
---|---|---|
committer | Clark Scheff <clark@cyngn.com> | 2014-08-13 15:25:51 -0700 |
commit | 0a5e0339b1fd85c6a58ddf5c05f06ba4af5d3b16 (patch) | |
tree | 8e8e6bada03ac54eb1978f93dc3504e0af48ee68 /src | |
parent | 7bd7c04e1820f3a7e17f7bc1a67c17cd17bd721f (diff) | |
download | packages_apps_ThemeChooser-0a5e0339b1fd85c6a58ddf5c05f06ba4af5d3b16.zip packages_apps_ThemeChooser-0a5e0339b1fd85c6a58ddf5c05f06ba4af5d3b16.tar.gz packages_apps_ThemeChooser-0a5e0339b1fd85c6a58ddf5c05f06ba4af5d3b16.tar.bz2 |
Update changes made to ComposedIconInfo in f/b
Change-Id: Ie7db5c03a463c44740f2d67310f57baf51c1b92a
Diffstat (limited to 'src')
-rw-r--r-- | src/com/cyngn/theme/util/IconPreviewHelper.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/cyngn/theme/util/IconPreviewHelper.java b/src/com/cyngn/theme/util/IconPreviewHelper.java index a391c36..3c37eb2 100644 --- a/src/com/cyngn/theme/util/IconPreviewHelper.java +++ b/src/com/cyngn/theme/util/IconPreviewHelper.java @@ -159,7 +159,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 != null || iconInfo.iconUpon != null)) { + iconInfo.iconMask != 0 || iconInfo.iconUpon != 0)) { return IconPackHelper.IconCustomizer.getComposedIconDrawable(baseIcon, res, iconInfo); } return baseIcon; @@ -167,7 +167,7 @@ public class IconPreviewHelper { private void setupComposedIcon(Resources res, ActivityInfo info, int iconId) { ComposedIconInfo iconInfo = mIconPackHelper.getComposedIconInfo(); - if (iconInfo.iconBacks == null && iconInfo.iconMask == null && iconInfo.iconUpon == null) { + if (iconInfo.iconBacks == null && iconInfo.iconMask == 0 && iconInfo.iconUpon == 0) { return; } |