From 9af1b36e999036f4045b07285962cfdb7bfbcca7 Mon Sep 17 00:00:00 2001
From: Andrew Lee <anwlee@google.com>
Date: Thu, 15 Oct 2015 23:17:30 -0700
Subject: 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_header.xml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'res/layout/blocked_number_header.xml')

diff --git a/res/layout/blocked_number_header.xml b/res/layout/blocked_number_header.xml
index 0c8c086e4..e16efbcf4 100644
--- a/res/layout/blocked_number_header.xml
+++ b/res/layout/blocked_number_header.xml
@@ -13,12 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<android.support.v7.widget.CardView
-    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"
-    card_view:cardCornerRadius="0dp">
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
 
     <TextView android:id="@+id/textView"
         android:layout_width="wrap_content"
@@ -77,4 +72,4 @@
         android:layout_marginTop="8dp"
         android:text="@string/blockNumber" />
 
-</android.support.v7.widget.CardView>
+</merge>
-- 
cgit v1.2.3