TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-25 23:57:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #367 from nikolai-r/master

Browse Source 
add option to disable audible inthread notifications
This commit is contained in:
Moxie Marlinspike
2013-10-12 09:15:54 -07:00
parent 1c8f8666ba 2cf7f82f07
commit 763e4b1b27
4 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -437,6 +437,8 @@
<string name="preferences__pref_led_blink_dialogtitle">Select LED Blink Pattern</string>
<string name="preferences__select_led_color">Select LED Color</string>
<string name="preferences__sound">Sound</string>
<string name="preferences__inthread_notifications">In thread notifications</string>
<string name="preferences__play_inthread_notifications">Play notification sound while in thread.</string>
<string name="preferences__vibrate">Vibrate</string>
<string name="preferences__also_vibrate_when_notified">Also vibrate when notified</string>
<string name="preferences__minutes">minutes</string>

10
res/xml/preferences.xml
View File

@@ -50,12 +50,22 @@
android:title="@string/preferences__sound"
android:ringtoneType="notification"
android:defaultValue="content://settings/system/notification_sound" />
<CheckBoxPreference android:key="pref_key_inthread_notifications"
android:title="@string/preferences__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:key="pref_key_vibrate"
android:defaultValue="true"
android:title="@string/preferences__vibrate"
android:summary="@string/preferences__also_vibrate_when_notified" />
</PreferenceCategory>
<PreferenceCategory android:title="Input Settings">