Merged master into block-senders

This commit is contained in:
Moez Bhatti
2015-10-21 21:57:39 -04:00
8 changed files with 94 additions and 46 deletions
+7 -1
View File
@@ -204,7 +204,7 @@
<string name="pref_wake">Wake phone</string>
<string name="pref_wake_summary">Turn your screen on when you receive a new message</string>
<string name="pref_notifications_private">Private notifications</string>
<string name="pref_notifications_private_summary">Hide message text in notifications</string>
<string name="pref_notifications_private_summary">Tap to change what should be hidden in notfication</string>
<string name="pref_ringtone">Notification sound</string>
<string name="pref_ringtone_summary">Select a notification sound</string>
<string name="pref_ticker">Show ticker</string>
@@ -798,6 +798,12 @@
<item>Send message</item>
</string-array>
<string-array name="notification_private_options">
<item>Show all</item>
<item>Hide message</item>
<item>Hide message and sender</item>
</string-array>
<!-- Max MMS attachment sizes. I.e. will compress pictures that are larger than 300 KB down to
under 300KB. -->
<string-array name="max_mms_attachment_sizes">