merge in klp-factoryrom-release history after reset to klp-release
diff --git a/res/layout-sw600dp/list_separator.xml b/res/layout-sw600dp/list_separator.xml
new file mode 100644
index 0000000..74a031c
--- /dev/null
+++ b/res/layout-sw600dp/list_separator.xml
@@ -0,0 +1,24 @@
+<?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.
+-->
+
+<TextView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/title"
+ style="@style/ContactListSeparatorTextViewStyle"
+ android:paddingLeft="8dip"
+ android:paddingRight="8dip"
+ android:paddingStart="8dip"
+ android:paddingEnd="8dip" />
diff --git a/res/layout/group_account_header_horizontal.xml b/res/layout/group_account_header_horizontal.xml
index fe0ca2d..4173fa4 100644
--- a/res/layout/group_account_header_horizontal.xml
+++ b/res/layout/group_account_header_horizontal.xml
@@ -34,7 +34,10 @@
android:layout_gravity="center_vertical"
android:paddingLeft="?attr/list_item_header_text_indent"
android:paddingStart="?attr/list_item_header_text_indent"
- android:textAppearance="@style/SectionHeaderStyle"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="@color/people_app_theme_color"
+ android:textStyle="bold"
+ android:textAllCaps="true"
android:singleLine="true"
android:textAlignment="viewStart" />
@@ -45,7 +48,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:textAppearance="@style/SectionHeaderStyle"
+ android:textColor="@color/people_app_theme_color"
android:textSize="12sp"
android:singleLine="true"
android:ellipsize="middle"
diff --git a/res/layout/group_account_header_vertical.xml b/res/layout/group_account_header_vertical.xml
index b3e0eb1..289d23a 100644
--- a/res/layout/group_account_header_vertical.xml
+++ b/res/layout/group_account_header_vertical.xml
@@ -34,7 +34,10 @@
android:layout_height="wrap_content"
android:paddingLeft="?attr/list_item_header_text_indent"
android:paddingStart="?attr/list_item_header_text_indent"
- android:textAppearance="@style/SectionHeaderStyle"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="@color/people_app_theme_color"
+ android:textStyle="bold"
+ android:textAllCaps="true"
android:singleLine="true"/>
<!-- TODO: Should use correct color with a correct name (content should be same).
@@ -45,7 +48,7 @@
android:layout_height="wrap_content"
android:paddingLeft="?attr/list_item_header_text_indent"
android:paddingStart="?attr/list_item_header_text_indent"
- android:textAppearance="@style/SectionHeaderStyle"
+ android:textColor="@color/people_app_theme_color"
android:textSize="12sp"
android:singleLine="true"
android:ellipsize="middle" />
diff --git a/res/layout/user_profile_header.xml b/res/layout/user_profile_header.xml
index fb5341b..56ec894 100644
--- a/res/layout/user_profile_header.xml
+++ b/res/layout/user_profile_header.xml
@@ -34,11 +34,14 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/user_profile_contacts_list_header"
+ android:textStyle="bold"
android:ellipsize="end"
android:layout_weight="1"
- android:textAppearance="@style/SectionHeaderStyle"
+ android:textAllCaps="true"
+ android:textAppearance="?android:attr/textAppearanceSmall"
android:paddingLeft="?attr/list_item_text_indent"
- android:paddingStart="?attr/list_item_text_indent" />
+ android:paddingStart="?attr/list_item_text_indent"
+ android:textColor="@color/people_app_theme_color" />
<TextView
android:id="@+id/contacts_count"
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index bdbbd01..e59d6ee 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -41,8 +41,8 @@
<item name="list_item_profile_photo_size">80dip</item>
<item name="list_item_prefix_highlight_color">@color/people_app_theme_color</item>
<item name="list_item_header_text_indent">8dip</item>
- <item name="list_item_header_text_size">25sp</item>
- <item name="list_item_header_text_color">@color/people_app_theme_color</item>
+ <item name="list_item_header_text_size">20sp</item>
+ <item name="list_item_header_text_color">@color/dialtacts_secondary_text_color</item>
<item name="list_item_header_height">48dip</item>
<item name="list_item_header_underline_height">2dip</item>
<item name="list_item_header_underline_color">@color/secondary_header_separator_color</item>
diff --git a/res/values-sw720dp/styles.xml b/res/values-sw720dp/styles.xml
index 9178775..56442c2 100644
--- a/res/values-sw720dp/styles.xml
+++ b/res/values-sw720dp/styles.xml
@@ -41,9 +41,9 @@
<item name="list_item_profile_photo_size">80dip</item>
<item name="list_item_prefix_highlight_color">@color/people_app_theme_color</item>
<item name="list_item_header_text_indent">8dip</item>
- <item name="list_item_header_text_color">@color/people_app_theme_color</item>
+ <item name="list_item_header_text_color">@color/dialtacts_secondary_text_color</item>
<item name="list_item_header_height">48dip</item>
- <item name="list_item_header_text_size">25sp</item>
+ <item name="list_item_header_text_size">20sp</item>
<item name="list_item_header_underline_color">@color/secondary_header_separator_color</item>
<item name="list_item_header_underline_height">2dip</item>
<item name="list_item_contacts_count_text_color">@color/people_app_theme_color</item>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index ad86bc5..c9c59e7 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -80,8 +80,8 @@
<item name="list_item_photo_size">@dimen/contact_browser_list_item_photo_size</item>
<item name="list_item_profile_photo_size">70dip</item>
<item name="list_item_prefix_highlight_color">@color/people_app_theme_color</item>
- <item name="list_item_header_text_color">@color/people_app_theme_color</item>
- <item name="list_item_header_text_size">25sp</item>
+ <item name="list_item_header_text_color">@color/dialtacts_secondary_text_color</item>
+ <item name="list_item_header_text_size">20sp</item>
<item name="list_item_header_height">48dip</item>
<item name="list_item_header_underline_height">2dip</item>
<item name="list_item_header_underline_color">@color/secondary_header_separator_color</item>
diff --git a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
index 90495fa..1f68dae 100644
--- a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
+++ b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
@@ -285,6 +285,7 @@
mProfileHeader = inflater.inflate(R.layout.user_profile_header, null, false);
mCounterHeaderView = (TextView) mProfileHeader.findViewById(R.id.contacts_count);
mProfileTitle = (TextView) mProfileHeader.findViewById(R.id.profile_title);
+ mProfileTitle.setAllCaps(true);
mProfileHeaderContainer.addView(mProfileHeader);
list.addHeaderView(mProfileHeaderContainer, null, false);