Add butter bar when blocking is suppressed.

Screenshots:
https://drive.google.com/a/google.com/file/d/0ByV4lfyID02GTVJkei1GMWpSYXpHRlJPNG1yVHpoLUltWTNZ/view?usp=sharing
https://drive.google.com/a/google.com/file/d/0ByV4lfyID02GZGsyRm91anJoT1pHdjFreHhISnR6UXhUcHBV/view?usp=sharing

Bug: 26917087
Change-Id: I83ae16b7d869f342056403e0da41d23b4fc23448

2 files changed, 135 insertions, 42 deletions

diff --git a/res/xml/activity_blocked_numbers.xml b/res/xml/activity_blocked_numbers.xml
index a79078b88..681cf893a 100644
--- a/res/xml/activity_blocked_numbers.xml
+++ b/res/xml/activity_blocked_numbers.xml
@@ -15,56 +15,75 @@
   ~ limitations under the License
   -->
 
-<FrameLayout
+<ScrollView
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="@dimen/blocked_numbers_large_padding"
-        android:paddingRight="@dimen/blocked_numbers_large_padding">
-
-    <TextView
-            android:id="@+id/non_primary_user"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/non_primary_user"
-            android:paddingTop="@dimen/blocked_numbers_large_padding"
-            style="@style/BlockedNumbersText"
-            android:visibility="gone" />
+        android:layout_height="match_parent"
+        android:fillViewport="true">
 
     <LinearLayout
-            android:id="@+id/manage_blocked_ui"
             android:orientation="vertical"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="@dimen/blocked_numbers_large_padding">
+            android:layout_height="match_parent">
 
-        <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/blocked_numbers_msg"
-                android:paddingBottom="@dimen/blocked_numbers_extra_large_padding"
-                style="@style/BlockedNumbersText" />
+        <include
+                android:id="@+id/butter_bar"
+                layout="@xml/blocking_suppressed_butterbar" />
 
-        <TextView
-                android:id="@+id/add_blocked"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/block_number"
-                android:paddingBottom="@dimen/blocked_numbers_extra_large_padding"
-                style="@style/BlockedNumbersAddButton" />
+        <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:paddingLeft="@dimen/blocked_numbers_large_padding"
+                android:paddingRight="@dimen/blocked_numbers_large_padding">
 
-        <ProgressBar
-                android:id="@+id/progress_bar"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:indeterminate="true"
-                android:layout_marginTop="@dimen/blocked_numbers_progress_bar_padding"
-                style="@android:style/Widget.ProgressBar.Large" />
+            <TextView
+                    android:id="@+id/non_primary_user"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/non_primary_user"
+                    android:paddingTop="@dimen/blocked_numbers_large_padding"
+                    style="@style/BlockedNumbersTitleText"
+                    android:visibility="gone" />
 
-        <ListView
-                android:id="@android:id/list"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+            <LinearLayout
+                    android:id="@+id/manage_blocked_ui"
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="@dimen/blocked_numbers_large_padding">
+
+                <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/blocked_numbers_msg"
+                        android:paddingBottom="@dimen/blocked_numbers_extra_large_padding"
+                        style="@style/BlockedNumbersTitleText" />
+
+                <TextView
+                        android:id="@+id/add_blocked"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/block_number"
+                        android:paddingBottom="@dimen/blocked_numbers_extra_large_padding"
+                        style="@style/BlockedNumbersButton"
+                        android:background="?android:attr/selectableItemBackgroundBorderless" />
+
+                <ProgressBar
+                        android:id="@+id/progress_bar"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:indeterminate="true"
+                        android:layout_marginTop="@dimen/blocked_numbers_progress_bar_padding"
+                        style="@android:style/Widget.ProgressBar.Large" />
+
+                <ListView
+                        android:id="@android:id/list"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:nestedScrollingEnabled="true"
+                        android:paddingBottom="@dimen/blocked_numbers_extra_large_padding" />
+            </LinearLayout>
+        </FrameLayout>
     </LinearLayout>
-</FrameLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/res/xml/blocking_suppressed_butterbar.xml b/res/xml/blocking_suppressed_butterbar.xml
new file mode 100644
index 000000000..cd4579e1e
--- /dev/null
+++ b/res/xml/blocking_suppressed_butterbar.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016 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
+  -->
+
+ <RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/blocked_numbers_butter_bar_color">
+
+    <ImageView
+            android:id="@+id/icon"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:paddingTop="@dimen/blocked_numbers_large_padding"
+            android:paddingRight="@dimen/blocked_numbers_large_padding"
+            android:paddingLeft="@dimen/blocked_numbers_large_padding"
+            android:src="@drawable/ic_status_blocked_orange_40dp"/>
+
+    <TextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@id/icon"
+            android:paddingTop="@dimen/blocked_numbers_large_padding"
+            android:paddingRight="@dimen/blocked_numbers_large_padding"
+            android:text="@string/blocked_numbers_butter_bar_title"
+            style="@style/BlockedNumbersTitleText" />
+
+    <TextView
+            android:id="@+id/description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@id/icon"
+            android:layout_below="@id/title"
+            android:paddingTop="@dimen/blocked_numbers_large_padding"
+            android:paddingBottom="@dimen/blocked_numbers_large_padding"
+            android:paddingRight="@dimen/blocked_numbers_large_padding"
+            android:text="@string/blocked_numbers_butter_bar_body"
+            style="@style/BlockedNumbersSecondaryText" />
+
+    <TextView
+            android:id="@+id/reenable_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@id/icon"
+            android:layout_below="@id/description"
+            android:paddingRight="@dimen/blocked_numbers_large_padding"
+            android:text="@string/blocked_numbers_butter_bar_button"
+            style="@style/BlockedNumbersButton"
+            android:background="?android:attr/selectableItemBackgroundBorderless" />
+
+    <View
+          xmlns:tools="http://schemas.android.com/tools"
+          android:layout_width="match_parent"
+          android:layout_height="@dimen/blocked_numbers_divider_stroke"
+          android:layout_below="@id/reenable_button"
+          android:layout_marginTop="@dimen/blocked_numbers_large_padding"
+          android:background="@color/blocked_numbers_divider_color" />
+</RelativeLayout>
\ No newline at end of file