Merge change I8385f59d into eclair

* changes:
  sdk doc change for esr: Cleanup for resources tab content.

5 files changed, 38 insertions, 7 deletions

diff --git a/docs/html/resources/articles/backward-compatibility.jd b/docs/html/resources/articles/backward-compatibility.jd
index 9f0ddf5..e7f0b60 100644
--- a/docs/html/resources/articles/backward-compatibility.jd
+++ b/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>
\ No newline at end of file
diff --git a/docs/html/resources/articles/images/contacts-2.png b/docs/html/resources/articles/images/contacts-2.png
new file mode 100644
index 0000000..02f28aa
--- /dev/null
+++ b/docs/html/resources/articles/images/contacts-2.png
diff --git a/docs/html/resources/articles/layout-tricks-stubs.jd b/docs/html/resources/articles/layout-tricks-stubs.jd
index e494a54..88e4b25 100644
--- a/docs/html/resources/articles/layout-tricks-stubs.jd
+++ b/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
diff --git a/docs/html/resources/resources_toc.cs b/docs/html/resources/resources_toc.cs
index 60d044a..54602bf 100644
--- a/docs/html/resources/resources_toc.cs
+++ b/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>
 
 
diff --git a/docs/html/resources/samples/index.jd b/docs/html/resources/samples/index.jd
index 7fbbea1..f555073 100644
--- a/docs/html/resources/samples/index.jd
+++ b/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>