Merge branch '206-settings-prefs-alt' into 'master'
Material design settings - alternative Closes #206. Alternative to !77 that does not rely on an additional external library. The two alternatives should be compared for backwards-compatibility specifically regarding the ringtone selector. Includes code from https://github.com/consp1racy/android-support-preference License: Apache License v2.0 See merge request !78
Showing
- briar-android/AndroidManifest.xml 13 additions, 0 deletionsbriar-android/AndroidManifest.xml
- briar-android/res/layout/activity_settings.xml 13 additions, 0 deletionsbriar-android/res/layout/activity_settings.xml
- briar-android/res/values/arrays.xml 15 additions, 0 deletionsbriar-android/res/values/arrays.xml
- briar-android/res/values/color.xml 2 additions, 1 deletionbriar-android/res/values/color.xml
- briar-android/res/values/strings.xml 7 additions, 8 deletionsbriar-android/res/values/strings.xml
- briar-android/res/xml/settings.xml 70 additions, 0 deletionsbriar-android/res/xml/settings.xml
- briar-android/res/xml/settings_debug.xml 19 additions, 0 deletionsbriar-android/res/xml/settings_debug.xml
- briar-android/src/org/briarproject/android/BriarFragmentActivity.java 2 additions, 5 deletions...d/src/org/briarproject/android/BriarFragmentActivity.java
- briar-android/src/org/briarproject/android/NavDrawerActivity.java 1 addition, 2 deletions...droid/src/org/briarproject/android/NavDrawerActivity.java
- briar-android/src/org/briarproject/android/SettingsActivity.java 46 additions, 0 deletions...ndroid/src/org/briarproject/android/SettingsActivity.java
- briar-android/src/org/briarproject/android/fragment/SettingsFragment.java 119 additions, 268 deletions...c/org/briarproject/android/fragment/SettingsFragment.java
- briar-android/src/org/briarproject/android/widget/PreferenceDividerDecoration.java 181 additions, 0 deletions...arproject/android/widget/PreferenceDividerDecoration.java
Loading
Please register or sign in to comment