summaryrefslogtreecommitdiffstats
path: root/docs/html/tools
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-10-31 18:32:00 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-31 18:32:00 +0000
commit2eaf0b0a7b86304a739f91033e9f8f053123e74d (patch)
tree248a7e53501031107d9c254faf11d387cf4f3053 /docs/html/tools
parent5a51050519a3738488a4f7186e9822c448362a37 (diff)
parenta27afde31a6412c601f99ef5c7b78fb432f4cad7 (diff)
downloadframeworks_base-2eaf0b0a7b86304a739f91033e9f8f053123e74d.zip
frameworks_base-2eaf0b0a7b86304a739f91033e9f8f053123e74d.tar.gz
frameworks_base-2eaf0b0a7b86304a739f91033e9f8f053123e74d.tar.bz2
am a27afde3: Merge "Fix typo in activity_testing.jd" into lmp-mr1-dev
* commit 'a27afde31a6412c601f99ef5c7b78fb432f4cad7': Fix typo in activity_testing.jd
Diffstat (limited to 'docs/html/tools')
-rw-r--r--docs/html/tools/testing/activity_testing.jd2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/tools/testing/activity_testing.jd b/docs/html/tools/testing/activity_testing.jd
index 88ac9b2..8baa35d 100644
--- a/docs/html/tools/testing/activity_testing.jd
+++ b/docs/html/tools/testing/activity_testing.jd
@@ -242,7 +242,7 @@ parent.link=index.html
This changes when you run tests against the application. With instrumentation-based classes,
you can invoke methods against the UI of the application under test. The other test classes
don't allow this. To run an entire test method on the UI thread, you can annotate the thread
- with <code>@UIThreadTest</code>. Notice that this will run <em>all</em> of the method statements
+ with <code>@UiThreadTest</code>. Notice that this will run <em>all</em> of the method statements
on the UI thread. Methods that do not interact with the UI are not allowed; for example, you
can't invoke <code>Instrumentation.waitForIdleSync()</code>.
</p>