From 589fb01e4cb45824b11edfdb15393a0dd30cebd6 Mon Sep 17 00:00:00 2001
From: Zheng Fu <zhengfu@google.com>
Date: Thu, 14 Aug 2014 14:17:25 -0700
Subject: Set paddings on the portrait contact list view

Bug: 16568715

Change-Id: I3750285bf3354c4df1ea58a5cce30ecf7bcdcbcd
---
 res/layout-sw600dp-land/contact_list_content.xml   | 76 ----------------------
 res/layout-sw600dp-land/contact_tile_list.xml      | 64 ------------------
 .../contacts_unavailable_fragment.xml              | 49 --------------
 res/layout-sw600dp/contact_list_content.xml        | 76 ++++++++++++++++++++++
 res/layout-sw600dp/contact_tile_list.xml           | 64 ++++++++++++++++++
 .../contacts_unavailable_fragment.xml              | 49 ++++++++++++++
 res/values-sw600dp-land/integers.xml               |  7 ++
 res/values-sw600dp/bools.xml                       | 20 ++++++
 res/values-sw600dp/integers.xml                    |  6 ++
 res/values/integers.xml                            |  6 --
 10 files changed, 222 insertions(+), 195 deletions(-)
 delete mode 100644 res/layout-sw600dp-land/contact_list_content.xml
 delete mode 100644 res/layout-sw600dp-land/contact_tile_list.xml
 delete mode 100644 res/layout-sw600dp-land/contacts_unavailable_fragment.xml
 create mode 100644 res/layout-sw600dp/contact_list_content.xml
 create mode 100644 res/layout-sw600dp/contact_tile_list.xml
 create mode 100644 res/layout-sw600dp/contacts_unavailable_fragment.xml
 create mode 100644 res/values-sw600dp/bools.xml

(limited to 'res')

