diff --git a/samples/ApiDemos/AndroidManifest.xml b/samples/ApiDemos/AndroidManifest.xml
index d91e58c2b..35a49ddb6 100644
--- a/samples/ApiDemos/AndroidManifest.xml
+++ b/samples/ApiDemos/AndroidManifest.xml
@@ -36,6 +36,8 @@
     <!-- For android.media.audiofx.Visualizer -->
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
+    <uses-sdk android:minSdkVersion="4" />
+
     <!-- We will request access to the camera, saying we require a camera
          of some sort but not one with autofocus capability. -->
     <!--
@@ -153,7 +155,8 @@
         </activity>
 
         <activity android:name=".app.ActivityRecreate"
-                android:label="@string/activity_recreate">
+                android:label="@string/activity_recreate"
+                android:enabled="@bool/atLeastHoneycomb">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />
@@ -245,7 +248,8 @@
         <!-- Fragment Samples -->
 
         <activity android:name=".app.FragmentAlertDialog"
-                android:label="@string/fragment_alert_dialog">
+                android:label="@string/fragment_alert_dialog"
+                android:enabled="@bool/atLeastHoneycomb">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />
@@ -254,7 +258,8 @@
 
         <activity android:name=".app.FragmentHideShow"
                 android:label="@string/fragment_hide_show"
-                android:windowSoftInputMode="stateUnchanged">
+                android:windowSoftInputMode="stateUnchanged"
+                android:enabled="@bool/atLeastHoneycomb">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />
@@ -262,7 +267,8 @@
         </activity>
 
         <activity android:name=".app.FragmentContextMenu"
-                android:label="@string/fragment_context_menu">
+                android:label="@string/fragment_context_menu"
+                android:enabled="@bool/atLeastHoneycomb">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />
@@ -270,7 +276,8 @@
         </activity>
 
         <activity android:name=".app.FragmentDialog"
-                android:label="@string/fragment_dialog">
+                android:label="@string/fragment_dialog"
+                android:enabled="@bool/atLeastHoneycomb">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />
@@ -278,7 +285,8 @@
         </activity>
 
         <activity android:name=".app.FragmentDialogOrActivity"
-                android:label="@string/fragment_dialog_or_activity">
+                android:label="@string/fragment_dialog_or_activity"
+                android:enabled="@bool/atLeastHoneycomb">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />
@@ -286,17 +294,20 @@
         </activity>
 
         <activity android:name=".app.FragmentLayout"
-                android:label="@string/fragment_layout">
+                android:label="@string/fragment_layout"
+                android:enabled="@bool/atLeastHoneycomb">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />
             </intent-filter>
         </activity>
 
-        <activity android:name=".app.FragmentLayout$DetailsActivity" />
+        <activity android:name=".app.FragmentLayout$DetailsActivity"
+                android:enabled="@bool/atLeastHoneycomb" />
 
         <activity android:name=".app.FragmentListCursorLoader"
-                android:label="@string/fragment_list_cursor_loader">
+                android:label="@string/fragment_list_cursor_loader"
+                android:enabled="@bool/atLeastHoneycomb">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />
@@ -304,7 +315,8 @@
         </activity>
 
         <activity android:name=".app.FragmentListArray"
-                android:label="@string/fragment_list_array">
+                android:label="@string/fragment_list_array"
+                android:enabled="@bool/atLeastHoneycomb">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />
@@ -312,7 +324,8 @@
         </activity>
 
         <activity android:name=".app.FragmentMenu"
-                android:label="@string/fragment_menu">
+                android:label="@string/fragment_menu"
+                android:enabled="@bool/atLeastHoneycomb">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />
@@ -320,7 +333,8 @@
         </activity>
 
         <activity android:name=".app.FragmentRetainInstance"
-                android:label="@string/fragment_retain_instance">
+                android:label="@string/fragment_retain_instance"
+                android:enabled="@bool/atLeastHoneycomb">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />
@@ -328,7 +342,8 @@
         </activity>
 
         <activity android:name=".app.FragmentReceiveResult"
-                android:label="@string/fragment_receive_result">
+                android:label="@string/fragment_receive_result"
+                android:enabled="@bool/atLeastHoneycomb">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />
@@ -336,7 +351,8 @@
         </activity>
 
         <activity android:name=".app.FragmentStack"
-                android:label="@string/fragment_stack">
+                android:label="@string/fragment_stack"
+                android:enabled="@bool/atLeastHoneycomb">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />
@@ -347,7 +363,8 @@
 
 <!-- BEGIN_INCLUDE(loader_throttle) -->
         <activity android:name=".app.LoaderThrottle"
