diff options
| author | Andrew Lee <anwlee@google.com> | 2014-06-04 17:43:15 -0700 |
|---|---|---|
| committer | Andrew Lee <anwlee@google.com> | 2014-06-04 17:43:15 -0700 |
| commit | 7ae7a6f81a6f9225d58cf97ce333070257177397 (patch) | |
| tree | 9303d59e3b274f62d913084a32882045a731f25d /res | |
| parent | 699cb35df66ceb769ae2149ca9681498802a08bf (diff) | |
| parent | bdfc5554dd3a1b964e8cac6df1a7a4d5ebd3bfd7 (diff) | |
resolved conflicts for merge of bdfc5554 to master
Change-Id: I0344feb0f87bc5da9f86971a3557f0eea3a360d2
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/colors.xml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml index f6cae5668..a034c906b 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -88,7 +88,10 @@ <!-- Color for answered or outgoing call icons. --> <color name="answered_call">#2aad6f</color> - <color name="dialer_dialpad_touch_tint">#1a1dc7db</color> + <!-- Color for icons in the actionbar --> + <color name="actionbar_icon_color">#ffffff</color> + + <color name="dialer_dialpad_touch_tint">#331dc7db</color> <color name="tab_ripple_color">@color/dialer_accent_color</color> <color name="tab_selected_underline_color">@color/dialer_accent_color</color> |