am 6ccc515c: Merge change I8385f59d into eclair

Merge commit '6ccc515c7f705a66718d0138a421e29186667b9e' into eclair-plus-aosp

* commit '6ccc515c7f705a66718d0138a421e29186667b9e':
  sdk doc change for esr: Cleanup for resources tab content.

docs/html/guide/appendix/api-levels.jd

@@ -6,7 +6,7 @@ page.title=Android API Levels
 
   <h2>In this document</h2>
 <ol>
-  <li><a href="intro">What is API Level?</a></li>
+  <li><a href="#intro">What is API Level?</a></li>
   <li><a href="#uses">Uses of API Level in Android</a></li>
   <li><a href="#considerations">Development Considerations</a>
     <ol>

docs/html/guide/samples/index.jd

@@ -31,56 +31,57 @@ platforms) and allow you to view the source files in your browser. </p>
 <div class="special">
   <p>Some of the samples in this listing are not yet available in the
   SDK. While we work to update the SDK, you can
-  <a href="../../shareables/latest_samples.zip">download the latest samples</a> as a ZIP
-  file here.</p>
+  <a href="{@docRoot}shareables/latest_samples.zip">download the latest samples</a> as a ZIP
+  archive.</p>
 </div>
 
 <dl>
 
- <dt><a href="ApiDemos/index.html">API Demos</a></dt>
+ <dt><a href="{@docRoot}resources/samples/ApiDemos/index.html">API Demos</a></dt>
   <dd>A variety of small applications that demonstrate an extensive collection of
   framework topics.</dd>
 
- <dt><a href="BluetoothChat/index.html">Bluetooth Chat</a></dt>
+ <dt><a href="{@docRoot}resources/samples/BluetoothChat/index.html">Bluetooth Chat</a></dt>
   <dd>An application for two-way text messaging over Bluetooth.</dd>
 
- <dt><a href="ContactManager/index.html">Contact Manager</a></dt>
-  <dd>An application that demonstrates how to query the system contacts provider, as
-  well as insert contacts into a specific account.</p>
+ <dt><a href="{@docRoot}resources/samples/ContactManager/index.html">Contact Manager</a></dt>
+  <dd>An application that demonstrates how to query the system contacts provider 
+  using the <code>ContactsContract</code> API, as
+  well as insert contacts into a specific account.</dd>
   
- <dt><a href="Home/index.html">Home</a></dt>
+ <dt><a href="{@docRoot}resources/samples/Home/index.html">Home</a></dt>
   <dd>A home screen replacement application.</dd>
   
- <dt><a href="JetBoy/index.html">JetBoy</a></dt>
+ <dt><a href="{@docRoot}resources/samples/JetBoy/index.html">JetBoy</a></dt>
   <dd>JetBoy is a game that demonstrates the SONiVOX JET interactive music technology,
   with {@link android.media.JetPlayer}.</dd>
     
- <dt><a href="LunarLander/index.html">Lunar Lander</a></dt>
+ <dt><a href="{@docRoot}resources/samples/LunarLander/index.html">Lunar Lander</a></dt>
   <dd>A classic Lunar Lander game.</dd>
 
- <dt><a href="MultiResolution/index.html">Multiple Resolutions</a></dt>
+ <dt><a href="{@docRoot}resources/samples/MultiResolution/index.html">Multiple Resolutions</a></dt>
   <dd>A sample application that shows how to use resource directory qualifiers to
   provide different resources for different screen configurations.</dd>
   
- <dt><a href="NotePad/index.html">Note Pad</a></dt>
+ <dt><a href="{@docRoot}resources/samples/NotePad/index.html">Note Pad</a></dt>
   <dd>An application for saving notes. Similar (but not identical) to the 
-    <a href="{@docRoot}guide/tutorials/notepad/index.html">Notepad tutorial</a>.</dd>
+    <a href="{@docRoot}resources/tutorials/notepad/index.html">Notepad tutorial</a>.</dd>
   
- <dt><a href="SearchableDictionary/index.html">Searchable Dictionary</a></dt>
+ <dt><a href="{@docRoot}resources/samples/SearchableDictionary/index.html">Searchable Dictionary</a></dt>
   <dd>A sample application that demonstrates Android's search framework, 
   including how to provide search suggestions for Quick Search Box.</dd>
   
- <dt><a href="Snake/index.html">Snake</a></dt>
+ <dt><a href="{@docRoot}resources/samples/Snake/index.html">Snake</a></dt>
   <dd>An implementation of the classic game "Snake."</dd>
   
- <dt><a href="SoftKeyboard/index.html">Soft Keyboard</a></dt>
+ <dt><a href="{@docRoot}resources/samples/SoftKeyboard/index.html">Soft Keyboard</a></dt>
   <dd>An example of writing an input method for a software keyboard.</dd>
 
- <dt><a href="Wiktionary/index.html">Wiktionary</a></dt>
+ <dt><a href={@docRoot}resources/samples/Wiktionary/index.html">Wiktionary</a></dt>
   <dd>An example of creating interactive widgets for display on the Android
   home screen.</dd>
 
- <dt><a href="WiktionarySimple/index.html">Wiktionary (Simplified)</a></dt>
+ <dt><a href="{@docRoot}resources/samples/WiktionarySimple/index.html">Wiktionary (Simplified)</a></dt>
   <dd>A simple Android home screen widgets example.</dd>
     
 </dl>

docs/html/guide/topics/intents/intents-filters.jd

