diff options
author | Maurice Lam <yukl@google.com> | 2017-06-27 16:56:16 -0700 |
---|---|---|
committer | Maurice Lam <yukl@google.com> | 2017-06-28 12:17:42 -0700 |
commit | 5e98278ebfad7aa858fbfcc4dd53db7442f9bc15 (patch) | |
tree | bad7b990f6dd5d0033d41eb2c51f7a24e66f4269 | |
parent | 5e12def0e205065561e1e64c849bcc7e1df2cccb (diff) | |
download | setupwizard-5e98278ebfad7aa858fbfcc4dd53db7442f9bc15.tar.gz |
Add ButtonBarLayout
Add custom (linear) layout which will stack the buttons vertically
when there is not enough horizontal space.
Test: Manual
Bug: 62488121
Change-Id: I8d5cc72d07514627e800382267f8850531fce3d2
6 files changed, 135 insertions, 6 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 7f5bd70..428fe60 100644 --- a/library/main/res/layout/suw_glif_footer_button_bar.xml +++ b/library/main/res/layout/suw_glif_footer_button_bar.xml @@ -15,7 +15,8 @@ limitations under the License. --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<com.android.setupwizardlib.view.ButtonBarLayout + xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/suw_footer_button_bar" style="@style/SuwGlifButtonBar" android:layout_width="match_parent" diff --git a/library/main/res/values/config.xml b/library/main/res/values/config.xml index 74e30d3..a81b177 100644 --- a/library/main/res/values/config.xml +++ b/library/main/res/values/config.xml @@ -23,4 +23,8 @@ <!-- Whether to use tablet layout --> <bool name="suwUseTabletLayout">false</bool> + <!-- ID used with setTag(int, Object) to store the original weight of a view inside + ButtonBarLayout --> + <item name="suw_original_weight" type="id" /> + </resources> diff --git a/library/main/res/values/dimens.xml b/library/main/res/values/dimens.xml index 14d7429..f29484a 100644 --- a/library/main/res/values/dimens.xml +++ b/library/main/res/values/dimens.xml @@ -25,7 +25,7 @@ <!-- Calculated by (suw_glif_margin_sides - suw_glif_button_padding) --> <dimen name="suw_glif_button_margin_start">8dp</dimen> <dimen name="suw_glif_button_padding">16dp</dimen> - <dimen name="suw_glif_footer_bottom_padding">0dp</dimen> + <dimen name="suw_glif_footer_padding_vertical">8dp</dimen> <dimen name="suw_glif_footer_min_height">80dp</dimen> <dimen name="suw_glif_margin_sides">24dp</dimen> <dimen name="suw_glif_margin_top">48dp</dimen> diff --git a/library/main/res/values/styles.xml b/library/main/res/values/styles.xml index 736bcc4..53fe658 100644 --- a/library/main/res/values/styles.xml +++ b/library/main/res/values/styles.xml @@ -211,10 +211,11 @@ <item name="android:baselineAligned">false</item> <item name="android:clipChildren">false</item> <item name="android:clipToPadding">false</item> - <item name="android:gravity">center_vertical</item> + <item name="android:gravity">center</item> <item name="android:minHeight">@dimen/suw_glif_footer_min_height</item> <item name="android:orientation">horizontal</item> - <item name="android:paddingBottom">@dimen/suw_glif_footer_bottom_padding</item> + <item name="android:paddingTop">@dimen/suw_glif_footer_padding_vertical</item> + <item name="android:paddingBottom">@dimen/suw_glif_footer_padding_vertical</item> <item name="android:paddingEnd" tools:ignore="NewApi">@dimen/suw_glif_button_margin_end</item> <item name="android:paddingLeft">@dimen/suw_glif_button_margin_start</item> <item name="android:paddingRight">@dimen/suw_glif_button_margin_end</item> diff --git a/library/main/src/com/android/setupwizardlib/template/ButtonFooterMixin.java b/library/main/src/com/android/setupwizardlib/template/ButtonFooterMixin.java index 37df096..01dbc29 100644 --- a/library/main/src/com/android/setupwizardlib/template/ButtonFooterMixin.java +++ b/library/main/src/com/android/setupwizardlib/template/ButtonFooterMixin.java @@ -25,7 +25,6 @@ import android.support.annotation.StyleRes; import android.view.ContextThemeWrapper; import android.view.LayoutInflater; import android.view.View; -import android.view.ViewGroup; import android.view.ViewStub; import android.widget.Button; import android.widget.LinearLayout; @@ -114,7 +113,7 @@ public class ButtonFooterMixin implements Mixin { public View addSpace() { final LinearLayout buttonContainer = ensureFooterInflated(); View space = new View(buttonContainer.getContext()); - space.setLayoutParams(new LayoutParams(0, ViewGroup.LayoutParams.MATCH_PARENT, 1.0f)); + space.setLayoutParams(new LayoutParams(0, 0, 1.0f)); space.setVisibility(View.INVISIBLE); buttonContainer.addView(space); return space; diff --git a/library/main/src/com/android/setupwizardlib/view/ButtonBarLayout.java b/library/main/src/com/android/setupwizardlib/view/ButtonBarLayout.java new file mode 100644 index 0000000..f7f5f99 --- /dev/null +++ b/library/main/src/com/android/setupwizardlib/view/ButtonBarLayout.java @@ -0,0 +1,124 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.setupwizardlib.view; + +import android.content.Context; +import android.util.AttributeSet; +import android.view.View; +import android.widget.LinearLayout; + +import com.android.setupwizardlib.R; + +/** + * An extension of LinearLayout that automatically switches to vertical orientation when it can't + * fit its child views horizontally. + * + * Modified from {@code com.android.internal.widget.ButtonBarLayout} + */ +public class ButtonBarLayout extends LinearLayout { + + private boolean mStacked = false; + private int mOriginalPaddingLeft; + private int mOriginalPaddingRight; + + public ButtonBarLayout(Context context) { + super(context); + } + + public ButtonBarLayout(Context context, AttributeSet attrs) { + super(context, attrs); + } + + @Override + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + final int widthSize = MeasureSpec.getSize(widthMeasureSpec); + + setStacked(false); + + boolean needsRemeasure = false; + + int initialWidthMeasureSpec = widthMeasureSpec; + if (MeasureSpec.getMode(widthMeasureSpec) == MeasureSpec.EXACTLY) { + // Measure with WRAP_CONTENT, so that we can compare the measured size with the + // available size to see if we need to stack. + initialWidthMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED); + + // We'll need to remeasure again to fill excess space. + needsRemeasure = true; + } + + super.onMeasure(initialWidthMeasureSpec, heightMeasureSpec); + + if (getMeasuredWidth() > widthSize) { + setStacked(true); + + // Measure again in the new orientation. + needsRemeasure = true; + } + + if (needsRemeasure) { + super.onMeasure(widthMeasureSpec, heightMeasureSpec); + } + } + + private void setStacked(boolean stacked) { + if (mStacked == stacked) { + return; + } + mStacked = stacked; + int childCount = getChildCount(); + for (int i = 0; i < childCount; i++) { + View child = getChildAt(i); + LayoutParams childParams = (LayoutParams) child.getLayoutParams(); + if (stacked) { + child.setTag(R.id.suw_original_weight, childParams.weight); + childParams.weight = 0; + } else { + Float weight = (Float) child.getTag(R.id.suw_original_weight); + if (weight != null) { + childParams.weight = weight; + } + } + child.setLayoutParams(childParams); + } + + setOrientation(stacked ? LinearLayout.VERTICAL : LinearLayout.HORIZONTAL); + + // Reverse the child order, so that the primary button is towards the top when vertical + for (int i = childCount - 1; i >= 0; i--) { + bringChildToFront(getChildAt(i)); + } + + if (stacked) { + // HACK: In the default button bar style, the left and right paddings are not + // balanced to compensate for different alignment for borderless (left) button and + // the raised (right) button. When it's stacked, we want the buttons to be centered, + // so we balance out the paddings here. + mOriginalPaddingLeft = getPaddingLeft(); + mOriginalPaddingRight = getPaddingRight(); + int paddingHorizontal = Math.max(mOriginalPaddingLeft, mOriginalPaddingRight); + setPadding( + paddingHorizontal, getPaddingTop(), paddingHorizontal, getPaddingBottom()); + } else { + setPadding( + mOriginalPaddingLeft, + getPaddingTop(), + mOriginalPaddingRight, + getPaddingBottom()); + } + } +} |