Call Blocking UI/String change

+ Adjusted UI/String according to new specifications.
+ Added class VisualVoicemailEnabledChecker
+ Block number dialog display different message depending
  on whether VVM is activated.

Bug:25455707
Change-Id: I09425053c91a5517e309302d421beadcc2d81cd4

2 files changed, 81 insertions, 14 deletions

diff --git a/res/layout/blocked_number_footer.xml b/res/layout/blocked_number_footer.xml
new file mode 100644
index 000000000..cdb3ead1b
--- /dev/null
+++ b/res/layout/blocked_number_footer.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source 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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:focusable="false">
+
+    <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:orientation="vertical"
+      android:layout_marginBottom="8dp"
+      android:padding="16dp"
+      android:background="@android:color/white"
+      android:focusable="true">
+
+      <TextView android:id="@+id/blocked_number_footer_textview"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textColor="@color/blocked_number_secondary_text_color"
+        android:textSize="@dimen/blocked_number_primary_text_size"
+        android:text="@string/block_number_footer_message_vvm" />
+
+    </LinearLayout>
+</LinearLayout>
diff --git a/res/layout/blocked_number_header.xml b/res/layout/blocked_number_header.xml
index 50a3dc8f2..685c4efd8 100644
--- a/res/layout/blocked_number_header.xml
+++ b/res/layout/blocked_number_header.xml
@@ -60,7 +60,7 @@
             <TextView android:id="@+id/textView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/blockList"
+                android:text="@string/block_list"
                 android:textColor="@color/blocked_number_header_color"
                 android:padding="@dimen/blocked_number_container_padding"
                 style="@android:style/TextAppearance.Material.Subhead" />
@@ -105,21 +105,48 @@
 
             </RelativeLayout>
 
-            <TextView android:id="@+id/add_number_textview"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?android:attr/selectableItemBackground"
-                android:textColor="@color/blocked_number_primary_text_color"
-                android:textSize="@dimen/blocked_number_primary_text_size"
-                android:paddingTop="24dp"
-                android:paddingBottom="24dp"
-                android:paddingEnd="@dimen/blocked_number_container_padding"
-                android:paddingStart="24dp"
-                android:drawableStart="@drawable/ic_blocked_numbers_settings_add"
-                android:drawablePadding="24dp"
-                android:text="@string/addBlockedNumber" />
+            <LinearLayout
+              android:id="@+id/add_number_linear_layout"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:paddingStart="@dimen/blocked_number_horizontal_margin"
+              android:paddingTop="@dimen/blocked_number_top_margin"
+              android:paddingBottom="@dimen/blocked_number_bottom_margin"
+              android:baselineAligned="false"
+              android:gravity="center_vertical"
+              android:orientation="horizontal"
+              android:focusable="true"
+              android:clickable="true"
+              android:background="?android:attr/selectableItemBackground"
+              android:contentDescription="@string/addBlockedNumber">
+
+                <ImageView
+                  android:id="@+id/add_number_icon"
+                  android:layout_width="@dimen/contact_photo_size"
+                  android:layout_height="@dimen/contact_photo_size"
+                  android:importantForAccessibility="no" />
+                <LinearLayout
+                  android:layout_width="0dp"
+                  android:layout_height="wrap_content"
+                  android:layout_weight="1"
+                  android:orientation="vertical"
+                  android:gravity="center_vertical"
+                  android:layout_marginStart="@dimen/blocked_number_horizontal_margin">
+
+                    <TextView android:id="@+id/add_number_textview"
+                      android:layout_width="match_parent"
+                      android:layout_height="wrap_content"
+                      android:textColor="@color/blocked_number_primary_text_color"
+                      android:textSize="@dimen/blocked_number_primary_text_size"
+                      android:includeFontPadding="false"
+                      android:layout_marginBottom="5dp"
+                      android:text="@string/addBlockedNumber" />
+                </LinearLayout>
+
+            </LinearLayout>
 
             <View
+                android:id="@+id/blocked_number_list_divider"
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
                 android:layout_marginStart="72dp"