commit 9af1b36e999036f4045b07285962cfdb7bfbcca7
author Andrew Lee <anwlee@google.com> Thu Oct 15 23:17:30 2015 -0700
committer Andrew Lee <anwlee@google.com> Tue Oct 20 23:34:06 2015 -0700
tree 862f54198bc60a7303356f63eba48596875a9992
parent 4f52db88d380e1d18926928059d7b0cd73b2a11e

Add import fragment, rearrange fragments.

+ Add a fragment (and adapter) for displaying numbers from contacts
marked as send to voicemail. This fragment has import functionality.

+ Refactor logic around the Blocked Numbers activity; relocate a lot
of the fragment-specific logic, particularly around actionbars, to
within the fragments themselves.

+ Simplify fragment management logic by using replace instead of
show/hide.

Bug: 23351616
Change-Id: I5c1076d6d001a8401234f57c27ada4bcd90e6c27

res/layout/blocked_number_fragment.xml

diff --git a/res/layout/blocked_number_fragment.xml b/res/layout/blocked_number_fragment.xml
index f8d3030..e41d6bc 100644
--- a/res/layout/blocked_number_fragment.xml
+++ b/res/layout/blocked_number_fragment.xml
@@ -53,28 +53,36 @@
 
     </android.support.v7.widget.CardView>
 
-
-    <LinearLayout
-        android:orientation="vertical"
+    <android.support.v7.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/background_dialer_white">
+        card_view:cardCornerRadius="0dp">
 
-        <ListView android:id="@+id/blocked_numbers_list"
+        <LinearLayout
+            android:orientation="vertical"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:drawSelectorOnTop="false"
-            android:headerDividersEnabled="false" />
+            android:layout_height="wrap_content"
+            android:background="@color/background_dialer_white">
 
-        <TextView android:id="@android:id/empty"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:paddingStart="@dimen/blocked_number_horizontal_margin"
-            android:paddingTop="@dimen/blocked_number_top_margin"
-            android:paddingBottom="@dimen/blocked_number_bottom_margin"
-            android:text="@string/listNoBlockedNumbers" />
+            <include layout="@layout/blocked_number_header" />
 
-    </LinearLayout>
+            <ListView android:id="@id/android:list"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:drawSelectorOnTop="false"
+                android:headerDividersEnabled="false" />
+
+            <TextView android:id="@android:id/empty"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:paddingStart="@dimen/blocked_number_horizontal_margin"
+                android:paddingTop="@dimen/blocked_number_top_margin"
+                android:paddingBottom="@dimen/blocked_number_bottom_margin"
+                android:text="@string/listNoBlockedNumbers" />
+
+        </LinearLayout>
+
+    </android.support.v7.widget.CardView>
 
 </LinearLayout>