diff options
author | Setup Wizard Team <android-setup-team-eng@google.com> | 2022-03-31 01:07:11 +0800 |
---|---|---|
committer | Pasty Chang <pastychang@google.com> | 2022-03-31 02:39:03 +0000 |
commit | 53645a102c457caf0f82e659c40f4eae67e4b9f6 (patch) | |
tree | dafec759eab71f1fd06d4c8fa8f43db9a0dbf5d0 | |
parent | 74bcb93675ea2ab9f55531706cf88b2f7f48991d (diff) | |
download | setupdesign-53645a102c457caf0f82e659c40f4eae67e4b9f6.tar.gz |
Import updated Android Setupdesign Library 438331250
Copied from google3/third_party/java_src/android_libs/setupdesign
Test: mm
Bug: 225800660
Included changes:
- 438331250 Use the dynamic color theme which is not depend on glif t...
- 438250648 Apply the glif v4 style on the list item description layo...
- 438237741 Update the list item verbose style.
- 438229858 Update the list item switch style and correct the font fa...
- 437961224 Automated g4 rollback of changelist 437849321.
- 437849321 Automated g4 rollback of changelist 437438413.
- 437438413 Automated g4 rollback of changelist 436450355.
- 436450355 Automated g4 rollback of changelist 436406248.
- 436406248 Update Glifv4 default value for button.
PiperOrigin-RevId: 438331250
Change-Id: Ief5e41fda89e546388e56c5c788dde45171f018a
-rw-r--r-- | main/res/layout/sud_items_description.xml | 2 | ||||
-rw-r--r-- | main/res/layout/sud_items_switch.xml | 6 | ||||
-rw-r--r-- | main/res/layout/sud_items_verbose.xml | 4 | ||||
-rw-r--r-- | main/res/values/attrs.xml | 2 | ||||
-rw-r--r-- | main/res/values/config.xml | 4 | ||||
-rw-r--r-- | main/res/values/dimens.xml | 9 | ||||
-rw-r--r-- | main/res/values/styles.xml | 37 | ||||
-rw-r--r-- | main/src/com/google/android/setupdesign/util/ThemeHelper.java | 12 |
8 files changed, 60 insertions, 16 deletions
diff --git a/main/res/layout/sud_items_description.xml b/main/res/layout/sud_items_description.xml index 1caa5ee..8c24e87 100644 --- a/main/res/layout/sud_items_description.xml +++ b/main/res/layout/sud_items_description.xml @@ -52,7 +52,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:lineSpacingExtra="@dimen/sud_description_line_spacing_extra" - android:textAppearance="@style/TextAppearance.SudDescription" + android:textAppearance="?attr/sudItemDescriptionTitleTextAppearence" tools:ignore="UnusedAttribute" /> <com.google.android.setupdesign.view.RichTextView diff --git a/main/res/layout/sud_items_switch.xml b/main/res/layout/sud_items_switch.xml index 3826ae3..28660a4 100644 --- a/main/res/layout/sud_items_switch.xml +++ b/main/res/layout/sud_items_switch.xml @@ -17,7 +17,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" - style="@style/SudItemContainer" + style="?attr/sudItemContainerStyle" android:layout_width="match_parent" android:layout_height="wrap_content" android:baselineAligned="false" @@ -47,7 +47,7 @@ <com.google.android.setupdesign.view.RichTextView android:id="@+id/sud_items_title" - style="@style/SudItemTitle" + style="?attr/sudItemTitleStyle" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="start" @@ -57,7 +57,7 @@ <com.google.android.setupdesign.view.RichTextView android:id="@+id/sud_items_summary" - style="@style/SudItemSummary" + style="?attr/sudItemSummaryStyle" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="start" diff --git a/main/res/layout/sud_items_verbose.xml b/main/res/layout/sud_items_verbose.xml index 210c41c..f246e61 100644 --- a/main/res/layout/sud_items_verbose.xml +++ b/main/res/layout/sud_items_verbose.xml @@ -49,7 +49,7 @@ <com.google.android.setupdesign.view.RichTextView android:id="@+id/sud_items_title" - style="@style/SudItemTitle.Verbose" + style="?attr/sudItemVerboseTitleStyle" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="start" @@ -58,7 +58,7 @@ <com.google.android.setupdesign.view.RichTextView android:id="@+id/sud_items_summary" - style="@style/SudItemSummary" + style="?attr/sudItemSummaryStyle" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="start" diff --git a/main/res/values/attrs.xml b/main/res/values/attrs.xml index 6a3d9a4..d739189 100644 --- a/main/res/values/attrs.xml +++ b/main/res/values/attrs.xml @@ -122,6 +122,8 @@ <attr name="sudItemSummaryStyle" format="reference"/> <attr name="sudItemDescriptionStyle" format="reference" /> <attr name="sudItemDescriptionTitleStyle" format="reference" /> + <attr name="sudItemDescriptionTitleTextAppearence" format="reference" /> + <attr name="sudItemVerboseTitleStyle" format="reference" /> <attr name="sudContentFramePaddingTop" format="dimension|reference" /> <attr name="sudContentFramePaddingBottom" format="dimension|reference" /> diff --git a/main/res/values/config.xml b/main/res/values/config.xml index dafc0dd..de724a3 100644 --- a/main/res/values/config.xml +++ b/main/res/values/config.xml @@ -25,8 +25,10 @@ <!-- Secondary font for use with headings, title, and other non-body text --> <string name="sudFontSecondary" translatable="false">google-sans</string> + <string name="sudFontSecondaryText" translatable="false">google-sans-text</string> <string name="sudFontSecondaryMedium" translatable="false">google-sans-medium</string> - + <!-- Material You button font family--> + <string name="sudFontSecondaryMediumMaterialYou" translatable="false">google-sans-text-medium</string> <item name="sud_layout_description" type="id" /> </resources> diff --git a/main/res/values/dimens.xml b/main/res/values/dimens.xml index 02f9444..242c370 100644 --- a/main/res/values/dimens.xml +++ b/main/res/values/dimens.xml @@ -174,12 +174,17 @@ <!-- Page Margins Material You --> <dimen name="sud_glif_margin_start_material_you">40dp</dimen> <dimen name="sud_glif_margin_end_material_you">24dp</dimen> + + <!-- Footer Button Material You--> + <dimen name="sud_footer_bar_button_radius_material_you">20dp</dimen> + <!-- Footer Bar Material You --> <dimen name="sud_glif_footer_bar_padding_vertical_material_you">6dp</dimen> <dimen name="sud_glif_footer_bar_padding_start_material_you">8dp</dimen> <!-- Calculated by (sud_glif_margin_end - 4dp internal padding of button) --> <dimen name="sud_glif_footer_bar_padding_end_material_you">20dp</dimen> <dimen name="sud_glif_footer_bar_min_height_material_you">72dp</dimen> + <!-- Header Area Material You --> <dimen name="sud_header_container_margin_bottom_material_you">24dp</dimen> <dimen name="sud_glif_header_title_size_material_you">36sp</dimen> @@ -193,8 +198,8 @@ <dimen name="sud_glif_icon_max_height_material_you">48dp</dimen> <!-- Items Material You --> - <dimen name="sud_items_padding_top_material_you">18dp</dimen> - <dimen name="sud_items_padding_bottom_material_you">18dp</dimen> + <dimen name="sud_items_padding_top_material_you">16dp</dimen> + <dimen name="sud_items_padding_bottom_material_you">16dp</dimen> <dimen name="sud_items_title_text_size_material_you">20sp</dimen> <dimen name="sud_items_summary_text_size_material_you">14sp</dimen> <dimen name="sud_items_summary_margin_top_material_you">4dp</dimen> diff --git a/main/res/values/styles.xml b/main/res/values/styles.xml index 078a6ea..7dd96db 100644 --- a/main/res/values/styles.xml +++ b/main/res/values/styles.xml @@ -71,6 +71,7 @@ <item name="sudItemIconContainerStyle">@style/SudItemIconContainer</item> <item name="sudItemTitleStyle">@style/SudItemTitle</item> <item name="sudItemSummaryStyle">@style/SudItemSummaryGlif</item> + <item name="sudItemDescriptionTitleTextAppearence">@style/TextAppearance.SudDescription</item> </style> <style name="SudThemeMaterial.Light" parent="Theme.AppCompat.Light.NoActionBar"> @@ -125,6 +126,7 @@ <item name="sudItemIconContainerStyle">@style/SudItemIconContainer</item> <item name="sudItemTitleStyle">@style/SudItemTitle</item> <item name="sudItemSummaryStyle">@style/SudItemSummaryGlif</item> + <item name="sudItemDescriptionTitleTextAppearence">@style/TextAppearance.SudDescription</item> </style> <style name="SudBaseThemeGlif" parent="Theme.AppCompat.NoActionBar"> @@ -215,6 +217,8 @@ <item name="sudItemIconContainerStyle">@style/SudItemIconContainer</item> <item name="sudItemTitleStyle">@style/SudItemTitle</item> <item name="sudItemSummaryStyle">@style/SudItemSummaryGlif</item> + <item name="sudItemDescriptionTitleTextAppearence">@style/TextAppearance.SudDescription</item> + <item name="sudItemVerboseTitleStyle">@style/SudItemTitle.Verbose</item> </style> <style name="SudThemeGlif" parent="SudBaseThemeGlif"/> @@ -306,6 +310,8 @@ <item name="sudItemIconContainerStyle">@style/SudItemIconContainer</item> <item name="sudItemTitleStyle">@style/SudItemTitle</item> <item name="sudItemSummaryStyle">@style/SudItemSummaryGlif</item> + <item name="sudItemDescriptionTitleTextAppearence">@style/TextAppearance.SudDescription</item> + <item name="sudItemVerboseTitleStyle">@style/SudItemTitle.Verbose</item> </style> <style name="SudThemeGlif.Light" parent="SudBaseThemeGlif.Light"/> @@ -384,7 +390,9 @@ <item name="sucFooterBarMinHeight">@dimen/sud_glif_footer_bar_min_height_material_you</item> <item name="sudMarginEnd">@dimen/sud_glif_margin_end_material_you</item> <item name="sucHeaderContainerMarginBottom">@dimen/sud_header_container_margin_bottom_material_you</item> + <item name="sucFooterBarButtonFontFamily">@string/sudFontSecondaryMediumMaterialYou</item> <item name="sucGlifIconMarginTop">@dimen/sud_glif_icon_margin_top_material_you</item> + <item name="sudButtonCornerRadius">@dimen/sud_footer_bar_button_radius_material_you</item> <item name="sudGlifIconSize">@dimen/sud_glif_icon_max_height_material_you</item> <item name="sudGlifHeaderTitleStyle">@style/SudGlifHeaderTitleMaterialYou</item> <item name="sudGlifHeaderGravity">start</item> @@ -395,10 +403,14 @@ <item name="sudGlifDescriptionMarginBottom">@dimen/sud_glif_description_margin_bottom_material_you</item> <item name="textAppearanceListItem">@style/TextAppearance.SudMaterialYouItemTitle</item> <item name="textAppearanceListItemSmall">@style/TextAppearance.SudMaterialYouItemSummary</item> + <item name="sudItemDescriptionTitleTextAppearence">@style/TextAppearance.SudMaterialYouDescription</item> <item name="sudDividerShown">false</item> <item name="sudItemContainerStyle">@style/SudItemContainerMaterialYou</item> <item name="sudItemTitleStyle">@style/SudItemTitleMaterialYou</item> <item name="sudItemSummaryStyle">@style/SudItemSummaryMaterialYou</item> + <item name="sudItemDescriptionTitleStyle">@style/SudItemTitleMaterialYou</item> + <item name="sudItemDescriptionStyle">@style/SudItemContainerMaterialYou.Description</item> + <item name="sudItemVerboseTitleStyle">@style/SudMaterialYouItemTitle.Verbose</item> <item name="alertDialogTheme">@style/SudMaterialYouAlertDialogThemeCompat</item> <item name="android:alertDialogTheme" >@style/SudMaterialYouAlertDialogTheme</item> </style> @@ -411,7 +423,9 @@ <item name="sucFooterBarMinHeight">@dimen/sud_glif_footer_bar_min_height_material_you</item> <item name="sudMarginEnd">@dimen/sud_glif_margin_end_material_you</item> <item name="sucHeaderContainerMarginBottom">@dimen/sud_header_container_margin_bottom_material_you</item> + <item name="sucFooterBarButtonFontFamily">@string/sudFontSecondaryMediumMaterialYou</item> <item name="sucGlifIconMarginTop">@dimen/sud_glif_icon_margin_top_material_you</item> + <item name="sudButtonCornerRadius">@dimen/sud_footer_bar_button_radius_material_you</item> <item name="sudGlifIconSize">@dimen/sud_glif_icon_max_height_material_you</item> <item name="sudGlifHeaderTitleStyle">@style/SudGlifHeaderTitleMaterialYou</item> <item name="sudGlifHeaderGravity">start</item> @@ -422,10 +436,14 @@ <item name="sudGlifDescriptionMarginBottom">@dimen/sud_glif_description_margin_bottom_material_you</item> <item name="textAppearanceListItem">@style/TextAppearance.SudMaterialYouItemTitle</item> <item name="textAppearanceListItemSmall">@style/TextAppearance.SudMaterialYouItemSummary</item> + <item name="sudItemDescriptionTitleTextAppearence">@style/TextAppearance.SudMaterialYouDescription</item> <item name="sudDividerShown">false</item> <item name="sudItemContainerStyle">@style/SudItemContainerMaterialYou</item> <item name="sudItemTitleStyle">@style/SudItemTitleMaterialYou</item> <item name="sudItemSummaryStyle">@style/SudItemSummaryMaterialYou</item> + <item name="sudItemDescriptionTitleStyle">@style/SudItemTitleMaterialYou</item> + <item name="sudItemDescriptionStyle">@style/SudItemContainerMaterialYou.Description</item> + <item name="sudItemVerboseTitleStyle">@style/SudMaterialYouItemTitle.Verbose</item> <item name="alertDialogTheme">@style/SudMaterialYouAlertDialogThemeCompat.Light</item> <item name="android:alertDialogTheme" >@style/SudMaterialYouAlertDialogTheme.Light</item> </style> @@ -789,6 +807,12 @@ <item name="android:layout_marginTop">@dimen/sud_items_summary_margin_top_material_you</item> </style> + <style name="SudItemContainerMaterialYou.Description" parent="SudItemContainerMaterialYou"> + <item name="android:minHeight">0dp</item> + <item name="android:paddingTop">@dimen/sud_items_padding_top_material_you</item> + <item name="android:paddingBottom">@dimen/sud_items_padding_bottom_material_you</item> + </style> + <style name="SudItemTitle"> <item name="android:textAppearance">?attr/textAppearanceListItem</item> </style> @@ -806,9 +830,13 @@ <item name="android:textAppearance">@style/TextAppearance.SudGlifBody</item> </style> + <style name="SudMaterialYouItemTitle.Verbose" parent="SudItemTitle"> + <item name="android:textAppearance">?attr/textAppearanceListItem</item> + </style> + <style name="SudItemTitle.SectionHeader" parent="SudItemTitle"> <item name="android:textSize">14sp</item> - <item name="android:fontFamily">@string/sudFontSecondaryMedium</item> + <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/sudFontSecondaryMedium</item> </style> <style name="SudSwitchStyle"> @@ -934,14 +962,21 @@ <style name="TextAppearance.SudMaterialYouItemTitle" parent="android:TextAppearance"> <item name="android:textSize">@dimen/sud_items_title_text_size_material_you</item> + <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/sudFontSecondary</item> <item name="android:textColor">?android:attr/textColorPrimary</item> </style> <style name="TextAppearance.SudMaterialYouItemSummary" parent="android:TextAppearance"> <item name="android:textSize">@dimen/sud_items_summary_text_size_material_you</item> + <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/sudFontSecondaryText</item> <item name="android:textColor">?android:attr/textColorSecondary</item> </style> + <style name="TextAppearance.SudMaterialYouDescription" parent="TextAppearance.AppCompat.Medium"> + <item name="android:textColor">?android:attr/textColorPrimary</item> + <item name="android:textSize">@dimen/sud_items_title_text_size_material_you</item> + <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/sudFontSecondary</item> + </style> <!-- Navigation bar styles --> <style name="SudNavBarTheme"> diff --git a/main/src/com/google/android/setupdesign/util/ThemeHelper.java b/main/src/com/google/android/setupdesign/util/ThemeHelper.java index 497b88e..eeee7dd 100644 --- a/main/src/com/google/android/setupdesign/util/ThemeHelper.java +++ b/main/src/com/google/android/setupdesign/util/ThemeHelper.java @@ -203,19 +203,19 @@ public final class ThemeHelper { // return theme for inside setup flow resId = isDayNightEnabled - ? R.style.SudDynamicColorThemeGlifV3_DayNight - : R.style.SudDynamicColorThemeGlifV3_Light; + ? R.style.SudDynamicColorTheme_DayNight + : R.style.SudDynamicColorTheme_Light; } else { // return theme for outside setup flow resId = isDayNightEnabled - ? R.style.SudFullDynamicColorThemeGlifV3_DayNight - : R.style.SudFullDynamicColorThemeGlifV3_Light; + ? R.style.SudFullDynamicColorTheme_DayNight + : R.style.SudFullDynamicColorTheme_Light; LOG.atInfo( "Return " + (isDayNightEnabled - ? "SudFullDynamicColorThemeGlifV3_DayNight" - : "SudFullDynamicColorThemeGlifV3_Light")); + ? "SudFullDynamicColorTheme_DayNight" + : "SudFullDynamicColorTheme_Light")); } LOG.atDebug( |