From 63825c8c150676a563719a00aa02b42c9775189c Mon Sep 17 00:00:00 2001
From: Yorke Lee <yorkelee@google.com>
Date: Wed, 15 Jul 2015 17:35:33 -0700
Subject: Update Dialer permissions UI per mocks

Bug: 22174668
Change-Id: If6757ff66c411228cfa22d70caaf6cc532fd2b31
---
 res/layout/all_contacts_fragment.xml      | 54 +++++++++++++++++++++++++++++++
 res/layout/call_log_fragment.xml          |  3 +-
 res/layout/empty_content_view.xml         |  9 ++++--
 res/layout/show_all_contacts_fragment.xml | 53 ------------------------------
 res/layout/speed_dial_fragment.xml        |  3 +-
 5 files changed, 65 insertions(+), 57 deletions(-)
 create mode 100644 res/layout/all_contacts_fragment.xml
 delete mode 100644 res/layout/show_all_contacts_fragment.xml

(limited to 'res/layout')

diff --git a/res/layout/all_contacts_fragment.xml b/res/layout/all_contacts_fragment.xml
new file mode 100644
index 000000000..2ca013a19
--- /dev/null
+++ b/res/layout/all_contacts_fragment.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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"
+    android:id="@+id/pinned_header_list_layout"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <!-- Shown only when an Account filter is set.
+         - paddingTop should be here to show "shade" effect correctly. -->
+    <!-- TODO: Remove the filter header. -->
+    <include layout="@layout/account_filter_header" />
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1" >
+        <view
+            class="com.android.contacts.common.list.PinnedHeaderListView"
+            style="@style/DialtactsTheme"
+            android:id="@android:id/list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="?attr/contact_browser_list_padding_left"
+            android:layout_marginEnd="?attr/contact_browser_list_padding_right"
+            android:paddingTop="18dp"
+            android:fastScrollEnabled="true"
+            android:fadingEdge="none"
+            android:nestedScrollingEnabled="true" />
+
+        <com.android.dialer.widget.EmptyContentView
+            android:id="@+id/empty_list_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:visibility="gone"/>
+
+    </FrameLayout>
+</LinearLayout>
diff --git a/res/layout/call_log_fragment.xml b/res/layout/call_log_fragment.xml
index 3a7013d57..f69c5139f 100644
--- a/res/layout/call_log_fragment.xml
+++ b/res/layout/call_log_fragment.xml
@@ -30,7 +30,8 @@
     <com.android.dialer.widget.EmptyContentView
         android:id="@+id/empty_list_view"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
         android:visibility="gone" />
 
 </FrameLayout>
diff --git a/res/layout/empty_content_view.xml b/res/layout/empty_content_view.xml
index 18633d0f9..d8f27aad8 100644
--- a/res/layout/empty_content_view.xml
+++ b/res/layout/empty_content_view.xml
@@ -25,12 +25,13 @@
         android:id="@+id/emptyListViewMessage"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:minHeight="84dp"
         android:gravity="center_horizontal|top"
         android:textSize="@dimen/empty_list_message_text_size"
         android:textColor="@color/empty_list_text_color"
         android:paddingRight="16dp"
-        android:paddingLeft="16dp" />
+        android:paddingLeft="16dp"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp" />
 
     <TextView
         android:id="@+id/emptyListViewAction"
@@ -47,4 +48,8 @@
         android:clickable="true"
         style="@style/TextActionStyle" />
 
+    <Space
+        android:layout_width="match_parent"
+        android:layout_height="40dp" />
+
 </merge>
diff --git a/res/layout/show_all_contacts_fragment.xml b/res/layout/show_all_contacts_fragment.xml
deleted file mode 100644
index 3b501fb88..000000000
--- a/res/layout/show_all_contacts_fragment.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 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"
-    android:id="@+id/pinned_header_list_layout"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <!-- Shown only when an Account filter is set.
-         - paddingTop should be here to show "shade" effect correctly. -->
-    <!-- TODO: Remove the filter header. -->
-    <include layout="@layout/account_filter_header" />
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1" >
-        <view
-            class="com.android.contacts.common.list.PinnedHeaderListView"
-            style="@style/DialtactsTheme"
-            android:id="@android:id/list"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginStart="?attr/contact_browser_list_padding_left"
-            android:layout_marginEnd="?attr/contact_browser_list_padding_right"
-            android:paddingTop="18dp"
-            android:fastScrollEnabled="true"
-            android:fadingEdge="none"
-            android:nestedScrollingEnabled="true" />
-    </FrameLayout>
-
-    <com.android.dialer.widget.EmptyContentView
-        android:id="@+id/empty_list_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="gone"/>
-
-</LinearLayout>
diff --git a/res/layout/speed_dial_fragment.xml b/res/layout/speed_dial_fragment.xml
index 55dd158d2..5b6ce4fb8 100644
--- a/res/layout/speed_dial_fragment.xml
+++ b/res/layout/speed_dial_fragment.xml
@@ -44,7 +44,8 @@
     <com.android.dialer.widget.EmptyContentView
         android:id="@+id/empty_list_view"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
         android:visibility="gone"/>
 
 </FrameLayout>
-- 
cgit v1.2.3