Place phonetic name under display name in QuickContact.
Set phonetic name a smaller font size than display name.
BUG 22235947
Change-Id: I7d021ea8f6cc1a88c32eaccfa6ed7fe2cc2b9eb4
diff --git a/res/layout-sw720dp/quickcontact_activity.xml b/res/layout-sw720dp/quickcontact_activity.xml
index efbb4d1..0499b8e 100644
--- a/res/layout-sw720dp/quickcontact_activity.xml
+++ b/res/layout-sw720dp/quickcontact_activity.xml
@@ -71,5 +71,5 @@
<!-- This title's maximum height must be less than the minimum size of its
parent ViewGroup because of an oddity in the way View#setScaleY() works. As a result,
this title can not be inside @style/quickcontact_header. -->
- <include layout="@layout/quickcontact_title" />
+ <include layout="@layout/quickcontact_title_and_phoneticname" />
</com.android.contacts.widget.MultiShrinkScroller>
\ No newline at end of file
diff --git a/res/layout/quickcontact_activity.xml b/res/layout/quickcontact_activity.xml
index 6d94fcc..c3b035d 100644
--- a/res/layout/quickcontact_activity.xml
+++ b/res/layout/quickcontact_activity.xml
@@ -49,6 +49,6 @@
<!-- This title's maximum height must be less than the minimum size of its
parent ViewGroup because of an oddity in the way View#setScaleY() works. As a result,
this title can not be inside @style/quickcontact_header. -->
- <include layout="@layout/quickcontact_title" />
+ <include layout="@layout/quickcontact_title_and_phoneticname" />
</com.android.contacts.widget.MultiShrinkScroller>
\ No newline at end of file
diff --git a/res/layout/quickcontact_activity_landscape.xml b/res/layout/quickcontact_activity_landscape.xml
index 1130ff8..5f3bbc4 100644
--- a/res/layout/quickcontact_activity_landscape.xml
+++ b/res/layout/quickcontact_activity_landscape.xml
@@ -51,7 +51,7 @@
<include layout="@layout/quickcontact_header" />
- <include layout="@layout/quickcontact_title" />
+ <include layout="@layout/quickcontact_title_and_phoneticname" />
</FrameLayout>
diff --git a/res/layout/quickcontact_title.xml b/res/layout/quickcontact_title.xml
deleted file mode 100644
index 3f4886d..0000000
--- a/res/layout/quickcontact_title.xml
+++ /dev/null
@@ -1,34 +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.
--->
-
-<!-- The importantForAccessibility is set to "no" since we want the ViewGroup that pretends to be
- this View's parent (contact photo overlay) to provide the content description for Talkback. -->
-<TextView
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/quickcontact_title_initial_margin"
- android:layout_marginEnd="@dimen/quickcontact_title_initial_margin"
- android:layout_marginBottom="@dimen/quickcontact_title_initial_margin"
- android:layout_gravity="top|start"
- android:textColor="@color/actionbar_text_color"
- android:maxLines="@integer/quickcontact_title_lines"
- android:textSize="@dimen/quickcontact_maximum_title_size"
- android:textAlignment="viewStart"
- android:ellipsize="end"
- android:importantForAccessibility="no"
- android:id="@+id/large_title"/>
\ No newline at end of file
diff --git a/res/layout/quickcontact_title_and_phoneticname.xml b/res/layout/quickcontact_title_and_phoneticname.xml
new file mode 100644
index 0000000..350c5e9
--- /dev/null
+++ b/res/layout/quickcontact_title_and_phoneticname.xml
@@ -0,0 +1,48 @@
+<?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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/title_and_phonetic_name"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:layout_marginStart="@dimen/quickcontact_title_initial_margin"
+ android:layout_marginEnd="@dimen/quickcontact_title_initial_margin"
+ android:layout_marginBottom="@dimen/quickcontact_title_initial_bottom_margin">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="top|start"
+ android:textColor="@color/actionbar_text_color"
+ android:maxLines="@integer/quickcontact_title_lines"
+ android:textSize="@dimen/quickcontact_maximum_title_size"
+ android:textAlignment="viewStart"
+ android:ellipsize="end"
+ android:importantForAccessibility="no"
+ android:id="@+id/large_title"/>
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/large_title"
+ android:textColor="@color/actionbar_text_color"
+ android:maxLines="@integer/quickcontact_title_lines"
+ android:textSize="@dimen/quickcontact_maximum_phonetic_name_size"
+ android:textAlignment="viewStart"
+ android:ellipsize="end"
+ android:importantForAccessibility="no"
+ android:id="@+id/phonetic_name"/>
+</LinearLayout>
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
index 67b2514..6e87e97 100644
--- a/res/values-sw720dp/dimens.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -22,10 +22,14 @@
<dimen name="contact_picker_contact_list_min_height">650dip</dimen>
<dimen name="list_visible_scrollbar_padding">48dip</dimen>
- <!-- When QC is uncollapsed, the title has this much margin on its left, right and bottom -->
+ <!-- When QC is uncollapsed, the title has this much margin on its left and right -->
<dimen name="quickcontact_title_initial_margin">32dp</dimen>
+ <!-- When QC is uncollapsed, the title has this much margin on its bottom -->
+ <dimen name="quickcontact_title_initial_bottom_margin">0dp</dimen>
<!-- Initial size of QuickContact's title size -->
- <dimen name="quickcontact_maximum_title_size">64dp</dimen>
+ <dimen name="quickcontact_maximum_title_size">56dp</dimen>
+ <!-- Initial size of QuickContact's phonetic name size -->
+ <dimen name="quickcontact_maximum_phonetic_name_size">50dp</dimen>
<!-- Right margin of the floating action button -->
<dimen name="floating_action_button_margin_right">100dp</dimen>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 8b0a07e..c57127f 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -19,9 +19,13 @@
<!-- Initial height of transparent space above QuickContacts -->
<dimen name="quickcontact_starting_empty_height">150dp</dimen>
<!-- Initial size of QuickContact's title size -->
- <dimen name="quickcontact_maximum_title_size">30dp</dimen>
- <!-- When QC is uncollapsed, the title has this much margin on its left, right and bottom -->
+ <dimen name="quickcontact_maximum_title_size">32dp</dimen>
+ <!-- Initial size of QuickContact's phonetic name size -->
+ <dimen name="quickcontact_maximum_phonetic_name_size">28dp</dimen>
+ <!-- When QC is uncollapsed, the title has this much margin on its left and right. -->
<dimen name="quickcontact_title_initial_margin">16dp</dimen>
+ <!-- When QC is uncollapsed, the title has this much margin on its bottom -->
+ <dimen name="quickcontact_title_initial_bottom_margin">8dp</dimen>
<!-- The ratio of width:height for the contact's photo in landscape -->
<item name="quickcontact_landscape_photo_ratio" type="dimen" format="float">0.7</item>
<!-- How far QuickContacts can be dragged and released from the top of the window before we dismiss it. -->