diff options
| author | Tingting Wang <tingtingw@google.com> | 2015-07-15 00:33:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-15 00:33:37 +0000 |
| commit | dea958db4beac1de8efcdfd448ec172ada1828a9 (patch) | |
| tree | d8e760af78c3f8f1471a0653cceba451639393ed /res | |
| parent | 82652b3c698abed5834e8f976c3dce6b3ea5f5e3 (diff) | |
| parent | 4202f18c3c97f78cc63caf172209d54713fdadb5 (diff) | |
| download | packages_apps_Contacts-dea958db4beac1de8efcdfd448ec172ada1828a9.tar.gz packages_apps_Contacts-dea958db4beac1de8efcdfd448ec172ada1828a9.tar.bz2 packages_apps_Contacts-dea958db4beac1de8efcdfd448ec172ada1828a9.zip | |
am 4202f18c: am 561e5974: am 7f11f2ec: Merge "Show phonetic name next to display name in UI." into mnc-dev
* commit '4202f18c3c97f78cc63caf172209d54713fdadb5':
Show phonetic name next to display name in UI.
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/dimens.xml | 2 | ||||
| -rw-r--r-- | res/values/strings.xml | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml index b8650e3ab..8b0a07ec9 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -19,7 +19,7 @@ <!-- 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">36dp</dimen> + <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_title_initial_margin">16dp</dimen> <!-- The ratio of width:height for the contact's photo in landscape --> diff --git a/res/values/strings.xml b/res/values/strings.xml index 936f093a9..bd9e3412d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -767,4 +767,7 @@ <!-- Content description for the compact contact editor photo overlay which, when clicked, shows a dialog with the options for changing the contact photo. [CHAR LIMIT=30] --> <string name="compact_editor_change_photo_content_description">Change photo</string> + + <!-- Quick contact display name with phonetic name --> + <string name="quick_contact_display_name_with_phonetic"><xliff:g id="display_name">%s</xliff:g> (<xliff:g id="phonetic_name">%s</xliff:g>)</string> </resources> |