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/res | |
| 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/res')
| -rw-r--r-- | app/src/main/res/layout/cache_location_buttons.xml | 19 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/xml/settings_cache.xml | 2 |
3 files changed, 22 insertions, 1 deletions
diff --git a/app/src/main/res/layout/cache_location_buttons.xml b/app/src/main/res/layout/cache_location_buttons.xml new file mode 100644 index 00000000..31e12642 --- /dev/null +++ b/app/src/main/res/layout/cache_location_buttons.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="horizontal" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center"> + + <Button + android:id="@+id/location_internal" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/settings.cache_location_internal"/> + + <Button + android:id="@+id/location_external" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/settings.cache_location_external"/> +</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3acbff3e..5d0aacd7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -291,6 +291,8 @@ <string name="settings.cache_location">Cache location</string> <string name="settings.cache_location_error">Invalid cache location. Using default.</string> <string name="settings.cache_location_reset">The cache location you have set is no longer writable. If you recently upgraded your phone OS to KitKat 4.4, then the way apps write to the SD Card has changed so that they can only write to a specific location. The location that DSub uses has already been automatically changed to the correct location. In order to delete all of the old app data, you will need to mount the SD Card on your computer and delete the old folder manually</string> + <string name="settings.cache_location_internal">Internal</string> + <string name="settings.cache_location_external">External</string> <string name="settings.cache_clear">Clear Cache</string> <string name="settings.cache_clear_complete">Finished clearing cache</string> <string name="settings.testing_connection">Testing connection...</string> diff --git a/app/src/main/res/xml/settings_cache.xml b/app/src/main/res/xml/settings_cache.xml index bb5710b2..248572ca 100644 --- a/app/src/main/res/xml/settings_cache.xml +++ b/app/src/main/res/xml/settings_cache.xml @@ -57,7 +57,7 @@ android:defaultValue="2000" android:digits="0123456789"/> - <EditTextPreference + <github.daneren2005.dsub.view.CacheLocationPreference android:title="@string/settings.cache_location" android:key="cacheLocation"/> |