diff options
8 files changed, 19 insertions, 3 deletions
diff --git a/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_collapse_pin.xml b/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_collapse_pin.xml index 2809b04ae..ee3114dd2 100644 --- a/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_collapse_pin.xml +++ b/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_collapse_pin.xml @@ -18,10 +18,12 @@ <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/col" android:layout_width="match_parent" android:layout_height="match_parent"> <android.support.design.widget.AppBarLayout + android:id="@+id/app_bar" android:layout_height="192dp" android:layout_width="match_parent" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> diff --git a/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_collapse_pin_with_fab.xml b/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_collapse_pin_with_fab.xml index cff9d92fd..adf7900de 100644 --- a/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_collapse_pin_with_fab.xml +++ b/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_collapse_pin_with_fab.xml @@ -18,6 +18,7 @@ <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/col" android:layout_width="match_parent" android:layout_height="match_parent"> diff --git a/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_collapse_scroll.xml b/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_collapse_scroll.xml index a865ca307..fc85db043 100644 --- a/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_collapse_scroll.xml +++ b/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_collapse_scroll.xml @@ -17,10 +17,12 @@ <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/col" android:layout_width="match_parent" android:layout_height="match_parent"> <android.support.design.widget.AppBarLayout + android:id="@+id/app_bar" android:layout_height="192dp" android:layout_width="match_parent" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> diff --git a/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_collapse_with_image.xml b/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_collapse_with_image.xml index ebdbf10ef..930c1a849 100644 --- a/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_collapse_with_image.xml +++ b/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_collapse_with_image.xml @@ -18,10 +18,12 @@ <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/col" android:layout_width="match_parent" android:layout_height="match_parent"> <android.support.design.widget.AppBarLayout + android:id="@+id/app_bar" android:layout_height="192dp" android:layout_width="match_parent" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> diff --git a/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_collapse_with_image_insets.xml b/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_collapse_with_image_insets.xml index 95f13c318..6e2ba9b64 100644 --- a/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_collapse_with_image_insets.xml +++ b/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_collapse_with_image_insets.xml @@ -18,12 +18,14 @@ <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/col" android:layout_width="match_parent" android:layout_height="match_parent" android:fitsSystemWindows="true"> <android.support.design.widget.AppBarLayout - android:layout_height="256dp" + android:id="@+id/app_bar" + android:layout_height="wrap_content" android:layout_width="match_parent" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" android:fitsSystemWindows="true"> @@ -31,7 +33,7 @@ <android.support.design.widget.CollapsingToolbarLayout android:id="@+id/collapsing_app_bar" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="256dp" app:layout_scrollFlags="scroll|exitUntilCollapsed" app:contentScrim="?attr/colorPrimary"> @@ -41,7 +43,8 @@ android:layout_height="match_parent" app:layout_collapseMode="parallax" android:src="@drawable/photo" - android:scaleType="centerCrop"/> + android:scaleType="centerCrop" + android:fitsSystemWindows="true"/> <android.support.v7.widget.Toolbar android:id="@+id/toolbar" diff --git a/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_parallax_overlap.xml b/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_parallax_overlap.xml index 98158e7de..2b12b91a1 100644 --- a/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_parallax_overlap.xml +++ b/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_parallax_overlap.xml @@ -18,10 +18,12 @@ <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/col" android:layout_width="match_parent" android:layout_height="match_parent"> <android.support.design.widget.AppBarLayout + android:id="@+id/app_bar" android:layout_height="192dp" android:layout_width="match_parent" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> diff --git a/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_scroll_tabs_pinned.xml b/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_scroll_tabs_pinned.xml index ea94c8ab5..c7bc615b2 100644 --- a/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_scroll_tabs_pinned.xml +++ b/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_scroll_tabs_pinned.xml @@ -18,10 +18,12 @@ <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/col" android:layout_width="match_parent" android:layout_height="match_parent"> <android.support.design.widget.AppBarLayout + android:id="@+id/app_bar" android:layout_height="wrap_content" android:layout_width="match_parent" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> diff --git a/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_scroll_tabs_scroll.xml b/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_scroll_tabs_scroll.xml index 580c5c4c4..239c0366d 100644 --- a/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_scroll_tabs_scroll.xml +++ b/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_scroll_tabs_scroll.xml @@ -18,10 +18,12 @@ <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/col" android:layout_width="match_parent" android:layout_height="match_parent"> <android.support.design.widget.AppBarLayout + android:id="@+id/app_bar" android:layout_height="wrap_content" android:layout_width="match_parent" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> |