summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNancy Chen <nancychen@google.com>2014-07-29 15:28:48 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-28 22:45:16 +0000
commit9582d0e4bb58fdcb04260bb75f0d474b0c1b62a6 (patch)
tree13a3effa08ff25a4dfd689501331874999798500
parent01aef89650cea6e1929ee7172b80134a183d30d7 (diff)
parent1844ca0b12e31ade1c4bae9f2d566e8f98fc49df (diff)
Merge "Update Dialer activity background colors" into lmp-dev
-rw-r--r--res/values/colors.xml5
-rw-r--r--res/values/styles.xml2
2 files changed, 2 insertions, 5 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml
index bc8ff734e..ae54d0b90 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -48,15 +48,12 @@
<!-- 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 -->
- <color name="background_dialer_light">#f6f6f6</color>
+ <color name="background_dialer_light">#fafafa</color>
<!-- Background color of dialer list items (contacts, call log entries) -->
<color name="background_dialer_list_items">@color/background_dialer_light</color>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 9601a4b9e..dcd23d15f 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -59,7 +59,7 @@
<item name="list_item_text_offset_top">-2dp</item>
<!-- CallLog -->
<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_primary_background_color">#000000</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>