TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-24 16:57:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #961 from cloudkicker/notification_preferences

Browse Source 
Make notification preferences look normally
This commit is contained in:
Moxie Marlinspike 2014-03-03 08:53:00 -08:00
commit b7f8c3b3d3
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
res/xml/preferences.xml
View File

@ -54,8 +54,7 @@
android:entries="@array/pref_led_blink_pattern_entries" android:entries="@array/pref_led_blink_pattern_entries"
android:entryValues="@array/pref_led_blink_pattern_values" /> android:entryValues="@array/pref_led_blink_pattern_values" />
<RingtonePreference android:layout="?android:attr/preferenceLayoutChild" <RingtonePreference android:dependency="pref_key_enable_notifications"
android:dependency="pref_key_enable_notifications"
android:key="pref_key_ringtone" android:key="pref_key_ringtone"
android:title="@string/preferences__sound" android:title="@string/preferences__sound"
android:summary="@string/preferences__change_notification_sound" android:summary="@string/preferences__change_notification_sound"
@ -63,14 +62,12 @@
android:defaultValue="content://settings/system/notification_sound" /> android:defaultValue="content://settings/system/notification_sound" />
<CheckBoxPreference android:key="pref_key_inthread_notifications" <CheckBoxPreference android:key="pref_key_inthread_notifications"
android:title="@string/preferences__inthread_notifications" android:title="@string/preferences__inthread_notifications"
android:summary="@string/preferences__play_inthread_notifications" android:summary="@string/preferences__play_inthread_notifications"
android:layout="?android:attr/preferenceLayoutChild"
android:dependency="pref_key_enable_notifications"
android:defaultValue="true" />
<CheckBoxPreference android:layout="?android:attr/preferenceLayoutChild"
android:dependency="pref_key_enable_notifications" android:dependency="pref_key_enable_notifications"
android:defaultValue="true" />
<CheckBoxPreference android:dependency="pref_key_enable_notifications"
android:key="pref_key_vibrate" android:key="pref_key_vibrate"
android:defaultValue="true" android:defaultValue="true"
android:title="@string/preferences__vibrate" android:title="@string/preferences__vibrate"
@ -127,9 +124,9 @@
<PreferenceCategory android:title="@string/preferences__display_settings" android:key="pref_display_category"> <PreferenceCategory android:title="@string/preferences__display_settings" android:key="pref_display_category">
<Preference android:key="pref_choose_identity" <Preference android:key="pref_choose_identity"
android:title="@string/preferences__choose_identity" android:title="@string/preferences__choose_identity"
android:summary="@string/preferences__choose_your_contact_entry_from_the_contacts_list"/> android:summary="@string/preferences__choose_your_contact_entry_from_the_contacts_list"/>
</PreferenceCategory> </PreferenceCategory>