diff --git a/samples/ApiDemos/AndroidManifest.xml b/samples/ApiDemos/AndroidManifest.xml
index 4c4a30e18..769129c1c 100644
--- a/samples/ApiDemos/AndroidManifest.xml
+++ b/samples/ApiDemos/AndroidManifest.xml
@@ -37,7 +37,7 @@
     <!-- For android.media.audiofx.Visualizer -->
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
-    <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="19" />
+    <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="20" />
 
     <!-- We will request access to the camera, saying we require a camera
          of some sort but not one with autofocus capability. -->
@@ -48,7 +48,6 @@
     <application android:name="ApiDemosApplication"
             android:label="@string/activity_sample_code"
             android:icon="@drawable/app_sample_code"
-            android:theme="@style/ThemeCurrent"
             android:hardwareAccelerated="true"
             android:supportsRtl="true">
 
diff --git a/samples/ApiDemos/res/values-v19/bools.xml b/samples/ApiDemos/res/values-v19/bools.xml
index 3a4b91e2e..136d8fe17 100644
--- a/samples/ApiDemos/res/values-v19/bools.xml
+++ b/samples/ApiDemos/res/values-v19/bools.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!-- Copyright (C) 2013 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.
@@ -15,8 +15,8 @@
 -->
 
 <resources>
-    <!-- This resource is true if running under at least L-Release
+    <!-- This resource is true if running under at least KitKat
          API level.  The default value is false; an alternative value
-         for L-Release is true. -->
-    <bool name="atLeastLRelease">true</bool>
+         for KitKat is true. -->
+    <bool name="atLeastKitKat">true</bool>
 </resources>
diff --git a/samples/ApiDemos/res/values-v19/styles.xml b/samples/ApiDemos/res/values-v19/styles.xml
index 8307228f3..33a747220 100644
--- a/samples/ApiDemos/res/values-v19/styles.xml
+++ b/samples/ApiDemos/res/values-v19/styles.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!-- 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.
@@ -16,18 +16,18 @@
 
 <resources>
     <!-- For API level XX or later, the Quantum theme is available and we prefer that. -->
-    <style name="ThemeCurrent" parent="android:Theme.Quantum.Light">
+    <style name="ThemeCurrent" parent="android:Theme.Quantum">
     </style>
 
     <!-- For API level XX or later, the Holo theme is available and we prefer that. -->
-    <style name="ThemeCurrentDialog" parent="android:Theme.Quantum.Light.Dialog">
+    <style name="ThemeCurrentDialog" parent="android:Theme.Quantum.Dialog">
     </style>
 
     <!-- For API level XX or later, we can use the magical DialogWhenLarge theme. -->
-    <style name="ThemeCurrentDialogWhenLarge" parent="android:style/Theme.Quantum.Light.DialogWhenLarge">
+    <style name="ThemeCurrentDialogWhenLarge" parent="android:style/Theme.Quantum.DialogWhenLarge">
     </style>
 
-    <style name="ActivityTransitionTheme" parent="android:style/Theme.Quantum.Light">
+    <style name="ActivityTransitionTheme" parent="android:style/Theme.Quantum">
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowContentTransitionManager">@transition/activity_transition_mgr</item>
diff --git a/samples/ApiDemos/res/values-v99/bools.xml b/samples/ApiDemos/res/values-v20/bools.xml
similarity index 77%
rename from samples/ApiDemos/res/values-v99/bools.xml
rename to samples/ApiDemos/res/values-v20/bools.xml
index 136d8fe17..3a4b91e2e 100644
--- a/samples/ApiDemos/res/values-v99/bools.xml
+++ b/samples/ApiDemos/res/values-v20/bools.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
+<!-- Copyright (C) 2014 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.
@@ -15,8 +15,8 @@
 -->
 
 <resources>
-    <!-- This resource is true if running under at least KitKat
+    <!-- This resource is true if running under at least L-Release
          API level.  The default value is false; an alternative value
-         for KitKat is true. -->
-    <bool name="atLeastKitKat">true</bool>
+         for L-Release is true. -->
+    <bool name="atLeastLRelease">true</bool>
 </resources>
diff --git a/samples/ApiDemos/res/values-v99/styles.xml b/samples/ApiDemos/res/values-v20/styles.xml
similarity index 87%
rename from samples/ApiDemos/res/values-v99/styles.xml
rename to samples/ApiDemos/res/values-v20/styles.xml
index 33a747220..8307228f3 100644
--- a/samples/ApiDemos/res/values-v99/styles.xml
+++ b/samples/ApiDemos/res/values-v20/styles.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
+<!-- Copyright (C) 2014 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.
@@ -16,18 +16,18 @@
 
 <resources>
     <!-- For API level XX or later, the Quantum theme is available and we prefer that. -->
-    <style name="ThemeCurrent" parent="android:Theme.Quantum">
+    <style name="ThemeCurrent" parent="android:Theme.Quantum.Light">
     </style>
 
     <!-- For API level XX or later, the Holo theme is available and we prefer that. -->
-    <style name="ThemeCurrentDialog" parent="android:Theme.Quantum.Dialog">
+    <style name="ThemeCurrentDialog" parent="android:Theme.Quantum.Light.Dialog">
     </style>
 
     <!-- For API level XX or later, we can use the magical DialogWhenLarge theme. -->
-    <style name="ThemeCurrentDialogWhenLarge" parent="android:style/Theme.Quantum.DialogWhenLarge">
+    <style name="ThemeCurrentDialogWhenLarge" parent="android:style/Theme.Quantum.Light.DialogWhenLarge">
     </style>
 
-    <style name="ActivityTransitionTheme" parent="android:style/Theme.Quantum">
+    <style name="ActivityTransitionTheme" parent="android:style/Theme.Quantum.Light">
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowContentTransitionManager">@transition/activity_transition_mgr</item>