Merge "Undemote contact when starring" into klp-dev
diff --git a/res/drawable-xxhdpi/ab_solid_custom_blue_inverse_holo.9.png b/res/drawable-xxhdpi/ab_solid_custom_blue_inverse_holo.9.png
new file mode 100644
index 0000000..24c267f
--- /dev/null
+++ b/res/drawable-xxhdpi/ab_solid_custom_blue_inverse_holo.9.png
Binary files differ
diff --git a/res/drawable-xxhdpi/account_spinner_icon.png b/res/drawable-xxhdpi/account_spinner_icon.png
new file mode 100644
index 0000000..5f90fbc
--- /dev/null
+++ b/res/drawable-xxhdpi/account_spinner_icon.png
Binary files differ
diff --git a/res/drawable-xxhdpi/bg_people_updates_holo.9.png b/res/drawable-xxhdpi/bg_people_updates_holo.9.png
new file mode 100644
index 0000000..fb2dbb9
--- /dev/null
+++ b/res/drawable-xxhdpi/bg_people_updates_holo.9.png
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_star_off_normal_holo_dark.png b/res/drawable-xxhdpi/btn_star_off_normal_holo_dark.png
new file mode 100644
index 0000000..b7cf983
--- /dev/null
+++ b/res/drawable-xxhdpi/btn_star_off_normal_holo_dark.png
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_star_off_normal_holo_light.png b/res/drawable-xxhdpi/btn_star_off_normal_holo_light.png
new file mode 100644
index 0000000..4ebf2f6
--- /dev/null
+++ b/res/drawable-xxhdpi/btn_star_off_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_star_on_normal_holo_dark.png b/res/drawable-xxhdpi/btn_star_on_normal_holo_dark.png
new file mode 100644
index 0000000..0201cbd
--- /dev/null
+++ b/res/drawable-xxhdpi/btn_star_on_normal_holo_dark.png
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_star_on_normal_holo_light.png b/res/drawable-xxhdpi/btn_star_on_normal_holo_light.png
new file mode 100644
index 0000000..9f07084
--- /dev/null
+++ b/res/drawable-xxhdpi/btn_star_on_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_ab_favourites_holo_dark.png b/res/drawable-xxhdpi/ic_ab_favourites_holo_dark.png
new file mode 100644
index 0000000..083e432
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_ab_favourites_holo_dark.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_ab_search_holo_dark.png b/res/drawable-xxhdpi/ic_ab_search_holo_dark.png
new file mode 100644
index 0000000..d56194d
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_ab_search_holo_dark.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_add_contact_holo_light.png b/res/drawable-xxhdpi/ic_add_contact_holo_light.png
new file mode 100644
index 0000000..b6d756d
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_add_contact_holo_light.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_add_group_holo_dark.png b/res/drawable-xxhdpi/ic_add_group_holo_dark.png
new file mode 100644
index 0000000..44d8fe9
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_add_group_holo_dark.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_contacts_holo_dark.png b/res/drawable-xxhdpi/ic_contacts_holo_dark.png
new file mode 100644
index 0000000..9328a6a
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_contacts_holo_dark.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_favorite_off_lt.png b/res/drawable-xxhdpi/ic_favorite_off_lt.png
new file mode 100644
index 0000000..b7cf983
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_favorite_off_lt.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_favorite_on_lt.png b/res/drawable-xxhdpi/ic_favorite_on_lt.png
new file mode 100644
index 0000000..0201cbd
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_favorite_on_lt.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_groups_holo_dark.png b/res/drawable-xxhdpi/ic_groups_holo_dark.png
new file mode 100644
index 0000000..6fdaa5d
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_groups_holo_dark.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_list_default_mime_holo_dark.png b/res/drawable-xxhdpi/ic_list_default_mime_holo_dark.png
new file mode 100644
index 0000000..4f12d95
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_list_default_mime_holo_dark.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_menu_add_field_holo_light.png b/res/drawable-xxhdpi/ic_menu_add_field_holo_light.png
new file mode 100644
index 0000000..f8ed465
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_add_field_holo_light.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_menu_compose_holo_dark.png b/res/drawable-xxhdpi/ic_menu_compose_holo_dark.png
new file mode 100644
index 0000000..0b2a07d
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_compose_holo_dark.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_menu_compose_holo_light.png b/res/drawable-xxhdpi/ic_menu_compose_holo_light.png
new file mode 100644
index 0000000..bbca49f
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_compose_holo_light.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_menu_done_holo_dark.png b/res/drawable-xxhdpi/ic_menu_done_holo_dark.png
new file mode 100644
index 0000000..7f6919c
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_done_holo_dark.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_menu_done_holo_light.png b/res/drawable-xxhdpi/ic_menu_done_holo_light.png
new file mode 100644
index 0000000..9a6f448
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_done_holo_light.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_menu_expander_maximized_holo_light.png b/res/drawable-xxhdpi/ic_menu_expander_maximized_holo_light.png
new file mode 100644
index 0000000..a42aec2
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_expander_maximized_holo_light.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_menu_expander_minimized_holo_light.png b/res/drawable-xxhdpi/ic_menu_expander_minimized_holo_light.png
new file mode 100644
index 0000000..1ca2e46
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_expander_minimized_holo_light.png
Binary files differ
diff --git a/res/drawable-xxhdpi/list_pressed_holo_light.9.png b/res/drawable-xxhdpi/list_pressed_holo_light.9.png
new file mode 100644
index 0000000..d9328f2
--- /dev/null
+++ b/res/drawable-xxhdpi/list_pressed_holo_light.9.png
Binary files differ
diff --git a/res/drawable-xxhdpi/list_section_divider_holo_custom.9.png b/res/drawable-xxhdpi/list_section_divider_holo_custom.9.png
new file mode 100644
index 0000000..acc7f00
--- /dev/null
+++ b/res/drawable-xxhdpi/list_section_divider_holo_custom.9.png
Binary files differ
diff --git a/res/drawable-xxhdpi/quickcon_background_texture.png b/res/drawable-xxhdpi/quickcon_background_texture.png
new file mode 100644
index 0000000..aaf5741
--- /dev/null
+++ b/res/drawable-xxhdpi/quickcon_background_texture.png
Binary files differ
diff --git a/res/drawable-xxhdpi/sym_action_audiochat_holo_light.png b/res/drawable-xxhdpi/sym_action_audiochat_holo_light.png
new file mode 100644
index 0000000..ee17752
--- /dev/null
+++ b/res/drawable-xxhdpi/sym_action_audiochat_holo_light.png
Binary files differ
diff --git a/res/drawable-xxhdpi/sym_action_videochat_holo_light.png b/res/drawable-xxhdpi/sym_action_videochat_holo_light.png
new file mode 100644
index 0000000..ac3507c
--- /dev/null
+++ b/res/drawable-xxhdpi/sym_action_videochat_holo_light.png
Binary files differ
diff --git a/res/layout-sw600dp/list_separator.xml b/res/layout-sw600dp/list_separator.xml
deleted file mode 100644
index 74a031c..0000000
--- a/res/layout-sw600dp/list_separator.xml
+++ /dev/null
@@ -1,24 +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.
--->
-
-<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 4173fa4..fe0ca2d 100644
--- a/res/layout/group_account_header_horizontal.xml
+++ b/res/layout/group_account_header_horizontal.xml
@@ -34,10 +34,7 @@
android:layout_gravity="center_vertical"
android:paddingLeft="?attr/list_item_header_text_indent"
android:paddingStart="?attr/list_item_header_text_indent"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="@color/people_app_theme_color"
- android:textStyle="bold"
- android:textAllCaps="true"
+ android:textAppearance="@style/SectionHeaderStyle"
android:singleLine="true"
android:textAlignment="viewStart" />
@@ -48,7 +45,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:textColor="@color/people_app_theme_color"
+ android:textAppearance="@style/SectionHeaderStyle"
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 289d23a..b3e0eb1 100644
--- a/res/layout/group_account_header_vertical.xml
+++ b/res/layout/group_account_header_vertical.xml
@@ -34,10 +34,7 @@
android:layout_height="wrap_content"
android:paddingLeft="?attr/list_item_header_text_indent"
android:paddingStart="?attr/list_item_header_text_indent"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="@color/people_app_theme_color"
- android:textStyle="bold"
- android:textAllCaps="true"
+ android:textAppearance="@style/SectionHeaderStyle"
android:singleLine="true"/>
<!-- TODO: Should use correct color with a correct name (content should be same).
@@ -48,7 +45,7 @@
android:layout_height="wrap_content"
android:paddingLeft="?attr/list_item_header_text_indent"
android:paddingStart="?attr/list_item_header_text_indent"
- android:textColor="@color/people_app_theme_color"
+ android:textAppearance="@style/SectionHeaderStyle"
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 56ec894..fb5341b 100644
--- a/res/layout/user_profile_header.xml
+++ b/res/layout/user_profile_header.xml
@@ -34,14 +34,11 @@
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:textAllCaps="true"
- android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textAppearance="@style/SectionHeaderStyle"
android:paddingLeft="?attr/list_item_text_indent"
- android:paddingStart="?attr/list_item_text_indent"
- android:textColor="@color/people_app_theme_color" />
+ android:paddingStart="?attr/list_item_text_indent" />
<TextView
android:id="@+id/contacts_count"
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index e59d6ee..bdbbd01 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">20sp</item>
- <item name="list_item_header_text_color">@color/dialtacts_secondary_text_color</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_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 56442c2..9178775 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/dialtacts_secondary_text_color</item>
+ <item name="list_item_header_text_color">@color/people_app_theme_color</item>
<item name="list_item_header_height">48dip</item>
- <item name="list_item_header_text_size">20sp</item>
+ <item name="list_item_header_text_size">25sp</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 c9c59e7..ad86bc5 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/dialtacts_secondary_text_color</item>
- <item name="list_item_header_text_size">20sp</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_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 1f68dae..90495fa 100644
--- a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
+++ b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
@@ -285,7 +285,6 @@
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);
