summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaurice Lam <yukl@google.com>2015-06-04 17:12:36 -0700
committerMaurice Lam <yukl@google.com>2015-06-04 17:12:36 -0700
commit9a3337d4b0ab077ea247fcb70a252a8c26489a72 (patch)
tree526685e938912e8f62213d798db282337b5d24f1
parent84a854ebb14fde852e21676f294feff9abdb54ac (diff)
downloadsetupwizard-9a3337d4b0ab077ea247fcb70a252a8c26489a72.tar.gz
[SetupWizardLib] Add radio button style
Add radio button style according to UX guidelines. Bug: 21561511 Change-Id: I71f31968a69a7da55841e466cd557b8b0eaea5d7
-rw-r--r--library/eclair-mr1/res/values/styles.xml8
-rw-r--r--library/main/res/values-v21/styles.xml6
-rw-r--r--library/main/res/values/dimens.xml7
-rw-r--r--library/main/res/values/styles.xml20
4 files changed, 29 insertions, 12 deletions
diff --git a/library/eclair-mr1/res/values/styles.xml b/library/eclair-mr1/res/values/styles.xml
index 282d7cb..c9d6ed5 100644
--- a/library/eclair-mr1/res/values/styles.xml
+++ b/library/eclair-mr1/res/values/styles.xml
@@ -49,13 +49,7 @@
<!-- Content styles -->
- <style name="SuwDescription">
- <!-- Before Honeycomb, layout_gravity is needed for FrameLayout to apply the margins -->
- <item name="android:layout_gravity">top</item>
- <item name="android:layout_marginBottom">@dimen/suw_description_margin_bottom</item>
- <item name="android:layout_marginTop">@dimen/suw_description_margin_top</item>
- <item name="android:lineSpacingExtra">@dimen/suw_description_line_spacing_extra</item>
- <item name="android:textAppearance">@style/TextAppearance.AppCompat.Medium</item>
+ <style name="TextAppearance.SuwDescription" parent="TextAppearance.AppCompat.Medium">
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textSize">@dimen/suw_description_text_size</item>
</style>
diff --git a/library/main/res/values-v21/styles.xml b/library/main/res/values-v21/styles.xml
index 027fff0..5fe679e 100644
--- a/library/main/res/values-v21/styles.xml
+++ b/library/main/res/values-v21/styles.xml
@@ -19,11 +19,7 @@
<!-- Content styles -->
- <style name="SuwDescription">
- <item name="android:layout_marginBottom">@dimen/suw_description_margin_bottom</item>
- <item name="android:layout_marginTop">@dimen/suw_description_margin_top</item>
- <item name="android:lineSpacingExtra">@dimen/suw_description_line_spacing_extra</item>
- <item name="android:textAppearance">@android:style/TextAppearance.Material.Medium</item>
+ <style name="TextAppearance.SuwDescription" parent="android:TextAppearance.Material.Medium">
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textSize">@dimen/suw_description_text_size</item>
</style>
diff --git a/library/main/res/values/dimens.xml b/library/main/res/values/dimens.xml
index fd5aac0..38f89e2 100644
--- a/library/main/res/values/dimens.xml
+++ b/library/main/res/values/dimens.xml
@@ -29,6 +29,13 @@
<dimen name="suw_description_line_spacing_extra">4sp</dimen>
<dimen name="suw_description_text_size">16sp</dimen>
+ <!-- Margin on the start to offset for margin in the drawable -->
+ <dimen name="suw_radio_button_margin_start">-6dp</dimen>
+ <dimen name="suw_radio_button_margin_top">0dp</dimen>
+ <dimen name="suw_radio_button_margin_bottom">12dp</dimen>
+ <dimen name="suw_radio_button_padding_start">18dp</dimen>
+ <dimen name="suw_radio_button_line_spacing_extra">5sp</dimen>
+
<!-- Card layout (for tablets) -->
<dimen name="suw_card_corner_radius">2dp</dimen>
<dimen name="suw_card_elevation">5dp</dimen>
diff --git a/library/main/res/values/styles.xml b/library/main/res/values/styles.xml
index f4e2798..9826738 100644
--- a/library/main/res/values/styles.xml
+++ b/library/main/res/values/styles.xml
@@ -35,6 +35,26 @@
<item name="android:paddingBottom">@dimen/suw_content_frame_padding_bottom</item>
</style>
+ <style name="SuwDescription">
+ <!-- Before Honeycomb, layout_gravity is needed for FrameLayout to apply the margins -->
+ <item name="android:layout_gravity">top</item>
+ <item name="android:layout_marginBottom">@dimen/suw_description_margin_bottom</item>
+ <item name="android:layout_marginTop">@dimen/suw_description_margin_top</item>
+ <item name="android:lineSpacingExtra">@dimen/suw_description_line_spacing_extra</item>
+ <item name="android:textAppearance">@style/TextAppearance.SuwDescription</item>
+ </style>
+
+ <style name="SuwRadioButton">
+ <item name="android:layout_marginBottom">@dimen/suw_radio_button_margin_bottom</item>
+ <item name="android:layout_marginLeft">@dimen/suw_radio_button_margin_start</item>
+ <item name="android:layout_marginStart" tools:ignore="NewApi">@dimen/suw_radio_button_margin_start</item>
+ <item name="android:layout_marginTop">@dimen/suw_radio_button_margin_top</item>
+ <item name="android:lineSpacingExtra">@dimen/suw_radio_button_line_spacing_extra</item>
+ <item name="android:paddingLeft" tools:ignore="NewApi">@dimen/suw_radio_button_padding_start</item>
+ <item name="android:paddingStart" tools:ignore="NewApi">@dimen/suw_radio_button_padding_start</item>
+ <item name="android:textAppearance">@style/TextAppearance.SuwDescription</item>
+ </style>
+
<!-- Card layout (for tablets) -->
<style name="SuwBaseCardTitle">