commit 6d6f11032666bfcd1198d45ea6838cf4f98ddf15
author yangxingsui <yang.xingsui@zte.com.cn> Tue Jan 07 16:01:23 2014 +0800
committer Daniel Xie <dxie@google.com> Wed Jul 15 00:09:25 2015 +0000
tree e3abad730ad58e17605805cc4af36ff4c1115a75
parent c73d8100d22d5ece6a261f480c78a7c2127037a9

CtsUiAutomatorTest pinchin/pinout test case: add support for 480X320 pixel solution device.
The pinchin/pinout test need the device solution bigger than ***X400.
This is hardcode in the CtsUiAutomatorTest.java
the source code is:
withinMarginOfError(0.1f, screenRect.centerX(), p2s.x))
 private boolean withinMarginOfError(float marginPrecent, int expected, int actual) {
       int m = (int) (marginPrecent * expected);
       return actual >= expected - m && actual <= expected + m;
     }

The vaule of p2s.x equals to  "centerX - 20", 20 is hard code like below:
protected static final int FINGER_TOUCH_HALF_WIDTH = 20;

So only the X pos of the device center is bigger than 20/0.1=200 can meet the requirement.
I have change the 0.1 to 0.125 to let 320 pixels device can meet the
requirement

Signed-off-by: yangxingsui <yang.xingsui@zte.com.cn>

Change-Id: Id4ccba21f08100a6d82991f83b6f18646611153a
Signed-off-by: yangxingsui <yang.xingsui@zte.com.cn>

tests/uiautomator/src/com/android/cts/uiautomatortest/CtsUiAutomatorTest.java

diff --git a/tests/uiautomator/src/com/android/cts/uiautomatortest/CtsUiAutomatorTest.java b/tests/uiautomator/src/com/android/cts/uiautomatortest/CtsUiAutomatorTest.java
index 7e44e49..7e4c367 100644
--- a/tests/uiautomator/src/com/android/cts/uiautomatortest/CtsUiAutomatorTest.java
+++ b/tests/uiautomator/src/com/android/cts/uiautomatortest/CtsUiAutomatorTest.java
@@ -827,17 +827,17 @@
         assertTrue("Pinch must be in center of target view", p2s.y == screenRect.centerY());
 
         assertTrue("Touch-down X coordinate for pointer 1 is invalid",
-                withinMarginOfError(0.1f, screenRect.centerX(), p1s.x));
+                withinMarginOfError(0.125f, screenRect.centerX(), p1s.x));
 
         assertTrue("Touch-down X coordinate for pointer 2 is invalid",
-                withinMarginOfError(0.1f, screenRect.centerX(), p2s.x));
+                withinMarginOfError(0.125f, screenRect.centerX(), p2s.x));
 
         assertTrue("Touch-up X coordinate for pointer 1 is invalid",
-                withinMarginOfError(0.1f, screenRect.centerX() - screenRect.left,
+                withinMarginOfError(0.125f, screenRect.centerX() - screenRect.left,
                         screenRect.centerX() - p1e.x));
 
         assertTrue("Touch-up X coordinate for pointer 2 is invalid",
-                withinMarginOfError(0.1f, screenRect.right, p2e.x));
+                withinMarginOfError(0.125f, screenRect.right, p2e.x));
     }
 
     /**
@@ -881,17 +881,17 @@
         assertTrue("Pinch must be in center of target view", p2s.y == screenRect.centerY());
 
         assertTrue("Touch-down X coordinate for pointer 1 is invalid",
-                withinMarginOfError(0.1f, screenRect.centerX() - screenRect.left,
+                withinMarginOfError(0.125f, screenRect.centerX() - screenRect.left,
                         screenRect.centerX() -  p1s.x));
 
         assertTrue("Touch-down X coordinate for pointer 2 is invalid",
-                withinMarginOfError(0.1f, screenRect.right, p2s.x));
+                withinMarginOfError(0.125f, screenRect.right, p2s.x));
 
         assertTrue("Touch-up X coordinate for pointer 1 is invalid",
-                withinMarginOfError(0.1f, screenRect.centerX() - FINGER_TOUCH_HALF_WIDTH, p1e.x));
+                withinMarginOfError(0.125f, screenRect.centerX() - FINGER_TOUCH_HALF_WIDTH, p1e.x));
 
         assertTrue("Touch-up X coordinate for pointer 2 is invalid",
-                withinMarginOfError(0.1f, screenRect.centerX() + FINGER_TOUCH_HALF_WIDTH, p2e.x));
+                withinMarginOfError(0.125f, screenRect.centerX() + FINGER_TOUCH_HALF_WIDTH, p2e.x));
     }
 
     /**