commit e6a2dd091fd0b6ece8dc98ed444a5c1b36cfdbf9
author Madan Ankapura <mankapura@google.com> Fri Dec 13 00:44:37 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 13 00:44:37 2013 +0000
tree 55058f8ddfafa949763fb9841e8ef3503a52564b
parent 10364c81b3e4971e7bf584ac32405ccb4a7bbe42
parent 5723256742dd831851595ada06f6964b49144398

Merge "Update test for 400dpi and xxxhdpi" into klp-dev

tests/tests/app/src/android/app/cts/ActivityManagerMemoryClassTest.java

diff --git a/tests/tests/app/src/android/app/cts/ActivityManagerMemoryClassTest.java b/tests/tests/app/src/android/app/cts/ActivityManagerMemoryClassTest.java
index 622055c..408efe7 100644
--- a/tests/tests/app/src/android/app/cts/ActivityManagerMemoryClassTest.java
+++ b/tests/tests/app/src/android/app/cts/ActivityManagerMemoryClassTest.java
@@ -90,10 +90,18 @@
                 expectedMinimumMemory = isXLarge ? 128 : 64;
                 break;
 
+            case DisplayMetrics.DENSITY_400:
+                expectedMinimumMemory = isXLarge ? 192 : 128;
+                break;
+
             case DisplayMetrics.DENSITY_XXHIGH:
                 expectedMinimumMemory = isXLarge ? 256 : 128;
                 break;
 
+            case DisplayMetrics.DENSITY_XXXHIGH:
+                expectedMinimumMemory = isXLarge ? 512 : 256;
+                break;
+
             default:
                 throw new IllegalArgumentException("No memory requirement specified "
                         + " for screen density " + screenDensity);

tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java

diff --git a/tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java b/tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java
index 6f26b6e..4ecabc5 100644
--- a/tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java
+++ b/tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java
@@ -52,7 +52,9 @@
         allowedDensities.add(DisplayMetrics.DENSITY_TV);
         allowedDensities.add(DisplayMetrics.DENSITY_HIGH);
         allowedDensities.add(DisplayMetrics.DENSITY_XHIGH);
+        allowedDensities.add(DisplayMetrics.DENSITY_400);
         allowedDensities.add(DisplayMetrics.DENSITY_XXHIGH);
+        allowedDensities.add(DisplayMetrics.DENSITY_XXXHIGH);
         assertTrue("DisplayMetrics#densityDpi must be one of the DisplayMetrics.DENSITY_* values: "
                 + allowedDensities, allowedDensities.contains(metrics.densityDpi));