Merge "Make fonts and colors consistent across views." into klp-dev
diff --git a/res/drawable-hdpi/shadow_contact_photo.png b/res/drawable-hdpi/shadow_contact_photo.png
index 49cbb97..44b06f2 100644
--- a/res/drawable-hdpi/shadow_contact_photo.png
+++ b/res/drawable-hdpi/shadow_contact_photo.png
Binary files differ
diff --git a/res/drawable-mdpi/shadow_contact_photo.png b/res/drawable-mdpi/shadow_contact_photo.png
index 4734bbd..8665d83 100644
--- a/res/drawable-mdpi/shadow_contact_photo.png
+++ b/res/drawable-mdpi/shadow_contact_photo.png
Binary files differ
diff --git a/res/drawable-xhdpi/shadow_contact_photo.png b/res/drawable-xhdpi/shadow_contact_photo.png
index 1077ec1..8359a50 100644
--- a/res/drawable-xhdpi/shadow_contact_photo.png
+++ b/res/drawable-xhdpi/shadow_contact_photo.png
Binary files differ
diff --git a/res/drawable-xxhdpi/shadow_contact_photo.png b/res/drawable-xxhdpi/shadow_contact_photo.png
index 1c60c8d..bfeb0ff 100644
--- a/res/drawable-xxhdpi/shadow_contact_photo.png
+++ b/res/drawable-xxhdpi/shadow_contact_photo.png
Binary files differ
diff --git a/res/layout/call_log_list_item.xml b/res/layout/call_log_list_item.xml
index 1bd448c..5edd06b 100644
--- a/res/layout/call_log_list_item.xml
+++ b/res/layout/call_log_list_item.xml
@@ -72,7 +72,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/call_log_icon_margin"
android:textColor="?attr/call_log_primary_text_color"
- android:textSize="18sp"
+ android:textSize="16sp"
android:singleLine="true"
/>
<LinearLayout
@@ -86,8 +86,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/call_log_icon_margin"
android:textColor="?attr/call_log_secondary_text_color"
- android:textStyle="bold"
- android:textSize="14sp"
+ android:textSize="12sp"
android:singleLine="true"
android:ellipsize="marquee"
/>
@@ -113,7 +112,7 @@
android:layout_marginEnd="@dimen/call_log_icon_margin"
android:layout_gravity="center_vertical"
android:textColor="?attr/call_log_secondary_text_color"
- android:textSize="14sp"
+ android:textSize="12sp"
android:singleLine="true"
/>
</LinearLayout>
diff --git a/res/layout/phone_favorite_regular_row_view.xml b/res/layout/phone_favorite_regular_row_view.xml
index a90117f..012c9be 100644
--- a/res/layout/phone_favorite_regular_row_view.xml
+++ b/res/layout/phone_favorite_regular_row_view.xml
@@ -49,7 +49,8 @@
android:id="@id/contact_tile_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textSize="16sp"
+ android:textColor="@color/dialtacts_primary_text_color"/>
android:singleLine="true"
android:fadingEdge="horizontal"
android:fadingEdgeLength="3dip"
diff --git a/res/layout/phone_favorite_tile_view.xml b/res/layout/phone_favorite_tile_view.xml
index fce25ea..8806d39 100644
--- a/res/layout/phone_favorite_tile_view.xml
+++ b/res/layout/phone_favorite_tile_view.xml
@@ -55,7 +55,7 @@
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:textColor="@color/contact_tile_name_color"
- android:fontFamily="sans-serif-light"
+ android:fontFamily="sans-serif"
android:singleLine="true"
android:textSize="16sp"
android:fadingEdge="horizontal"
@@ -68,7 +68,7 @@
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:textColor="@color/contact_tile_name_color"
- android:fontFamily="sans-serif-light"
+ android:fontFamily="sans-serif"
android:singleLine="true"
android:textSize="12sp"
android:paddingBottom="2dp"
@@ -168,7 +168,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:fontFamily="sans-serif-light"
+ android:fontFamily="sans-serif"
android:textSize="13sp"
android:ellipsize="marquee"
android:singleLine="true"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 7cbe1f9..a8ddf2b 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -17,7 +17,7 @@
<resources>
<!-- Secondary text color in the Phone app -->
- <color name="dialtacts_primary_text_color">#111111</color>
+ <color name="dialtacts_primary_text_color">#000000</color>
<color name="dialtacts_secondary_text_color">#888888</color>
<color name="dialpad_text_color">#ffffff</color>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index f3b4098..89678fc 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -54,9 +54,9 @@
<item name="contact_browser_background">@android:color/transparent</item>
<item name="list_item_text_indent">@dimen/contact_browser_list_item_text_indent</item>
<!-- CallLog -->
- <item name="call_log_primary_text_color">#111111</item>
+ <item name="call_log_primary_text_color">#000000</item>
<item name="call_log_primary_background_color">#000000</item>
- <item name="call_log_secondary_text_color">#555555</item>
+ <item name="call_log_secondary_text_color">@color/dialtacts_secondary_text_color</item>
<item name="call_log_secondary_background_color">#333333</item>
<item name="call_log_header_color">#33b5e5</item>
<!-- VoicemailStatus -->
