Merge "Update CTS for Android 14 CDD display requirements" into android14-tests-dev

1 files changed, 20 insertions, 1 deletions

diff --git a/tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java b/tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java
index 6cd292ac771..5f27a97a4e9 100644
--- a/tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java
+++ b/tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java
@@ -48,13 +48,20 @@ public class ConfigurationTest extends AndroidTestCase {
         display.getRealMetrics(mMetrics);
     }
 
+    @CddTest(requirement = "2.2.1")
     @Presubmit
     public void testScreenConfiguration() {
         double xInches = (double) mMetrics.widthPixels / mMetrics.xdpi;
         double yInches = (double) mMetrics.heightPixels / mMetrics.ydpi;
         double diagonalInches = Math.sqrt(Math.pow(xInches, 2) + Math.pow(yInches, 2));
         double minSize = 2.5d;
-        if (PropertyUtil.getFirstApiLevel() >= Build.VERSION_CODES.R) {
+        double minShortEdgeInches = 0.0d;
+        double minLongEdgeInches = 0.0d;
+        if (PropertyUtil.getFirstApiLevel() >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            minSize = 4.04d;
+            minShortEdgeInches = 2.2d;
+            minLongEdgeInches = 3.4d;
+        } else if (PropertyUtil.getFirstApiLevel() >= Build.VERSION_CODES.R) {
             minSize = 3.3d;
         }
         if (FeatureUtil.isWatch()) {
@@ -64,8 +71,20 @@ public class ConfigurationTest extends AndroidTestCase {
             // Cars have a different minimum diagonal.
             minSize = 6.0d;
         }
+
         assertTrue("Screen diagonal must be at least " + minSize + " inches: " + diagonalInches,
                 diagonalInches >= minSize);
+        // We can only verify short and long edge screen dimensions on non watch and auto devices.
+        if (!FeatureUtil.isAutomotive() && !FeatureUtil.isWatch()) {
+            assertTrue(
+                    "Screen short edge must be at least " + minShortEdgeInches + " inches: "
+                            + Math.min(xInches, yInches),
+                    Math.min(xInches, yInches) >= minShortEdgeInches);
+            assertTrue(
+                    "Screen long edge must be at least " + minLongEdgeInches + " inches: "
+                            + Math.max(xInches, yInches),
+                    Math.max(xInches, yInches) >= minLongEdgeInches);
+        }
 
         double density = 160.0d * mMetrics.density;
         assertTrue("Screen density must be at least 100 dpi: " + density, density >= 100.0d);