diff options
| author | Maurice Lam <yukl@google.com> | 2015-06-05 19:13:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-05 19:13:58 +0000 |
| commit | 1a9708016810992f8ca3394189939f372c47816c (patch) | |
| tree | 56436b27690d29ee996d0170c54c07cc495a6578 | |
| parent | 5e9c2cf9ad95ba57d587f0404bab4b2cfdb728b7 (diff) | |
| parent | 69ebd3159bcd408d4787a0fc3dff073da5b2c34a (diff) | |
| download | setupwizard-1a9708016810992f8ca3394189939f372c47816c.tar.gz | |
Merge "[SetupWizardLib] Check box styles" into ub-setupwizard-alatar
| -rw-r--r-- | library/main/res/values/dimens.xml | 7 | ||||
| -rw-r--r-- | library/main/res/values/styles.xml | 20 |
2 files changed, 27 insertions, 0 deletions
diff --git a/library/main/res/values/dimens.xml b/library/main/res/values/dimens.xml index 38f89e2..483f1d1 100644 --- a/library/main/res/values/dimens.xml +++ b/library/main/res/values/dimens.xml @@ -21,6 +21,13 @@ <dimen name="suw_layout_margin_sides">40dp</dimen> <!-- Content styles --> + <dimen name="suw_check_box_line_spacing_extra">4sp</dimen> + <dimen name="suw_check_box_margin_bottom">12dp</dimen> + <dimen name="suw_check_box_margin_start">1dp</dimen> + <dimen name="suw_check_box_margin_top">24dp</dimen> + <dimen name="suw_check_box_padding_start">15dp</dimen> + <dimen name="suw_check_box_text_size">16sp</dimen> + <dimen name="suw_content_frame_padding_top">0dp</dimen> <dimen name="suw_content_frame_padding_bottom">16dp</dimen> diff --git a/library/main/res/values/styles.xml b/library/main/res/values/styles.xml index 8181a68..e53ede2 100644 --- a/library/main/res/values/styles.xml +++ b/library/main/res/values/styles.xml @@ -44,6 +44,10 @@ <item name="android:textAppearance">@style/TextAppearance.SuwDescription</item> </style> + <style name="TextAppearance.SuwDescription.Light" parent="TextAppearance.SuwDescription"> + <item name="android:fontFamily">sans-serif-light</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> @@ -55,6 +59,22 @@ <item name="android:textAppearance">@style/TextAppearance.SuwDescription</item> </style> + <style name="SuwCheckBox"> + <item name="android:layout_marginBottom">@dimen/suw_check_box_margin_bottom</item> + <item name="android:layout_marginLeft">@dimen/suw_check_box_margin_start</item> + <item name="android:layout_marginStart" tools:ignore="NewApi">@dimen/suw_check_box_margin_start</item> + <item name="android:layout_marginTop">@dimen/suw_check_box_margin_top</item> + <item name="android:lineSpacingExtra">@dimen/suw_check_box_line_spacing_extra</item> + <item name="android:paddingLeft">@dimen/suw_check_box_padding_start</item> + <item name="android:paddingStart" tools:ignore="NewApi">@dimen/suw_check_box_padding_start</item> + <item name="android:textAppearance">@style/TextAppearance.SuwDescription.Light</item> + <item name="android:textSize">@dimen/suw_check_box_text_size</item> + </style> + + <style name="SuwCheckBox.Multiline" parent="SuwCheckBox"> + <item name="android:gravity">top</item> + </style> + <!-- Card layout (for tablets) --> <style name="SuwBaseCardTitle"> |