Merged 'master' into 'per-contact-colors'

This commit is contained in:
Moez Bhatti
2015-12-23 01:24:33 -05:00
19 changed files with 333 additions and 46 deletions
+1 -1
View File
@@ -4,6 +4,6 @@
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#FF000000"
android:fillColor="#FFFFFFFF"
android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z" />
</vector>
+1 -1
View File
@@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:fillColor="#FFFFFFFF"
android:pathData="M6.62,10.79c1.44,2.83 3.76,5.14 6.59,6.59l2.2,-2.2c0.27,-0.27 0.67,-0.36 1.02,-0.24 1.12,0.37 2.33,0.57 3.57,0.57 0.55,0 1,0.45 1,1V20c0,0.55 -0.45,1 -1,1 -9.39,0 -17,-7.61 -17,-17 0,-0.55 0.45,-1 1,-1h3.5c0.55,0 1,0.45 1,1 0,1.25 0.2,2.45 0.57,3.57 0.11,0.35 0.03,0.74 -0.25,1.02l-2.2,2.2z"/>
</vector>
+1 -1
View File
@@ -4,6 +4,6 @@
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#FF000000"
android:fillColor="#FFFFFFFF"
android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z" />
</vector>
@@ -4,6 +4,6 @@
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#FF000000"
android:fillColor="#FFFFFFFF"
android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM9,11L7,11L7,9h2v2zM13,11h-2L11,9h2v2zM17,11h-2L15,9h2v2z" />
</vector>
@@ -4,6 +4,6 @@
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#FF000000"
android:fillColor="#FFFFFFFF"
android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM13,14h-2v-2h2v2zM13,10h-2L11,6h2v4z" />
</vector>
@@ -4,6 +4,6 @@
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#FF000000"
android:fillColor="#FFFFFFFF"
android:pathData="M20,2H4c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2V4c0,-1.1 -0.9,-2 -2,-2zM5,14l3.5,-4.5 2.5,3.01L14.5,8l4.5,6H5z" />
</vector>
+1 -1
View File
@@ -4,6 +4,6 @@
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#FF000000"
android:fillColor="#FFFFFFFF"
android:pathData="M10,9V5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z" />
</vector>
+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
@@ -89,7 +89,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"
@@ -104,6 +104,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"