summaryrefslogtreecommitdiffstats
path: root/res/values-v17
diff options
context:
space:
mode:
authorJin Cao <jinyan@google.com>2014-07-28 19:03:56 -0700
committerJin Cao <jinyan@google.com>2014-07-29 09:42:04 -0700
commit4ddcdaed9ef5ea83910a0513e87538130270e2e4 (patch)
tree36c74c7fee9f8d049a27f397be2d14bef6945cca /res/values-v17
parente096b4534f8f7bd30513aed0e8fb9dc045842baf (diff)
downloadandroid_frameworks_opt_chips-4ddcdaed9ef5ea83910a0513e87538130270e2e4.tar.gz
android_frameworks_opt_chips-4ddcdaed9ef5ea83910a0513e87538130270e2e4.tar.bz2
android_frameworks_opt_chips-4ddcdaed9ef5ea83910a0513e87538130270e2e4.zip
[Quantum] chips autocomplete to quantum style
Separate layout for chips that have icons on the lefthand side and icons on the righthand side. b/15934812 Change-Id: I7b58197e46ad48bb838ee5e0c34bb06b0b74dfba
Diffstat (limited to 'res/values-v17')
-rw-r--r--res/values-v17/styles.xml26
1 files changed, 23 insertions, 3 deletions
diff --git a/res/values-v17/styles.xml b/res/values-v17/styles.xml
index 03f6ae3..0842ba7 100644
--- a/res/values-v17/styles.xml
+++ b/res/values-v17/styles.xml
@@ -14,16 +14,36 @@
limitations under the License.
-->
<resources>
- <style name="ChipTitleStyle">
+ <style name="ChipWrapperStyle">
+ <item name="android:paddingStart">@dimen/chip_wrapper_start_padding</item>
+ <item name="android:paddingTop">@dimen/chip_wrapper_top_padding</item>
+ <item name="android:paddingEnd">@dimen/chip_wrapper_end_padding</item>
+ <item name="android:paddingBottom">@dimen/chip_wrapper_bottom_padding</item>
+ </style>
+
+ <style name="ChipTitleStartIconStyle" parent="@style/ChipTitleBaseStyle">
<item name="android:layout_toEndOf">@android:id/icon</item>
</style>
- <style name="ChipSubtitleStyle">
+ <style name="ChipTitleEndIconStyle" parent="@style/ChipTitleBaseStyle">
+ <item name="android:layout_toStartOf">@android:id/icon</item>
+ </style>
+
+ <style name="ChipSubtitleStartIconStyle" parent="@style/ChipSubtitleBaseStyle">
<item name="android:layout_toEndOf">@android:id/icon</item>
</style>
- <style name="ChipIconStyle">
+ <style name="ChipSubtitleEndIconStyle" parent="@style/ChipSubtitleBaseStyle">
+ <item name="android:layout_toStartOf">@android:id/icon</item>
+ </style>
+
+ <style name="ChipStartIconStyle" parent="@style/ChipIconBaseStyle">
<item name="android:layout_marginEnd">@dimen/chip_icon_margin_end</item>
<item name="android:layout_alignParentStart">true</item>
</style>
+
+ <style name="ChipEndIconStyle" parent="@style/ChipIconBaseStyle">
+ <item name="android:layout_marginStart">@dimen/chip_icon_margin_end</item>
+ <item name="android:layout_alignParentEnd">true</item>
+ </style>
</resources>