23 files changed, 70 insertions, 24 deletions

diff --git a/res/drawable-hdpi/ic_blacklist_calls_on.png b/res/drawable-hdpi/ic_blacklist_calls_icon.png
index 5073d63..5073d63 100644
--- a/res/drawable-hdpi/ic_blacklist_calls_on.png
+++ b/res/drawable-hdpi/ic_blacklist_calls_icon.png
diff --git a/res/drawable-hdpi/ic_blacklist_calls_off.png b/res/drawable-hdpi/ic_blacklist_calls_off.png
deleted file mode 100644
index 22a05c2..0000000
--- a/res/drawable-hdpi/ic_blacklist_calls_off.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_blacklist_messages_on.png b/res/drawable-hdpi/ic_blacklist_messages_icon.png
index 4d7c809..4d7c809 100644
--- a/res/drawable-hdpi/ic_blacklist_messages_on.png
+++ b/res/drawable-hdpi/ic_blacklist_messages_icon.png
diff --git a/res/drawable-hdpi/ic_blacklist_messages_off.png b/res/drawable-hdpi/ic_blacklist_messages_off.png
deleted file mode 100644
index 812aaa5..0000000
--- a/res/drawable-hdpi/ic_blacklist_messages_off.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_blacklist_calls_on.png b/res/drawable-mdpi/ic_blacklist_calls_icon.png
index 9ec572d..9ec572d 100644
--- a/res/drawable-mdpi/ic_blacklist_calls_on.png
+++ b/res/drawable-mdpi/ic_blacklist_calls_icon.png
diff --git a/res/drawable-mdpi/ic_blacklist_calls_off.png b/res/drawable-mdpi/ic_blacklist_calls_off.png
deleted file mode 100644
index 7917f46..0000000
--- a/res/drawable-mdpi/ic_blacklist_calls_off.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_blacklist_messages_on.png b/res/drawable-mdpi/ic_blacklist_messages_icon.png
index 01b4747..01b4747 100644
--- a/res/drawable-mdpi/ic_blacklist_messages_on.png
+++ b/res/drawable-mdpi/ic_blacklist_messages_icon.png
diff --git a/res/drawable-mdpi/ic_blacklist_messages_off.png b/res/drawable-mdpi/ic_blacklist_messages_off.png
deleted file mode 100644
index a2e53e3..0000000
--- a/res/drawable-mdpi/ic_blacklist_messages_off.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_blacklist_calls_on.png b/res/drawable-xhdpi/ic_blacklist_calls_icon.png
index cb67ee0..cb67ee0 100644
--- a/res/drawable-xhdpi/ic_blacklist_calls_on.png
+++ b/res/drawable-xhdpi/ic_blacklist_calls_icon.png
diff --git a/res/drawable-xhdpi/ic_blacklist_calls_off.png b/res/drawable-xhdpi/ic_blacklist_calls_off.png
deleted file mode 100644
index 6fd91de..0000000
--- a/res/drawable-xhdpi/ic_blacklist_calls_off.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_blacklist_messages_on.png b/res/drawable-xhdpi/ic_blacklist_messages_icon.png
index c12e04c..c12e04c 100644
--- a/res/drawable-xhdpi/ic_blacklist_messages_on.png
+++ b/res/drawable-xhdpi/ic_blacklist_messages_icon.png
diff --git a/res/drawable-xhdpi/ic_blacklist_messages_off.png b/res/drawable-xhdpi/ic_blacklist_messages_off.png
deleted file mode 100644
index f32eab6..0000000
--- a/res/drawable-xhdpi/ic_blacklist_messages_off.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_blacklist_calls_on.png b/res/drawable-xxhdpi/ic_blacklist_calls_icon.png
index 7f252d3..7f252d3 100644
--- a/res/drawable-xxhdpi/ic_blacklist_calls_on.png
+++ b/res/drawable-xxhdpi/ic_blacklist_calls_icon.png
diff --git a/res/drawable-xxhdpi/ic_blacklist_calls_off.png b/res/drawable-xxhdpi/ic_blacklist_calls_off.png
deleted file mode 100644
index 0841442..0000000
--- a/res/drawable-xxhdpi/ic_blacklist_calls_off.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_blacklist_messages_on.png b/res/drawable-xxhdpi/ic_blacklist_messages_icon.png
index 50dd562..50dd562 100644
--- a/res/drawable-xxhdpi/ic_blacklist_messages_on.png
+++ b/res/drawable-xxhdpi/ic_blacklist_messages_icon.png
diff --git a/res/drawable-xxhdpi/ic_blacklist_messages_off.png b/res/drawable-xxhdpi/ic_blacklist_messages_off.png
deleted file mode 100644
index 10a07db..0000000
--- a/res/drawable-xxhdpi/ic_blacklist_messages_off.png
+++ /dev/null
diff --git a/res/drawable/ic_blacklist_calls.xml b/res/drawable/ic_blacklist_calls.xml
index 401fb4a..33aa301 100644
--- a/res/drawable/ic_blacklist_calls.xml
+++ b/res/drawable/ic_blacklist_calls.xml
@@ -15,7 +15,14 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true" android:drawable="@drawable/ic_blacklist_calls_on" />
-    <item android:drawable="@drawable/ic_blacklist_calls_off" />
+    <item android:state_checked="true">
+        <bitmap android:src="@drawable/ic_blacklist_calls_icon"
+                android:tint="@color/theme_accent"/>
+    </item>
+    <item>
+        <bitmap
+                android:src="@drawable/ic_blacklist_calls_icon"
+                android:tint="@*android:color/secondary_text_default_material_light"/>
+    </item>
 </selector>
 