-                android:label="@string/loader_throttle">
+                android:label="@string/loader_throttle"
+                android:enabled="@bool/atLeastHoneycomb">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />
@@ -720,14 +737,17 @@
 
         <!-- Action Bar Samples -->
         <activity android:name=".app.ActionBarMechanics"
-                  android:label="@string/action_bar_mechanics">
+                android:label="@string/action_bar_mechanics"
+                android:enabled="@bool/atLeastHoneycomb">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />
             </intent-filter>
         </activity>
 
-        <activity android:name=".app.ActionBarUsage" android:label="@string/action_bar_usage">
+        <activity android:name=".app.ActionBarUsage"
+                android:label="@string/action_bar_usage"
+                android:enabled="@bool/atLeastHoneycomb">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />
@@ -735,8 +755,9 @@
         </activity>
 
         <activity android:name=".app.ActionBarDisplayOptions"
-                  android:label="@string/action_bar_display_options"
-                  android:logo="@drawable/apidemo_androidlogo">
+                android:label="@string/action_bar_display_options"
+                android:logo="@drawable/apidemo_androidlogo"
+                android:enabled="@bool/atLeastHoneycomb">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />
@@ -744,7 +765,8 @@
         </activity>
 
         <activity android:name=".app.ActionBarTabs"
-                  android:label="@string/action_bar_tabs">
+                android:label="@string/action_bar_tabs"
+                android:enabled="@bool/atLeastHoneycomb">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />
@@ -756,7 +778,8 @@
         <!-- ************************************* -->
 
         <activity android:name=".preference.FragmentPreferences"
-                android:label="@string/fragment_preferences">
+                android:label="@string/fragment_preferences"
+                android:enabled="@bool/atLeastHoneycomb">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />
@@ -764,7 +787,8 @@
         </activity>
 
         <activity android:name=".preference.PreferenceWithHeaders"
-                android:label="@string/preference_with_headers">
+                android:label="@string/preference_with_headers"
+                android:enabled="@bool/atLeastHoneycomb">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />
@@ -822,7 +846,9 @@
         <!--        CONTENT PACKAGE SAMPLES        -->
         <!-- ************************************* -->
 
-        <activity android:name=".content.ClipboardSample" android:label="@string/activity_clipboard">
+        <activity android:name=".content.ClipboardSample"
+                android:label="@string/activity_clipboard"
+                android:enabled="@bool/atLeastHoneycomb">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />
@@ -913,8 +939,10 @@
         <!--     ANDROID.ANIMATION PACKAGE SAMPLES         -->
         <!-- ************************************* -->
 
-        <activity android:name=".animation.AnimationLoading" android:label="Animation/Loading"
-                  android:hardwareAccelerated="false">
+        <activity android:name=".animation.AnimationLoading"
+                android:label="Animation/Loading"
+                android:hardwareAccelerated="false"
+                android:enabled="@bool/atLeastHoneycomb">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />
@@ -922,24 +950,29 @@
         </activity>
 
         <activity android:name=".animation.AnimationCloning"
-                  android:label="Animation/Cloning"
-                  android:hardwareAccelerated="false">
+                android:label="Animation/Cloning"
+                android:hardwareAccelerated="false"
+                android:enabled="@bool/atLeastHoneycomb">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />
             </intent-filter>
         </activity>
 
-        <activity android:name=".animation.AnimationSeeking" android:label="Animation/Seeking"
-                  android:hardwareAccelerated="false">
+        <activity android:name=".animation.AnimationSeeking"
+                android:label="Animation/Seeking"
+                android:hardwareAccelerated="false"
+                android:enabled="@bool/atLeastHoneycomb">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />
             </intent-filter>
         </activity>
 
-        <activity android:name=".animation.AnimatorEvents" android:label="Animation/Events"
-                  android:hardwareAccelerated="false">
+        <activity android:name=".animation.AnimatorEvents"
+                android:label="Animation/Events"
+                android:hardwareAccelerated="false"
+                android:enabled="@bool/atLeastHoneycomb">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />
@@ -947,8 +980,9 @@
         </activity>
 
         <activity android:name=".animation.BouncingBalls"
-                  android:label="Animation/Bouncing Balls"
-                  android:hardwareAccelerated="false">
+                android:label="Animation/Bouncing Balls"
+                android:hardwareAccelerated="false"
+                android:enabled="@bool/atLeastHoneycomb">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />
@@ -956,23 +990,28 @@
         </activity>
 
         <activity android:name=".animation.CustomEvaluator"
-                  android:label="Animation/Custom Evaluator"
-                  android:hardwareAccelerated="false">
+                android:label="Animation/Custom Evaluator"
+                android:hardwareAccelerated="false"
+                android:enabled="@bool/atLeastHoneycomb">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />
             </intent-filter>
         </activity>
 
