diff options
author | Jorge Ruesga <jorge@ruesga.com> | 2013-08-07 00:10:01 +0200 |
---|---|---|
committer | Jorge Ruesga <jorge@ruesga.com> | 2013-08-07 00:10:01 +0200 |
commit | e3e640aa2e7b1357903663705bfdce8e8f95dc43 (patch) | |
tree | 340c2f372e5c302f5c88b84053badfac03cc2b32 /src/org/cyanogenmod/wallpapers/photophase/preferences | |
parent | 2f4271e4cd39237a518684b35b526e264d0a2109 (diff) | |
download | android_packages_wallpapers_PhotoPhase-e3e640aa2e7b1357903663705bfdce8e8f95dc43.tar.gz android_packages_wallpapers_PhotoPhase-e3e640aa2e7b1357903663705bfdce8e8f95dc43.tar.bz2 android_packages_wallpapers_PhotoPhase-e3e640aa2e7b1357903663705bfdce8e8f95dc43.zip |
Multiple effect selection (#13)
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Diffstat (limited to 'src/org/cyanogenmod/wallpapers/photophase/preferences')
-rw-r--r-- | src/org/cyanogenmod/wallpapers/photophase/preferences/GeneralPreferenceFragment.java | 5 | ||||
-rw-r--r-- | src/org/cyanogenmod/wallpapers/photophase/preferences/PreferencesProvider.java | 13 |
2 files changed, 13 insertions, 5 deletions
diff --git a/src/org/cyanogenmod/wallpapers/photophase/preferences/GeneralPreferenceFragment.java b/src/org/cyanogenmod/wallpapers/photophase/preferences/GeneralPreferenceFragment.java index 1d50da3..e30e9c8 100644 --- a/src/org/cyanogenmod/wallpapers/photophase/preferences/GeneralPreferenceFragment.java +++ b/src/org/cyanogenmod/wallpapers/photophase/preferences/GeneralPreferenceFragment.java @@ -20,6 +20,7 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.preference.ListPreference; +import android.preference.MultiSelectListPreference; import android.preference.Preference; import android.preference.Preference.OnPreferenceChangeListener; import android.preference.PreferenceFragment; @@ -47,7 +48,7 @@ public class GeneralPreferenceFragment extends PreferenceFragment { private ListPreference mTouchActions; private ListPreference mTransitionsTypes; private SeekBarProgressPreference mTransitionsInterval; - private ListPreference mEffectsTypes; + private MultiSelectListPreference mEffectsTypes; boolean mRedrawFlag; boolean mEmptyTextureQueueFlag; @@ -141,7 +142,7 @@ public class GeneralPreferenceFragment extends PreferenceFragment { }); mTransitionsInterval.setOnPreferenceChangeListener(mOnChangeListener); - mEffectsTypes = (ListPreference)findPreference("ui_effect_types"); + mEffectsTypes = (MultiSelectListPreference)findPreference("ui_effect_types"); mEffectsTypes.setOnPreferenceChangeListener(mOnChangeListener); } diff --git a/src/org/cyanogenmod/wallpapers/photophase/preferences/PreferencesProvider.java b/src/org/cyanogenmod/wallpapers/photophase/preferences/PreferencesProvider.java index 0b3e439..ab18a48 100644 --- a/src/org/cyanogenmod/wallpapers/photophase/preferences/PreferencesProvider.java +++ b/src/org/cyanogenmod/wallpapers/photophase/preferences/PreferencesProvider.java @@ -243,10 +243,17 @@ public final class PreferencesProvider { * Return the current user preference about the effect to apply to * the pictures of the wallpaper. * - * @return int The effect to apply to the wallpaper's pictures + * @return EFFECTS[] The effects to apply to the wallpaper's pictures */ - public static int getEffectTypes() { - return Integer.valueOf(getString("ui_effect_types", String.valueOf(EFFECTS.NO_EFFECT.ordinal()))); + public static EFFECTS[] getEffectTypes() { + Set<String> set = getStringSet("ui_effect_types", new HashSet<String>()); + String[] values = set.toArray(new String[set.size()]); + int count = values.length; + EFFECTS[] effects = new EFFECTS[count]; + for (int i = 0; i < count; i++) { + effects[i] = EFFECTS.fromOrdinal(Integer.valueOf(values[i])); + } + return effects; } } } |