diff options
author | James Falcon <therealfalcon@gmail.com> | 2013-05-06 21:48:18 -0500 |
---|---|---|
committer | James Falcon <therealfalcon@gmail.com> | 2013-05-06 21:48:18 -0500 |
commit | b48c3807fd23df0a6d953ebdabaaf2330bc4f3d3 (patch) | |
tree | 327374119c2b40b64de192534b8b6e4f242778be /src/de/danoeh/antennapod/activity/PreferenceActivity.java | |
parent | 5b58466fd21c8bc97fe00698369228ea96566c33 (diff) | |
parent | 2db89cb807ae06b0f59039307e20c32cd9052b57 (diff) | |
download | AntennaPod-b48c3807fd23df0a6d953ebdabaaf2330bc4f3d3.zip |
Merge branch 'playback-speed' into speed
Conflicts:
res/values/arrays.xml
res/values/strings.xml
src/de/danoeh/antennapod/activity/PreferenceActivity.java
src/de/danoeh/antennapod/service/PlaybackService.java
Diffstat (limited to 'src/de/danoeh/antennapod/activity/PreferenceActivity.java')
-rw-r--r-- | src/de/danoeh/antennapod/activity/PreferenceActivity.java | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/src/de/danoeh/antennapod/activity/PreferenceActivity.java b/src/de/danoeh/antennapod/activity/PreferenceActivity.java index a8b11bcbc..21998ea73 100644 --- a/src/de/danoeh/antennapod/activity/PreferenceActivity.java +++ b/src/de/danoeh/antennapod/activity/PreferenceActivity.java @@ -14,6 +14,7 @@ import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; import android.os.Bundle; import android.preference.CheckBoxPreference; +import android.preference.ListPreference; import android.preference.Preference; import android.preference.Preference.OnPreferenceChangeListener; import android.preference.Preference.OnPreferenceClickListener; @@ -178,13 +179,40 @@ public class PreferenceActivity extends SherlockPreferenceActivity { return true; } }); - + buildUpdateIntervalPreference(); buildAutodownloadSelectedNetworsPreference(); setSelectedNetworksEnabled(UserPreferences .isEnableAutodownloadWifiFilter()); } + private void buildUpdateIntervalPreference() { + ListPreference pref = (ListPreference) findPreference(UserPreferences.PREF_UPDATE_INTERVAL); + String[] values = getResources().getStringArray( + R.array.update_intervall_values); + String[] entries = new String[values.length]; + for (int x = 0; x < values.length; x++) { + Integer v = Integer.parseInt(values[x]); + switch (v) { + case 0: + entries[x] = getString(R.string.pref_update_interval_hours_manual); + break; + case 1: + entries[x] = v + + " " + + getString(R.string.pref_update_interval_hours_singular); + break; + default: + entries[x] = v + " " + + getString(R.string.pref_update_interval_hours_plural); + break; + + } + } + pref.setEntries(entries); + + } + private void setSelectedNetworksEnabled(boolean b) { if (selectedNetworks != null) { for (Preference p : selectedNetworks) { |