diff --git a/res/drawable/ic_blacklist_messages.xml b/res/drawable/ic_blacklist_messages.xml
index f0fafa1..8365b9e 100644
--- a/res/drawable/ic_blacklist_messages.xml
+++ b/res/drawable/ic_blacklist_messages.xml
@@ -15,7 +15,13 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true" android:drawable="@drawable/ic_blacklist_messages_on" />
-    <item android:drawable="@drawable/ic_blacklist_messages_off" />
+     <item android:state_checked="true">
+          <bitmap android:src="@drawable/ic_blacklist_messages_icon"
+                  android:tint="@color/theme_accent"/>
+     </item>
+     <item>
+           <bitmap android:src="@drawable/ic_blacklist_messages_icon"
+                   android:tint="@*android:color/secondary_text_default_material_light"/>
+     </item>
 </selector>
 
diff --git a/res/layout/empty_list_entry_footer.xml b/res/layout/empty_list_entry_footer.xml
new file mode 100644
index 0000000..47e8967
--- /dev/null
+++ b/res/layout/empty_list_entry_footer.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<View xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="?android:attr/listPreferredItemHeight"/>
diff --git a/res/layout/preference_blacklist.xml b/res/layout/preference_blacklist.xml
new file mode 100644
index 0000000..38cceb7
--- /dev/null
+++ b/res/layout/preference_blacklist.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+    <include layout="@*android:layout/preference_list_fragment"/>
+
+    <include layout="@layout/fab" />
+</FrameLayout>
diff --git a/res/menu/blacklist.xml b/res/menu/blacklist.xml
index a3d294e..f3f6cce 100644
--- a/res/menu/blacklist.xml
+++ b/res/menu/blacklist.xml
@@ -16,13 +16,8 @@
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
-        android:id="@+id/blacklist_add"
-        android:title="@string/add_blacklist_number"
-        android:icon="@drawable/ic_menu_add"
-        android:showAsAction="ifRoom|withText" />
-    <item
         android:id="@+id/blacklist_prefs"
         android:title="@string/blacklist_prefs"
-        android:icon="@drawable/ic_sysbar_quicksettings"
+        android:icon="@drawable/ic_settings_24dp"
         android:showAsAction="ifRoom|withText" />
 </menu>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 7d71b61..ba3a0cb 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -721,21 +721,21 @@
     <string name="select_custom_activity_title">Select custom activity</string>
 
     <!-- Blacklist preferences -->
-    <string name="blacklist_title">Blacklist</string>
-    <string name="blacklist_edit_dialog_title">Edit blacklist entry</string>
+    <string name="blacklist_title">Blocked caller list</string>
+    <string name="blacklist_edit_dialog_title">Edit blocked phone number</string>
     <string name="blacklist_prefs">Settings</string>
     <string name="blacklist_button_delete">Delete</string>