-        <activity android:name=".animation.ListFlipper" android:label="Animation/View Flip">
+        <activity android:name=".animation.ListFlipper"
+                android:label="Animation/View Flip"
+                android:enabled="@bool/atLeastHoneycomb">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />
             </intent-filter>
         </activity>
 
-        <activity android:name=".animation.ReversingAnimation" android:label="Animation/Reversing"
-                  android:hardwareAccelerated="false">
+        <activity android:name=".animation.ReversingAnimation"
+                android:label="Animation/Reversing"
+                android:hardwareAccelerated="false"
+                android:enabled="@bool/atLeastHoneycomb">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />
@@ -980,8 +1019,9 @@
         </activity>
 
         <activity android:name=".animation.MultiPropertyAnimation"
-                  android:label="Animation/Multiple Properties"
-                  android:hardwareAccelerated="false">
+                android:label="Animation/Multiple Properties"
+                android:hardwareAccelerated="false"
+                android:enabled="@bool/atLeastHoneycomb">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />
@@ -989,7 +1029,8 @@
         </activity>
 
         <activity android:name=".animation.LayoutAnimations"
-                  android:label="Animation/Layout Animations">
+                android:label="Animation/Layout Animations"
+                android:enabled="@bool/atLeastHoneycomb">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />
@@ -997,7 +1038,8 @@
         </activity>
 
         <activity android:name=".animation.LayoutAnimationsHideShow"
-                  android:label="Animation/Hide-Show Animations">
+                android:label="Animation/Hide-Show Animations"
+                android:enabled="@bool/atLeastHoneycomb">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />
@@ -1005,7 +1047,8 @@
         </activity>
 
         <activity android:name=".animation.LayoutAnimationsByDefault"
-                  android:label="Animation/Default Layout Animations">
+                android:label="Animation/Default Layout Animations"
+                android:enabled="@bool/atLeastHoneycomb">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />
@@ -1685,7 +1728,8 @@
 
         <activity android:name=".view.Controls3"
                   android:label="Views/Controls/3. Holo Light Theme"
-                  android:theme="@android:style/Theme.Holo.Light">
+                  android:theme="@android:style/Theme.Holo.Light"
+                  android:enabled="@bool/atLeastHoneycomb">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />
@@ -1694,7 +1738,26 @@
 
         <activity android:name=".view.Controls4"
                   android:label="Views/Controls/4. Holo Dark Theme"
-                  android:theme="@android:style/Theme.Holo">
+                  android:theme="@android:style/Theme.Holo"
+                  android:enabled="@bool/atLeastHoneycomb">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.SAMPLE_CODE" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name=".view.Controls5"
+                  android:label="Views/Controls/5. Custom Theme"
+                  android:theme="@style/CustomTheme">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.SAMPLE_CODE" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name=".view.Controls6"
+                  android:label="Views/Controls/6. Holo or Old Theme"
+                  android:theme="@style/ThemeHolo">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />
@@ -1890,7 +1953,8 @@
 
         <activity android:name=".view.DragAndDropDemo"
                 android:label="Views/Drag and Drop"
-                android:hardwareAccelerated="false">
+                android:hardwareAccelerated="false"
+                android:enabled="@bool/atLeastHoneycomb">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />
diff --git a/samples/ApiDemos/res/layout/controls_1.xml b/samples/ApiDemos/res/layout/controls_1.xml
index 63a2de122..e280188a2 100644
--- a/samples/ApiDemos/res/layout/controls_1.xml
+++ b/samples/ApiDemos/res/layout/controls_1.xml
@@ -139,6 +139,14 @@
             android:text="@string/listSeparatorTextViewStyle"
             android:layout_marginTop="5dip"
         />
+
+        <TextView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginTop="400dip"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:text="(And all inside of a ScrollView!)"
+        />
         
     </LinearLayout>
 
diff --git a/samples/ApiDemos/res/values-v11/bools.xml b/samples/ApiDemos/res/values-v11/bools.xml
new file mode 100644
index 000000000..5ea02dd99
--- /dev/null
+++ b/samples/ApiDemos/res/values-v11/bools.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+
+<resources>
+    <!-- True if running under Honeycomb or later. -->
+    <bool name="atLeastHoneycomb">true</bool>
+</resources>
diff --git a/samples/ApiDemos/res/values-v11/styles.xml b/samples/ApiDemos/res/values-v11/styles.xml
new file mode 100644
index 000000000..aa8f2ce11
--- /dev/null
+++ b/samples/ApiDemos/res/values-v11/styles.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+
+<resources>
+    <!-- For API level 11 or later, the Holo theme is available and we prefer that. -->
+    <style name="ThemeHolo" parent="android:Theme.Holo">
+    </style>
+</resources>
diff --git a/samples/ApiDemos/res/values/bools.xml b/samples/ApiDemos/res/values/bools.xml
new file mode 100644
index 000000000..0faffb3a6
--- /dev/null
+++ b/samples/ApiDemos/res/values/bools.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+
+<resources>
+    <!-- This resource is true if running under at least Honeycomb's
+         API level.  The default value is false; an alternative value
+         for Honeycomb is true. -->
+    <bool name="atLeastHoneycomb">false</bool>
+</resources>
diff --git a/samples/ApiDemos/res/values/styles.xml b/samples/ApiDemos/res/values/styles.xml
index 8cc831287..1a295baf4 100644
--- a/samples/ApiDemos/res/values/styles.xml
+++ b/samples/ApiDemos/res/values/styles.xml
@@ -15,6 +15,21 @@
 -->
 
 <resources>
