aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJorge Ruesga <jorge@ruesga.com>2013-08-13 17:27:31 +0200
committerJorge Ruesga <jorge@ruesga.com>2013-08-13 17:27:31 +0200
commitc5d9a3b6d4697b12f0be4c9568f008df6525be2b (patch)
tree731796362b83eb9a354fd147131484fdbcf13470 /src
parent9ec2c4522d62b26e3034314e361f255fe044016c (diff)
downloadandroid_packages_wallpapers_PhotoPhase-c5d9a3b6d4697b12f0be4c9568f008df6525be2b.tar.gz
android_packages_wallpapers_PhotoPhase-c5d9a3b6d4697b12f0be4c9568f008df6525be2b.tar.bz2
android_packages_wallpapers_PhotoPhase-c5d9a3b6d4697b12f0be4c9568f008df6525be2b.zip
Support for no effect.
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Diffstat (limited to 'src')
-rw-r--r--src/org/cyanogenmod/wallpapers/photophase/effects/Effects.java4
-rw-r--r--src/org/cyanogenmod/wallpapers/photophase/preferences/PreferencesProvider.java4
2 files changed, 7 insertions, 1 deletions
diff --git a/src/org/cyanogenmod/wallpapers/photophase/effects/Effects.java b/src/org/cyanogenmod/wallpapers/photophase/effects/Effects.java
index eb41f34..04866c0 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/effects/Effects.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/effects/Effects.java
@@ -36,6 +36,10 @@ public class Effects {
*/
public enum EFFECTS {
/**
+ * No effect
+ */
+ NO_EFFECT,
+ /**
* @see EffectFactory#EFFECT_AUTOFIX
*/
AUTOFIX,
diff --git a/src/org/cyanogenmod/wallpapers/photophase/preferences/PreferencesProvider.java b/src/org/cyanogenmod/wallpapers/photophase/preferences/PreferencesProvider.java
index f8aa5f4..e2e8ee0 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/preferences/PreferencesProvider.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/preferences/PreferencesProvider.java
@@ -275,7 +275,9 @@ public final class PreferencesProvider {
* @return EFFECTS[] The effects to apply to the wallpaper's pictures
*/
public static EFFECTS[] getEffectTypes() {
- Set<String> set = getStringSet("ui_effect_types", new HashSet<String>());
+ Set<String> defaults = new HashSet<String>();
+ defaults.add(String.valueOf(EFFECTS.NO_EFFECT.ordinal()));
+ Set<String> set = getStringSet("ui_effect_types", defaults);
String[] values = set.toArray(new String[set.size()]);
int count = values.length;
EFFECTS[] effects = new EFFECTS[count];