DO NOT MERGE Changed margins of Dialer and Contact list items to match redline spec.

Changed text color of items to match spec (#4d4d4d).
Fixed text size issue in People app.
Bug: 15165159

Change-Id: Ib07111d6d829363f5258fbe6475dd8d1918b8ec7
(cherry picked from commit 3bc19a3bb1ed23b03352fff6de69a89e763a315e)

3 files changed, 11 insertions, 3 deletions

diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index e4f79d1f..dfba0d8f 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -57,6 +57,7 @@
         <attr name="list_item_header_text_size" format="dimension"/>
         <attr name="list_item_header_height" format="dimension"/>
         <attr name="list_item_name_text_color" format="color"/>
+        <attr name="list_item_name_text_size" format="dimension"/>
         <attr name="list_item_text_indent" format="dimension"/>
         <attr name="list_item_data_width_weight" format="integer"/>
         <attr name="list_item_label_width_weight" format="integer"/>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 755f3a2f..4904400d 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -75,8 +75,9 @@
     <dimen name="empty_message_top_margin">48dip</dimen>
 
     <!-- contact browser list margins -->
-    <dimen name="contact_browser_list_item_photo_size">48dip</dimen>
-    <dimen name="contact_browser_list_top_margin">8dip</dimen>
+    <dimen name="contact_browser_list_item_text_size">16sp</dimen>
+    <dimen name="contact_browser_list_item_photo_size">40dp</dimen>
+    <dimen name="contact_browser_list_top_margin">12dp</dimen>
 
     <!-- Dimensions for "No contacts" string in PhoneFavoriteFragment for the All contacts
          with phone numbers section
diff --git a/src/com/android/contacts/common/list/ContactListItemView.java b/src/com/android/contacts/common/list/ContactListItemView.java
index 4b3b0dcb..18b88c8d 100644
--- a/src/com/android/contacts/common/list/ContactListItemView.java
+++ b/src/com/android/contacts/common/list/ContactListItemView.java
@@ -34,6 +34,7 @@ import android.text.SpannableString;
 import android.text.TextUtils;
 import android.text.TextUtils.TruncateAt;
 import android.util.AttributeSet;
+import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
@@ -85,6 +86,7 @@ public class ContactListItemView extends ViewGroup
     private int mPresenceIconMargin = 4;
     private int mPresenceIconSize = 16;
     private int mTextIndent = 0;
+    private int mNameTextViewTextSize;
     private int mHeaderWidth;
     private Drawable mActivatedBackgroundDrawable;
 
@@ -255,6 +257,9 @@ public class ContactListItemView extends ViewGroup
                 mLabelViewWidthWeight);
         mNameTextViewTextColor = a.getColor(
                 R.styleable.ContactListItemView_list_item_name_text_color, mNameTextViewTextColor);
+        mNameTextViewTextSize = (int) a.getDimension(
+                R.styleable.ContactListItemView_list_item_name_text_size,
+                (int) getResources().getDimension(R.dimen.contact_browser_list_item_text_size));
 
         setPaddingRelative(
                 a.getDimensionPixelOffset(
@@ -836,8 +841,9 @@ public class ContactListItemView extends ViewGroup
             mNameTextView = new TextView(getContext());
             mNameTextView.setSingleLine(true);
             mNameTextView.setEllipsize(getTextEllipsis());
-            mNameTextView.setTextAppearance(getContext(), R.style.TextAppearanceMedium);
             mNameTextView.setTextColor(mNameTextViewTextColor);
+            mNameTextView.setTextSize(TypedValue.COMPLEX_UNIT_PX,
+                    mNameTextViewTextSize);
             // Manually call setActivated() since this view may be added after the first
             // setActivated() call toward this whole item view.
             mNameTextView.setActivated(isActivated());