diff options
| author | stefan-niedermann <info@niedermann.it> | 2020-01-31 14:58:45 +0300 |
|---|---|---|
| committer | stefan-niedermann <info@niedermann.it> | 2020-01-31 14:58:45 +0300 |
| commit | 68ed8c9998b56e0ecc801f42551d5bd5f9c77719 (patch) | |
| tree | d7d2133ce7efec165cbf85ac6c0e282494bb9797 /app/src/main/res/xml | |
| parent | 8c07d32d9a4b35862b8b041e7fe31a1fd6e4b6ea (diff) | |
| parent | 3dfbf53d23f770d670cf55087f3a2d193f0ec3cb (diff) | |
Merge branch 'master' into 354-password-protection
# Conflicts:
# app/src/main/java/it/niedermann/owncloud/notes/android/fragment/PreferencesFragment.java
# app/src/main/res/values/strings.xml
Diffstat (limited to 'app/src/main/res/xml')
| -rw-r--r-- | app/src/main/res/xml/preferences.xml | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 3b3c4ead..9219480f 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -45,9 +45,19 @@ <SwitchPreference android:defaultValue="@string/pref_value_wifi_and_mobile" - android:icon="@drawable/ic_sync_black_24dp" + android:icon="@drawable/ic_network_wifi_grey600_24dp" android:key="@string/pref_key_wifi_only" android:layout="@layout/item_pref" android:title="@string/settings_wifi_only" /> + <ListPreference + android:defaultValue="@string/pref_value_sync_off" + android:entries="@array/sync_entries" + android:entryValues="@array/sync_values" + android:icon="@drawable/ic_sync_black_24dp" + android:key="@string/pref_key_background_sync" + android:layout="@layout/item_pref" + android:summary="%s" + android:title="@string/settings_background_sync" /> + </PreferenceScreen> |