diff options
author | Eric Erfanian <erfanian@google.com> | 2017-08-31 06:57:16 -0700 |
---|---|---|
committer | Roland Levillain <rpl@google.com> | 2017-09-04 18:05:19 +0100 |
commit | fc0eb8ccebcc7846db5e8b5c5430070055679bfa (patch) | |
tree | a8a23c3202e4161ffd57a71095a404db1bcf5735 /java/com/android/dialer/app/res/values/colors.xml | |
parent | ea7b4dc89590ffa3332766a531e0eab6ffb9aebd (diff) |
Update Dialer source to latest internal Google revision.
Previously, Android's Dialer app was developed in an internal Google
source control system and only exported to public during AOSP drops.
The Dialer team is now switching to a public development model similar
to the telephony team.
This CL represents all internal Google changes that were committed to
Dialer between the public O release and today's tip of tree on internal
master. This CL squashes those changes into a single commit.
In subsequent changes, changes will be exported on a per-commit basis.
(cherry picked from commit 2ca4318cc1ee57dda907ba2069bd61d162b1baef
and amended to match paths of dependencies under
prebuilts/maven_repo/bumptech/com/github/bumptech/glide/.)
This CL was generated using these commands from a repository at
stage-stage-master at revision ea7b4dc89590ffa3332766a531e0eab6ffb9aebd
("Merge "Update Dialer source to latest internal Google revision." am: c39ea3c55f -s ours"):
git diff --binary 2ca4318cc1ee57dda907ba2069bd61d162b1baef | git apply -R --index
git commit -c 2ca4318cc1ee57dda907ba2069bd61d162b1baef
Test: make, flash install, run
Change-Id: I529aaeb88535b9533c0ae4ef4e6c1222d4e0f1c8
PiperOrigin-RevId: 167068436
Diffstat (limited to 'java/com/android/dialer/app/res/values/colors.xml')
-rw-r--r-- | java/com/android/dialer/app/res/values/colors.xml | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/java/com/android/dialer/app/res/values/colors.xml b/java/com/android/dialer/app/res/values/colors.xml index 2f6d87b49..f1f5002ed 100644 --- a/java/com/android/dialer/app/res/values/colors.xml +++ b/java/com/android/dialer/app/res/values/colors.xml @@ -15,9 +15,6 @@ --> <resources> - <color name="dialer_red_highlight_color">#ff1744</color> - - <color name="dialer_button_text_color">#fff</color> <color name="dialer_flat_button_text_color">@color/dialer_theme_color</color> <!-- Color for the setting text. --> @@ -26,7 +23,6 @@ <color name="setting_secondary_color">@color/dialer_secondary_text_color</color> <color name="setting_disabled_color">#aaaaaa</color> <color name="setting_background_color">#ffffff</color> - <color name="setting_button_color">#eee</color> <!-- 54% black --> <color name="call_log_icon_tint">#8a000000</color> @@ -36,6 +32,8 @@ <color name="call_log_detail_color">#8a000000</color> <!-- 87% black --> <color name="call_log_voicemail_transcript_color">#de000000</color> + <!-- 54% black --> + <color name="call_log_voicemail_transcript_branding_color">#8a000000</color> <!-- 70% black --> <color name="call_log_action_color">#b3000000</color> <!-- 54% black --> @@ -54,35 +52,19 @@ <!-- Background color for search results and call details --> <color name="background_dialer_results">#f9f9f9</color> - <color name="background_dialer_call_log">@color/background_dialer_light</color> - - <!-- Color of the 1dp divider that separates favorites --> - <color name="favorite_contacts_separator_color">#d0d0d0</color> <!-- Color of the contact name in favorite tiles --> <color name="contact_tile_name_color">#ffffff</color> <color name="contact_list_name_text_color">@color/dialer_primary_text_color</color> - <!-- Undo dialogue color --> - <color name="undo_dialogue_text_color">#4d4d4d</color> - <color name="remove_text_color">#ffffff</color> <!-- Text color for the "Remove" text when a contact is dragged on top of the remove view --> <color name="remove_highlighted_text_color">#FF3F3B</color> - <!-- Color of the bottom border below the contacts grid on the main dialer screen. --> - <color name="contacts_grid_bottom_border_color">#16000000</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">@color/dialer_theme_color</color> - <color name="dialer_dialpad_touch_tint">@color/dialer_theme_color_20pct</color> - <color name="floating_action_button_touch_tint">#80ffffff</color> - <color name="call_log_action_divider">#eeeeee</color> <color name="divider_line_color">#D8D8D8</color> @@ -93,11 +75,7 @@ <color name="blocked_number_background">#FFFFFF</color> <color name="blocked_number_block_color">#F44336</color> <color name="blocked_number_header_color">@color/dialer_theme_color</color> - <color name="blocked_number_disabled_emergency_header_color">#616161</color> <color name="blocked_number_disabled_emergency_background_color">#E0E0E0</color> <color name="add_blocked_number_icon_color">#bdbdbd</color> - <!-- Grey 700 --> - <color name="call_detail_footer_text_color">#616161</color> - <color name="call_detail_footer_icon_tint">@color/call_detail_footer_text_color</color> </resources> |