diff --git a/res/layout-sw600dp-land/contact_list_content.xml b/res/layout-sw600dp-land/contact_list_content.xml
deleted file mode 100644
index 7a2343048..000000000
--- a/res/layout-sw600dp-land/contact_list_content.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/pinned_header_list_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal">
-        <View
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="@integer/people_activity_land_space_layout_weight"
-            android:background="@color/background_primary"/>
-        <View
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:background="@color/contact_all_list_background_color"
-            android:layout_weight="@integer/people_activity_land_list_view_layout_weight"
-            android:elevation="@dimen/people_activity_card_elevation"/>
-        <View
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="@integer/people_activity_land_space_layout_weight"
-            android:background="@color/background_primary"/>
-    </LinearLayout>
-    <LinearLayout
-        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. -->
-        <include
-            android:id="@+id/account_filter_header_container"
-            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"
-                android:id="@android:id/list"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="?attr/contact_browser_list_padding_left"
-                android:layout_marginRight="?attr/contact_browser_list_padding_right"
-                android:layout_marginStart="?attr/contact_browser_list_padding_left"
-                android:layout_marginEnd="?attr/contact_browser_list_padding_right"
-                android:fastScrollEnabled="true"
-                android:fadingEdge="none" />
-            <ProgressBar
-                android:id="@+id/search_progress"
-                style="?android:attr/progressBarStyleLarge"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:visibility="gone" />
-        </FrameLayout>
-    </LinearLayout>
-</FrameLayout>
diff --git a/res/layout-sw600dp-land/contact_tile_list.xml b/res/layout-sw600dp-land/contact_tile_list.xml
deleted file mode 100644
index 5b8200eab..000000000
--- a/res/layout-sw600dp-land/contact_tile_list.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="?attr/favorites_padding_bottom">
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal">
-        <View
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="@integer/people_activity_land_space_layout_weight"
-            android:background="@color/background_primary"/>
-        <View
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:background="@color/contact_favorites_list_background_color"
-            android:layout_weight="@integer/people_activity_land_list_view_layout_weight"
-            android:elevation="@dimen/people_activity_card_elevation"/>
-        <View
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="@integer/people_activity_land_space_layout_weight"
-            android:background="@color/background_primary"/>
-    </LinearLayout>
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-        <ListView
-            android:id="@+id/contact_tile_list"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:paddingTop="@dimen/contact_tile_list_padding_top"
-            android:clipToPadding="false"
-            android:fadingEdge="none"
-            android:divider="@null"
-            android:scrollbarStyle="outsideOverlay"/>
-        <TextView
-            android:id="@+id/contact_tile_list_empty"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center_horizontal"
-            android:layout_marginTop="@dimen/empty_message_top_margin"
-            android:textColor="?android:attr/textColorSecondary"
-            android:textAppearance="?android:attr/textAppearanceLarge"/>
-    </FrameLayout>
-</FrameLayout>
diff --git a/res/layout-sw600dp-land/contacts_unavailable_fragment.xml b/res/layout-sw600dp-land/contacts_unavailable_fragment.xml
deleted file mode 100644
index eb3e5f24c..000000000
--- a/res/layout-sw600dp-land/contacts_unavailable_fragment.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="?attr/favorites_padding_bottom">
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal">
-        <View
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="@integer/people_activity_land_space_layout_weight"
-            android:background="@color/background_primary"/>
-        <View
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:background="@color/contact_favorites_list_background_color"
-            android:layout_weight="@integer/people_activity_land_list_view_layout_weight"
-            android:elevation="@dimen/people_activity_card_elevation"/>
-        <View
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="@integer/people_activity_land_space_layout_weight"
-            android:background="@color/background_primary"/>
-    </LinearLayout>
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fillViewport="true">
-        <include layout="@layout/contacts_unavailable_fragment_content"/>
-    </ScrollView>
-</FrameLayout>
diff --git a/res/layout-sw600dp/contact_list_content.xml b/res/layout-sw600dp/contact_list_content.xml
new file mode 100644
index 000000000..1b52068a3
--- /dev/null
+++ b/res/layout-sw600dp/contact_list_content.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/pinned_header_list_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
+        <View
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="@integer/people_activity_space_layout_weight"
+            android:background="@color/background_primary"/>
+        <View
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:background="@color/contact_all_list_background_color"
+            android:layout_weight="@integer/people_activity_list_view_layout_weight"
+            android:elevation="@dimen/people_activity_card_elevation"/>
+        <View
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="@integer/people_activity_space_layout_weight"
+            android:background="@color/background_primary"/>
+    </LinearLayout>
+    <LinearLayout
+        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. -->
+        <include
+            android:id="@+id/account_filter_header_container"
+            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"
+                android:id="@android:id/list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="?attr/contact_browser_list_padding_left"
+                android:layout_marginRight="?attr/contact_browser_list_padding_right"
+                android:layout_marginStart="?attr/contact_browser_list_padding_left"
+                android:layout_marginEnd="?attr/contact_browser_list_padding_right"
+                android:fastScrollEnabled="true"
+                android:fadingEdge="none" />
+            <ProgressBar
+                android:id="@+id/search_progress"
+                style="?android:attr/progressBarStyleLarge"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:visibility="gone" />
+        </FrameLayout>
+    </LinearLayout>
+</FrameLayout>
diff --git a/res/layout-sw600dp/contact_tile_list.xml b/res/layout-sw600dp/contact_tile_list.xml
new file mode 100644
index 000000000..102a58d2f
--- /dev/null
+++ b/res/layout-sw600dp/contact_tile_list.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="?attr/favorites_padding_bottom">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
+        <View
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="@integer/people_activity_space_layout_weight"
+            android:background="@color/background_primary"/>
+        <View
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:background="@color/contact_favorites_list_background_color"
+            android:layout_weight="@integer/people_activity_list_view_layout_weight"
+            android:elevation="@dimen/people_activity_card_elevation"/>
+        <View
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="@integer/people_activity_space_layout_weight"
+            android:background="@color/background_primary"/>
+    </LinearLayout>
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <ListView
+            android:id="@+id/contact_tile_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:paddingTop="@dimen/contact_tile_list_padding_top"
+            android:clipToPadding="false"
+            android:fadingEdge="none"
+            android:divider="@null"
+            android:scrollbarStyle="outsideOverlay"/>
+        <TextView
+            android:id="@+id/contact_tile_list_empty"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center_horizontal"
+            android:layout_marginTop="@dimen/empty_message_top_margin"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textAppearance="?android:attr/textAppearanceLarge"/>
+    </FrameLayout>
+</FrameLayout>
diff --git a/res/layout-sw600dp/contacts_unavailable_fragment.xml b/res/layout-sw600dp/contacts_unavailable_fragment.xml
new file mode 100644
index 000000000..8727359e5
--- /dev/null
+++ b/res/layout-sw600dp/contacts_unavailable_fragment.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="?attr/favorites_padding_bottom">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
+        <View
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="@integer/people_activity_space_layout_weight"
+            android:background="@color/background_primary"/>
+        <View
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:background="@color/contact_favorites_list_background_color"
+            android:layout_weight="@integer/people_activity_list_view_layout_weight"
+            android:elevation="@dimen/people_activity_card_elevation"/>
+        <View
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="@integer/people_activity_space_layout_weight"
+            android:background="@color/background_primary"/>
+    </LinearLayout>
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true">
+        <include layout="@layout/contacts_unavailable_fragment_content"/>
+    </ScrollView>
+</FrameLayout>
diff --git a/res/values-sw600dp-land/integers.xml b/res/values-sw600dp-land/integers.xml
index bcc008d94..4bf44c030 100644
--- a/res/values-sw600dp-land/integers.xml
+++ b/res/values-sw600dp-land/integers.xml
@@ -18,4 +18,11 @@
     <integer name="contact_tile_column_count_in_favorites">4</integer>
 
     <integer name="contact_tile_column_count">3</integer>
