diff options
| -rw-r--r-- | core/tests/coretests/src/android/view/DisabledTest.java | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/core/tests/coretests/src/android/view/DisabledTest.java b/core/tests/coretests/src/android/view/DisabledTest.java index 992c277e51d3..d78e5e9bcbbd 100644 --- a/core/tests/coretests/src/android/view/DisabledTest.java +++ b/core/tests/coretests/src/android/view/DisabledTest.java @@ -16,15 +16,15 @@ package android.view; -import com.android.frameworks.coretests.R; +import android.test.ActivityInstrumentationTestCase; import android.test.TouchUtils; -import android.test.suitebuilder.annotation.MediumTest; import android.test.suitebuilder.annotation.LargeTest; - -import android.test.ActivityInstrumentationTestCase; -import android.widget.Button; +import android.test.suitebuilder.annotation.MediumTest; import android.view.KeyEvent; import android.view.View; +import android.widget.Button; + +import com.android.frameworks.coretests.R; /** * Exercises {@link android.view.View}'s disabled property. @@ -45,18 +45,23 @@ public class DisabledTest extends ActivityInstrumentationTestCase<Disabled> { final Disabled a = getActivity(); mDisabled = (Button) a.findViewById(R.id.disabledButton); - mDisabled.setOnClickListener(new View.OnClickListener() { - public void onClick(View v) { - mClicked = true; - } - }); - mDisabledParent = a.findViewById(R.id.clickableParent); - mDisabledParent.setOnClickListener(new View.OnClickListener() { - public void onClick(View v) { - mParentClicked = true; - } - }); + getInstrumentation().runOnMainSync( + new Runnable() { + @Override + public void run() { + mDisabled.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + mClicked = true; + } + }); + mDisabledParent.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + mParentClicked = true; + } + }); + } + }); } @Override |