am 7a6a6e7: Merge "Add switches to the Controls sample in ApiDemos" into lmp-dev

* commit '7a6a6e7a7efc289826cddb6b0af1e77289492702':
  Add switches to the Controls sample in ApiDemos

Author: alanv

samples/ApiDemos/res/layout/controls_1.xml

@@ -43,6 +43,23 @@
                 android:text="@string/controls_1_save" />
         </LinearLayout>
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal" >
+
+            <Switch
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/controls_1_save" />
+
+            <Switch
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:enabled="false"
+                android:text="@string/controls_1_save" />
+        </LinearLayout>
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"