diff options
| author | Maurice Lam <yukl@google.com> | 2015-06-05 01:03:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-05 01:03:55 +0000 |
| commit | 5e9c2cf9ad95ba57d587f0404bab4b2cfdb728b7 (patch) | |
| tree | 396d6e599301a73fc938975c15f272dffe268579 | |
| parent | fa7b14ac2034f3c88c1b6d7ac5f05d669d7b80e8 (diff) | |
| parent | 9a3337d4b0ab077ea247fcb70a252a8c26489a72 (diff) | |
| download | setupwizard-5e9c2cf9ad95ba57d587f0404bab4b2cfdb728b7.tar.gz | |
Merge "[SetupWizardLib] Add radio button style" into ub-setupwizard-alatar
| -rw-r--r-- | library/eclair-mr1/res/values/styles.xml | 8 | ||||
| -rw-r--r-- | library/main/res/values-v21/styles.xml | 6 | ||||
| -rw-r--r-- | library/main/res/values/dimens.xml | 7 | ||||
| -rw-r--r-- | library/main/res/values/styles.xml | 20 |
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 868fe99..8181a68 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"> |