+
+    <!-- Layout weight of space elements in PeopleActivity for favorites list and all
+        contacts list-->
+    <integer name="people_activity_space_layout_weight">1</integer>
+    <!-- Layout weight of ListViews in PeopleActivityfor tile favorites list and all
+         contacts list in PeopleActivity -->
+    <integer name="people_activity_list_view_layout_weight">3</integer>
 </resources>
diff --git a/res/values-sw600dp/bools.xml b/res/values-sw600dp/bools.xml
new file mode 100644
index 000000000..2ef703c0b
--- /dev/null
+++ b/res/values-sw600dp/bools.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+<resources>
+
+    <bool name="contact_all_list_show_card_frame">true</bool>
+
+</resources>
diff --git a/res/values-sw600dp/integers.xml b/res/values-sw600dp/integers.xml
index c629f7e7f..ab2a52de9 100644
--- a/res/values-sw600dp/integers.xml
+++ b/res/values-sw600dp/integers.xml
@@ -15,4 +15,10 @@
 -->
 <resources>
     <integer name="contact_tile_column_count">2</integer>
+    <!-- Layout weight of space elements in PeopleActivity for favorites list and all
+       contacts list-->
+    <integer name="people_activity_space_layout_weight">1</integer>
+    <!-- Layout weight of ListViews in PeopleActivityfor tile favorites list and all
+         contacts list in PeopleActivity -->
+    <integer name="people_activity_list_view_layout_weight">5</integer>
 </resources>
diff --git a/res/values/integers.xml b/res/values/integers.xml
index 3cd571112..0de1de11a 100644
--- a/res/values/integers.xml
+++ b/res/values/integers.xml
@@ -24,10 +24,4 @@
     <!-- Number of lines the QuickContact title can have -->
     <integer name="quickcontact_title_lines">1</integer>
 
-    <!-- Layout weight of space elements in PeopleActivity for favorites list and all
-         contacts list when in sw600dp landscape. -->
-    <integer name="people_activity_land_space_layout_weight">2</integer>
-    <!-- Layout weight of ListViews in PeopleActivityfor tile favorites list and all
-         contacts list in PeopleActivity when in sw600dp landscape. -->
-    <integer name="people_activity_land_list_view_layout_weight">6</integer>
 </resources>
-- 
cgit v1.2.3