summaryrefslogtreecommitdiffstats
path: root/docs/html/tools
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-10-31 18:25:43 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-10-31 18:25:45 +0000
commita27afde31a6412c601f99ef5c7b78fb432f4cad7 (patch)
treec68af91066e72673f7c933ab78f1630ded0be4dc /docs/html/tools
parent38b00a63c9f637bbe43b6ea3785c9577c43dbac5 (diff)
parent3df06ddd33a6c51813171951fd82b34f7039144d (diff)
downloadframeworks_base-a27afde31a6412c601f99ef5c7b78fb432f4cad7.zip
frameworks_base-a27afde31a6412c601f99ef5c7b78fb432f4cad7.tar.gz
frameworks_base-a27afde31a6412c601f99ef5c7b78fb432f4cad7.tar.bz2
Merge "Fix typo in activity_testing.jd" into lmp-mr1-dev
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>