isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-07 17:48:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into feature/stackview

Browse Source 
# Conflicts:
#	uhabits-android/src/main/java/org/isoron/uhabits/widgets/HabitPickerDialog.kt
This commit is contained in:
Alinson S. Xavier
2018-06-16 18:06:23 -05:00
parent 2654521647 6ca4877f1f
commit 436d19dfea
70 changed files with 1255 additions and 552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
uhabits-android/src/main/res/xml/preferences.xml
View File

@@ -74,6 +74,11 @@
android:title="@string/led_notifications"
android:summary="@string/led_notifications_description"/>
<Preference
android:key="reminderCustomize"
android:summary="@string/customize_notification_summary"
android:title="@string/customize_notification"/>
</PreferenceCategory>
<PreferenceCategory