-    <string name="blacklist_empty_text">You don\'t have any blacklisted numbers. Add an entry by touching the Add (+) button.</string>
-    <string name="blacklist_disabled_empty_text">To blacklist calls and/or messages from certain numbers, enable the blacklist.</string>
+    <string name="blacklist_empty_text">You don\'t have any blocked numbers. Add an entry by touching the Add (+) button.</string>
+    <string name="blacklist_disabled_empty_text">To prevent phone numbers from calling or messaging you, enable the blocked caller list.</string>
     <string name="blacklist_summary_disabled">Disabled</string>
-    <string name="blacklist_summary">Incoming calls and messages from phone numbers in the blacklist will be blocked</string>
+    <string name="blacklist_summary">You will not receive incoming calls or messages from phone numbers on the blocked caller list</string>
     <string name="blacklist_notify">Show notification</string>
     <string name="blacklist_private_numbers_title">Private numbers</string>
     <string name="blacklist_private_numbers_summary_disabled">Don\'t block calls from private numbers</string>
-    <string name="blacklist_private_numbers_summary">Block incoming <xliff:g id="type">%2$s</xliff:g> from private numbers</string>
+    <string name="blacklist_private_numbers_summary">Block incoming <xliff:g id="type">%s</xliff:g> from private numbers</string>
     <string name="blacklist_unknown_numbers_title">Unknown numbers</string>
     <string name="blacklist_unknown_numbers_summary_disabled">Don\'t block calls or messages from numbers not in the contact list</string>
-    <string name="blacklist_unknown_numbers_summary">Block incoming <xliff:g id="type">%2$s</xliff:g> from numbers not in the contact list</string>
+    <string name="blacklist_unknown_numbers_summary">Block incoming <xliff:g id="type">%s</xliff:g> from numbers not in the contact list</string>
     <string name="blacklist_summary_type_calls_only">calls</string>
     <string name="blacklist_summary_type_messages_only">messages</string>
     <string name="blacklist_summary_type_calls_and_messages">calls and messages</string>
@@ -743,12 +743,11 @@
     <string name="blacklist_regex_summary">Use . as a wildcard and * for repetition. E.g. 123.* blocks numbers starting with 123 and .*123.* blocks numbers containing 123</string>
     <string name="blacklist_policy_block_calls">Block incoming calls</string>
     <string name="blacklist_policy_block_messages">Block incoming messages</string>
-    <string name="blacklist_bad_number_add">Unable to add invalid number to blacklist</string>
+    <string name="blacklist_bad_number_add">Unable to add invalid phone number to blocked caller list</string>
 
     <!-- Blacklist management -->
-    <string name="add_blacklist_number">Add number</string>
     <string name="remove_blacklist_number_title">Remove number</string>
-    <string name="remove_blacklist_entry">Do you want to remove this blacklist entry?</string>
+    <string name="remove_blacklist_entry">Do you want to remove this blocked phone number?</string>
     <string name="select_contact">Select contact</string>
 
     <!-- Sms security limit -->
diff --git a/res/xml/blacklist_prefs.xml b/res/xml/blacklist_prefs.xml
index be63b7d..3b33ba2 100644
--- a/res/xml/blacklist_prefs.xml
+++ b/res/xml/blacklist_prefs.xml
@@ -27,16 +27,14 @@
         android:title="@string/blacklist_private_numbers_title"
         android:dialogTitle="@string/blacklist_private_numbers_title"
         android:entries="@array/blacklist_policy_private_entries"
-        android:entryValues="@array/blacklist_policy_private_values"
-        android:persistent="false" />
+        android:entryValues="@array/blacklist_policy_private_values" />
 
     <MultiSelectListPreference
         android:key="button_blacklist_unknown_numbers"
         android:title="@string/blacklist_unknown_numbers_title"
         android:dialogTitle="@string/blacklist_unknown_numbers_title"
         android:entries="@array/blacklist_policy_unknown_entries"
-        android:entryValues="@array/blacklist_policy_unknown_values"
-        android:persistent="false" />
+        android:entryValues="@array/blacklist_policy_unknown_values" />
 
     <com.android.settings.cyanogenmod.SystemSettingCheckBoxPreference
         android:key="phone_blacklist_regex_enabled"