diff options
| author | stefan-niedermann <info@niedermann.it> | 2019-02-07 23:51:35 +0300 |
|---|---|---|
| committer | stefan-niedermann <info@niedermann.it> | 2019-02-07 23:51:35 +0300 |
| commit | d0b94df7234c1a3cdc7b66325867beb35fa43402 (patch) | |
| tree | 964d8a1d5ce07e19b7658d1ab69c4b9eec94538b /app/src/main/res/xml | |
| parent | 257b3424e889d2f880b87e410ed0babfb9faaea5 (diff) | |
| parent | b4d260b7b852a9085e0664620730241694809406 (diff) | |
Merge remote-tracking branch 'origin/master' into synchronize-on-wifi-only
# Conflicts:
# app/src/main/res/values/strings.xml
# app/src/main/res/xml/preferences.xml
Diffstat (limited to 'app/src/main/res/xml')
| -rw-r--r-- | app/src/main/res/xml/preferences.xml | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 7f2049ef..46870cae 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -19,18 +19,24 @@ android:title="@string/settings_note_mode" /> <SwitchPreference + android:defaultValue="@string/pref_value_wifi_and_mobile" + android:icon="@drawable/ic_sync_black_24dp" + android:key="@string/pref_key_wifi_only" + android:summary="%s" + android:title="@string/settings_theme_wifi_only" /> + + <SwitchPreference android:defaultValue="@string/pref_value_theme_light" android:icon="@drawable/ic_brightness_2_grey_24dp" android:key="@string/pref_key_theme" android:summary="%s" android:title="@string/settings_theme_title" /> - <SwitchPreference - android:defaultValue="@string/pref_value_wifi_and_mobile" - android:icon="@drawable/ic_sync_black_24dp" - android:key="@string/pref_key_wifi_only" - android:summary="%s" - android:title="@string/settings_theme_wifi_only" /> + android:defaultValue="@string/pref_value_font_normal" + android:icon="@drawable/ic_text_fields_black_24dp" + android:key="@string/pref_key_font" + android:title="@string/settings_font_title" /> + <PreferenceScreen android:key="@string/pref_key_certs" |