Adjust minimum screen size for watches in CTS
1 inch vs 2.5 inches minimum diagonal screen.
Change-Id: Idb9f1b76548157ec88fb8c7b8a589cdb0e5151eb
diff --git a/tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java b/tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java
index 4ecabc5..e2f75c6 100644
--- a/tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java
+++ b/tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java
@@ -17,6 +17,7 @@
package android.dpi.cts;
import android.content.Context;
+import android.content.pm.PackageManager;
import android.test.AndroidTestCase;
import android.util.DisplayMetrics;
import android.view.Display;
@@ -40,8 +41,13 @@
double xInches = (double) metrics.widthPixels / metrics.xdpi;
double yInches = (double) metrics.heightPixels / metrics.ydpi;
double diagonalInches = Math.sqrt(Math.pow(xInches, 2) + Math.pow(yInches, 2));
- assertTrue("Screen diagonal must be at least 2.5 inches: " + diagonalInches,
- diagonalInches >= 2.5d);
+ double minSize = 2.5d;
+ if (getContext().getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)) {
+ // Watches have a different minimum diagonal.
+ minSize = 1.0d;
+ }
+ assertTrue("Screen diagonal must be at least " + minSize + " inches: " + diagonalInches,
+ diagonalInches >= minSize);
double density = 160.0d * metrics.density;
assertTrue("Screen density must be at least 100 dpi: " + density, density >= 100.0d);