diff options
| author | Maurice Lam <yukl@google.com> | 2015-04-23 17:31:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-23 17:31:57 +0000 |
| commit | b01e885bac69f64b860f2d26b4760d8c0186707c (patch) | |
| tree | a67a9ea95f08d5fb30a006b7031577a7255f0781 | |
| parent | 41aa41aa942708b8552050698fea6052ac2a4ad1 (diff) | |
| parent | a38fab1af11a7c08355b12c617499b8743a03b8b (diff) | |
| download | android_frameworks_opt_setupwizard-b01e885bac69f64b860f2d26b4760d8c0186707c.tar.gz android_frameworks_opt_setupwizard-b01e885bac69f64b860f2d26b4760d8c0186707c.tar.bz2 android_frameworks_opt_setupwizard-b01e885bac69f64b860f2d26b4760d8c0186707c.zip | |
am a38fab1a: Merge "[SetupWizardLib] Fill viewport on phone portrait" into ub-setupwizard-alatar
* commit 'a38fab1af11a7c08355b12c617499b8743a03b8b':
[SetupWizardLib] Fill viewport on phone portrait
| -rw-r--r-- | library/main/res/layout/suw_no_scroll_template_header.xml | 3 | ||||
| -rw-r--r-- | library/main/res/layout/suw_template_header.xml | 23 |
2 files changed, 13 insertions, 13 deletions
diff --git a/library/main/res/layout/suw_no_scroll_template_header.xml b/library/main/res/layout/suw_no_scroll_template_header.xml index 7bdb34c..bdd64e3 100644 --- a/library/main/res/layout/suw_no_scroll_template_header.xml +++ b/library/main/res/layout/suw_no_scroll_template_header.xml @@ -57,7 +57,8 @@ <FrameLayout android:id="@+id/suw_layout_content" android:layout_width="match_parent" - android:layout_height="wrap_content" /> + android:layout_height="0dp" + android:layout_weight="1" /> </LinearLayout> diff --git a/library/main/res/layout/suw_template_header.xml b/library/main/res/layout/suw_template_header.xml index ea37163..e130728 100644 --- a/library/main/res/layout/suw_template_header.xml +++ b/library/main/res/layout/suw_template_header.xml @@ -29,16 +29,21 @@ android:layout_height="0dp" android:fillViewport="true"> - <LinearLayout + <RelativeLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - android:clipChildren="false" - android:orientation="vertical"> + android:layout_height="match_parent" + android:clipChildren="false"> + + <FrameLayout + android:id="@+id/suw_layout_content" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_below="@+id/suw_layout_header" /> <LinearLayout + android:id="@+id/suw_layout_header" android:layout_width="match_parent" android:layout_height="wrap_content" - android:clipChildren="false" android:orientation="vertical" android:tag="stickyContainer"> @@ -65,13 +70,7 @@ </LinearLayout> - <FrameLayout - android:id="@+id/suw_layout_content" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:clipChildren="false" /> - - </LinearLayout> + </RelativeLayout> </com.android.setupwizardlib.view.StickyHeaderScrollView> |