Merge "Fix internationalization of percentage formatting in ContactsCommon." into lmp-mr1-dev
diff --git a/res-common/layout/select_dialog_item.xml b/res-common/layout/select_dialog_item.xml
index de495f6..b0fceac 100644
--- a/res-common/layout/select_dialog_item.xml
+++ b/res-common/layout/select_dialog_item.xml
@@ -16,8 +16,8 @@
<!--
List item in the pop-up window that appears when tapping a contact's photo
- in the contact editor. This is similar to the framework's select_dialog_item.xml layout
- except the text appearance is medium.
+ in the contact editor. This is similar to the framework's select_dialog_item_material.xml layout
+ except the text appearance is medium and the padding is set to match the material spec.
-->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1"
@@ -27,9 +27,6 @@
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorAlertDialogListItem"
android:gravity="center_vertical"
- android:paddingLeft="14dip"
- android:paddingRight="15dip"
- android:paddingStart="14dip"
- android:paddingEnd="15dip"
- android:ellipsize="marquee"
-/>
+ android:paddingStart="24dip"
+ android:paddingEnd="24dip"
+ android:ellipsize="marquee" />
\ No newline at end of file
diff --git a/res-common/values/colors.xml b/res-common/values/colors.xml
index 02ba95d..1da07fb 100644
--- a/res-common/values/colors.xml
+++ b/res-common/values/colors.xml
@@ -139,9 +139,9 @@
<color name="searchbox_text_color">#000000</color>
<!-- Background color of the search box -->
<color name="searchbox_background_color">#ffffff</color>
- <!-- Text color of the search box hint text -->
- <color name="searchbox_hint_text_color">#a4a4a4</color>
- <color name="searchbox_icon_tint">#a4a4a4</color>
+
+ <color name="searchbox_hint_text_color">#737373</color>
+ <color name="searchbox_icon_tint">@color/searchbox_hint_text_color</color>
<color name="search_shortcut_background_color">#b6b6b6</color>
<color name="search_shortcut_icon_color">#f8f8f8</color>