diff options
| author | Maurice Lam <yukl@google.com> | 2015-04-06 16:52:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-06 16:52:11 +0000 |
| commit | 589209c5b6a8636a4e88cd101eff614ba1f87f84 (patch) | |
| tree | 7a13df85b7f8067e4da498ae3bf9f80039e47e46 /library/main/res/layout/suw_no_scroll_template_header.xml | |
| parent | 49c72c5f917df6ba5592e3b9e5ae116786baaee1 (diff) | |
| parent | d61674efcfaa9f591a44fc75d59566cdd5b409eb (diff) | |
| download | android_frameworks_opt_setupwizard-589209c5b6a8636a4e88cd101eff614ba1f87f84.tar.gz android_frameworks_opt_setupwizard-589209c5b6a8636a4e88cd101eff614ba1f87f84.tar.bz2 android_frameworks_opt_setupwizard-589209c5b6a8636a4e88cd101eff614ba1f87f84.zip | |
am d61674ef: [SetupWizardLib] Add progress bar support
* commit 'd61674efcfaa9f591a44fc75d59566cdd5b409eb':
[SetupWizardLib] Add progress bar support
Diffstat (limited to 'library/main/res/layout/suw_no_scroll_template_header.xml')
| -rw-r--r-- | library/main/res/layout/suw_no_scroll_template_header.xml | 12 |
1 files changed, 7 insertions, 5 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 f2774cc..7bdb34c 100644 --- a/library/main/res/layout/suw_no_scroll_template_header.xml +++ b/library/main/res/layout/suw_no_scroll_template_header.xml @@ -27,10 +27,11 @@ android:layout_height="match_parent" android:orientation="vertical"> - <RelativeLayout + <LinearLayout android:layout_width="match_parent" android:layout_height="0dp" - android:layout_weight="1"> + android:layout_weight="1" + android:orientation="vertical"> <com.android.setupwizardlib.view.Illustration android:id="@+id/suw_layout_decor" @@ -51,13 +52,14 @@ </com.android.setupwizardlib.view.Illustration> + <include layout="@layout/suw_progress_bar_stub" /> + <FrameLayout android:id="@+id/suw_layout_content" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_below="@id/suw_layout_decor" /> + android:layout_height="wrap_content" /> - </RelativeLayout> + </LinearLayout> <com.android.setupwizardlib.view.NavigationBar android:id="@+id/suw_layout_navigation_bar" |