diff options
author | Scott Jackson <daneren2005@gmail.com> | 2016-01-04 17:05:20 -0800 |
---|---|---|
committer | Scott Jackson <daneren2005@gmail.com> | 2016-01-04 17:05:20 -0800 |
commit | 9fcb88c5a91ee271eaae81c0ccabe7111dcc695a (patch) | |
tree | 9df00ec861e6b27ef7c48387fe703a4232391122 /app/src/main/java/github/daneren2005/dsub/fragments | |
parent | 3e341f4220d71b6d0abda0d0b4eed81538bd9293 (diff) | |
parent | 013b4a554da59ef3b0fc19a0510dd47bb5c5f520 (diff) | |
download | dsub-9fcb88c5a91ee271eaae81c0ccabe7111dcc695a.tar.gz dsub-9fcb88c5a91ee271eaae81c0ccabe7111dcc695a.tar.bz2 dsub-9fcb88c5a91ee271eaae81c0ccabe7111dcc695a.zip |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'app/src/main/java/github/daneren2005/dsub/fragments')
-rw-r--r-- | app/src/main/java/github/daneren2005/dsub/fragments/SettingsFragment.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SettingsFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/SettingsFragment.java index 11de6aee..249b8a93 100644 --- a/app/src/main/java/github/daneren2005/dsub/fragments/SettingsFragment.java +++ b/app/src/main/java/github/daneren2005/dsub/fragments/SettingsFragment.java @@ -56,6 +56,7 @@ import github.daneren2005.dsub.util.FileUtil; import github.daneren2005.dsub.util.LoadingTask; import github.daneren2005.dsub.util.SyncUtil; import github.daneren2005.dsub.util.Util; +import github.daneren2005.dsub.view.CacheLocationPreference; import github.daneren2005.dsub.view.ErrorDialog; public class SettingsFragment extends PreferenceCompatFragment implements SharedPreferences.OnSharedPreferenceChangeListener { @@ -69,7 +70,7 @@ public class SettingsFragment extends PreferenceCompatFragment implements Shared private ListPreference maxVideoBitrateWifi; private ListPreference maxVideoBitrateMobile; private ListPreference networkTimeout; - private EditTextPreference cacheLocation; + private CacheLocationPreference cacheLocation; private ListPreference preloadCountWifi; private ListPreference preloadCountMobile; private ListPreference keepPlayedCount; @@ -205,7 +206,7 @@ public class SettingsFragment extends PreferenceCompatFragment implements Shared maxVideoBitrateWifi = (ListPreference) this.findPreference(Constants.PREFERENCES_KEY_MAX_VIDEO_BITRATE_WIFI); maxVideoBitrateMobile = (ListPreference) this.findPreference(Constants.PREFERENCES_KEY_MAX_VIDEO_BITRATE_MOBILE); networkTimeout = (ListPreference) this.findPreference(Constants.PREFERENCES_KEY_NETWORK_TIMEOUT); - cacheLocation = (EditTextPreference) this.findPreference(Constants.PREFERENCES_KEY_CACHE_LOCATION); + cacheLocation = (CacheLocationPreference) this.findPreference(Constants.PREFERENCES_KEY_CACHE_LOCATION); preloadCountWifi = (ListPreference) this.findPreference(Constants.PREFERENCES_KEY_PRELOAD_COUNT_WIFI); preloadCountMobile = (ListPreference) this.findPreference(Constants.PREFERENCES_KEY_PRELOAD_COUNT_MOBILE); keepPlayedCount = (ListPreference) this.findPreference(Constants.PREFERENCES_KEY_KEEP_PLAYED_CNT); |