Don't add default wallpapers if external images are selected

External wallpapers are set from within the chooser and therefore
not added to the components map.  Because of this, if we add in
the missing wallpaper from the default theme we will override this
behavior and the user will not get their custom wallpaper.

Change-Id: I8a897e6851039eaee502736bef98b93f827e952a
REF: THEMES-420 and THEMES-421

1 files changed, 8 insertions, 0 deletions

diff --git a/src/com/cyngn/theme/chooser/ThemeFragment.java b/src/com/cyngn/theme/chooser/ThemeFragment.java
index 39c17e6..a2181d9 100644
--- a/src/com/cyngn/theme/chooser/ThemeFragment.java
+++ b/src/com/cyngn/theme/chooser/ThemeFragment.java
@@ -2098,6 +2098,14 @@ public class ThemeFragment extends Fragment implements LoaderManager.LoaderCallb
             String component = entry.getKey();
             String defaultPkg = entry.getValue();
             if (!newMap.containsKey(component)) {
+                // Don't use default wallpaper or lockscreen wallpaper if an external image
+                // is suppose to be used.
+                if ((ThemesColumns.MODIFIES_LAUNCHER.equals(component) &&
+                        mExternalWallpaperUri != null) ||
+                        (ThemesColumns.MODIFIES_LOCKSCREEN.equals(component) &&
+                        mExternalLockscreenUri != null)) {
+                    continue;
+                }
                 newMap.put(component, defaultPkg);
             }
         }