commit 1a023c1d3280e4818a98e5bbe846833e96c45cb5
author Brian Muramatsu <btmura@android.com> Mon Feb 28 18:00:59 2011 -0800
committer Android Code Review <code-review@android.com> Mon Feb 28 18:00:59 2011 -0800
tree 22f4beb024155451690cd6c8d00f53e22621f5bb
parent d9e30a1c9d97af9b9ea28fe20daf39a94d985914
parent fe2e2a2382ca488c6b17f2d8ff27499b50a05261

Merge "Merge remote branch 'korg/eclair' into eclairmerge" into froyo

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 77624e8..5c730f8 100644
--- a/tests/tests/view/src/android/view/cts/ViewTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewTest.java
@@ -3946,6 +3946,7 @@
                 fitWindowsView.requestFocus();
             }
         });
+        getInstrumentation().waitForIdleSync();
         assertTrue(mockView.isFocusableInTouchMode());
         assertFalse(fitWindowsView.isFocusableInTouchMode());
         assertTrue(mockView.isFocusable());
@@ -3963,12 +3964,14 @@
                 mockView.requestFocus();
             }
         });
+        getInstrumentation().waitForIdleSync();
         assertTrue(mockView.isFocused());
         runTestOnUiThread(new Runnable() {
             public void run() {
                 fitWindowsView.requestFocus();
             }
         });
+        getInstrumentation().waitForIdleSync();
         assertFalse(fitWindowsView.isFocused());
         assertTrue(mockView.isInTouchMode());
         assertTrue(fitWindowsView.isInTouchMode());
@@ -3982,6 +3985,7 @@
                 fitWindowsView.requestFocus();
             }
         });
+        getInstrumentation().waitForIdleSync();
         assertFalse(mockView.isFocused());
         assertTrue(fitWindowsView.isFocused());
         assertFalse(mockView.isInTouchMode());