tree 42365bf0345eaee7fe004fb108222c310034c470
parent 46a3b3dd3e9bbf841587243107b085e75b98a715
parent f8accbd8768c899edd41230f8dea23aca22628c9
author Daniel Xie <dxie@google.com> 1436923567 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436923567 +0000

am f8accbd8: am 191214cc: am e51fb92a: am 9b379ec1: Merge "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

* commit 'f8accbd8768c899edd41230f8dea23aca22628c9':
  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;      }