diff options
author | Setup Wizard Team <android-setup-team-eng@google.com> | 2020-12-30 19:23:06 +0800 |
---|---|---|
committer | alexylli <alexylli@google.com> | 2020-12-31 10:47:36 +0800 |
commit | 6c15fbdff11497af53e2a9bdff042e0e89df2659 (patch) | |
tree | 14e6fb8ea965c7ec84ad2d57b9310f45d412f8ce /main/res | |
parent | 6c7dfb3e2434a01371394a45ea687df7e331d5d7 (diff) | |
download | setupdesign-6c15fbdff11497af53e2a9bdff042e0e89df2659.tar.gz |
Import updated Android Setupdesign Library 349536308
Copied from google3/third_party/java_src/android_libs/setupdesign
Test: mm
Included changes:
- 349536308 [BC][Stencil] Add partner resource for the item padding t...
- 349498664 [BC][Transition] Adds shared axis api for support lib's f...
- 349396975 adds java doc for TransitionHelper class
- 349384451 Make the padding start/end of ExpandableSwitchItem to fit...
- 349384008 [BC][Tranisition] Implement the API for BC activity trans...
- 349382331 Applying divider start/end margins to BC layout
- 349374941 [BC][Transition] Adds shared axis api for platform fragme...
- 349374546 [SetupDesign] Let the partnerStyleHelper to get partner r...
- 349360486 [SetupDesign] issue fix and refactoring
- 349347558 Support BC layout for outside setup screens
- 349265027 Update language to comply with Android’s inclusive langua...
- 349260624 [BC][Tranisition] Implement the API for BC activity trans...
- 349186993 Implement the API for BC activity transition
- 349006680 [BC][Stencil] Add partner resource for the item title tex...
- 348989675 Automated g4 rollback of changelist 348974409.
- 348983766 Automated g4 rollback of changelist 348976028.
- 348976028 [SetupDesign] refactor and improve the utils
- 348974409 Change the description textview from TextView to RichText...
- 348915728 [SetupDesign] Fix the condition for use partner heavy the...
- 348748997 Remove unnecessary null check
- 348729496 Cloned from CL 348561620 by 'g4 patch' and removed using ...
- 348611275 Add extra padding start/end of header container for BC la...
- 348586422 Fix backward transition with fade out meet abnormal issue.
- 348580285 [SUW][SetupDesign] Enable stencil config for auto text si...
- 348570510 [SetupDesign] remove the value for BC
- 348565251 Automated g4 rollback of changelist 348561620.
- 348561620 [BC][Stencil] Add partner resource for the icon margin to...
- 347789412 [BC][Stencil] Add partner resource for the layout margin ...
- 347548473 Check the flag of applying partner resource when extended...
- 347544485 Adjusts the javadoc for transition APIs
- 346907111 Fix legacy description doesn't apply partner resource
- 346894262 [BC][Stencil] Add partner resource for the description te...
- 346681228 Whenever sets the description, it also sets the visibilit...
- 346521136 [BC tranisition] Declare the interface for BC transition ...
- 346250818 Migrate SimMissing activity to new DescriptionMixin
- 346235546 [BC transition] Declare the interface to support new tran...
- 345997245 [BC][Stencil] Add partner resource for the header text ma...
- 345586018 [SetupDesign] Default enable the stencil heavy theme if e...
- 345388161 [BC][Stencil] Add partner resource for the header contain...
- 345182340 Create subtitle mixin for BC layout
- 345174090 [SetupDesign] Enable auto text size based on attr
PiperOrigin-RevId: 349536308
Change-Id: I6f9475b58106a2462c74892451c05c9d42eff21f
Diffstat (limited to 'main/res')
-rw-r--r-- | main/res/layout/sud_glif_header.xml | 7 | ||||
-rw-r--r-- | main/res/values-night/styles.xml | 1 | ||||
-rw-r--r-- | main/res/values-v21/styles.xml | 4 | ||||
-rw-r--r-- | main/res/values/attrs.xml | 8 | ||||
-rw-r--r-- | main/res/values/dimens.xml | 21 | ||||
-rw-r--r-- | main/res/values/styles.xml | 56 |
6 files changed, 43 insertions, 54 deletions
diff --git a/main/res/layout/sud_glif_header.xml b/main/res/layout/sud_glif_header.xml index 0ff67bc..ea20993 100644 --- a/main/res/layout/sud_glif_header.xml +++ b/main/res/layout/sud_glif_header.xml @@ -47,4 +47,11 @@ android:inflatedId="@+id/sud_layout_progress" android:layout="@layout/sud_progress_bar" /> + <TextView + android:id="@+id/sud_layout_subtitle" + style="@style/SudGlifDescription" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:visibility="gone" /> + </LinearLayout> diff --git a/main/res/values-night/styles.xml b/main/res/values-night/styles.xml index 15c4028..ca94c12 100644 --- a/main/res/values-night/styles.xml +++ b/main/res/values-night/styles.xml @@ -22,6 +22,5 @@ <style name="SudThemeGlif.DayNight" parent="SudThemeGlif" /> <style name="SudThemeGlifV2.DayNight" parent="SudThemeGlifV2" /> <style name="SudThemeGlifV3.DayNight" parent="SudThemeGlifV3" /> - <style name="SudThemeGlifV4.DayNight" parent="SudThemeGlifV4" /> </resources> diff --git a/main/res/values-v21/styles.xml b/main/res/values-v21/styles.xml index 6a4df1b..c961745 100644 --- a/main/res/values-v21/styles.xml +++ b/main/res/values-v21/styles.xml @@ -54,10 +54,10 @@ <style name="SudItemContainer"> <item name="android:minHeight">?android:attr/listPreferredItemHeight</item> - <item name="android:paddingBottom">@dimen/sud_items_padding_vertical</item> + <item name="android:paddingBottom">@dimen/sud_items_padding_bottom</item> <item name="android:paddingEnd">?android:attr/listPreferredItemPaddingEnd</item> <item name="android:paddingStart">?android:attr/listPreferredItemPaddingStart</item> - <item name="android:paddingTop">@dimen/sud_items_padding_vertical</item> + <item name="android:paddingTop">@dimen/sud_items_padding_top</item> </style> <style name="SudItemTitle"> diff --git a/main/res/values/attrs.xml b/main/res/values/attrs.xml index f96a4f3..7262f70 100644 --- a/main/res/values/attrs.xml +++ b/main/res/values/attrs.xml @@ -233,4 +233,12 @@ <attr name="sudCollapsedSummary" format="string" localization="suggested" /> <attr name="sudExpandedSummary" format="string" localization="suggested" /> </declare-styleable> + + <declare-styleable name="SudDescriptionMixin"> + <attr name="sudDescriptionText" format="string" localization="suggested" /> + <attr name="sudDescriptionTextColor" format="reference|color" /> + <attr name="sudGlifDescriptionMarginTop" format="dimension" /> + <attr name="sudGlifDescriptionMarginBottom" format="dimension" /> + </declare-styleable> + </resources> diff --git a/main/res/values/dimens.xml b/main/res/values/dimens.xml index 273db2d..670743a 100644 --- a/main/res/values/dimens.xml +++ b/main/res/values/dimens.xml @@ -38,9 +38,6 @@ <dimen name="sud_glif_margin_start">24dp</dimen> <dimen name="sud_glif_margin_end">24dp</dimen> <dimen name="sud_glif_icon_margin_top">56dp</dimen> - <dimen name="sud_glif_v4_icon_margin_top">48dp</dimen> - <dimen name="sud_glif_v4_margin_start">40dp</dimen> - <dimen name="sud_glif_v4_margin_end">24dp</dimen> <dimen name="sud_glif_alert_dialog_corner_radius">8dp</dimen> <dimen name="sud_glif_v3_button_corner_radius">4dp</dimen> @@ -61,6 +58,7 @@ <dimen name="sud_description_line_spacing_extra">4sp</dimen> <dimen name="sud_description_text_size">16sp</dimen> + <!-- TODO: Remove sud_description_glif_margin_xxx once all apps migrate to sud_glif_description_margin_xxx --> <dimen name="sud_description_glif_margin_top">3dp</dimen> <dimen name="sud_description_glif_margin_bottom_lists">24dp</dimen> @@ -113,25 +111,26 @@ <dimen name="sud_glif_header_title_margin_top">16dp</dimen> <dimen name="sud_glif_header_title_margin_bottom">2dp</dimen> - <dimen name="sud_glif_v4_header_title_margin_top">24dp</dimen> - <dimen name="sud_glif_v4_header_title_margin_bottom">0dp</dimen> + <dimen name="sud_header_container_margin_bottom">0dp</dimen> <!-- This value leverages sud_description_glif_margin_top --> - <dimen name="sud_glif_subtitle_margin_top">3dp</dimen> - <dimen name="sud_glif_subtitle_margin_bottom">0dp</dimen> - <!-- TODO: Remove all attributes in Glifv4 after the stencil supports. --> - <dimen name="sud_glif_v4_subtitle_margin_top">24dp</dimen> - <dimen name="sud_glif_v4_subtitle_margin_bottom">0dp</dimen> + <dimen name="sud_glif_description_margin_top">3dp</dimen> + <dimen name="sud_glif_description_margin_bottom">12dp</dimen> <dimen name="sud_glif_icon_max_height">32dp</dimen> - <dimen name="sud_glif_v4_icon_max_height">48dp</dimen> <!-- Illustration --> <item name="sud_illustration_aspect_ratio" format="float" type="dimen">2.22</item> <!-- Items --> <dimen name="sud_items_icon_container_width">48dp</dimen> + <!-- TODO: Remove it when all attributes being used migrated into new one. --> <dimen name="sud_items_padding_vertical">15dp</dimen> <dimen name="sud_items_verbose_padding_vertical">20dp</dimen> + <dimen name="sud_items_title_text_size">16sp</dimen> + <dimen name="sud_items_summary_text_size">14sp</dimen> + <dimen name="sud_items_summary_margin_top">4dp</dimen> + <dimen name="sud_items_padding_top">15dp</dimen> + <dimen name="sud_items_padding_bottom">15dp</dimen> <!-- Ignore UnusedResources: can be used by clients --> <dimen name="sud_items_icon_divider_inset" tools:ignore="UnusedResources">88dp</dimen> diff --git a/main/res/values/styles.xml b/main/res/values/styles.xml index 055c8c8..f348651 100644 --- a/main/res/values/styles.xml +++ b/main/res/values/styles.xml @@ -134,9 +134,10 @@ <item name="sudGlifHeaderGravity">start</item> <item name="sudGlifSubtitleGravity">start</item> <item name="sucGlifHeaderMarginTop">@dimen/sud_glif_header_title_margin_top</item> - <item name="sucGlifSubtitleMarginTop">@dimen/sud_glif_subtitle_margin_top</item> + <item name="sudGlifDescriptionMarginTop">@dimen/sud_glif_description_margin_top</item> <item name="sucGlifHeaderMarginBottom">@dimen/sud_glif_header_title_margin_bottom</item> - <item name="sucGlifSubtitleMarginBottom">@dimen/sud_glif_subtitle_margin_bottom</item> + <item name="sudGlifDescriptionMarginBottom">@dimen/sud_glif_description_margin_bottom</item> + <item name="sucHeaderContainerMarginBottom">@dimen/sud_header_container_margin_bottom</item> <item name="sudGlifIconStyle">@style/SudGlifIcon</item> <item name="sucGlifIconMarginTop">@dimen/sud_glif_icon_margin_top</item> <item name="sudGlifIconSize">@dimen/sud_glif_icon_max_height</item> @@ -198,9 +199,10 @@ <item name="sudGlifHeaderGravity">start</item> <item name="sudGlifSubtitleGravity">start</item> <item name="sucGlifHeaderMarginTop">@dimen/sud_glif_header_title_margin_top</item> - <item name="sucGlifSubtitleMarginTop">@dimen/sud_glif_subtitle_margin_top</item> + <item name="sudGlifDescriptionMarginTop">@dimen/sud_glif_description_margin_top</item> <item name="sucGlifHeaderMarginBottom">@dimen/sud_glif_header_title_margin_bottom</item> - <item name="sucGlifSubtitleMarginBottom">@dimen/sud_glif_subtitle_margin_bottom</item> + <item name="sudGlifDescriptionMarginBottom">@dimen/sud_glif_description_margin_bottom</item> + <item name="sucHeaderContainerMarginBottom">@dimen/sud_header_container_margin_bottom</item> <item name="sudGlifIconStyle">@style/SudGlifIcon</item> <item name="sucGlifIconMarginTop">@dimen/sud_glif_icon_margin_top</item> <item name="sudGlifIconSize">@dimen/sud_glif_icon_max_height</item> @@ -288,30 +290,6 @@ </style> <style name="SudThemeGlifV3.Light" parent="SudBaseThemeGlifV3.Light" /> - <style name="SudThemeGlifV4" parent="SudThemeGlifV3"> - <!-- TODO: Remove all attributes in Glifv4 after the stencil supports. --> - <item name="sucGlifIconMarginTop">@dimen/sud_glif_v4_icon_margin_top</item> - <item name="sudMarginStart">@dimen/sud_glif_v4_margin_start</item> - <item name="sudMarginEnd">@dimen/sud_glif_v4_margin_end</item> - <item name="sudGlifIconSize">@dimen/sud_glif_v4_icon_max_height</item> - <item name="sucGlifHeaderMarginTop">@dimen/sud_glif_v4_header_title_margin_top</item> - <item name="sucGlifSubtitleMarginTop">@dimen/sud_glif_v4_subtitle_margin_top</item> - <item name="sucGlifHeaderMarginBottom">@dimen/sud_glif_v4_header_title_margin_bottom</item> - <item name="sucGlifSubtitleMarginBottom">@dimen/sud_glif_v4_subtitle_margin_bottom</item> - </style> - - <style name="SudThemeGlifV4.Light" parent="SudThemeGlifV3.Light"> - <!-- TODO: Remove all attributes in Glifv4 after the stencil supports. --> - <item name="sucGlifIconMarginTop">@dimen/sud_glif_v4_icon_margin_top</item> - <item name="sudMarginStart">@dimen/sud_glif_v4_margin_start</item> - <item name="sudMarginEnd">@dimen/sud_glif_v4_margin_end</item> - <item name="sudGlifIconSize">@dimen/sud_glif_v4_icon_max_height</item> - <item name="sucGlifHeaderMarginTop">@dimen/sud_glif_v4_header_title_margin_top</item> - <item name="sucGlifSubtitleMarginTop">@dimen/sud_glif_v4_subtitle_margin_top</item> - <item name="sucGlifHeaderMarginBottom">@dimen/sud_glif_v4_header_title_margin_bottom</item> - <item name="sucGlifSubtitleMarginBottom">@dimen/sud_glif_v4_subtitle_margin_bottom</item> - </style> - <style name="Animation.SudWindowAnimation" parent="@android:style/Animation.Activity"> <item name="android:activityOpenEnterAnimation">@anim/sud_slide_next_in</item> <item name="android:activityOpenExitAnimation">@anim/sud_slide_next_out</item> @@ -324,7 +302,6 @@ <style name="SudThemeGlif.DayNight" parent="SudThemeGlif.Light" /> <style name="SudThemeGlifV2.DayNight" parent="SudThemeGlifV2.Light" /> <style name="SudThemeGlifV3.DayNight" parent="SudThemeGlifV3.Light" /> - <style name="SudThemeGlifV4.DayNight" parent="SudThemeGlifV4.Light" /> <!-- Content styles --> @@ -578,12 +555,12 @@ <style name="SudItemContainer"> <item name="android:minHeight">?android:attr/listPreferredItemHeight</item> - <item name="android:paddingBottom">@dimen/sud_items_padding_vertical</item> + <item name="android:paddingBottom">@dimen/sud_items_padding_bottom</item> <item name="android:paddingEnd" tools:ignore="NewApi">?attr/listPreferredItemPaddingRight</item> <item name="android:paddingLeft">?attr/listPreferredItemPaddingLeft</item> <item name="android:paddingRight">?attr/listPreferredItemPaddingRight</item> <item name="android:paddingStart" tools:ignore="NewApi">?attr/listPreferredItemPaddingLeft</item> - <item name="android:paddingTop">@dimen/sud_items_padding_vertical</item> + <item name="android:paddingTop">@dimen/sud_items_padding_top</item> </style> <style name="SudItemContainer.Description" parent="SudItemContainer"> @@ -654,21 +631,20 @@ <item name="android:textColor">?android:attr/textColorPrimary</item> </style> - <style name="SudGlifSubtitleTitle"> - <item name="android:gravity">?attr/sudGlifSubtitleGravity</item> - <item name="android:layout_marginBottom">?attr/sucGlifSubtitleMarginBottom</item> + <style name="SudGlifDescription" parent="SudDescription.Glif"> + <item name="android:layout_marginTop">?attr/sudGlifDescriptionMarginTop</item> + <item name="android:layout_marginBottom">?attr/sudGlifDescriptionMarginBottom</item> <item name="android:layout_marginLeft">?attr/sudMarginStart</item> + <item name="android:layout_marginStart">?attr/sudMarginStart</item> <item name="android:layout_marginRight">?attr/sudMarginEnd</item> - <item name="android:layout_marginTop">?attr/sucGlifSubtitleMarginTop</item> + <item name="android:layout_marginEnd">?attr/sudMarginEnd</item> <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/sudFontSecondary</item> - <item name="android:textAlignment" tools:targetApi="jelly_bean_mr1">gravity</item> <item name="android:textColor">?android:attr/textColorPrimary</item> - <item name="android:lineSpacingExtra">@dimen/sud_description_line_spacing_extra</item> - <item name="android:textAppearance">@style/TextAppearance.SudDescription</item> </style> <style name="SudGlifHeaderContainer"> <item name="android:gravity">?attr/sudGlifHeaderGravity</item> + <item name="android:layout_marginBottom">?attr/sucHeaderContainerMarginBottom</item> </style> <style name="SudGlifIcon"> @@ -686,12 +662,12 @@ </style> <style name="TextAppearance.SudGlifItemTitle" parent="android:TextAppearance"> - <item name="android:textSize">16sp</item> + <item name="android:textSize">@dimen/sud_items_title_text_size</item> <item name="android:textColor">?android:attr/textColorPrimary</item> </style> <style name="TextAppearance.SudGlifItemSummary" parent="android:TextAppearance"> - <item name="android:textSize">14sp</item> + <item name="android:textSize">@dimen/sud_items_summary_text_size</item> <item name="android:textColor">?android:attr/textColorSecondary</item> </style> |