summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorNancy Chen <nancychen@google.com>2014-07-29 11:39:28 -0700
committerNancy Chen <nancychen@google.com>2014-07-29 12:02:35 -0700
commitc824550da0ff0dadf195b76634b206ec43a2d24a (patch)
tree58a3877df4672dee37725c602595692b7c4a68f8 /res
parenta96c244d7a4ee2e23302846d337324c3a6d91c46 (diff)
Continue to make UI color changes in Dialer.
Specifically to update text and background color in call details and colors in dialpad. Bug: 16356911 Change-Id: I048ca9d71a7befb25aa9f68bace5b6cd7f76e47a
Diffstat (limited to 'res')
-rw-r--r--res/layout/call_detail.xml5
-rw-r--r--res/layout/call_detail_history_item.xml3
-rw-r--r--res/values/colors.xml7
-rw-r--r--res/values/styles.xml4
4 files changed, 8 insertions, 11 deletions
diff --git a/res/layout/call_detail.xml b/res/layout/call_detail.xml
index 45431a215..2e38e2d99 100644
--- a/res/layout/call_detail.xml
+++ b/res/layout/call_detail.xml
@@ -24,7 +24,7 @@
android:orientation="vertical"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
- android:background="@color/background_dialer_list_items" >
+ android:background="@color/background_dialer_details_list_items" >
<!-- Caller information "card" -->
<LinearLayout
android:id="@+id/caller_information"
@@ -104,8 +104,7 @@
android:paddingStart="@dimen/call_detail_horizontal_margin"
android:paddingEnd="@dimen/call_detail_horizontal_margin"
android:paddingTop="@dimen/transcription_top_margin"
- android:paddingBottom="@dimen/transcription_bottom_margin"
- android:background="@color/background_dialer_list_items" />
+ android:paddingBottom="@dimen/transcription_bottom_margin" />
<LinearLayout
android:id="@+id/voicemail_container"
android:layout_width="match_parent"
diff --git a/res/layout/call_detail_history_item.xml b/res/layout/call_detail_history_item.xml
index 0e5dcf2f4..cbe844234 100644
--- a/res/layout/call_detail_history_item.xml
+++ b/res/layout/call_detail_history_item.xml
@@ -22,8 +22,7 @@
android:paddingBottom="@dimen/call_log_inner_margin"
android:paddingStart="@dimen/call_detail_horizontal_margin"
android:paddingEnd="@dimen/call_log_outer_margin"
- android:orientation="vertical"
- android:background="@color/background_dialer_list_items" >
+ android:orientation="vertical" >
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index ae54d0b90..c3b99b9bb 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -48,14 +48,15 @@
<!-- Standard color for selected items. -->
<color name="item_selected">#660099cc</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">#fafafa</color>
+ <!-- Background color for search results and call details -->
+ <color name="background_dialer_results">#f9f9f9</color>
<!-- Background color of dialer list items (contacts, call log entries) -->
<color name="background_dialer_list_items">@color/background_dialer_light</color>
+ <color name="background_dialer_details_list_items">@color/background_dialer_results</color>
<!-- Color of the 1dp divider that separates favorites -->
<color name="favorite_contacts_separator_color">#d0d0d0</color>
@@ -65,7 +66,7 @@
<!-- Color of the contact name in favorite tiles -->
<color name="contact_tile_name_color">#ffffff</color>
- <color name="contact_list_name_text_color">#4d4d4d</color>
+ <color name="contact_list_name_text_color">@color/dialtacts_primary_text_color</color>
<!-- Undo dialogue color -->
<color name="undo_dialogue_text_color">#4d4d4d</color>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index dcd23d15f..9f37d2883 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -102,11 +102,9 @@
</style>
<style name="CallDetailActivityTheme" parent="DialtactsThemeWithoutActionBarOverlay">
- <item name="android:windowBackground">@color/background_dialer_light</item>
+ <item name="android:windowBackground">@color/background_dialer_results</item>
<!-- CallLog -->
- <item name="call_log_primary_text_color">#404040</item>
<item name="call_log_primary_background_color">#FFFFFF</item>
- <item name="call_log_secondary_text_color">#8f8f8f</item>
<item name="call_log_secondary_background_color">#FFFFFF</item>
<item name="call_log_header_color">#FFFFFF</item>
<!-- VoicemailStatus -->