diff options
author | Hank Sheng <hanksheng@google.com> | 2022-05-27 05:48:04 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-05-27 05:48:04 +0000 |
commit | 23a17530430678271448df5cdc1d0cffd57a568c (patch) | |
tree | f2c4fe11a4e7a1fc471cb09301f1dfa8c393e441 | |
parent | be2fda753617fb301494386e33749da57d5a1c9b (diff) | |
parent | d198d8ea756a7fcb62ea977305ced543f6700ab4 (diff) | |
download | setupdesign-23a17530430678271448df5cdc1d0cffd57a568c.tar.gz |
Keep the tertiary button align be the same as bc style(central_horizontal). am: d198d8ea75
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/18580228
Change-Id: I989df1479a06e71bf93d977a4ee825d4e9ea1d91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | main/res/values/attrs.xml | 15 | ||||
-rw-r--r-- | main/res/values/styles.xml | 6 |
2 files changed, 20 insertions, 1 deletions
diff --git a/main/res/values/attrs.xml b/main/res/values/attrs.xml index d739189..22aee0d 100644 --- a/main/res/values/attrs.xml +++ b/main/res/values/attrs.xml @@ -65,6 +65,21 @@ <attr name="sudButtonAllCaps" format="boolean" /> <attr name="sudButtonCornerRadius" format="dimension" /> <attr name="sudButtonFontFamily" format="string|reference" /> + <!-- Values copied from frameworks/base/core/res/res/values/attrs.xml --> + <attr name="sudButtonTertiaryGravity"> + <!-- Push object to the left of its container, not changing its size. --> + <flag name="left" value="0x03" /> + <!-- Push object to the right of its container, not changing its size. --> + <flag name="right" value="0x05" /> + <!-- Place object in the horizontal center of its container, not changing its size. --> + <flag name="center_horizontal" value="0x01" /> + <!-- Grow the horizontal size of the object if needed so it completely fills its container. --> + <flag name="fill_horizontal" value="0x07" /> + <!-- Push object to the beginning of its container, not changing its size. --> + <flag name="start" value="0x00800003" /> + <!-- Push object to the end of its container, not changing its size. --> + <flag name="end" value="0x00800005" /> + </attr> <attr name="sudCardBackground" format="color|reference" /> <attr name="sudDividerCondition"> <enum name="either" value="0" /> diff --git a/main/res/values/styles.xml b/main/res/values/styles.xml index d675c62..e33b305 100644 --- a/main/res/values/styles.xml +++ b/main/res/values/styles.xml @@ -155,6 +155,7 @@ <item name="sudButtonCornerRadius">@dimen/sud_glif_button_corner_radius</item> <item name="sudButtonFontFamily">sans-serif-medium</item> <item name="sudButtonHighlightAlpha">0.24</item> + <item name="sudButtonTertiaryGravity">?attr/sudGlifHeaderGravity</item> <item name="sudColorPrimary">?attr/colorPrimary</item> <item name="sudContentFramePaddingTop">@dimen/sud_content_frame_padding_top</item> <item name="sudContentFramePaddingBottom">@dimen/sud_content_frame_padding_bottom</item> @@ -248,6 +249,7 @@ <item name="sudButtonCornerRadius">@dimen/sud_glif_button_corner_radius</item> <item name="sudButtonFontFamily">sans-serif-medium</item> <item name="sudButtonHighlightAlpha">0.12</item> + <item name="sudButtonTertiaryGravity">?attr/sudGlifHeaderGravity</item> <item name="sudColorPrimary">?attr/colorPrimary</item> <item name="sudContentFramePaddingTop">@dimen/sud_content_frame_padding_top</item> <item name="sudContentFramePaddingBottom">@dimen/sud_content_frame_padding_bottom</item> @@ -393,6 +395,7 @@ <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="sudButtonTertiaryGravity">center_horizontal</item> <item name="sudGlifIconSize">@dimen/sud_glif_icon_max_height_material_you</item> <item name="sudGlifHeaderTitleStyle">@style/SudGlifHeaderTitleMaterialYou</item> <item name="sudGlifHeaderGravity">start</item> @@ -426,6 +429,7 @@ <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="sudButtonTertiaryGravity">center_horizontal</item> <item name="sudGlifIconSize">@dimen/sud_glif_icon_max_height_material_you</item> <item name="sudGlifHeaderTitleStyle">@style/SudGlifHeaderTitleMaterialYou</item> <item name="sudGlifHeaderGravity">start</item> @@ -668,7 +672,7 @@ <item name="android:theme">@style/SudGlifButton.Tertiary</item> <item name="android:fontFamily" tools:targetApi="jelly_bean">sans-serif</item> - <item name="android:layout_gravity">?attr/sudGlifHeaderGravity</item> + <item name="android:layout_gravity">?attr/sudButtonTertiaryGravity</item> <item name="android:layout_marginLeft">@dimen/sud_glif_negative_button_padding</item> <item name="android:layout_marginRight">@dimen/sud_glif_negative_button_padding</item> <!-- Always lowercase instead of reading attr/sudButtonAllCaps, since this is a tertiary |