diff options
6 files changed, 179 insertions, 27 deletions
diff --git a/library/full-support/res/layout/suw_glif_recycler_template_card.xml b/library/full-support/res/layout/suw_glif_recycler_template_card.xml index cf67bd9..7b5c6b0 100644 --- a/library/full-support/res/layout/suw_glif_recycler_template_card.xml +++ b/library/full-support/res/layout/suw_glif_recycler_template_card.xml @@ -15,21 +15,35 @@ limitations under the License. --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/suw_pattern_bg" style="@style/SuwGlifCardBackground" android:layout_width="match_parent" android:layout_height="match_parent" - android:fitsSystemWindows="true"> + android:fitsSystemWindows="true" + android:gravity="center_horizontal" + android:orientation="vertical"> - <FrameLayout + <View + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_weight="1" + android:visibility="invisible" /> + + <com.android.setupwizardlib.view.IntrinsicSizeFrameLayout style="@style/SuwGlifCardContainer" android:layout_width="@dimen/suw_glif_card_width" - android:layout_height="@dimen/suw_glif_card_height" - android:layout_centerInParent="true"> + android:layout_height="wrap_content" + android:height="@dimen/suw_glif_card_height"> <include layout="@layout/suw_glif_recycler_template_content" /> - </FrameLayout> + </com.android.setupwizardlib.view.IntrinsicSizeFrameLayout> + + <View + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_weight="1" + android:visibility="invisible" /> -</RelativeLayout> +</LinearLayout> diff --git a/library/main/res/layout/suw_glif_blank_template_card.xml b/library/main/res/layout/suw_glif_blank_template_card.xml index 6f1ab9d..d120ab0 100644 --- a/library/main/res/layout/suw_glif_blank_template_card.xml +++ b/library/main/res/layout/suw_glif_blank_template_card.xml @@ -15,18 +15,32 @@ limitations under the License. --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/suw_pattern_bg" style="@style/SuwGlifCardBackground" android:layout_width="match_parent" android:layout_height="match_parent" - android:fitsSystemWindows="true"> + android:fitsSystemWindows="true" + android:gravity="center_horizontal" + android:orientation="vertical"> - <FrameLayout + <View + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_weight="1" + android:visibility="invisible" /> + + <com.android.setupwizardlib.view.IntrinsicSizeFrameLayout android:id="@+id/suw_layout_content" style="@style/SuwGlifCardContainer" android:layout_width="@dimen/suw_glif_card_width" - android:layout_height="@dimen/suw_glif_card_height" - android:layout_centerInParent="true" /> + android:layout_height="wrap_content" + android:height="@dimen/suw_glif_card_height" /> + + <View + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_weight="1" + android:visibility="invisible" /> -</RelativeLayout> +</LinearLayout> diff --git a/library/main/res/layout/suw_glif_list_template_card.xml b/library/main/res/layout/suw_glif_list_template_card.xml index 8d7fa95..5a3ba89 100644 --- a/library/main/res/layout/suw_glif_list_template_card.xml +++ b/library/main/res/layout/suw_glif_list_template_card.xml @@ -15,21 +15,35 @@ limitations under the License. --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/suw_pattern_bg" style="@style/SuwGlifCardBackground" android:layout_width="match_parent" android:layout_height="match_parent" - android:fitsSystemWindows="true"> + android:fitsSystemWindows="true" + android:gravity="center_horizontal" + android:orientation="vertical"> - <FrameLayout + <View + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_weight="1" + android:visibility="invisible" /> + + <com.android.setupwizardlib.view.IntrinsicSizeFrameLayout style="@style/SuwGlifCardContainer" android:layout_width="@dimen/suw_glif_card_width" - android:layout_height="@dimen/suw_glif_card_height" - android:layout_centerInParent="true"> + android:layout_height="wrap_content" + android:height="@dimen/suw_glif_card_height"> <include layout="@layout/suw_glif_list_template_content" /> - </FrameLayout> + </com.android.setupwizardlib.view.IntrinsicSizeFrameLayout> + + <View + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_weight="1" + android:visibility="invisible" /> -</RelativeLayout> +</LinearLayout> diff --git a/library/main/res/layout/suw_glif_template_card.xml b/library/main/res/layout/suw_glif_template_card.xml index d1d354f..7b190a1 100644 --- a/library/main/res/layout/suw_glif_template_card.xml +++ b/library/main/res/layout/suw_glif_template_card.xml @@ -15,22 +15,35 @@ limitations under the License. --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/suw_pattern_bg" style="@style/SuwGlifCardBackground" android:layout_width="match_parent" android:layout_height="match_parent" - android:fitsSystemWindows="true"> + android:fitsSystemWindows="true" + android:gravity="center_horizontal" + android:orientation="vertical"> - <FrameLayout + <View + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_weight="1" + android:visibility="invisible" /> + + <com.android.setupwizardlib.view.IntrinsicSizeFrameLayout style="@style/SuwGlifCardContainer" android:layout_width="@dimen/suw_glif_card_width" - android:layout_height="@dimen/suw_glif_card_height" - android:layout_centerInParent="true"> + android:layout_height="wrap_content" + android:height="@dimen/suw_glif_card_height"> <include layout="@layout/suw_glif_template_content" /> - </FrameLayout> + </com.android.setupwizardlib.view.IntrinsicSizeFrameLayout> + <View + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_weight="1" + android:visibility="invisible" /> -</RelativeLayout> +</LinearLayout> diff --git a/library/main/res/values/attrs.xml b/library/main/res/values/attrs.xml index 77e5252..73f8863 100644 --- a/library/main/res/values/attrs.xml +++ b/library/main/res/values/attrs.xml @@ -66,6 +66,11 @@ <attr name="suwStatusBarBackground" format="color|reference" /> </declare-styleable> + <declare-styleable name="SuwMaxSizeFrameLayout"> + <attr name="android:height" /> + <attr name="android:width" /> + </declare-styleable> + <declare-styleable name="SuwSetupWizardLayout"> <attr name="suwBackground" format="color|reference" /> <attr name="suwBackgroundTile" format="color|reference" /> diff --git a/library/main/src/com/android/setupwizardlib/view/IntrinsicSizeFrameLayout.java b/library/main/src/com/android/setupwizardlib/view/IntrinsicSizeFrameLayout.java new file mode 100644 index 0000000..e9ab1a7 --- /dev/null +++ b/library/main/src/com/android/setupwizardlib/view/IntrinsicSizeFrameLayout.java @@ -0,0 +1,92 @@ +/* + * Copyright (C) 2016 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.annotation.TargetApi; +import android.content.Context; +import android.content.res.TypedArray; +import android.os.Build.VERSION_CODES; +import android.util.AttributeSet; +import android.widget.FrameLayout; + +import com.android.setupwizardlib.R; + +/** + * A FrameLayout subclass that has an "intrinsic size", which is the size it wants to be if that is + * within the constraints given by the parent. The intrinsic size can be set with the + * {@code android:width} and {@code android:height} attributes in XML. + * + * Note that for the intrinsic size to be meaningful, {@code android:layout_width} and/or + * {@code android:layout_height} will need to be {@code wrap_content}. + */ +public class IntrinsicSizeFrameLayout extends FrameLayout { + + private int mIntrinsicHeight = 0; + private int mIntrinsicWidth = 0; + + public IntrinsicSizeFrameLayout(Context context) { + super(context); + init(context, null, 0); + } + + public IntrinsicSizeFrameLayout(Context context, AttributeSet attrs) { + super(context, attrs); + init(context, attrs, 0); + } + + @TargetApi(VERSION_CODES.HONEYCOMB) + public IntrinsicSizeFrameLayout(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + init(context, attrs, defStyleAttr); + } + + private void init(Context context, AttributeSet attrs, int defStyleAttr) { + final TypedArray a = context.obtainStyledAttributes(attrs, + R.styleable.SuwMaxSizeFrameLayout, defStyleAttr, 0); + mIntrinsicHeight = + a.getDimensionPixelSize(R.styleable.SuwMaxSizeFrameLayout_android_height, 0); + mIntrinsicWidth = + a.getDimensionPixelSize(R.styleable.SuwMaxSizeFrameLayout_android_width, 0); + a.recycle(); + } + + @Override + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + super.onMeasure(getIntrinsicMeasureSpec(widthMeasureSpec, mIntrinsicWidth), + getIntrinsicMeasureSpec(heightMeasureSpec, mIntrinsicHeight)); + } + + private int getIntrinsicMeasureSpec(int measureSpec, int intrinsicSize) { + if (intrinsicSize <= 0) { + // Intrinsic size is not set, just return the original spec + return measureSpec; + } + final int mode = MeasureSpec.getMode(measureSpec); + final int size = MeasureSpec.getSize(measureSpec); + if (mode == MeasureSpec.UNSPECIFIED) { + // Parent did not give any constraint, so we'll be the intrinsic size + return MeasureSpec.makeMeasureSpec(mIntrinsicHeight, MeasureSpec.EXACTLY); + } else if (mode == MeasureSpec.AT_MOST) { + // If intrinsic size is within parents constraint, take the intrinsic size. + // Otherwise take the parents size because that's closest to the intrinsic size. + return MeasureSpec.makeMeasureSpec(Math.min(size, mIntrinsicHeight), + MeasureSpec.EXACTLY); + } + // Parent specified EXACTLY, or in all other cases, just return the original spec + return measureSpec; + } +} |