From d9b5ca8fb8fa49d937bcbf95e6d309651318b0ba Mon Sep 17 00:00:00 2001
From: Yuichi Araki <yaraki@google.com>
Date: Mon, 28 Sep 2015 16:41:16 +0900
Subject: [PATCH] Add usage of app:actionLayout in NavigationView

Change-Id: Ia89c13233226bebba9a0d0bde57f183debd85ba4
---
 .../res/layout/action_layout.xml              | 23 +++++++++++++++++++
 .../res/menu/navigation.xml                   |  6 +++--
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 samples/SupportDesignDemos/res/layout/action_layout.xml

diff --git a/samples/SupportDesignDemos/res/layout/action_layout.xml b/samples/SupportDesignDemos/res/layout/action_layout.xml
new file mode 100644
index 000000000..a266d5104
--- /dev/null
+++ b/samples/SupportDesignDemos/res/layout/action_layout.xml
@@ -0,0 +1,23 @@
+<?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.
+-->
+<android.support.v7.widget.SwitchCompat
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/toggle"
+        android:orientation="vertical"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:gravity="center_vertical"/>
diff --git a/samples/SupportDesignDemos/res/menu/navigation.xml b/samples/SupportDesignDemos/res/menu/navigation.xml
index b399ef3a9..6425b1893 100644
--- a/samples/SupportDesignDemos/res/menu/navigation.xml
+++ b/samples/SupportDesignDemos/res/menu/navigation.xml
@@ -14,7 +14,8 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <!-- Main items -->
     <group android:checkableBehavior="single">
@@ -30,7 +31,8 @@
         <item
                 android:id="@+id/navigation_item_3"
                 android:icon="@drawable/ic_android"
-                android:title="@string/navigation_item_3"/>
+                android:title="@string/navigation_item_3"
+                app:actionLayout="@layout/action_layout"/>
         <item
                 android:id="@+id/navigation_item_disabled"
                 android:icon="@drawable/ic_android"