summaryrefslogtreecommitdiff
path: root/library/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'library/main/res')
-rw-r--r--library/main/res/layout/suw_items_description.xml2
-rw-r--r--library/main/res/values-sw600dp/dimens.xml2
-rw-r--r--library/main/res/values-v21/styles.xml6
-rw-r--r--library/main/res/values/attrs.xml7
-rw-r--r--library/main/res/values/colors.xml2
-rw-r--r--library/main/res/values/dimens.xml4
-rw-r--r--library/main/res/values/styles.xml27
7 files changed, 43 insertions, 7 deletions
diff --git a/library/main/res/layout/suw_items_description.xml b/library/main/res/layout/suw_items_description.xml
index 26a604b..e27d7b8 100644
--- a/library/main/res/layout/suw_items_description.xml
+++ b/library/main/res/layout/suw_items_description.xml
@@ -48,7 +48,7 @@
<com.android.setupwizardlib.view.RichTextView
android:id="@+id/suw_items_title"
- style="@style/SuwItemTitle.Description"
+ style="?attr/suwItemDescriptionTitleStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
diff --git a/library/main/res/values-sw600dp/dimens.xml b/library/main/res/values-sw600dp/dimens.xml
index 2b5f3be..d1734ab 100644
--- a/library/main/res/values-sw600dp/dimens.xml
+++ b/library/main/res/values-sw600dp/dimens.xml
@@ -32,6 +32,8 @@
<dimen name="suw_header_title_size">34sp</dimen>
<!-- Items -->
+ <dimen name="suw_items_icon_divider_inset">88dp</dimen>
+ <dimen name="suw_items_text_divider_inset">40dp</dimen>
<dimen name="suw_items_glif_icon_divider_inset">88dp</dimen>
<dimen name="suw_items_glif_text_divider_inset">40dp</dimen>
diff --git a/library/main/res/values-v21/styles.xml b/library/main/res/values-v21/styles.xml
index fddfdc7..ab6f887 100644
--- a/library/main/res/values-v21/styles.xml
+++ b/library/main/res/values-v21/styles.xml
@@ -36,6 +36,12 @@
<item name="android:background">?android:attr/colorPrimary</item>
</style>
+ <!-- Button styles -->
+
+ <style name="SuwGlifButton.Tertiary" parent="SuwGlifButton.BaseTertiary">
+ <item name="android:fontFamily">sans-serif-medium</item>
+ </style>
+
<!-- Items styles -->
<style name="SuwItemContainer">
diff --git a/library/main/res/values/attrs.xml b/library/main/res/values/attrs.xml
index 14799df..0339469 100644
--- a/library/main/res/values/attrs.xml
+++ b/library/main/res/values/attrs.xml
@@ -72,8 +72,13 @@
<!-- Custom view attributes -->
<attr name="suwColorPrimary" format="color" />
<attr name="suwHeader" format="reference" />
+ <!-- Deprecated. Use suwDividerInsetStart and suwDividerInsetEnd instead -->
<attr name="suwDividerInset" format="dimension|reference" />
+ <attr name="suwDividerInsetEnd" format="dimension|reference" />
+ <attr name="suwDividerInsetStart" format="dimension|reference" />
+ <attr name="suwDividerInsetStartNoIcon" format="dimension|reference" />
<attr name="suwItemDescriptionStyle" format="reference" />
+ <attr name="suwItemDescriptionTitleStyle" format="reference" />
<declare-styleable name="SuwIllustration">
<attr name="suwAspectRatio" format="float" />
@@ -159,6 +164,8 @@
<declare-styleable name="SuwListMixin">
<attr name="android:entries" />
<attr name="suwDividerInset" />
+ <attr name="suwDividerInsetEnd" />
+ <attr name="suwDividerInsetStart" />
</declare-styleable>
</resources>
diff --git a/library/main/res/values/colors.xml b/library/main/res/values/colors.xml
index f9c5da3..cd57a8a 100644
--- a/library/main/res/values/colors.xml
+++ b/library/main/res/values/colors.xml
@@ -40,5 +40,7 @@
<!-- GLIF colors -->
<color name="suw_color_accent_glif_dark">#ff4285f4</color>
<color name="suw_color_accent_glif_light">#ff4285f4</color>
+ <color name="suw_glif_background_color_dark">#ff000000</color>
+ <color name="suw_glif_background_color_light">#ffffffff</color>
</resources>
diff --git a/library/main/res/values/dimens.xml b/library/main/res/values/dimens.xml
index 96712f7..458e99c 100644
--- a/library/main/res/values/dimens.xml
+++ b/library/main/res/values/dimens.xml
@@ -25,7 +25,7 @@
<!-- Calculated by (suw_glif_margin_sides - suw_glif_button_padding) -->
<dimen name="suw_glif_button_margin_start">8dp</dimen>
<dimen name="suw_glif_button_padding">16dp</dimen>
- <dimen name="suw_glif_footer_bottom_padding">4dp</dimen>
+ <dimen name="suw_glif_footer_bottom_padding">0dp</dimen>
<dimen name="suw_glif_footer_min_height">80dp</dimen>
<dimen name="suw_glif_margin_sides">24dp</dimen>
<dimen name="suw_glif_margin_top">48dp</dimen>
@@ -116,7 +116,7 @@
<dimen name="suw_items_preferred_height">56dp</dimen>
<!-- Navigation bar -->
- <!-- TODO: Move this dimen to eclair-mr1, or see if it should be in platform style as well -->
+ <!-- TODO: Move this dimen to gingerbread, or see if it should be in platform style as well -->
<dimen name="suw_navbar_button_drawable_padding" tools:ignore="UnusedResources">6dp</dimen>
<dimen name="suw_navbar_button_padding_sides">10dp</dimen>
<dimen name="suw_navbar_height">56dp</dimen>
diff --git a/library/main/res/values/styles.xml b/library/main/res/values/styles.xml
index 4bd99de..bcdae0e 100644
--- a/library/main/res/values/styles.xml
+++ b/library/main/res/values/styles.xml
@@ -19,24 +19,38 @@
<!-- General styles -->
- <style name="SuwThemeGlifPixel" parent="SuwThemeGlif">
+ <style name="SuwThemeGlifV2" parent="SuwThemeGlif">
+ <item name="android:colorBackground">@color/suw_glif_background_color_dark</item>
<item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
<item name="suwBackgroundBaseColor">?android:attr/colorBackground</item>
<item name="suwBackgroundPatterned">false</item>
+ <item name="suwDividerInsetEnd">?attr/suwMarginSides</item>
+ <item name="suwDividerInsetStart">?attr/suwMarginSides</item>
+ <item name="suwDividerInsetStartNoIcon">?attr/suwMarginSides</item>
<item name="suwGlifHeaderGravity">center_horizontal</item>
<item name="suwScrollIndicators">top|bottom</item>
</style>
- <style name="SuwThemeGlifPixel.Light" parent="SuwThemeGlif.Light">
+ <!-- Deprecated. Use SuwThemeGlifV2 instead -->
+ <style name="SuwThemeGlifPixel" parent="SuwThemeGlifV2" />
+
+ <style name="SuwThemeGlifV2.Light" parent="SuwThemeGlif.Light">
+ <item name="android:colorBackground">@color/suw_glif_background_color_light</item>
<item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
<item name="suwBackgroundBaseColor">?android:attr/colorBackground</item>
<item name="suwBackgroundPatterned">false</item>
+ <item name="suwDividerInsetEnd">?attr/suwMarginSides</item>
+ <item name="suwDividerInsetStart">?attr/suwMarginSides</item>
+ <item name="suwDividerInsetStartNoIcon">?attr/suwMarginSides</item>
<item name="suwGlifHeaderGravity">center_horizontal</item>
<item name="suwScrollIndicators">top|bottom</item>
</style>
+ <!-- Deprecated. Use SuwThemeGlifV2.Light instead -->
+ <style name="SuwThemeGlifPixel.Light" parent="SuwThemeGlifV2.Light" />
+
<style name="Animation.SuwWindowAnimation" parent="@android:style/Animation.Activity">
<item name="android:activityOpenEnterAnimation">@anim/suw_slide_next_in</item>
<item name="android:activityOpenExitAnimation">@anim/suw_slide_next_out</item>
@@ -160,7 +174,7 @@
<!-- Use this style with a Button not a TextView, so that TalkBack will announce it as a
button. -->
- <style name="SuwGlifButton.Tertiary" parent="SuwGlifButton.Secondary">
+ <style name="SuwGlifButton.BaseTertiary" parent="SuwGlifButton.Secondary">
<!-- This style can be applied to a button either as a "style" in XML, or as a theme in
ContextThemeWrapper. These self-referencing attributes make sure this is applied as
both to the button. -->
@@ -169,13 +183,17 @@
<item name="android:background">@null</item>
<item name="android:fontFamily" tools:targetApi="jelly_bean">sans-serif</item>
+ <item name="android:layout_gravity">?attr/suwGlifHeaderGravity</item>
<item name="android:padding">0dp</item>
<item name="android:textAllCaps" tools:targetApi="ice_cream_sandwich">false</item>
</style>
+ <style name="SuwGlifButton.Tertiary" parent="SuwGlifButton.BaseTertiary" />
+
<!-- The start and end paddings are asymmetric because start buttons are borderless buttons
which aligns the text label. -->
<style name="SuwGlifButtonBar">
+ <item name="android:baselineAligned">false</item>
<item name="android:clipChildren">false</item>
<item name="android:clipToPadding">false</item>
<item name="android:gravity">center_vertical</item>
@@ -206,7 +224,7 @@
<item name="android:paddingTop">@dimen/suw_items_verbose_padding_vertical</item>
</style>
- <style name="SuwItemTitle.Description" parent="SuwItemTitle">
+ <style name="SuwItemTitle.GlifDescription" parent="SuwItemTitle">
<item name="android:gravity">?attr/suwGlifHeaderGravity</item>
<item name="android:textAlignment" tools:targetApi="jelly_bean_mr1">gravity</item>
</style>
@@ -228,6 +246,7 @@
<item name="android:layout_marginLeft">?attr/suwMarginSides</item>
<item name="android:layout_marginRight">?attr/suwMarginSides</item>
<item name="android:layout_marginTop">@dimen/suw_glif_header_title_margin_top</item>
+ <item name="android:fontFamily" tools:targetApi="jelly_bean">google-sans</item>
<item name="android:textAlignment" tools:targetApi="jelly_bean_mr1">gravity</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
</style>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 12:03:03 +0000