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
+1 -1
View File
@@ -11,7 +11,7 @@
<string name="hint_reply">Nachricht eingeben</string>
<string name="hint_redeem">Code eingeben</string>
<string name="new_message">Neue Nachricht</string>
<string name="new_messages">Neue Nachrichten</string>
<string name="new_messages">neue Nachrichten</string>
<string name="failed_message">Nachricht konnte nicht gesendet werden</string>
<string name="failed_messages">Nachrichten konnten nicht gesendet werden</string>
<string name="failed_messages_summary">Berühre zum Ansehen</string>
+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">
+2 -2
View File
@@ -106,8 +106,8 @@
android:defaultValue="true"
android:key="pref_key_ticker" />
<Preference
android:defaultValue="false"
android:key="pref_key_notifications_private" />
android:defaultValue="0"
android:key="pref_key_notification_private" />
<Preference
android:defaultValue="true"
android:key="pref_key_vibration" />
@@ -39,14 +39,14 @@
android:summary="@string/pref_ticker_summary"
android:title="@string/pref_ticker"
android:widgetLayout="@layout/view_checkbox" />
<CheckBoxPreference
android:defaultValue="false"
android:dependency="pref_key_notifications"
android:key="pref_key_notifications_private"
<ListPreference
android:defaultValue="0"
android:entries="@array/notification_private_options"
android:entryValues="@array/enter_button_values"
android:key="pref_key_notification_private"
android:layout="@layout/list_item_preference"
android:summary="@string/pref_notifications_private_summary"
android:title="@string/pref_notifications_private"
android:widgetLayout="@layout/view_checkbox" />
android:title="@string/pref_notifications_private" />
<CheckBoxPreference
android:defaultValue="true"
android:dependency="pref_key_notifications"