diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2010-10-10 13:20:12 -0700 |
|---|---|---|
| committer | Dirk Dougherty <ddougherty@google.com> | 2010-10-10 13:20:12 -0700 |
| commit | dafac622a4520fd8dde85807c7a6498937d80158 (patch) | |
| tree | 425d7371a437dda0b8f4b70db3881004a81ad126 /docs/html/guide/guide_toc.cs | |
| parent | bed5af7ebcd195a2ab5e16fc03ee8b61a4d7aec6 (diff) | |
| download | frameworks_base-dafac622a4520fd8dde85807c7a6498937d80158.zip frameworks_base-dafac622a4520fd8dde85807c7a6498937d80158.tar.gz frameworks_base-dafac622a4520fd8dde85807c7a6498937d80158.tar.bz2 | |
Doc change: cherrypick testing changes from master. Squashed commit of the following:
commit 3341f42f857058707c1c9f77dcfaecb22ff2f125
Author: Joe Malin <jmalin@google.com>
Date: Wed Sep 1 14:43:24 2010 -0700
Doc Change: cherrypick from master -- add screenshots to Testing in Eclipse topic
Change-Id: If0ebd70ece3f077e18c909db2b8cc499a7f92692
commit af2da09a6c69cac02fd1987a44d223d678b2484d
Author: Dirk Dougherty <ddougherty@google.com>
Date: Sun Oct 10 12:39:55 2010 -0700
Doc change: Cherrypick from master -- Testing Documentation in the Dev Guide tab
Conflicts:
docs/html/guide/guide_toc.cs
docs/html/guide/topics/testing/testing_android.jd
Change-Id: I6d2e7b7f69517e8aae3a1274596d2ecbd85cac50
Change-Id: Ic6e547ce25c35060ec073b9da75e1d71b4946a85
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> |