Merge branch 'should-I-answer'

This commit is contained in:
Moez Bhatti
2015-12-20 23:19:38 -05:00
9 changed files with 315 additions and 35 deletions
+5
View File
@@ -110,6 +110,7 @@
<string name="pref_category_summary_appearance">Themes, fonts, colors, avatars, and more</string>
<string name="pref_category_general">General</string>
<string name="pref_category_summary_general">Delivery, message sending, formatting</string>
<string name="pref_category_blocking">Message blocking</string>
<string name="pref_category_notifications">Notifications</string>
<string name="pref_category_summary_notifications">Sounds, LED, privacy</string>
<string name="pref_category_mms">MMS</string>
@@ -170,6 +171,8 @@
<string name="pref_blocked_conversations_summary">Long-press on a conversation and block to move to blocked inbox and stop notifications</string>
<string name="pref_block_future">Block future messages</string>
<string name="pref_block_future_summary">Add additional phone numbers to block</string>
<string name="pref_should_i_answer">Should I Answer? Integration</string>
<string name="pref_should_i_answer_summary">Automatically delete incoming messages from numbers which are blocked through Should I Answer?</string>
<string name="pref_mobile_only">Mobile numbers</string>
<string name="pref_mobile_only_summary">Only show mobile numbers in contact suggestions</string>
<string name="pref_auto_emoji">Automatic emoji</string>
@@ -575,6 +578,8 @@
<string name="dialog_conversation_details_last_message_date">Last message date</string>
<string name="dialog_conversation_details_message_count">Message count</string>
<string name="dialog_conversation_details_recipients">Recipients (%s)</string>
<string name="dialog_should_i_answer_title">Should I Answer? not installed</string>
<string name="dialog_should_i_answer_message">Would you like to download the app from Google Play now?</string>
<!-- Title for audio file picker -->
<string name="select_audio">Choose audio</string>
+12 -1
View File
@@ -88,7 +88,7 @@
</PreferenceCategory>
<PreferenceCategory
android:layout="@layout/list_item_preference_category"
android:title="@string/pref_category_general">
android:title="@string/pref_category_blocking">
<CheckBoxPreference
android:defaultValue="false"
android:key="pref_key_blocked_enabled"
@@ -103,6 +103,17 @@
android:layout="@layout/list_item_preference"
android:summary="@string/pref_block_future_summary"
android:title="@string/pref_block_future" />
<CheckBoxPreference
android:defaultValue="false"
android:key="pref_key_should_i_answer"
android:layout="@layout/list_item_preference"
android:summary="@string/pref_should_i_answer_summary"
android:title="@string/pref_should_i_answer"
android:widgetLayout="@layout/view_switch" />
</PreferenceCategory>
<PreferenceCategory
android:layout="@layout/list_item_preference_category"
android:title="@string/pref_category_general">
<CheckBoxPreference
android:defaultValue="false"
android:key="pref_key_mobile_only"