diff --git a/samples/SupportDesignDemos/AndroidManifest.xml b/samples/SupportDesignDemos/AndroidManifest.xml index 16665b121..9d724b3c9 100644 --- a/samples/SupportDesignDemos/AndroidManifest.xml +++ b/samples/SupportDesignDemos/AndroidManifest.xml @@ -163,6 +163,15 @@ + + + + + + + diff --git a/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_collapse_pin_nested.xml b/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_collapse_pin_nested.xml new file mode 100644 index 000000000..baed926dd --- /dev/null +++ b/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_collapse_pin_nested.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/SupportDesignDemos/res/values/strings.xml b/samples/SupportDesignDemos/res/values/strings.xml index 60dddfebb..19b8c1e55 100644 --- a/samples/SupportDesignDemos/res/values/strings.xml +++ b/samples/SupportDesignDemos/res/values/strings.xml @@ -74,6 +74,7 @@ AppBar/Toolbar Scroll + Tabs Pin + Swipe Refresh AppBar/Collapsing Toolbar (pinned) AppBar/Collapsing Toolbar (pinned with FAB) + AppBar/Collapsing Toolbar (pinned + nested) AppBar/Collapsing Toolbar (scroll off) AppBar/Collapsing Toolbar (scroll off) + Swipe Refresh AppBar/Collapsing Toolbar + Parallax Image diff --git a/samples/SupportDesignDemos/src/com/example/android/support/design/widget/AppBarLayoutToolbarCollapseThenPinNested.java b/samples/SupportDesignDemos/src/com/example/android/support/design/widget/AppBarLayoutToolbarCollapseThenPinNested.java new file mode 100644 index 000000000..957e248d7 --- /dev/null +++ b/samples/SupportDesignDemos/src/com/example/android/support/design/widget/AppBarLayoutToolbarCollapseThenPinNested.java @@ -0,0 +1,27 @@ +/* + * 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. + */ + +package com.example.android.support.design.widget; + +import com.example.android.support.design.R; + +public class AppBarLayoutToolbarCollapseThenPinNested extends AppBarLayoutUsageBase { + + @Override + protected int getLayoutId() { + return R.layout.design_appbar_toolbar_collapse_pin_nested; + } +}