diff --git a/samples/ApiDemos/res/values/arrays.xml b/samples/ApiDemos/res/values/arrays.xml
index 79f7af451..b515c1ef5 100644
--- a/samples/ApiDemos/res/values/arrays.xml
+++ b/samples/ApiDemos/res/values/arrays.xml
@@ -102,6 +102,7 @@
         <item>Unspecified</item>
         <item>Something</item>
         <item>Numeric</item>
+        <item>Numeric(Complex)</item>
         <item>Alphabetic</item>
         <item>Alphanumeric</item>
         <item>Complex</item>
diff --git a/samples/ApiDemos/src/com/example/android/apis/app/DeviceAdminSample.java b/samples/ApiDemos/src/com/example/android/apis/app/DeviceAdminSample.java
index 70d4b6b03..f95b1bb01 100644
--- a/samples/ApiDemos/src/com/example/android/apis/app/DeviceAdminSample.java
+++ b/samples/ApiDemos/src/com/example/android/apis/app/DeviceAdminSample.java
@@ -133,7 +133,11 @@ public class DeviceAdminSample extends PreferenceActivity {
 
     @Override
     protected boolean isValidFragment(String fragmentName) {
-        return GeneralFragment.class.getName().equals(fragmentName);
+        return GeneralFragment.class.getName().equals(fragmentName)
+                || QualityFragment.class.getName().equals(fragmentName)
+                || ExpirationFragment.class.getName().equals(fragmentName)
+                || LockWipeFragment.class.getName().equals(fragmentName)
+                || EncryptionFragment.class.getName().equals(fragmentName);
     }
 
     /**
@@ -437,6 +441,7 @@ public class DeviceAdminSample extends PreferenceActivity {
             DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED,
             DevicePolicyManager.PASSWORD_QUALITY_SOMETHING,
             DevicePolicyManager.PASSWORD_QUALITY_NUMERIC,
+            DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX,
             DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC,
             DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC,
             DevicePolicyManager.PASSWORD_QUALITY_COMPLEX
@@ -448,6 +453,7 @@ public class DeviceAdminSample extends PreferenceActivity {
             String.valueOf(DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED),
             String.valueOf(DevicePolicyManager.PASSWORD_QUALITY_SOMETHING),
             String.valueOf(DevicePolicyManager.PASSWORD_QUALITY_NUMERIC),
+            String.valueOf(DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX),
             String.valueOf(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC),
             String.valueOf(DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC),
             String.valueOf(DevicePolicyManager.PASSWORD_QUALITY_COMPLEX)