commit 107b997e41fffb30e37e3bc1e438a706105b0986
author Adam Momtaz <amomtaz@google.com> Thu Feb 21 18:02:01 2013 -0800
committer Adam Momtaz <amomtaz@google.com> Fri Feb 22 12:38:59 2013 -0800
tree 6a9cd70aa6e3b9670b01ab0896bcbc6030860708
parent 1d28e621ea4588c1fa4967f8afca78a7c8005bb5

Fix calculation for swipe margin of error

Change-Id: If33dd8de5d9891a6d82d26767bdf3814d032db58

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 705c777..ce6c02d 100644
--- a/tests/uiautomator/src/com/android/cts/uiautomatortest/CtsUiAutomatorTest.java
+++ b/tests/uiautomator/src/com/android/cts/uiautomatortest/CtsUiAutomatorTest.java
@@ -810,16 +810,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.05f, screenRect.centerX(), p1s.x));
+                withinMarginOfError(0.1f, screenRect.centerX(), p1s.x));
 
         assertTrue("Touch-down X coordinate for pointer 2 is invalid",
-                withinMarginOfError(0.05f, screenRect.centerX(), p2s.x));
+                withinMarginOfError(0.1f, screenRect.centerX(), p2s.x));
 
         assertTrue("Touch-up X coordinate for pointer 1 is invalid",
-                withinMarginOfError(0.05f, screenRect.left, p1e.x));
+                withinMarginOfError(0.1f, screenRect.centerX() - screenRect.left,
+                        screenRect.centerX() - p1e.x));
 
         assertTrue("Touch-up X coordinate for pointer 2 is invalid",
-                withinMarginOfError(0.05f, screenRect.right, p2e.x));
+                withinMarginOfError(0.1f, screenRect.right, p2e.x));
     }
 
     /**
@@ -863,16 +864,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.05f, screenRect.left, p1s.x));
+                withinMarginOfError(0.1f, screenRect.centerX() - screenRect.left,
+                        screenRect.centerX() -  p1s.x));
 
         assertTrue("Touch-down X coordinate for pointer 2 is invalid",
-                withinMarginOfError(0.05f, screenRect.right, p2s.x));
+                withinMarginOfError(0.1f, screenRect.right, p2s.x));
 
         assertTrue("Touch-up X coordinate for pointer 1 is invalid",
-                withinMarginOfError(0.05f, screenRect.centerX(), p1e.x));
+                withinMarginOfError(0.1f, screenRect.centerX(), p1e.x));
 
         assertTrue("Touch-up X coordinate for pointer 2 is invalid",
-                withinMarginOfError(0.05f, screenRect.centerX(), p2e.x));
+                withinMarginOfError(0.1f, screenRect.centerX(), p2e.x));
     }
 
     /**