diff options
| author | Chiao Cheng <chiaocheng@google.com> | 2013-11-13 21:40:42 -0800 |
|---|---|---|
| committer | Chiao Cheng <chiaocheng@google.com> | 2013-11-13 21:40:42 -0800 |
| commit | a350efe79dd18df1d6e31694d68094ad99736a11 (patch) | |
| tree | ac249eb6ae2f2a99eae0955de8a2a8d842b24230 /res | |
| parent | 9552192be3977ce2a7fd21b091dffa38808df73e (diff) | |
| parent | d67140414bde8d7b5d6f809a7bf8ada466428eaf (diff) | |
| download | android_packages_apps_ContactsCommon-a350efe79dd18df1d6e31694d68094ad99736a11.tar.gz android_packages_apps_ContactsCommon-a350efe79dd18df1d6e31694d68094ad99736a11.tar.bz2 android_packages_apps_ContactsCommon-a350efe79dd18df1d6e31694d68094ad99736a11.zip | |
Fix auto-merge conflict.
Merge commit 'd6714041' into manualmerge
Conflicts:
src/com/android/contacts/common/list/ContactListItemView.java
Change-Id: Icade3af50d0c509b17341d6bcb15d5ed0419109f
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/colors.xml | 2 | ||||
| -rw-r--r-- | res/values/styles.xml | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml index 709a205b..65abd95c 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 eb6743b7..1bde31c3 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -59,6 +59,16 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar <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> |