am 7eb6ec1f: Merge change I18305fec into eclair

Merge commit '7eb6ec1f44ade4c7bf3d23cbcfe29a17bbd940b1' into eclair-mr2

* commit '7eb6ec1f44ade4c7bf3d23cbcfe29a17bbd940b1':
  Add ContactManager, MultiResolution, Wiktionary, and WiktionarySimple to samples index. Also add latest samples zip file.

Android.mk

@@ -361,14 +361,18 @@ web_docs_sample_code_flags := \
 		-hdf android.hasSamples 1 \
 		-samplecode $(sample_dir)/ApiDemos \
 		            guide/samples/ApiDemos "API Demos" \
-    -samplecode $(sample_dir)/BluetoothChat \
-                guide/samples/BluetoothChat "Bluetooth Chat" \
+	        -samplecode $(sample_dir)/BluetoothChat \
+	                    guide/samples/BluetoothChat "Bluetooth Chat" \
+	        -samplecode $(sample_dir)/ContactManager \
+	                    guide/samples/ContactManager "Contact Manager" \
 		-samplecode $(sample_dir)/Home \
 		            guide/samples/Home "Home" \
 		-samplecode $(sample_dir)/JetBoy \
 		            guide/samples/JetBoy "JetBoy" \
 		-samplecode $(sample_dir)/LunarLander \
 		            guide/samples/LunarLander "Lunar Lander" \
+	        -samplecode $(sample_dir)/MultiResolution \
+	                    guide/samples/MultiResolution "Multiple Resolutions" \
 		-samplecode $(sample_dir)/NotePad \
 		            guide/samples/NotePad "Note Pad" \
 		-samplecode $(sample_dir)/SearchableDictionary \
@@ -376,7 +380,13 @@ web_docs_sample_code_flags := \
 		-samplecode $(sample_dir)/Snake \
 		            guide/samples/Snake "Snake" \
 		-samplecode $(sample_dir)/SoftKeyboard \
-		            guide/samples/SoftKeyboard "Soft Keyboard"
+		            guide/samples/SoftKeyboard "Soft Keyboard" \
+	        -samplecode $(sample_dir)/Wiktionary \
+	                    guide/samples/Wiktionary "Wiktionary" \
+	        -samplecode $(sample_dir)/WiktionarySimple \
+	                    guide/samples/WiktionarySimple "Wiktionary (Simplified)"
+
+
 
 ## SDK version identifiers used in the published docs
   # major[.minor] version for current SDK. (full releases only)

docs/html/guide/guide_toc.cs

@@ -401,6 +401,9 @@
           <li><a href="<?cs var:toroot ?>guide/samples/BluetoothChat/index.html">
                 <span class="en">Bluetooth Chat</span>
               </a></li>
+          <li><a href="<?cs var:toroot ?>guide/samples/ContactManager/index.html">
+                <span class="en">Contact Manager</span>
+              </a></li>
           <li><a href="<?cs var:toroot ?>guide/samples/Home/index.html">
                 <span class="en">Home</span>
               </a></li>
@@ -410,6 +413,9 @@
           <li><a href="<?cs var:toroot ?>guide/samples/LunarLander/index.html">
                 <span class="en">Lunar Lander</span>
               </a></li>
+          <li><a href="<?cs var:toroot ?>guide/samples/MultiResolution/index.html">
+                <span class="en">Multiple Resolutions</span>
+              </a></li>
           <li><a href="<?cs var:toroot ?>guide/samples/NotePad/index.html">
                 <span class="en">Note Pad</span>
               </a></li>
@@ -422,6 +428,12 @@
           <li><a href="<?cs var:toroot ?>guide/samples/SoftKeyboard/index.html">
                 <span class="en">Soft Keyboard</span>
               </a></li>
+          <li><a href="<?cs var:toroot ?>guide/samples/Wiktionary/index.html">
+                <span class="en">Wiktionary</span>
+              </a></li>
+          <li><a href="<?cs var:toroot ?>guide/samples/WiktionarySimple/index.html">
+                <span class="en">Wiktionary (Simplified)</span>
+              </a></li>
         </ul>
       </li>
     </ul>

docs/html/guide/samples/index.jd

@@ -28,6 +28,13 @@ 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="../../shareables/latest_samples.zip">download the latest samples</a> as a ZIP
+  file here.</p>
+</div>
+
 <dl>
 
  <dt><a href="ApiDemos/index.html">API Demos</a></dt>
@@ -36,10 +43,13 @@ platforms) and allow you to view the source files in your browser. </p>
 
  <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, as
+  well as insert contacts into a specific account.</p>
   
  <dt><a href="Home/index.html">Home</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>
+  <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,
@@ -47,6 +57,10 @@ 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 
@@ -61,6 +75,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>