+    <!-- A custom theme that is a variation on the light them with a different
+         background color. -->
+    <color name="custom_theme_color">#b0b0ff</color>
+    <style name="CustomTheme" parent="android:Theme.Light">
+        <item name="android:windowBackground">@color/custom_theme_color</item>
+        <item name="android:colorBackground">@color/custom_theme_color</item>
+    </style>
+
+    <!-- This is a theme that will adjust itself depending on the API version.
+         The default definition is the safe one, using a theme that has always
+         been defined.  Look at values-11/styles.xml for a variation that is
+         selected when the holographic theme is available. -->
+    <style name="ThemeHolo" parent="android:Theme">
+    </style>
+
     <!-- Base application theme is the default theme. -->
     <style name="Theme" parent="android:Theme">
     </style>
diff --git a/samples/ApiDemos/src/com/example/android/apis/view/Controls5.java b/samples/ApiDemos/src/com/example/android/apis/view/Controls5.java
new file mode 100644
index 000000000..dcc515b35
--- /dev/null
+++ b/samples/ApiDemos/src/com/example/android/apis/view/Controls5.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2011 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.apis.view;
+
+public class Controls5 extends Controls1 {}
diff --git a/samples/ApiDemos/src/com/example/android/apis/view/Controls6.java b/samples/ApiDemos/src/com/example/android/apis/view/Controls6.java
new file mode 100644
index 000000000..3002259ee
--- /dev/null
+++ b/samples/ApiDemos/src/com/example/android/apis/view/Controls6.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2011 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.apis.view;
+
+public class Controls6 extends Controls1 {}
diff --git a/samples/ApiDemos/src/com/example/android/apis/view/_index.html b/samples/ApiDemos/src/com/example/android/apis/view/_index.html
index 0a435c15f..e72890a92 100644
--- a/samples/ApiDemos/src/com/example/android/apis/view/_index.html
+++ b/samples/ApiDemos/src/com/example/android/apis/view/_index.html
@@ -259,21 +259,31 @@
 
 <h3>Controls</h3>
 <dl>
-  <dt><a href="Controls1.html">1. Theme Light</a></dt>
+  <dt><a href="Controls1.html">1. Light Theme</a></dt>
   <dd>Demonstrates a variety of common form type widgets, such as check boxes and radio buttons using the light theme. </dd>
 </dl>
 <dl>
-  <dt><a href="Controls1.html">2. Theme Dark</a></dt>
+  <dt><a href="Controls1.html">2. Dark Theme</a></dt>
   <dd>Demonstrates a variety of common form type widgets, such as check boxes and radio buttons using the dark theme. </dd>
 </dl>
 <dl>
-  <dt><a href="Controls1.html">3. Theme Holographic Light</a></dt>
+  <dt><a href="Controls1.html">3. Holographic Light Theme</a></dt>
   <dd>Demonstrates a variety of common form type widgets, such as check boxes and radio buttons using the light holographic theme. </dd>
 </dl>
 <dl>
-  <dt><a href="Controls1.html">4. Theme Holographic Dark</a></dt>
+  <dt><a href="Controls1.html">4. Holographic Dark Theme</a></dt>
   <dd>Demonstrates a variety of common form type widgets, such as check boxes and radio buttons using the dark holographic theme. </dd>
 </dl>
+<dl>
+  <dt><a href="Controls1.html">5. Custom Theme</a></dt>
+  <dd>Demonstrates a variety of common form type widgets, such as check boxes and radio buttons using a custom
+  theme based on the light theme. </dd>
+</dl>
+<dl>
+  <dt><a href="Controls1.html">6. Holo or Old Theme</a></dt>
+  <dd>Demonstrates a variety of common form type widgets, such as check boxes and radio buttons using a custom
+  theme that uses either the traditional or holo theme depending on the version of the platform. </dd>
+</dl>
 
 <h3>Auto Complete</h3>
 <dl>