diff options
author | Nancy Chen <nancychen@google.com> | 2014-07-24 21:57:16 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-24 15:36:21 +0000 |
commit | 6d543c375961d44d2d0af2b94840ac40717e222e (patch) | |
tree | 9fa1e4a222323225d8d4a490420e18f89c44dc06 | |
parent | c7b950714189bdf4d1adcf9562c5599de5ca4250 (diff) | |
parent | f35d7164f178d542017f032195de6b8505b657d4 (diff) |
Merge "Color changes in dialer for theme color (light blue) and text" into lmp-dev
-rw-r--r-- | res/drawable-hdpi/fab_teal_background.png | bin | 2233 -> 2805 bytes | |||
-rw-r--r-- | res/drawable-mdpi/fab_teal_background.png | bin | 1508 -> 1841 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/fab_teal_background.png | bin | 3304 -> 4085 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/fab_teal_background.png | bin | 5232 -> 7009 bytes | |||
-rw-r--r-- | res/values/colors.xml | 13 | ||||
-rw-r--r-- | res/values/styles.xml | 10 |
6 files changed, 14 insertions, 9 deletions
diff --git a/res/drawable-hdpi/fab_teal_background.png b/res/drawable-hdpi/fab_teal_background.png Binary files differindex e2f01e87a..b36439e53 100644 --- a/res/drawable-hdpi/fab_teal_background.png +++ b/res/drawable-hdpi/fab_teal_background.png diff --git a/res/drawable-mdpi/fab_teal_background.png b/res/drawable-mdpi/fab_teal_background.png Binary files differindex c95d1240e..55f9bb5cc 100644 --- a/res/drawable-mdpi/fab_teal_background.png +++ b/res/drawable-mdpi/fab_teal_background.png diff --git a/res/drawable-xhdpi/fab_teal_background.png b/res/drawable-xhdpi/fab_teal_background.png Binary files differindex f94f75935..d6379c215 100644 --- a/res/drawable-xhdpi/fab_teal_background.png +++ b/res/drawable-xhdpi/fab_teal_background.png diff --git a/res/drawable-xxhdpi/fab_teal_background.png b/res/drawable-xxhdpi/fab_teal_background.png Binary files differindex cc0ba27b6..76d68ac6a 100644 --- a/res/drawable-xxhdpi/fab_teal_background.png +++ b/res/drawable-xxhdpi/fab_teal_background.png diff --git a/res/values/colors.xml b/res/values/colors.xml index 44346bc8e..bc8ff734e 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -16,9 +16,9 @@ <resources> <!-- Primary text color in the Dialer --> - <color name="dialtacts_primary_text_color">#000000</color> + <color name="dialtacts_primary_text_color">#333</color> <!-- Secondary text color in the Dialer --> - <color name="dialtacts_secondary_text_color">#888888</color> + <color name="dialtacts_secondary_text_color">#737373</color> <color name="dialer_accent_color">#eeff41</color> <!-- Color for the setting text. --> @@ -48,6 +48,11 @@ <!-- Standard color for selected items. --> <color name="item_selected">#660099cc</color> + + <!-- Primary background color for dialer --> + <color name="background_dialer_primary">#fafafa</color> + <!-- Secondary background color for dialer --> + <color name="background_dialer_secondary">#f9f9f9</color> <!-- White background for dialer --> <color name="background_dialer_white">#ffffff</color> <!-- Background color of new dialer activity --> @@ -81,10 +86,10 @@ <color name="call_log_expanded_background_color">#ffffff</color> <!-- Color of actions in expanded call log entries. This text color represents actions such as call back, play voicemail, etc. --> - <color name="call_log_action_text">#1dc7db</color> + <color name="call_log_action_text">@color/dialer_theme_color</color> <!-- Color of view full call history item text. --> - <color name="view_full_call_history_color">#1dc7db</color> + <color name="view_full_call_history_color">@color/dialer_theme_color</color> <!-- Color for missed call icons. --> <color name="missed_call">#ff2e58</color> diff --git a/res/values/styles.xml b/res/values/styles.xml index c65b9e9bb..4a87201e6 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -45,7 +45,7 @@ <item name="list_item_prefix_highlight_color">@color/people_app_theme_color</item> <item name="list_item_background_color">@color/background_dialer_light</item> <item name="list_item_header_text_indent">8dip</item> - <item name="list_item_header_text_color">@color/people_app_theme_color</item> + <item name="list_item_header_text_color">@color/dialtacts_secondary_text_color</item> <item name="list_item_header_text_size">14sp</item> <item name="list_item_header_height">30dip</item> <item name="list_item_data_width_weight">5</item> @@ -58,8 +58,8 @@ <item name="list_item_text_indent">@dimen/contact_browser_list_item_text_indent</item> <item name="list_item_text_offset_top">-2dp</item> <!-- CallLog --> - <item name="call_log_primary_text_color">@color/contact_list_name_text_color</item> - <item name="call_log_primary_background_color">#000000</item> + <item name="call_log_primary_text_color">@color/dialtacts_primary_text_color</item> + <item name="call_log_primary_background_color">@color/background_dialer_secondary</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> @@ -70,8 +70,8 @@ <item name="call_log_voicemail_status_action_text_color">#33b5e5</item> <!-- Favorites --> <item name="favorites_padding_bottom">?android:attr/actionBarSize</item> - <item name="android:colorPrimary">@color/actionbar_background_color</item> - <item name="android:colorPrimaryDark">@color/actionbar_background_color_dark</item> + <item name="android:colorPrimary">@color/dialer_theme_color</item> + <item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item> <item name="dialpad_key_button_touch_tint">@color/dialer_dialpad_touch_tint</item> </style> |