summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaurice Lam <yukl@google.com>2017-07-07 22:14:37 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-07-07 22:14:37 +0000
commitf1ff4106f1e68b25c54530b0ae1c0d3567652947 (patch)
tree8cc9e8a4d701098e0861b13582870c6630a1918f
parent4793e2924e77e58df6111a3fc3b56e3299593b8d (diff)
parent2fc80693722673f25c67d062c6e7cc2436acc24b (diff)
downloadsetupwizard-f1ff4106f1e68b25c54530b0ae1c0d3567652947.tar.gz
Add stackable button bar style
am: 2fc8069372 Change-Id: I322b71441f1eee6cd33e4e43262a0c1445eff790
-rw-r--r--library/main/res/layout/suw_glif_footer_button_bar.xml2
-rw-r--r--library/main/res/values/styles.xml6
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">