diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2010-10-12 14:18:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-12 14:18:33 -0700 |
| commit | d555e2643f2bdc8b7e6096ce40943fcc56ec22d2 (patch) | |
| tree | 910334b1129b8902e37065876f894c5eb3f2bf7f /docs/html/guide/guide_toc.cs | |
| parent | 7a26ebdf0d5ba62c06ca0b8cb2b3280f008885ef (diff) | |
| parent | 354954a01c533c6789536c141cf330ddf3976e8b (diff) | |
| download | frameworks_base-d555e2643f2bdc8b7e6096ce40943fcc56ec22d2.zip frameworks_base-d555e2643f2bdc8b7e6096ce40943fcc56ec22d2.tar.gz frameworks_base-d555e2643f2bdc8b7e6096ce40943fcc56ec22d2.tar.bz2 | |
am 354954a0: Merge "Doc change: cherrypick testing changes from master. Squashed commit of the following:" into gingerbread
Merge commit '354954a01c533c6789536c141cf330ddf3976e8b' into gingerbread-plus-aosp
* commit '354954a01c533c6789536c141cf330ddf3976e8b':
Doc change: cherrypick testing changes from master. Squashed commit of the following:
Diffstat (limited to 'docs/html/guide/guide_toc.cs')
| -rw-r--r-- | docs/html/guide/guide_toc.cs | 30 |
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> |