@@ -968,7 +968,7 @@ NoteEditor activity:
 <dd>Asks the activity to display the content of the note identified 
 by {@code <var>ID</var>}. (For details on how {@code content:} URIs
 specify individual members of a group, see 
-<a href="{@docRoot}guide/topics/provider/content-providers.html">Content Providers</a>.)
+<a href="{@docRoot}guide/topics/providers/content-providers.html">Content Providers</a>.)
 
 <dt>action: <code>android.intent.action.EDIT</code>
 <br/>data: <code>content://com.google.provider.NotePad/notes/<var>ID</var></code></dt>

docs/html/resources/articles/backward-compatibility.jd

@@ -234,5 +234,5 @@ to do this easily by creating "Android Virtual Devices" with different API
 levels. Once you create the AVDs, you can test your application with old and new
 versions of the system, perhaps running them side-by-side to see the
 differences. More information about emulator AVDs can be found <a
-href={@docRoot}guide/developing/tools/avd.html">in the AVD documentation</a> and
+href="{@docRoot}guide/developing/tools/avd.html">in the AVD documentation</a> and
 from <code>emulator -help-virtual-device</code>.</p>

docs/html/resources/articles/layout-tricks-stubs.jd

@@ -2,7 +2,7 @@ page.title=Layout Tricks: Using ViewStubs
 @jd:body
 
 <p>Sharing and reusing UI components is very easy with Android, thanks to the <a
-href="layout-tricks-include.html">&lt;include /&gt;</a> tag. Sometimes it's so
+href="layout-tricks-reuse.html">&lt;include /&gt;</a> tag. Sometimes it's so
 easy to create complex UI constructs that your UI ends up with a large number of
 views, some of which are rarely used. Thankfully, Android offers a very special
 widget called {@link android.view.ViewStub}, which brings you all the benefits

docs/html/resources/resources_toc.cs

@@ -157,6 +157,11 @@
                <span class="zh-CN" style="display:none"></span>
                <span class="zh-TW" style="display:none"></span>
     </h2>
+    <ul>
+      <li class="toggle-list">
+        <div><a href="<?cs var:toroot ?>resources/samples/index.html">
+               <span class="en">List of Sample Apps</span>
+             </a> <span class="new">new!</span></div>
         <ul>
           <li><a href="<?cs var:toroot ?>resources/samples/ApiDemos/index.html">
                 <span class="en">API Demos</span>
@@ -198,6 +203,8 @@
                 <span class="en">Wiktionary (Simplified)</span>
               </a> <span class="new">new!</span></li>
         </ul>
+      </li>
+    </ul>
   </li>
 
 

docs/html/resources/samples/index.jd

@@ -28,15 +28,29 @@ android update project -s -n API Demos -t <em>&lt;target_ID></em> -p <em>&lt;pat
 <p>The pages below provide an overview of each sample application (available with most
 platforms) and allow you to view the source files in your browser. </p>
 
+<div class="special">
+  <p>Some of the samples in this listing are not yet available in the
+  SDK. While we work to update the SDK, you can
+  <a href="{@docRoot}shareables/latest_samples.zip">download the latest samples</a> as a ZIP
+  archive.</p>
+</div>
+
 <dl>
 
  <dt><a href="ApiDemos/index.html">API Demos</a></dt>
   <dd>A variety of small applications that demonstrate an extensive collection of
   framework topics.</dd>
-  
+
+ <dt><a href="BluetoothChat/index.html">Bluetooth Chat</a></dt>
+  <dd>An application for two-way text messaging over Bluetooth.</dd>
+
+ <dt><a href="ContactManager/index.html">Contact Manager</a></dt>
+  <dd>An application that demonstrates how to query the system contacts provider 
+  using the <code>ContactsContract</code> API, as
+  well as insert contacts into a specific account.</dd>
+
  <dt><a href="Home/index.html">Home</a></dt>
-  <dd>An application for saving notes. Similar (but not identical) to the 
-    <a href="{@docRoot}resources/tutorials/notepad/index.html">Notepad tutorial</a>.</dd>
+  <dd>A home screen replacement application.</dd>
   
  <dt><a href="JetBoy/index.html">JetBoy</a></dt>
   <dd>JetBoy is a game that demonstrates the SONiVOX JET interactive music technology,
@@ -44,7 +58,11 @@ platforms) and allow you to view the source files in your browser. </p>
     
  <dt><a href="LunarLander/index.html">Lunar Lander</a></dt>
   <dd>A classic Lunar Lander game.</dd>
-  
+
+  <dt><a href="MultiResolution/index.html">Multiple Resolutions</a></dt>
+  <dd>A sample application that shows how to use resource directory qualifiers to
+  provide different resources for different screen configurations.</dd>
+
  <dt><a href="NotePad/index.html">Note Pad</a></dt>
   <dd>An application for saving notes. Similar (but not identical) to the 
     <a href="{@docRoot}resources/tutorials/notepad/index.html">Notepad tutorial</a>.</dd>
@@ -58,7 +76,13 @@ platforms) and allow you to view the source files in your browser. </p>
   
  <dt><a href="SoftKeyboard/index.html">Soft Keyboard</a></dt>
   <dd>An example of writing an input method for a software keyboard.</dd>
-    
+
+ <dt><a href=Wiktionary/index.html">Wiktionary</a></dt>
+  <dd>An example of creating interactive widgets for display on the Android
+  home screen.</dd>
+
+ <dt><a href="WiktionarySimple/index.html">Wiktionary (Simplified)</a></dt>
+  <dd>A simple Android home screen widgets example.</dd>
 </dl>