diff options
author | Chiao Cheng <chiaocheng@google.com> | 2013-11-14 01:46:30 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-14 01:46:31 +0000 |
commit | e07ad7c9cd914ff76dcb2a08d43b64551aeb4efb (patch) | |
tree | f2200870026c16e0b3f5c7e5f37cf53d82342649 /res | |
parent | 349f3e1b6c5642636fbe4480a47b568e47c92154 (diff) | |
parent | 037bbac99e3b5e3e3ec32b9ad9c33022c945b2a1 (diff) |
Merge "Make fonts and colors consistent across views." into klp-dev
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-hdpi/shadow_contact_photo.png | bin | 346 -> 960 bytes | |||
-rw-r--r-- | res/drawable-mdpi/shadow_contact_photo.png | bin | 339 -> 948 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/shadow_contact_photo.png | bin | 353 -> 965 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/shadow_contact_photo.png | bin | 1029 -> 970 bytes | |||
-rw-r--r-- | res/layout/call_log_list_item.xml | 7 | ||||
-rw-r--r-- | res/layout/phone_favorite_regular_row_view.xml | 3 | ||||
-rw-r--r-- | res/layout/phone_favorite_tile_view.xml | 6 | ||||
-rw-r--r-- | res/values/colors.xml | 2 | ||||
-rw-r--r-- | res/values/styles.xml | 4 |
9 files changed, 11 insertions, 11 deletions
diff --git a/res/drawable-hdpi/shadow_contact_photo.png b/res/drawable-hdpi/shadow_contact_photo.png Binary files differindex 49cbb97dc..44b06f261 100644 --- a/res/drawable-hdpi/shadow_contact_photo.png +++ b/res/drawable-hdpi/shadow_contact_photo.png diff --git a/res/drawable-mdpi/shadow_contact_photo.png b/res/drawable-mdpi/shadow_contact_photo.png Binary files differindex 4734bbd21..8665d8303 100644 --- a/res/drawable-mdpi/shadow_contact_photo.png +++ b/res/drawable-mdpi/shadow_contact_photo.png diff --git a/res/drawable-xhdpi/shadow_contact_photo.png b/res/drawable-xhdpi/shadow_contact_photo.png Binary files differindex 1077ec1c8..8359a50e9 100644 --- a/res/drawable-xhdpi/shadow_contact_photo.png +++ b/res/drawable-xhdpi/shadow_contact_photo.png diff --git a/res/drawable-xxhdpi/shadow_contact_photo.png b/res/drawable-xxhdpi/shadow_contact_photo.png Binary files differindex 1c60c8df0..bfeb0ff53 100644 --- a/res/drawable-xxhdpi/shadow_contact_photo.png +++ b/res/drawable-xxhdpi/shadow_contact_photo.png diff --git a/res/layout/call_log_list_item.xml b/res/layout/call_log_list_item.xml index 1bd448c5a..5edd06b07 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 a90117f10..012c9be2f 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 fce25eafe..8806d3985 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 7cbe1f9d4..a8ddf2be7 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 f3b4098e7..89678fc48 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 --> |