New list assets
This is not supposed to be pixel-perfect.
Just some new colors to start getting a feel
for what it's going to look like eventually.
Change-Id: Ie656b13e425a42f49e1449f07455344d60ae1b37
diff --git a/res/drawable-hdpi/list_item_checked_bg.9.png b/res/drawable-hdpi/list_item_checked_bg.9.png
index b8b515c..cdd3c4c 100644
--- a/res/drawable-hdpi/list_item_checked_bg.9.png
+++ b/res/drawable-hdpi/list_item_checked_bg.9.png
Binary files differ
diff --git a/res/drawable-hdpi/list_item_divider.9.png b/res/drawable-hdpi/list_item_divider.9.png
new file mode 100644
index 0000000..60e2cb2
--- /dev/null
+++ b/res/drawable-hdpi/list_item_divider.9.png
Binary files differ
diff --git a/res/drawable-hdpi/section_header.9.png b/res/drawable-hdpi/section_header.9.png
new file mode 100644
index 0000000..8cd231b
--- /dev/null
+++ b/res/drawable-hdpi/section_header.9.png
Binary files differ
diff --git a/res/drawable-mdpi/list_item_checked_bg.9.png b/res/drawable-mdpi/list_item_checked_bg.9.png
index 8b773d5..cdd3c4c 100644
--- a/res/drawable-mdpi/list_item_checked_bg.9.png
+++ b/res/drawable-mdpi/list_item_checked_bg.9.png
Binary files differ
diff --git a/res/drawable-mdpi/list_item_divider.9.png b/res/drawable-mdpi/list_item_divider.9.png
new file mode 100644
index 0000000..60e2cb2
--- /dev/null
+++ b/res/drawable-mdpi/list_item_divider.9.png
Binary files differ
diff --git a/res/drawable-mdpi/section_header.9.png b/res/drawable-mdpi/section_header.9.png
new file mode 100644
index 0000000..ac906cd
--- /dev/null
+++ b/res/drawable-mdpi/section_header.9.png
Binary files differ
diff --git a/res/drawable-xlarge/contact_list_bg.png b/res/drawable-xlarge/contact_list_bg.png
new file mode 100644
index 0000000..570e0e6
--- /dev/null
+++ b/res/drawable-xlarge/contact_list_bg.png
Binary files differ
diff --git a/res/drawable-xlarge/directory_bg.9.png b/res/drawable-xlarge/directory_bg.9.png
new file mode 100644
index 0000000..c330f0f
--- /dev/null
+++ b/res/drawable-xlarge/directory_bg.9.png
Binary files differ
diff --git a/res/drawable-xlarge/list_item_divider.9.png b/res/drawable-xlarge/list_item_divider.9.png
new file mode 100644
index 0000000..f5130d5
--- /dev/null
+++ b/res/drawable-xlarge/list_item_divider.9.png
Binary files differ
diff --git a/res/drawable-xlarge/section_header.9.png b/res/drawable-xlarge/section_header.9.png
new file mode 100644
index 0000000..de12d0e
--- /dev/null
+++ b/res/drawable-xlarge/section_header.9.png
Binary files differ
diff --git a/res/layout-xlarge/contact_browser.xml b/res/layout-xlarge/contact_browser.xml
index c1541eb..e8614d1 100644
--- a/res/layout-xlarge/contact_browser.xml
+++ b/res/layout-xlarge/contact_browser.xml
@@ -18,11 +18,15 @@
android:id="@+id/two_pane_activity"
android:orientation="horizontal"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:background="@drawable/contact_list_bg"
+ >
<FrameLayout
android:id="@+id/list_container"
- android:layout_width="400dip"
- android:layout_height="match_parent" />
+ android:layout_width="380dip"
+ android:layout_height="match_parent"
+ android:layout_marginLeft="20dip"
+ android:layout_marginRight="50dip"/>
<!-- Holder for detail- or editor-fragment. -->
<FrameLayout
diff --git a/res/layout-xlarge/contacts_list_content.xml b/res/layout-xlarge/contacts_list_content.xml
index 403a46a..2b279be 100644
--- a/res/layout-xlarge/contacts_list_content.xml
+++ b/res/layout-xlarge/contacts_list_content.xml
@@ -42,6 +42,7 @@
android:layout_height="0dip"
android:fastScrollEnabled="true"
android:layout_weight="1"
+ android:scrollingCache="false"
/>
<include layout="@layout/contacts_list_empty"/>
diff --git a/res/layout-xlarge/list_section.xml b/res/layout-xlarge/list_section.xml
new file mode 100644
index 0000000..84d6e43
--- /dev/null
+++ b/res/layout-xlarge/list_section.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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.
+-->
+
+<!-- Layout used for list section separators. -->
+<RelativeLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="37dip"
+ android:background="@drawable/section_header"
+ >
+ <TextView
+ android:id="@+id/header_text"
+ android:layout_width="56dip"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_alignParentLeft="true"
+ android:textStyle="bold"
+ android:textColor="@color/section_header_text_color"
+ android:textSize="14sp"
+ android:gravity="center"
+ />
+</RelativeLayout>
diff --git a/res/layout-xlarge/total_contacts.xml b/res/layout-xlarge/total_contacts.xml
new file mode 100644
index 0000000..8c05119
--- /dev/null
+++ b/res/layout-xlarge/total_contacts.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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="47dip"
+ android:paddingLeft="5dp"
+ android:paddingRight="7dp"
+ >
+
+ <TextView
+ android:id="@+id/totalContactsText"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:textColor="#ff666666"
+ android:textSize="14sp"
+ android:textStyle="normal"
+ android:layout_alignParentLeft="true"
+ android:gravity="center_vertical"
+ />
+
+</RelativeLayout>
diff --git a/res/layout/list_section.xml b/res/layout/list_section.xml
index f7ba693..e920673 100644
--- a/res/layout/list_section.xml
+++ b/res/layout/list_section.xml
@@ -19,7 +19,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="25dip"
- android:background="@*android:drawable/dark_header"
+ android:background="@drawable/section_header"
>
<TextView
android:id="@+id/header_text"
@@ -28,7 +28,7 @@
android:layout_centerVertical="true"
android:layout_alignParentLeft="true"
android:textStyle="bold"
- android:textColor="@*android:color/dim_foreground_dark"
+ android:textColor="@color/section_header_text_color"
android:textSize="14sp"
android:gravity="center"
/>
diff --git a/res/values-xlarge/colors.xml b/res/values-xlarge/colors.xml
index 06962cf..b2d1444 100644
--- a/res/values-xlarge/colors.xml
+++ b/res/values-xlarge/colors.xml
@@ -16,9 +16,15 @@
<resources>
+ <color name="pinned_header_background">#ffcfd1dc</color>
+
<!-- Color used in the Aizy visual scroll control for empty section -->
<color name="aizy_empty_section">#ffcccccc</color>
<!-- Color used in the Aizy visual scroll control for non-empty sections -->
<color name="aizy_non_empty_section">#ff666666</color>
+
+ <!-- Color used for the letter in the A-Z section header -->
+ <color name="section_header_text_color">#ff000000</color>
+
</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index c475148..c50dd73 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -32,4 +32,7 @@
<!-- Color used in the Aizy visual scroll control for non-empty sections -->
<color name="aizy_non_empty_section">#ffcccccc</color>
+
+ <!-- Color used for the letter in the A-Z section header -->
+ <color name="section_header_text_color">#ff999999</color>
</resources>
diff --git a/src/com/android/contacts/list/ContactListItemView.java b/src/com/android/contacts/list/ContactListItemView.java
index 755fed7..287b796 100644
--- a/src/com/android/contacts/list/ContactListItemView.java
+++ b/src/com/android/contacts/list/ContactListItemView.java
@@ -428,7 +428,7 @@
private void ensureHorizontalDivider() {
if (mHorizontalDividerDrawable == null) {
mHorizontalDividerDrawable = mContext.getResources().getDrawable(
- com.android.internal.R.drawable.divider_horizontal_dark_opaque);
+ R.drawable.list_item_divider);
mHorizontalDividerHeight = mHorizontalDividerDrawable.getIntrinsicHeight();
}
}
@@ -439,7 +439,7 @@
private void ensureHeaderBackground() {
if (mHeaderBackgroundDrawable == null) {
mHeaderBackgroundDrawable = mContext.getResources().getDrawable(
- android.R.drawable.dark_header);
+ R.drawable.section_header);
mHeaderBackgroundHeight = mHeaderBackgroundDrawable.getIntrinsicHeight();
}
}
@@ -496,7 +496,7 @@
mHeaderTextView = new TextView(mContext);
mHeaderTextView.setTypeface(mHeaderTextView.getTypeface(), Typeface.BOLD);
mHeaderTextView.setTextColor(mContext.getResources()
- .getColor(com.android.internal.R.color.dim_foreground_dark));
+ .getColor(R.color.section_header_text_color));
mHeaderTextView.setTextSize(14);
mHeaderTextView.setGravity(Gravity.CENTER);
addView(mHeaderTextView);
