diff options
| author | Setup Wizard Team <android-setup-team-eng@google.com> | 2020-11-17 10:39:19 +0800 |
|---|---|---|
| committer | Alex Li <alexylli@google.com> | 2020-11-18 05:49:42 +0000 |
| commit | 2084d92b1b424a275c673ce8ae830d5fbaa44449 (patch) | |
| tree | 967d5f40ff33ad1c834f5cdf93bd5af11382b570 | |
| parent | d3c1a87534173fa0a717dcb18e98a404558f394a (diff) | |
| download | setupcompat-2084d92b1b424a275c673ce8ae830d5fbaa44449.tar.gz | |
Import updated Android SetupCompat Library 342766776
Copied from google3/third_party/java_src/android_libs/setupcompat
Test: mm
Bug: 173567690
Included changes:
- 342766776 Extra Icon margin top as attribute
- 342749536 Create Glifv4 theme
PiperOrigin-RevId: 342766776
Change-Id: I922e86a59a56dd71705770d8d34e96679369e723
| -rw-r--r-- | main/res/values/attrs.xml | 3 | ||||
| -rw-r--r-- | main/res/values/dimens.xml | 2 | ||||
| -rw-r--r-- | main/res/values/styles.xml | 8 |
3 files changed, 7 insertions, 6 deletions
diff --git a/main/res/values/attrs.xml b/main/res/values/attrs.xml index d075e81..65e3f76 100644 --- a/main/res/values/attrs.xml +++ b/main/res/values/attrs.xml @@ -91,11 +91,14 @@ <attr name="sucFooterBarButtonColorControlHighlight" format="color" /> <attr name="sucFooterBarButtonColorControlHighlightRipple" format="color" /> <attr name="sucFooterBarPaddingVertical" format="dimension" /> + <attr name="sucFooterBarPaddingStart" format="dimension" /> + <attr name="sucFooterBarPaddingEnd" format="dimension" /> </declare-styleable> <declare-styleable name="SucHeaderMixin"> <attr name="sucHeaderText" format="string" localization="suggested" /> <attr name="sucHeaderTextColor" format="reference|color" /> + <attr name="sucGlifIconMarginTop" format="dimension" /> </declare-styleable> </resources> diff --git a/main/res/values/dimens.xml b/main/res/values/dimens.xml index ef3d98d..7a39d42 100644 --- a/main/res/values/dimens.xml +++ b/main/res/values/dimens.xml @@ -20,8 +20,6 @@ <!-- TODO: Remove default values from setup compat, use from theme --> <!-- Footer button bar style padding attributes--> <dimen name="suc_customization_footer_min_height">72dp</dimen> - <dimen name="suc_customization_button_margin_start">8dp</dimen> - <dimen name="suc_customization_button_margin_end">20dp</dimen> <!-- Footer button style padding attributes --> <dimen name="suc_customization_button_padding">16dp</dimen> diff --git a/main/res/values/styles.xml b/main/res/values/styles.xml index 48fcddf..40da235 100644 --- a/main/res/values/styles.xml +++ b/main/res/values/styles.xml @@ -31,10 +31,10 @@ <item name="android:orientation">horizontal</item> <item name="android:paddingTop">?attr/sucFooterBarPaddingVertical</item> <item name="android:paddingBottom">?attr/sucFooterBarPaddingVertical</item> - <item name="android:paddingEnd" tools:ignore="NewApi">@dimen/suc_customization_button_margin_end</item> - <item name="android:paddingLeft">@dimen/suc_customization_button_margin_start</item> - <item name="android:paddingRight">@dimen/suc_customization_button_margin_end</item> - <item name="android:paddingStart" tools:ignore="NewApi">@dimen/suc_customization_button_margin_start</item> + <item name="android:paddingEnd" tools:ignore="NewApi">?attr/sucFooterBarPaddingEnd</item> + <item name="android:paddingLeft">?attr/sucFooterBarPaddingStart</item> + <item name="android:paddingRight">?attr/sucFooterBarPaddingEnd</item> + <item name="android:paddingStart" tools:ignore="NewApi">?attr/sucFooterBarPaddingStart</item> </style> <style name="SucPartnerCustomizationButton.Primary" parent="android:Widget.Material.Button.Colored"> |