Commit 37a1682d authored by Stefan Niedermann's avatar Stefan Niedermann
Browse files

Put appearance and behavior settings into one category

parent 09b1ba97
......@@ -171,7 +171,7 @@
<string name="settings_branding">Branding</string>
<string name="settings_gridview">Grid view</string>
<string name="simple_security">Security</string>
<string name="simple_appearance">Appearance</string>
<string name="appearance_and_behavior">Appearance and behavior</string>
<string name="simple_synchronization">Synchronization</string>
<string name="simple_behavior">Behavior</string>
<string name="manage_accounts">Manage accounts</string>
......
......@@ -26,7 +26,7 @@
<it.niedermann.owncloud.notes.branding.BrandedPreferenceCategory
app:layout="@layout/item_preference_category"
app:title="@string/simple_appearance">
app:title="@string/appearance_and_behavior">
<ListPreference
android:defaultValue="@string/pref_value_theme_system_default"
......@@ -44,26 +44,12 @@
android:layout="@layout/item_pref"
android:title="@string/settings_gridview" />
</it.niedermann.owncloud.notes.branding.BrandedPreferenceCategory>
<it.niedermann.owncloud.notes.branding.BrandedPreferenceCategory
app:layout="@layout/item_preference_category"
app:title="@string/simple_behavior">
<it.niedermann.owncloud.notes.branding.BrandedSwitchPreference
android:defaultValue="@string/pref_value_font_normal"
android:icon="@drawable/ic_text_format_grey600_24dp"
android:key="@string/pref_key_font"
android:layout="@layout/item_pref"
android:title="@string/settings_font_title" />
<ListPreference
android:defaultValue="@string/pref_value_mode_edit"
android:entries="@array/noteMode_entries"
android:entryValues="@array/noteMode_values"
android:icon="@drawable/ic_remove_red_eye_grey_24dp"
android:key="@string/pref_key_note_mode"
android:layout="@layout/item_pref"
android:summary="%s"
android:title="@string/settings_note_mode" />
<ListPreference
android:defaultValue="@string/pref_value_font_size_medium"
......@@ -74,6 +60,16 @@
android:layout="@layout/item_pref"
android:summary="%s"
android:title="@string/settings_font_size" />
<ListPreference
android:defaultValue="@string/pref_value_mode_edit"
android:entries="@array/noteMode_entries"
android:entryValues="@array/noteMode_values"
android:icon="@drawable/ic_remove_red_eye_grey_24dp"
android:key="@string/pref_key_note_mode"
android:layout="@layout/item_pref"
android:summary="%s"
android:title="@string/settings_note_mode" />
</it.niedermann.owncloud.notes.branding.BrandedPreferenceCategory>
<it.niedermann.owncloud.notes.branding.BrandedPreferenceCategory
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment