commit c52d6eacddfbc6e075419a9f951d1c7f2851cd61
author Justin Koh <justinkoh@google.com> Sun May 04 14:03:44 2014 -0700
committer Justin Koh <justinkoh@google.com> Wed May 07 16:47:27 2014 -0700
tree 3cee7d41e0cbf8643d6bb092ef84efa67676830e
parent f3238be7a95c8b2ba73bd677bd3859af830d56a4

Adjust aspect ratio test for watches.

Change-Id: I952151f2b193418bde3726f52c4b080aca9e6e22

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

diff --git a/tests/tests/dpi/src/android/dpi/cts/AspectRatioTest.java b/tests/tests/dpi/src/android/dpi/cts/AspectRatioTest.java
index 572c3f4..fafce61 100644
--- a/tests/tests/dpi/src/android/dpi/cts/AspectRatioTest.java
+++ b/tests/tests/dpi/src/android/dpi/cts/AspectRatioTest.java
@@ -20,6 +20,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
+import android.content.pm.PackageManager;
 import android.test.ActivityInstrumentationTestCase2;
 import android.util.DisplayMetrics;
 import android.view.Display;
@@ -49,6 +50,12 @@
         if (aspectRatio >= 1.333 && aspectRatio <= 1.86) {
             return;
         }
+        if (getActivity().getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)) {
+            // Watch allows for a different set of aspect ratios.
+            if (aspectRatio >= 1.0 && aspectRatio <= 1.86) {
+                return;
+            }
+        }
         fail("Aspect ratio was not between 1.333 and 1.86: " + aspectRatio);
     }