commit 2e4d0428d92a3e34e79f82a535f8fed07cecb2ec
author Unsuk Jung <unsuk@google.com> Thu Apr 23 03:39:45 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 23 03:39:45 2015 +0000
tree ea34db30ba4e206279e48f168c7d25879dda3515
parent 8b5d911ba7cd4c1b0a5a9b3624a806e54d3bcfe4
parent 23b4310c01afc54ce4000f761669085c3092c763

am 23b4310c: am 8dc44abd: Merge "Use smaller display size for secondary display test. (DO NOT MERGE)" into lmp-mr1-dev

* commit '23b4310c01afc54ce4000f761669085c3092c763':
  Use smaller display size for secondary display test. (DO NOT MERGE)

tests/tests/display/src/android/display/cts/DisplayTest.java

diff --git a/tests/tests/display/src/android/display/cts/DisplayTest.java b/tests/tests/display/src/android/display/cts/DisplayTest.java
index 4c7116d..bea99ed 100644
--- a/tests/tests/display/src/android/display/cts/DisplayTest.java
+++ b/tests/tests/display/src/android/display/cts/DisplayTest.java
@@ -28,10 +28,11 @@
 public class DisplayTest extends AndroidTestCase {
     // This test is called from DisplayTestRunner which brings up an overlay display on the target
     // device. The overlay display parameters must match the ones defined there which are
-    // 1281x721/214 (wxh/dpi).
+    // 181x161/214 (wxh/dpi).  It only matters that these values are different from any real
+    // display.
 
-    private static final int SECONDARY_DISPLAY_WIDTH = 1281;
-    private static final int SECONDARY_DISPLAY_HEIGHT = 721;
+    private static final int SECONDARY_DISPLAY_WIDTH = 181;
+    private static final int SECONDARY_DISPLAY_HEIGHT = 161;
     private static final int SECONDARY_DISPLAY_DPI = 214;
     private static final float SCALE_DENSITY_LOWER_BOUND =
             (float)(SECONDARY_DISPLAY_DPI - 1) / DisplayMetrics.DENSITY_DEFAULT;

tools/tradefed-host/src/com/android/cts/tradefed/testtype/DisplayTestRunner.java

diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/DisplayTestRunner.java b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/DisplayTestRunner.java
index 59bfcf8..3dee99e 100644
--- a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/DisplayTestRunner.java
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/DisplayTestRunner.java
@@ -29,7 +29,7 @@
     private static final String OVERLAY_DISPLAY_DEVICES_SETTING_NAME = "overlay_display_devices";
 
     // Use a non-standard pattern, must match values in tests/tests/display/.../DisplayTest.java
-    private static final String OVERLAY_DISPLAY_DEVICES_SETTING_VALUE = "1281x721/214";
+    private static final String OVERLAY_DISPLAY_DEVICES_SETTING_VALUE = "181x161/214";
 
     @Override
     public void run(ITestInvocationListener listener) throws DeviceNotAvailableException {