diff options
Diffstat (limited to 'library/main/res')
15 files changed, 197 insertions, 62 deletions
diff --git a/library/main/res/layout-v21/suw_progress_bar.xml b/library/main/res/layout-v21/suw_progress_bar.xml new file mode 100644 index 0000000..cbb69ea --- /dev/null +++ b/library/main/res/layout-v21/suw_progress_bar.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 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. +--> + +<ProgressBar xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/progress_bar" + style="?android:attr/progressBarStyleHorizontal" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="@dimen/suw_progress_bar_margin_vertical" + android:layout_marginTop="@dimen/suw_progress_bar_margin_vertical" + android:indeterminate="true" /> diff --git a/library/main/res/layout/suw_list_header.xml b/library/main/res/layout/suw_list_header.xml index 8d1cefa..7e6c770 100644 --- a/library/main/res/layout/suw_list_header.xml +++ b/library/main/res/layout/suw_list_header.xml @@ -15,24 +15,32 @@ limitations under the License. --> -<com.android.setupwizardlib.view.Illustration - xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/suw_layout_decor" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/suw_layout_background" - android:elevation="@dimen/suw_title_area_elevation" - android:tag="stickyContainer" - app:suwAspectRatio="2.22" - tools:ignore="UnusedAttribute"> - - <TextView - android:id="@+id/suw_layout_title" - style="@style/SuwHeaderTitle" + android:orientation="vertical" + android:tag="stickyContainer"> + + <com.android.setupwizardlib.view.Illustration + android:id="@+id/suw_layout_decor" android:layout_width="match_parent" android:layout_height="wrap_content" - android:tag="sticky" /> + android:background="@drawable/suw_layout_background" + android:elevation="@dimen/suw_title_area_elevation" + app:suwAspectRatio="2.22" + tools:ignore="UnusedAttribute"> + + <TextView + android:id="@+id/suw_layout_title" + style="@style/SuwHeaderTitle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:tag="sticky" /> + + </com.android.setupwizardlib.view.Illustration> + + <include layout="@layout/suw_progress_bar_stub" /> -</com.android.setupwizardlib.view.Illustration> +</LinearLayout> diff --git a/library/main/res/layout/suw_list_template_card.xml b/library/main/res/layout/suw_list_template_card.xml index 26099ee..08fd83b 100644 --- a/library/main/res/layout/suw_list_template_card.xml +++ b/library/main/res/layout/suw_list_template_card.xml @@ -42,14 +42,22 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - <ListView - android:id="@android:id/list" + <FrameLayout android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" android:background="?attr/suwCardBackground" android:elevation="@dimen/suw_card_elevation" - tools:ignore="UnusedAttribute" /> + tools:ignore="UnusedAttribute"> + + <include layout="@layout/suw_progress_bar_stub" /> + + <ListView + android:id="@android:id/list" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + + </FrameLayout> </LinearLayout> diff --git a/library/main/res/layout/suw_list_template_card_wide.xml b/library/main/res/layout/suw_list_template_card_wide.xml index 40d9090..1812bdc 100644 --- a/library/main/res/layout/suw_list_template_card_wide.xml +++ b/library/main/res/layout/suw_list_template_card_wide.xml @@ -42,15 +42,23 @@ android:layout_marginTop="@dimen/suw_tablet_illustration_height" android:layout_weight="6" /> - <ListView - android:id="@android:id/list" + <FrameLayout android:layout_width="0dp" android:layout_height="match_parent" android:layout_marginTop="@dimen/suw_card_land_margin_top" android:layout_weight="8" android:background="?attr/suwCardBackground" android:elevation="@dimen/suw_card_elevation" - tools:ignore="UnusedAttribute" /> + tools:ignore="UnusedAttribute"> + + <include layout="@layout/suw_progress_bar_stub" /> + + <ListView + android:id="@android:id/list" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + + </FrameLayout> </LinearLayout> diff --git a/library/main/res/layout/suw_list_template_header_collapsed.xml b/library/main/res/layout/suw_list_template_header_collapsed.xml index 85ec091..a85417b 100644 --- a/library/main/res/layout/suw_list_template_header_collapsed.xml +++ b/library/main/res/layout/suw_list_template_header_collapsed.xml @@ -37,6 +37,8 @@ </FrameLayout> + <include layout="@layout/suw_progress_bar_stub" /> + <ListView android:id="@android:id/list" android:layout_width="match_parent" diff --git a/library/main/res/layout/suw_no_scroll_template_card.xml b/library/main/res/layout/suw_no_scroll_template_card.xml index 00b10dd..21356c2 100644 --- a/library/main/res/layout/suw_no_scroll_template_card.xml +++ b/library/main/res/layout/suw_no_scroll_template_card.xml @@ -46,13 +46,21 @@ android:layout_height="wrap_content" /> <FrameLayout - android:id="@+id/suw_layout_content" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" android:background="?attr/suwCardBackground" android:elevation="@dimen/suw_card_elevation" - tools:ignore="UnusedAttribute" /> + tools:ignore="UnusedAttribute"> + + <include layout="@layout/suw_progress_bar_stub" /> + + <FrameLayout + android:id="@+id/suw_layout_content" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + + </FrameLayout> </LinearLayout> diff --git a/library/main/res/layout/suw_no_scroll_template_card_wide.xml b/library/main/res/layout/suw_no_scroll_template_card_wide.xml index e4b39a9..82fe8c9 100644 --- a/library/main/res/layout/suw_no_scroll_template_card_wide.xml +++ b/library/main/res/layout/suw_no_scroll_template_card_wide.xml @@ -46,15 +46,22 @@ android:layout_weight="6" /> <FrameLayout - android:id="@+id/suw_layout_content" android:layout_width="0dp" android:layout_height="match_parent" android:layout_marginTop="@dimen/suw_card_land_margin_top" android:layout_weight="8" android:background="?attr/suwCardBackground" android:elevation="@dimen/suw_card_elevation" - android:fillViewport="true" - tools:ignore="UnusedAttribute" /> + tools:ignore="UnusedAttribute"> + + <FrameLayout + android:id="@+id/suw_layout_content" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + + <include layout="@layout/suw_progress_bar_stub" /> + + </FrameLayout> </LinearLayout> 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" diff --git a/library/main/res/layout/suw_no_scroll_template_header_collapsed.xml b/library/main/res/layout/suw_no_scroll_template_header_collapsed.xml index 6e866b1..f8af7a7 100644 --- a/library/main/res/layout/suw_no_scroll_template_header_collapsed.xml +++ b/library/main/res/layout/suw_no_scroll_template_header_collapsed.xml @@ -40,6 +40,8 @@ </FrameLayout> + <include layout="@layout/suw_progress_bar_stub" /> + <FrameLayout android:id="@+id/suw_layout_content" android:layout_width="match_parent" android:layout_height="0dp" diff --git a/library/main/res/layout/suw_progress_bar_stub.xml b/library/main/res/layout/suw_progress_bar_stub.xml new file mode 100644 index 0000000..3a03375 --- /dev/null +++ b/library/main/res/layout/suw_progress_bar_stub.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 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. +--> + +<ViewStub xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/suw_layout_progress_stub" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="@dimen/suw_progress_bar_margin_vertical" + android:layout_marginTop="@dimen/suw_progress_bar_margin_vertical" + android:inflatedId="@+id/suw_layout_progress" + android:layout="@layout/suw_progress_bar" /> diff --git a/library/main/res/layout/suw_template_card.xml b/library/main/res/layout/suw_template_card.xml index 26e5c71..ca0ab25 100644 --- a/library/main/res/layout/suw_template_card.xml +++ b/library/main/res/layout/suw_template_card.xml @@ -42,23 +42,31 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - <com.android.setupwizardlib.view.BottomScrollView - android:id="@+id/suw_bottom_scroll_view" + <FrameLayout android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" android:background="?attr/suwCardBackground" android:elevation="@dimen/suw_card_elevation" - android:fillViewport="true" tools:ignore="UnusedAttribute"> - <FrameLayout - android:id="@+id/suw_layout_content" + <include layout="@layout/suw_progress_bar_stub" /> + + <com.android.setupwizardlib.view.BottomScrollView + android:id="@+id/suw_bottom_scroll_view" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:clipChildren="false" /> + android:layout_height="match_parent" + android:fillViewport="true"> + + <FrameLayout + android:id="@+id/suw_layout_content" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:clipChildren="false" /> + + </com.android.setupwizardlib.view.BottomScrollView> - </com.android.setupwizardlib.view.BottomScrollView> + </FrameLayout> </LinearLayout> diff --git a/library/main/res/layout/suw_template_card_wide.xml b/library/main/res/layout/suw_template_card_wide.xml index 74f91f1..5238963 100644 --- a/library/main/res/layout/suw_template_card_wide.xml +++ b/library/main/res/layout/suw_template_card_wide.xml @@ -42,23 +42,31 @@ android:layout_marginTop="@dimen/suw_tablet_illustration_height" android:layout_weight="6" /> - <com.android.setupwizardlib.view.BottomScrollView - android:id="@+id/suw_bottom_scroll_view" + <FrameLayout android:layout_width="0dp" android:layout_height="match_parent" android:layout_marginTop="@dimen/suw_card_land_margin_top" android:layout_weight="8" android:background="?attr/suwCardBackground" android:elevation="@dimen/suw_card_elevation" - android:fillViewport="true" tools:ignore="UnusedAttribute"> - <FrameLayout android:id="@+id/suw_layout_content" + <include layout="@layout/suw_progress_bar_stub" /> + + <com.android.setupwizardlib.view.BottomScrollView + android:id="@+id/suw_bottom_scroll_view" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:clipChildren="false" /> + android:layout_height="match_parent" + android:fillViewport="true"> + + <FrameLayout android:id="@+id/suw_layout_content" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:clipChildren="false" /> + + </com.android.setupwizardlib.view.BottomScrollView> - </com.android.setupwizardlib.view.BottomScrollView> + </FrameLayout> </LinearLayout> diff --git a/library/main/res/layout/suw_template_header.xml b/library/main/res/layout/suw_template_header.xml index fb6c5b8..ea37163 100644 --- a/library/main/res/layout/suw_template_header.xml +++ b/library/main/res/layout/suw_template_header.xml @@ -29,38 +29,49 @@ android:layout_height="0dp" android:fillViewport="true"> - <RelativeLayout + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:clipChildren="false"> + android:clipChildren="false" + android:orientation="vertical"> - <com.android.setupwizardlib.view.Illustration - android:id="@+id/suw_layout_decor" + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/suw_layout_background" - android:elevation="@dimen/suw_title_area_elevation" - android:tag="stickyContainer" - app:suwAspectRatio="2.22" - tools:ignore="UnusedAttribute"> - - <TextView - android:id="@+id/suw_layout_title" - style="@style/SuwHeaderTitle" + android:clipChildren="false" + android:orientation="vertical" + android:tag="stickyContainer"> + + <com.android.setupwizardlib.view.Illustration + android:id="@+id/suw_layout_decor" android:layout_width="match_parent" android:layout_height="wrap_content" - android:tag="sticky" /> + android:background="@drawable/suw_layout_background" + android:elevation="@dimen/suw_title_area_elevation" + android:orientation="vertical" + app:suwAspectRatio="2.22" + tools:ignore="UnusedAttribute"> + + <TextView + android:id="@+id/suw_layout_title" + style="@style/SuwHeaderTitle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:tag="sticky" /> + + </com.android.setupwizardlib.view.Illustration> + + <include layout="@layout/suw_progress_bar_stub" /> - </com.android.setupwizardlib.view.Illustration> + </LinearLayout> <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:clipChildren="false" /> - </RelativeLayout> + </LinearLayout> </com.android.setupwizardlib.view.StickyHeaderScrollView> diff --git a/library/main/res/layout/suw_template_header_collapsed.xml b/library/main/res/layout/suw_template_header_collapsed.xml index 22fcb4c..dab4df4 100644 --- a/library/main/res/layout/suw_template_header_collapsed.xml +++ b/library/main/res/layout/suw_template_header_collapsed.xml @@ -37,6 +37,15 @@ </FrameLayout> + <ViewStub + android:id="@+id/suw_layout_progress_stub" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="@dimen/suw_progress_bar_margin_vertical" + android:layout_marginTop="@dimen/suw_progress_bar_margin_vertical" + android:inflatedId="@+id/suw_layout_progress" + android:layout="@layout/suw_progress_bar" /> + <com.android.setupwizardlib.view.BottomScrollView android:id="@+id/suw_bottom_scroll_view" android:layout_width="match_parent" diff --git a/library/main/res/values/dimens.xml b/library/main/res/values/dimens.xml index 81fa53a..2f9c65f 100644 --- a/library/main/res/values/dimens.xml +++ b/library/main/res/values/dimens.xml @@ -60,4 +60,8 @@ <dimen name="suw_navbar_padding_sides">24dp</dimen> <dimen name="suw_navbar_text_size">16sp</dimen> + <!-- Progress bar --> + <!-- The margin to compensate for the padding built-in to the widget itself --> + <dimen name="suw_progress_bar_margin_vertical">-7dp</dimen> + </resources> |