am 374d4c2b: Merge "Add Snackbar demo without a CoordinatorLayout" into lmp-mr1-ub-dev

* commit '374d4c2b146ef2d8b3defd11dc3a48bb776c80a3':
  Add Snackbar demo without a CoordinatorLayout

samples/SupportDesignDemos/AndroidManifest.xml

@@ -90,5 +90,14 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".widget.SnackbarWithoutCoordinatorLayout"
+                  android:label="@string/design_snackbar_without_col"
+                  android:theme="@style/Theme.AppCompat.Light.DarkActionBar">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="com.example.android.support.design.SAMPLE_CODE" />
+            </intent-filter>
+        </activity>
+
     </application>
 </manifest>

samples/SupportDesignDemos/res/layout/design_snackbar_without_col.xml

@@ -0,0 +1,55 @@
+<?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.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:id="@+id/content_view"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:padding="16dp"
+              android:orientation="vertical">
+
+    <Button
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/snackbar_show_short"
+            android:onClick="showShort"/>
+
+    <Button
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/snackbar_show_short_action"
+            android:onClick="showAction"/>
+
+    <Button
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/snackbar_show_long"
+            android:onClick="showLong"/>
+
+    <Button
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/snackbar_show_long_action"
+            android:onClick="showLongAction"/>
+
+    <Button
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/snackbar_show_long_long_action"
+            android:onClick="showLongLongAction"/>
+
+</LinearLayout>

samples/SupportDesignDemos/res/values/strings.xml

@@ -56,6 +56,7 @@
 
     <string name="design_snackbar_basic">Snackbar/Usage</string>
     <string name="design_snackbar_fab">Snackbar/Coordinated with FAB</string>
+    <string name="design_snackbar_without_col">Snackbar/Usage without CoordinatorLayout</string>
     <string name="snackbar_show_short">Snackbar (short message)</string>
     <string name="snackbar_show_long">Snackbar (long message)</string>
     <string name="snackbar_show_short_action">Show (short message + action)</string>

samples/SupportDesignDemos/src/com/example/android/support/design/widget/SnackbarWithFloatingActionButton.java

@@ -25,7 +25,7 @@ import android.view.View;
 import android.view.ViewGroup;
 
 /**
- * This demonstrates idiomatic usage of the Floating Action Button
+ * This demonstrates idiomatic usage of Snackbar with a Floating Action Button present
  */
 public class SnackbarWithFloatingActionButton extends SnackbarUsage {
 

samples/SupportDesignDemos/src/com/example/android/support/design/widget/SnackbarWithoutCoordinatorLayout.java

@@ -0,0 +1,31 @@
+/*
+ * 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;
+
+/**
+ * This demonstrates idiomatic usage of Snackbar without a CoordinatorLayout
+ */
+public class SnackbarWithoutCoordinatorLayout extends SnackbarUsage {
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.design_snackbar_without_col;
+    }
+
+}