Revert "Support adding contacts to blacklist and whitelist"

* We have our own blacklist

This reverts commit 7419add9bcb08dc7f2156010f5b1a246b7587524.

Change-Id: I7ff690c6706082f83290ce7d421f2ae45538e1c0

8 files changed, 1 insertions, 17 deletions

diff --git a/res/drawable-hdpi/number_in_blacklist.png b/res/drawable-hdpi/number_in_blacklist.png
deleted file mode 100755
index a6d150927..000000000
--- a/res/drawable-hdpi/number_in_blacklist.png
+++ /dev/null
diff --git a/res/drawable-hdpi/number_in_whitelist.png b/res/drawable-hdpi/number_in_whitelist.png
deleted file mode 100755
index 43e55d1a4..000000000
--- a/res/drawable-hdpi/number_in_whitelist.png
+++ /dev/null
diff --git a/res/drawable-mdpi/number_in_blacklist.png b/res/drawable-mdpi/number_in_blacklist.png
deleted file mode 100755
index 27eb30dcb..000000000
--- a/res/drawable-mdpi/number_in_blacklist.png
+++ /dev/null
diff --git a/res/drawable-mdpi/number_in_whitelist.png b/res/drawable-mdpi/number_in_whitelist.png
deleted file mode 100755
index eb2c45d09..000000000
--- a/res/drawable-mdpi/number_in_whitelist.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/number_in_blacklist.png b/res/drawable-xhdpi/number_in_blacklist.png
deleted file mode 100755
index 12d04a644..000000000
--- a/res/drawable-xhdpi/number_in_blacklist.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/number_in_whitelist.png b/res/drawable-xhdpi/number_in_whitelist.png
deleted file mode 100755
index f1b905983..000000000
--- a/res/drawable-xhdpi/number_in_whitelist.png
+++ /dev/null
diff --git a/res/layout/expanding_entry_card_item.xml b/res/layout/expanding_entry_card_item.xml
index 468fbc50c..20e90ebf9 100644
--- a/res/layout/expanding_entry_card_item.xml
+++ b/res/layout/expanding_entry_card_item.xml
@@ -42,18 +42,11 @@
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
         android:layout_toEndOf="@+id/icon"
+        android:layout_toStartOf="@+id/icon_alternate"
         android:textColor="@color/quickcontact_entry_header_text_color"
         android:textAlignment="viewStart"
         android:layout_marginBottom="@dimen/expanding_entry_card_header_margin_bottom" />
 
-    <ImageView
-        android:id="@+id/black_white_list_indicator"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toEndOf="@+id/header"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="@dimen/expanding_entry_card_header_margin_bottom" />
-
     <TextView
         android:id="@+id/sub_header"
         android:layout_width="wrap_content"
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 0dc433ed4..1158d908b 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -73,8 +73,6 @@
     <string name="ContactMultiImportConfirmation">These contacts will be imported.</string>
     <string name="import_stop">"Import stopped"</string>
 
-    <string name="add_to_white">Add to whitelist</string>
-    <string name="add_to_black">Add to blacklist</string>
     <string name="calculating_status_now">Calculating status\u2026</string>
 
     <string name="menu_copyTo">Copy to <xliff:g id="destination">%s</xliff:g></string>
@@ -90,13 +88,6 @@
     <string name="title_del_call">Delete</string>
 
     <string name="title_add_members">Add members</string>
-    <string name="add_blacklist_success">"This number has been added in blacklist successfully."</string>
-    <string name="add_whitelist_success">"This number has been added in whitelist successfully."</string>
-    <string name="remove_blacklist_success">"This number has been removed from blacklist successfully."</string>
-    <string name="remove_whitelist_success">"This number has been removed from whitelist successfully."</string>
-    <string name="remove_from_black">Remove from blacklist</string>
-    <string name="remove_from_white">Remove from whitelist</string>
-    <string name="firewall_reach_maximun">The list is full and can not be filled in!</string>
 
     <string name="powered_by_provider">Powered by <xliff:g id="provider">%s</xliff:g></string>