1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2025-12-12 23:31:10 +01:00

Fixed lint issues (suppressed, where they cant be fixed)

Release 0.2.0 (Updated translation files)

Announcing 0.2.0-next

Added wipe-settings option

Merge branch 'master' of github.com:Diaspora-for-Android/diaspora-android

Merge branch 'master' into wipe-settings

Added ThemedAlertDialogBuilder and a corresponding method in ThemeHelper

Merge branch 'master' into wipe-settings

Reworked dialog
This commit is contained in:
vanitasvitae 2016-11-06 16:23:18 +01:00
parent a151d37a4e
commit dd4af48b8e
28 changed files with 240 additions and 29 deletions

View file

@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Logging -->
<com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory
android:key="@string/pref_key__title__debugging"
android:title="@string/pref_title__sub_logging">
@ -14,4 +16,16 @@
android:title="@string/pref_title__logging_spam_enabled"
android:dependency="@string/pref_key__logging_enabled"/>
</com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
<!-- Miscellaneous -->
<com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory
android:title="@string/pref_title__sub_miscelaneous">
<Preference
android:key="@string/pref_key__wipe_settings"
android:title="@string/pref_title__wipe_settings"
android:summary="@string/pref_desc__wipe_settings" />
</com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
</PreferenceScreen>