summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorJin Cao <jinyan@google.com>2014-07-29 16:23:03 -0700
committerJin Cao <jinyan@google.com>2014-07-29 16:23:03 -0700
commit58d541de27090b4bd55746368b3b3b1486a7c094 (patch)
tree557141a6770ff78f34539fb65fff2e80fc5bc8e9 /res/values
parent4ddcdaed9ef5ea83910a0513e87538130270e2e4 (diff)
downloadandroid_frameworks_opt_chips-58d541de27090b4bd55746368b3b3b1486a7c094.tar.gz
android_frameworks_opt_chips-58d541de27090b4bd55746368b3b3b1486a7c094.tar.bz2
android_frameworks_opt_chips-58d541de27090b4bd55746368b3b3b1486a7c094.zip
[Quantum chips] restyle recipient chips to quantum
Restyle recipient chips to quantum redlines, also remove padding style from non-autocomplete dropdowns. b/15934812 Change-Id: I28eef0f4b9d622f81782d12f279e78af10c14458
Diffstat (limited to 'res/values')
-rw-r--r--res/values/dimen.xml11
-rw-r--r--res/values/styles.xml2
2 files changed, 10 insertions, 3 deletions
diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index 645b3fc..636fd26 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -15,11 +15,18 @@
-->
<resources>
- <dimen name="chip_padding">3dip</dimen>
- <dimen name="chip_height">36dip</dimen>
+ <!-- override default padding values, -1dp if it's not set to override -->
+ <dimen name="chip_padding_start">-1dp</dimen>
+ <dimen name="chip_padding_end">12dp</dimen>
+
+ <!-- chip -->
+ <dimen name="chip_padding">8dp</dimen>
+ <dimen name="chip_height">32dp</dimen>
<dimen name="chip_text_size">14sp</dimen>
<dimen name="line_spacing_extra">4dip</dimen>
<integer name="chips_max_lines">-1</integer>
+
+ <!-- dropdown -->
<dimen name="chip_icon_margin_end">16dp</dimen>
<dimen name="chip_wrapper_start_padding">16dp</dimen>
<dimen name="chip_wrapper_top_padding">16dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 9e7b0d2..a2b8585 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -32,7 +32,7 @@
<item name="android:popupBackground">@drawable/chips_popup_background</item>
</style>
- <style name="ChipWrapperStyle">
+ <style name="ChipAutocompleteWrapperStyle">
<item name="android:paddingLeft">@dimen/chip_wrapper_start_padding</item>
<item name="android:paddingTop">@dimen/chip_wrapper_top_padding</item>
<item name="android:paddingRight">@dimen/chip_wrapper_end_padding</item>