Restyle "Set up my profile" option.
- Delete header count functionality.
- Relayout the "ME" header to the left of the profile button.
- Styling tweaks to get things to layout properly.
Change-Id: Icbadef9fb7b6e5acc7fc878948a8fe5c4985b394
diff --git a/res/layout/user_profile_button.xml b/res/layout/user_profile_button.xml
deleted file mode 100644
index 6a7c3b4..0000000
--- a/res/layout/user_profile_button.xml
+++ /dev/null
@@ -1,33 +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.
--->
-
-<Button
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:minHeight="@dimen/contact_browser_list_item_photo_size"
- android:layout_marginLeft="?attr/list_item_padding_left"
- android:layout_marginRight="?attr/list_item_padding_right"
- android:layout_marginStart="?attr/list_item_padding_left"
- android:layout_marginEnd="?attr/list_item_padding_right"
- android:paddingLeft="?attr/list_item_header_text_indent"
- android:paddingStart="?attr/list_item_header_text_indent"
- android:background="?android:attr/selectableItemBackground"
- android:singleLine="true"
- android:text="@string/profile_display_name"
- android:ellipsize="end"
- android:gravity="start|center_vertical"
- android:textAppearance="?android:attr/textAppearanceMedium" />
diff --git a/res/layout/user_profile_header.xml b/res/layout/user_profile_header.xml
index 1d08298..5a07313 100644
--- a/res/layout/user_profile_header.xml
+++ b/res/layout/user_profile_header.xml
@@ -25,31 +25,32 @@
android:paddingStart="?attr/list_item_padding_left"
android:paddingEnd="?attr/list_item_padding_right"
android:paddingTop="4dp"
- android:paddingBottom="8dp"
- android:background="@drawable/list_section_divider_holo_custom"
- android:gravity="center_vertical"
- >
+ android:paddingBottom="8dp" >
- <TextView
- android:id="@+id/profile_title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ <TextView android:id="@+id/profile_title"
+ android:layout_width="@dimen/contact_list_section_header_width"
+ android:layout_height="?android:attr/listPreferredItemHeight"
android:singleLine="true"
android:text="@string/user_profile_contacts_list_header"
android:ellipsize="end"
- android:layout_weight="1"
- android:textAppearance="@style/DirectoryHeaderStyle"
- android:paddingLeft="?attr/list_item_text_indent"
- android:paddingStart="?attr/list_item_text_indent" />
+ android:textAppearance="@style/SectionHeaderStyle"
+ android:gravity="start|center_vertical" />
- <TextView
- android:id="@+id/contacts_count"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ <Button android:id="@+id/user_profile_button"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="?android:attr/listPreferredItemHeight"
+ android:layout_marginLeft="?attr/list_item_padding_left"
+ android:layout_marginRight="?attr/list_item_padding_right"
+ android:layout_marginStart="?attr/list_item_padding_left"
+ android:layout_marginEnd="?attr/list_item_padding_right"
+ android:paddingLeft="?attr/list_item_gap_between_image_and_text"
+ android:paddingStart="?attr/list_item_gap_between_image_and_text"
+ android:background="?android:attr/selectableItemBackground"
android:singleLine="true"
+ android:text="@string/profile_display_name"
android:ellipsize="end"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textSize="12sp"
- android:textColor="@color/people_app_theme_color" />
+ android:gravity="start|center_vertical"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d88d688..5cad5f2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -258,12 +258,6 @@
<!-- Displayed at the top of the contacts showing the zero as total number of contacts visible when "Only contacts with phones" is selected [CHAR LIMIT=64]-->
<string name="listTotalPhoneContactsZero">No contacts with phone numbers</string>
- <!-- Displayed at the top of the contacts showing the total number of contacts visible when "Only contacts with phones" not selected -->
- <plurals name="listTotalAllContacts">
- <item quantity="one">1 contact</item>
- <item quantity="other"><xliff:g id="count">%d</xliff:g> contacts</item>
- </plurals>
-
<!-- Displayed at the top of the contacts showing the total number of contacts found when "Only contacts with phones" not selected [CHAR LIMIT=30] -->
<plurals name="listFoundAllContacts">
<item quantity="one">1 found</item>