summaryrefslogtreecommitdiffstats
path: root/docs/html/guide/guide_toc.cs
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2010-10-12 14:16:05 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-10-12 14:16:05 -0700
commit354954a01c533c6789536c141cf330ddf3976e8b (patch)
tree44ca327541699e187a997db1e1bfeea65c7540e0 /docs/html/guide/guide_toc.cs
parent844a6b3ccaff1ad1443ad985e4527b733ce97c0e (diff)
parentdafac622a4520fd8dde85807c7a6498937d80158 (diff)
downloadframeworks_base-354954a01c533c6789536c141cf330ddf3976e8b.zip
frameworks_base-354954a01c533c6789536c141cf330ddf3976e8b.tar.gz
frameworks_base-354954a01c533c6789536c141cf330ddf3976e8b.tar.bz2
Merge "Doc change: cherrypick testing changes from master. Squashed commit of the following:" into gingerbread
Diffstat (limited to 'docs/html/guide/guide_toc.cs')
-rw-r--r--docs/html/guide/guide_toc.cs30
1 files changed, 26 insertions, 4 deletions
diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs
index cdf5feb..2b80342 100644
--- a/docs/html/guide/guide_toc.cs
+++ b/docs/html/guide/guide_toc.cs
@@ -254,12 +254,34 @@
<li><a href="<?cs var:toroot?>guide/topics/search/searchable-config.html">Searchable Configuration</a></li>
</ul>
</li>
- <li><a href="<?cs var:toroot?>guide/topics/testing/testing_android.html">
- <span class="en">Testing and Instrumentation</span>
- </a></li>
+ <li class="toggle-list">
+ <div>
+ <a href="<?cs var:toroot ?>guide/topics/testing/index.html">
+ <span class="en">Testing</span>
+ </a> <span class="new">new!</span>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot?>guide/topics/testing/testing_android.html">
+ <span class="en">Testing Fundamentals</span></a>
+ </li>
+ <li><a href="<?cs var:toroot?>guide/topics/testing/activity_testing.html">
+ <span class="en">Activity Testing</span></a>
+ </li>
+ <li><a href="<?cs var:toroot ?>guide/topics/testing/contentprovider_testing.html">
+ <span class="en">Content Provider Testing</span></a>
+ </li>
+ <li><a href="<?cs var:toroot ?>guide/topics/testing/service_testing.html">
+ <span class="en">Service Testing</span></a>
+ </li>
+ <li><a href="<?cs var:toroot ?>guide/topics/testing/what_to_test.html">
+ <span class="en">What To Test</span></a>
+ </li>
+ </ul>
+ </li>
<li><a href="<?cs var:toroot?>guide/topics/admin/device-admin.html">
<span class="en">Device Administration</span>
- </a> <span class="new">new!</span><!-- 10/8/10 --></li>
+ </a> <span class="new">new!</span>
+ </li>
</ul>
</li>