am e61d1609: am ab8ca3ff: Merge "Make fonts consistent in contact list." into klp-dev
* commit 'e61d1609595cfe124f1d46a1a0f25c5d8f56bcf3':
Make fonts consistent in contact list.
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 709a205..65abd95 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -20,7 +20,7 @@
<color name="primary_text_color">#363636</color>
<!-- Divider color for header separator -->
- <color name="secondary_text_color">#777777</color>
+ <color name="secondary_text_color">#888888</color>
<!-- Divider color for header separator -->
<color name="main_header_separator_color">#AAAAAA</color>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index eb6743b..1bde31c 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -59,6 +59,16 @@
<item name="android:textAllCaps">true</item>
</style>
+ <style name="TextAppearanceMedium" parent="@android:style/TextAppearance.Medium">
+ <item name="android:textSize">16sp</item>
+ <item name="android:textColor">#000000</item>
+ </style>
+
+ <style name="TextAppearanceSmall" parent="@android:style/TextAppearance.Small">
+ <item name="android:textSize">12sp</item>
+ <item name="android:textColor">#888888</item>
+ </style>
+
<style name="ListViewStyle" parent="@android:style/Widget.Holo.Light.ListView">
<item name="android:overScrollMode">always</item>
</style>
diff --git a/src/com/android/contacts/common/list/ContactListItemView.java b/src/com/android/contacts/common/list/ContactListItemView.java
index 5d96d2c..6b9492b 100644
--- a/src/com/android/contacts/common/list/ContactListItemView.java
+++ b/src/com/android/contacts/common/list/ContactListItemView.java
@@ -916,7 +916,7 @@
mNameTextView = new TextView(mContext);
mNameTextView.setSingleLine(true);
mNameTextView.setEllipsize(getTextEllipsis());
- mNameTextView.setTextAppearance(mContext, android.R.style.TextAppearance_Medium);
+ mNameTextView.setTextAppearance(mContext, R.style.TextAppearanceMedium);
// Manually call setActivated() since this view may be added after the first
// setActivated() call toward this whole item view.
mNameTextView.setActivated(isActivated());
@@ -983,9 +983,9 @@
mLabelView = new TextView(mContext);
mLabelView.setSingleLine(true);
mLabelView.setEllipsize(getTextEllipsis());
- mLabelView.setTextAppearance(mContext, android.R.style.TextAppearance_Small);
+ mLabelView.setTextAppearance(mContext, R.style.TextAppearanceSmall);
if (mPhotoPosition == PhotoPosition.LEFT) {
- mLabelView.setTextSize(TypedValue.COMPLEX_UNIT_SP, mCountViewTextSize);
+ //mLabelView.setTextSize(TypedValue.COMPLEX_UNIT_SP, mCountViewTextSize);
mLabelView.setAllCaps(true);
mLabelView.setGravity(Gravity.END);
} else {
@@ -1072,7 +1072,7 @@
mDataView = new TextView(mContext);
mDataView.setSingleLine(true);
mDataView.setEllipsize(getTextEllipsis());
- mDataView.setTextAppearance(mContext, android.R.style.TextAppearance_Small);
+ mDataView.setTextAppearance(mContext, R.style.TextAppearanceSmall);
mDataView.setActivated(isActivated());
mDataView.setId(R.id.cliv_data_view);
addView(mDataView);
