commit d1d6cea15ea80e86f562b9174ea5bfa39d30fa97
author keunyoung <keunyoung@google.com> Mon Apr 01 10:26:23 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Apr 01 10:26:23 2013 -0700
tree 75d1c4f1915e8570638728a2b9dde27d3678eba1
parent 1b005d5b6a8bff083aef16494bac529b52a8c395
parent da7c58ec790c867e2f7bf40af4c05438eba89d4a

am da7c58ec: am 5158006b: am d4fa235e: Merge "version up to R4" into jb-mr1.1-dev

* commit 'da7c58ec790c867e2f7bf40af4c05438eba89d4a':
  version up to R4

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();