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
+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"