diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-15 02:04:01 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-15 02:04:01 +0000 |
| commit | 9618a34816f554188aec351db5b7983968a6920b (patch) | |
| tree | 096454abf50a73063ca997f864b3d5f3255a5899 /main/res/values/styles.xml | |
| parent | d497370655ea8c6f15169af88cd9c75406e51395 (diff) | |
| parent | 33cf4c96e8c4986edf036ec2c51228d5b9905bd2 (diff) | |
| download | setupcompat-9618a34816f554188aec351db5b7983968a6920b.tar.gz | |
Snap for 7550930 from 33cf4c96e8c4986edf036ec2c51228d5b9905bd2 to mainline-captiveportallogin-releaseandroid-mainline-12.0.0_r6android-mainline-12.0.0_r23android12-mainline-captiveportallogin-release
Change-Id: Id70096008f2743abb6ee77efce30f7216ebf962e
Diffstat (limited to 'main/res/values/styles.xml')
| -rw-r--r-- | main/res/values/styles.xml | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/main/res/values/styles.xml b/main/res/values/styles.xml index 48fcddf..6474426 100644 --- a/main/res/values/styles.xml +++ b/main/res/values/styles.xml @@ -27,14 +27,14 @@ <item name="android:clipChildren">false</item> <item name="android:clipToPadding">false</item> <item name="android:gravity">center_vertical</item> - <item name="android:minHeight">@dimen/suc_customization_footer_min_height</item> + <item name="android:minHeight">?attr/sucFooterBarMinHeight</item> <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"> @@ -46,8 +46,10 @@ <!-- Values used in styles --> <item name="android:fontFamily">?attr/sucFooterBarButtonFontFamily</item> - <item name="android:paddingLeft">@dimen/suc_customization_button_padding</item> - <item name="android:paddingRight">@dimen/suc_customization_button_padding</item> + <item name="android:paddingLeft">?attr/sucFooterButtonPaddingStart</item> + <item name="android:paddingStart" tools:ignore="NewApi">?attr/sucFooterButtonPaddingStart</item> + <item name="android:paddingRight">?attr/sucFooterButtonPaddingEnd</item> + <item name="android:paddingEnd" tools:ignore="NewApi">?attr/sucFooterButtonPaddingEnd</item> <item name="android:textAllCaps">?attr/sucFooterBarButtonAllCaps</item> <item name="android:stateListAnimator">@null</item> @@ -65,8 +67,10 @@ <!-- Values used in styles --> <item name="android:fontFamily">?attr/sucFooterBarButtonFontFamily</item> <item name="android:minWidth">0dp</item> - <item name="android:paddingLeft">@dimen/suc_customization_button_padding</item> - <item name="android:paddingRight">@dimen/suc_customization_button_padding</item> + <item name="android:paddingLeft">?attr/sucFooterButtonPaddingStart</item> + <item name="android:paddingStart" tools:ignore="NewApi">?attr/sucFooterButtonPaddingStart</item> + <item name="android:paddingRight">?attr/sucFooterButtonPaddingEnd</item> + <item name="android:paddingEnd" tools:ignore="NewApi">?attr/sucFooterButtonPaddingEnd</item> <item name="android:textAllCaps">?attr/sucFooterBarButtonAllCaps</item> <!-- Values used in themes --> |