diff options
| author | Maurice Lam <yukl@google.com> | 2017-07-06 15:02:40 -0700 |
|---|---|---|
| committer | Maurice Lam <yukl@google.com> | 2017-07-06 15:10:42 -0700 |
| commit | 2fc80693722673f25c67d062c6e7cc2436acc24b (patch) | |
| tree | 8cc9e8a4d701098e0861b13582870c6630a1918f | |
| parent | 5e98278ebfad7aa858fbfcc4dd53db7442f9bc15 (diff) | |
| download | setupwizard-oreo-dr1-dev.tar.gz | |
Add stackable button bar styleoreo-dr1-dev
The gravity change caused incompatibility with existing code. So
instead we create SuwGlifButtonBar.Stackable style for the stackable
version.
Test: Manual
Bug: 63399819
Change-Id: I146dbc4f7f2a2019cfe964f59f0a73c099845f30
| -rw-r--r-- | library/main/res/layout/suw_glif_footer_button_bar.xml | 2 | ||||
| -rw-r--r-- | library/main/res/values/styles.xml | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/library/main/res/layout/suw_glif_footer_button_bar.xml b/library/main/res/layout/suw_glif_footer_button_bar.xml index 428fe60..f347221 100644 --- a/library/main/res/layout/suw_glif_footer_button_bar.xml +++ b/library/main/res/layout/suw_glif_footer_button_bar.xml @@ -18,6 +18,6 @@ <com.android.setupwizardlib.view.ButtonBarLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/suw_footer_button_bar" - style="@style/SuwGlifButtonBar" + style="@style/SuwGlifButtonBar.Stackable" android:layout_width="match_parent" android:layout_height="wrap_content" /> diff --git a/library/main/res/values/styles.xml b/library/main/res/values/styles.xml index 53fe658..bd3b60f 100644 --- a/library/main/res/values/styles.xml +++ b/library/main/res/values/styles.xml @@ -211,7 +211,7 @@ <item name="android:baselineAligned">false</item> <item name="android:clipChildren">false</item> <item name="android:clipToPadding">false</item> - <item name="android:gravity">center</item> + <item name="android:gravity">center_vertical</item> <item name="android:minHeight">@dimen/suw_glif_footer_min_height</item> <item name="android:orientation">horizontal</item> <item name="android:paddingTop">@dimen/suw_glif_footer_padding_vertical</item> @@ -222,6 +222,10 @@ <item name="android:paddingStart" tools:ignore="NewApi">@dimen/suw_glif_button_margin_start</item> </style> + <style name="SuwGlifButtonBar.Stackable" parent="SuwGlifButtonBar"> + <item name="android:gravity">center</item> + </style> + <!-- Items styles --> <style name="SuwItemContainer.Description" parent="SuwItemContainer"> |