commit 38676a83977e35e6868d1fd491025363aee3f366
author keunyoung <keunyoung@google.com> Mon Apr 01 11:14:14 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Apr 01 11:14:14 2013 -0700
tree 6fa84bbdf4070eb6ab7a5f836bb0e9a2456a31b2
parent d1d6cea15ea80e86f562b9174ea5bfa39d30fa97
parent 38495164caf6de15071ed3675dcea4ff423ef887

am 38495164: Merge "change mechanism to report performance results" into jb-mr2-dev

* commit '38495164caf6de15071ed3675dcea4ff423ef887':
  change mechanism to report performance results

apps/CtsVerifier/src/com/android/cts/verifier/location/GpsTestActivity.java

diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/location/GpsTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/location/GpsTestActivity.java
index da1ee88..4909497 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/location/GpsTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/location/GpsTestActivity.java
@@ -155,6 +155,12 @@
     @Override
     public void pass() {
         log("OK!\n", Color.GREEN);
+        try {
+            Thread.sleep(2000);
+            log("(Sleep 2 second) \n", Color.GREEN);
+        } catch (InterruptedException e) {
+            fail("unexpected InterruptedException when sleep");
+        }
         mLocationVerifier = null;
         nextTest();
     }

tests/tests/view/src/android/view/cts/ViewTest.java

diff --git a/tests/tests/view/src/android/view/cts/ViewTest.java b/tests/tests/view/src/android/view/cts/ViewTest.java
index 888bb73..0af3f21 100644
--- a/tests/tests/view/src/android/view/cts/ViewTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewTest.java
@@ -247,10 +247,11 @@
         Rect rect = new Rect();
         final Button button = new Button(mActivity);
         final int WRAP_CONTENT = ViewGroup.LayoutParams.WRAP_CONTENT;
+        final int btnHeight = view.getHeight()/3;
         runTestOnUiThread(new Runnable() {
             public void run() {
                 mActivity.addContentView(button,
-                        new LinearLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT));
+                        new LinearLayout.LayoutParams(WRAP_CONTENT, btnHeight));
             }
         });
         getInstrumentation().waitForIdleSync();