diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2014-12-01 21:49:19 -0800 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2014-12-01 21:49:19 -0800 |
| commit | 73de83856f6106b8270c0e277756fb5fdf1cd0bc (patch) | |
| tree | a6e69c5578ac21fbe19f8d484f2c99c4b2a033c9 | |
| parent | 6d827d74e6462075939e12245665367b5dd92f1e (diff) | |
| download | dsub-73de83856f6106b8270c0e277756fb5fdf1cd0bc.tar.gz dsub-73de83856f6106b8270c0e277756fb5fdf1cd0bc.tar.bz2 dsub-73de83856f6106b8270c0e277756fb5fdf1cd0bc.zip | |
Revert back to text edit for cache size
| -rw-r--r-- | res/xml/settings.xml | 6 | ||||
| -rw-r--r-- | src/github/daneren2005/dsub/activity/SettingsActivity.java | 20 |
2 files changed, 19 insertions, 7 deletions
diff --git a/res/xml/settings.xml b/res/xml/settings.xml index 10ea66fe..f22a9c3f 100644 --- a/res/xml/settings.xml +++ b/res/xml/settings.xml @@ -215,13 +215,11 @@ <PreferenceCategory android:title="@string/settings.cache_title"> - <github.daneren2005.dsub.view.SeekBarPreference + <EditTextPreference android:title="@string/settings.cache_size" android:key="cacheSize" android:defaultValue="2000" - android:dialogLayout="@layout/seekbar_preference" - myns:max="20000" - myns:display="%.0f MB"/> + android:digits="0123456789"/> <EditTextPreference android:title="@string/settings.cache_location" diff --git a/src/github/daneren2005/dsub/activity/SettingsActivity.java b/src/github/daneren2005/dsub/activity/SettingsActivity.java index 6218dd74..d8a938cd 100644 --- a/src/github/daneren2005/dsub/activity/SettingsActivity.java +++ b/src/github/daneren2005/dsub/activity/SettingsActivity.java @@ -60,6 +60,7 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Method; import java.net.URL; import java.security.acl.Group; +import java.text.DecimalFormat; import java.util.LinkedHashMap; import java.util.Locale; import java.util.Map; @@ -94,9 +95,11 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer private Preference replayGainUntagged; private String internalSSID; private String internalSSIDDisplay; + private EditTextPreference cacheSize; private int serverCount = 3; private SharedPreferences settings; + private DecimalFormat megabyteFromat; @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) @Override @@ -123,7 +126,7 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer tempLoss = (ListPreference) findPreference(Constants.PREFERENCES_KEY_TEMP_LOSS); pauseDisconnect = (ListPreference) findPreference(Constants.PREFERENCES_KEY_PAUSE_DISCONNECT); serversCategory = (PreferenceCategory) findPreference(Constants.PREFERENCES_KEY_SERVER_KEY); - addServerPreference = (Preference) findPreference(Constants.PREFERENCES_KEY_SERVER_ADD); + addServerPreference = findPreference(Constants.PREFERENCES_KEY_SERVER_ADD); videoPlayer = (ListPreference) findPreference(Constants.PREFERENCES_KEY_VIDEO_PLAYER); syncInterval = (ListPreference) findPreference(Constants.PREFERENCES_KEY_SYNC_INTERVAL); syncEnabled = (CheckBoxPreference) findPreference(Constants.PREFERENCES_KEY_SYNC_ENABLED); @@ -133,8 +136,9 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer syncMostRecent = (CheckBoxPreference) findPreference(Constants.PREFERENCES_KEY_SYNC_MOST_RECENT); replayGain = (CheckBoxPreference) findPreference(Constants.PREFERENCES_KEY_REPLAY_GAIN); replayGainType = (ListPreference) findPreference(Constants.PREFERENCES_KEY_REPLAY_GAIN_TYPE); - replayGainBump = (Preference) findPreference(Constants.PREFERENCES_KEY_REPLAY_GAIN_BUMP); - replayGainUntagged = (Preference) findPreference(Constants.PREFERENCES_KEY_REPLAY_GAIN_UNTAGGED); + replayGainBump = findPreference(Constants.PREFERENCES_KEY_REPLAY_GAIN_BUMP); + replayGainUntagged = findPreference(Constants.PREFERENCES_KEY_REPLAY_GAIN_UNTAGGED); + cacheSize = (EditTextPreference) findPreference(Constants.PREFERENCES_KEY_CACHE_SIZE); settings = Util.getPreferences(this); serverCount = settings.getInt(Constants.PREFERENCES_KEY_SERVER_COUNT, 1); @@ -318,6 +322,16 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer pauseDisconnect.setSummary(pauseDisconnect.getEntry()); videoPlayer.setSummary(videoPlayer.getEntry()); syncInterval.setSummary(syncInterval.getEntry()); + try { + if(megabyteFromat == null) { + megabyteFromat = new DecimalFormat(getResources().getString(R.string.util_bytes_format_megabyte)); + } + + cacheSize.setSummary(megabyteFromat.format((double) Integer.parseInt(cacheSize.getText())).replace(".00", "")); + } catch(Exception e) { + Log.e(TAG, "Failed to format cache size", e); + cacheSize.setSummary(cacheSize.getText()); + } if(syncEnabled.isChecked()) { if(!syncInterval.isEnabled()) { syncInterval.setEnabled(true); |