summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorJames Lemieux <jplemieux@google.com>2014-08-18 18:05:04 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-16 03:56:00 +0000
commit47da4ce65aebb78dde6c3ce273e95b547360bec2 (patch)
treeff0897160ff894a7d7ec0763ed7dca7d46f9c5ee /res/values
parent1b7a74b590c952132883f5176f20d82d92f2e3f7 (diff)
parentcace3194e9b7b0e2b6554bda2fa8b2f98da04175 (diff)
downloadandroid_packages_apps_UnifiedEmail-47da4ce65aebb78dde6c3ce273e95b547360bec2.tar.gz
android_packages_apps_UnifiedEmail-47da4ce65aebb78dde6c3ce273e95b547360bec2.tar.bz2
android_packages_apps_UnifiedEmail-47da4ce65aebb78dde6c3ce273e95b547360bec2.zip
Merge "Implement inset dividers in Thread List" into ub-gmail-ur14-dev
Diffstat (limited to 'res/values')
-rw-r--r--res/values/colors.xml3
-rw-r--r--res/values/dimen.xml1
-rw-r--r--res/values/styles.xml3
3 files changed, 5 insertions, 2 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml
index fed191201..8b67dfbe3 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -174,4 +174,7 @@
<color name="snack_bar_background_color">#323232</color>
<color name="snack_bar_action_text_color">#f4b400</color>
+
+ <color name="conversation_item_blue_background">#e5f8fb</color>
+ <color name="conversation_list_divider_color">#b2b2b2</color>
</resources>
diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index b6aefa1ce..d242daa00 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -170,6 +170,7 @@
<dimen name="conv_list_wide_personal_indicator_padding_end">8dip</dimen>
<dimen name="conv_list_wide_star_padding_start">32dip</dimen>
<dimen name="conv_list_wide_color_block_padding_end">64dip</dimen>
+ <dimen name="conv_list_divider_inset">72dp</dimen>
<dimen name="conv_list_spacious_padding_start">22dip</dimen>
<dimen name="conv_list_spacious_padding_end">16dip</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index dd0830a25..db1574f62 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -221,8 +221,7 @@
<!-- Browse list item styles -->
<style name="ConversationListFadeBase" parent="android:Widget.Holo.Light.ListView" />
<style name="ConversationListFade" parent="@style/ConversationListFadeBase">
- <item name="android:divider">@android:color/transparent</item>
- <item name="android:dividerHeight">0dip</item>
+ <item name="android:divider">@null</item>
</style>
<!-- End browse list item styles -->