diff options
| author | Chris Banes <chrisbanes@google.com> | 2015-01-28 17:07:48 +0000 |
|---|---|---|
| committer | Chris Banes <chrisbanes@google.com> | 2015-02-10 11:12:30 -0800 |
| commit | f212598d83cfb8b2e2c2b41ae052fb5402c9e96f (patch) | |
| tree | fa2ec28fa614045cfcb1e288bbc32f936b8f2d40 /samples/Support7Demos | |
| parent | 2787b3ea0a6c48f23db2999d4194b11ceacbae39 (diff) | |
| download | android_development-f212598d83cfb8b2e2c2b41ae052fb5402c9e96f.tar.gz android_development-f212598d83cfb8b2e2c2b41ae052fb5402c9e96f.tar.bz2 android_development-f212598d83cfb8b2e2c2b41ae052fb5402c9e96f.zip | |
Add new SupportDesignDemos sample app
- I've moved the design stuff from Support7Demos
Change-Id: Ibb62a1692550419fea25d297aca5c0c7da0b0dbd
Diffstat (limited to 'samples/Support7Demos')
5 files changed, 0 insertions, 129 deletions
diff --git a/samples/Support7Demos/AndroidManifest.xml b/samples/Support7Demos/AndroidManifest.xml index 321e74e01..3e2ef99b0 100644 --- a/samples/Support7Demos/AndroidManifest.xml +++ b/samples/Support7Demos/AndroidManifest.xml @@ -352,14 +352,5 @@ android:label="@string/palette" android:theme="@style/Theme.AppCompat" /> - <activity android:name=".widget.FloatingActionButtonUsage" - android:label="@string/design_fab" - android:theme="@style/Theme.FAB"> - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - <category android:name="com.example.android.supportv7.SAMPLE_CODE" /> - </intent-filter> - </activity> - </application> </manifest> diff --git a/samples/Support7Demos/res/layout/design_fab.xml b/samples/Support7Demos/res/layout/design_fab.xml deleted file mode 100644 index 26a128a54..000000000 --- a/samples/Support7Demos/res/layout/design_fab.xml +++ /dev/null @@ -1,70 +0,0 @@ -<?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. ---> - -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <android.support.v7.widget.Toolbar - android:id="@+id/toolbar" - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:minHeight="?attr/actionBarSize" - android:background="?attr/colorPrimaryDark" - android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" - app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:gravity="center_vertical" - android:clipToPadding="true"> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textAppearance="@style/TextAppearance.AppCompat.Title" - android:text="@string/fab_size_normal" - android:layout_margin="16dp"/> - - <android.support.design.widget.FloatingActionButton - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:layout_margin="16dp" - android:src="@drawable/abc_ic_ab_back_mtrl_am_alpha" - android:clickable="true" /> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="16dp" - android:textAppearance="@style/TextAppearance.AppCompat.Title" - android:text="@string/fab_size_mini" /> - - <android.support.design.widget.FloatingActionButton - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:layout_margin="16dp" - android:src="@drawable/abc_ic_ab_back_mtrl_am_alpha" - android:clickable="true" - app:fabSize="mini" /> - - </LinearLayout> - -</FrameLayout>
\ No newline at end of file diff --git a/samples/Support7Demos/res/values/strings.xml b/samples/Support7Demos/res/values/strings.xml index 6d1ac8652..7e8fc872b 100644 --- a/samples/Support7Demos/res/values/strings.xml +++ b/samples/Support7Demos/res/values/strings.xml @@ -174,8 +174,4 @@ <string name="sorted_list_activity">Sorted List</string> <string name="add_new_item">Add New Item</string> - <string name="design_fab">Design/Floating Action Button</string> - <string name="fab_size_normal">Normal size</string> - <string name="fab_size_mini">Mini size</string> - </resources> diff --git a/samples/Support7Demos/res/values/styles.xml b/samples/Support7Demos/res/values/styles.xml index 253bd4cb5..26a9f70de 100644 --- a/samples/Support7Demos/res/values/styles.xml +++ b/samples/Support7Demos/res/values/styles.xml @@ -33,10 +33,4 @@ <item name="android:minHeight">35dp</item> </style> - <style name="Theme.FAB" parent="Theme.AppCompat.Light.NoActionBar"> - <item name="colorPrimary">#ff00bcd4</item> - <item name="colorPrimaryDark">#00838f</item> - <item name="colorAccent">#ff0000</item> - </style> - </resources>
\ No newline at end of file diff --git a/samples/Support7Demos/src/com/example/android/supportv7/widget/FloatingActionButtonUsage.java b/samples/Support7Demos/src/com/example/android/supportv7/widget/FloatingActionButtonUsage.java deleted file mode 100644 index 791d14007..000000000 --- a/samples/Support7Demos/src/com/example/android/supportv7/widget/FloatingActionButtonUsage.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * 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.supportv7.widget; - -import com.example.android.supportv7.R; - -import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; - -/** - * This demonstrates idiomatic usage of the Floating Action Button - */ -public class FloatingActionButtonUsage extends AppCompatActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.design_fab); - - // Retrieve the Toolbar from our content view, and set it as the action bar - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); - setSupportActionBar(toolbar); - } - -} |
