diff options
| author | Jorge Ruesga <jorge@ruesga.com> | 2013-08-13 17:27:31 +0200 |
|---|---|---|
| committer | Jorge Ruesga <jorge@ruesga.com> | 2013-08-13 17:27:31 +0200 |
| commit | c5d9a3b6d4697b12f0be4c9568f008df6525be2b (patch) | |
| tree | 731796362b83eb9a354fd147131484fdbcf13470 | |
| parent | 9ec2c4522d62b26e3034314e361f255fe044016c (diff) | |
| download | android_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>
| -rw-r--r-- | res/values/arrays.xml | 6 | ||||
| -rw-r--r-- | res/values/strings.xml | 1 | ||||
| -rw-r--r-- | src/org/cyanogenmod/wallpapers/photophase/effects/Effects.java | 4 | ||||
| -rw-r--r-- | src/org/cyanogenmod/wallpapers/photophase/preferences/PreferencesProvider.java | 4 |
4 files changed, 13 insertions, 2 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 8da02e7..1ba53ac 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -77,6 +77,7 @@ <string-array name="transitions_default" translatable="false"/> <string-array name="effects_labels" translatable="false"> + <item>@string/effects_noeffect</item> <item>@string/effects_autofix</item> <item>@string/effects_crossprocess</item> <item>@string/effects_documentary</item> @@ -110,8 +111,11 @@ <item>12</item> <item>13</item> <item>14</item> + <item>15</item> </string-array> - <string-array name="effects_default" translatable="false"/> + <string-array name="effects_default" translatable="false"> + <item>0</item> + </string-array> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 7c61e91..8ab01b0 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -116,6 +116,7 @@ <string name="transitions_flip">Flip</string> <!-- Effects --> + <string name="effects_noeffect">No effect</string> <string name="effects_autofix">Autofix</string> <string name="effects_crossprocess">Cross process</string> <string name="effects_documentary">Documentary</string> 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]; |