diff options
| author | Andrew Lee <anwlee@google.com> | 2015-10-06 20:03:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-06 20:03:29 +0000 |
| commit | cc2921b812917b119bf09a710c2fca04758cbad3 (patch) | |
| tree | c0c7d84e378005254c30ceb2fe9506214974cd6d /res | |
| parent | b76adafb815ac54810081c370b3b16fc6a83afec (diff) | |
| parent | dfbc86655b2bcf9b179afd94f89465d6541ace0b (diff) | |
am dfbc8665: Merge "Show blocked icon in call log." into ub-contactsdialer-a-dev
* commit 'dfbc86655b2bcf9b179afd94f89465d6541ace0b':
Show blocked icon in call log.
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/colors.xml | 3 | ||||
| -rw-r--r-- | res/values/dimens.xml | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml index e80ee6913..f0765bab9 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -92,9 +92,10 @@ <!-- Color for missed call icons. --> <color name="missed_call">#ff2e58</color> - <!-- Color for answered or outgoing call icons. --> <color name="answered_call">@color/dialer_green_highlight_color</color> + <!-- Color for blocked call icons. --> + <color name="blocked_call">@color/dialtacts_secondary_text_color</color> <!-- Color for icons in the actionbar --> <color name="actionbar_icon_color">#ffffff</color> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index d35a78d12..fa0b917f6 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -154,4 +154,6 @@ <dimen name="blocked_number_secondary_text_size">12sp</dimen> <dimen name="blocked_number_delete_icon_size">32dp</dimen> <dimen name="blocked_number_search_text_size">14sp</dimen> + + <dimen name="call_type_icon_size">12dp</dimen> </resources> |