LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am a2413acd: am b1629398: Tweaks around AppBar demos

Browse Source 
* commit 'a2413acdeebeb1d16cc9e44fddfb13caa22de127':
  Tweaks around AppBar demos
This commit is contained in:
Chris Banes
2015-05-12 10:39:08 +00:00
committed by Android Git Automerger
parent 379bd9516c a2413acdee
commit 9646b38ead
8 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/SupportDesignDemos/res/layout/design_appbar_toolbar_collapse_pin.xml
View File

@@ -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">

1
samples/SupportDesignDemos/res/layout/design_appbar_toolbar_collapse_pin_with_fab.xml
View File

@@ -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">

2
samples/SupportDesignDemos/res/layout/design_appbar_toolbar_collapse_scroll.xml
View File

@@ -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">

2
samples/SupportDesignDemos/res/layout/design_appbar_toolbar_collapse_with_image.xml
View File

@@ -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">

9
samples/SupportDesignDemos/res/layout/design_appbar_toolbar_collapse_with_image_insets.xml
View File

@@ -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"

2
samples/SupportDesignDemos/res/layout/design_appbar_toolbar_parallax_overlap.xml
View File

@@ -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">

2
samples/SupportDesignDemos/res/layout/design_appbar_toolbar_scroll_tabs_pinned.xml
View File

@@ -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">

2
samples/SupportDesignDemos/res/layout/design_appbar_toolbar_scroll_tabs_scroll.xml
View File

@@ -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">