auto import from //depot/cupcake/@135843
diff --git a/docs/docs-documentation-redirect.html b/docs/docs-documentation-redirect.html
new file mode 100644
index 0000000..98a265e
--- /dev/null
+++ b/docs/docs-documentation-redirect.html
@@ -0,0 +1,9 @@
+<html>
+<head>
+<meta http-equiv="refresh" content="0;url=documentation.html">
+</head>
+<body>
+<a href="documentation.html">click here if you are not redirected</a>
+</body>
+</html>
+
diff --git a/docs/docs-redirect-index.html b/docs/docs-redirect-index.html
new file mode 100644
index 0000000..dc0bc72
--- /dev/null
+++ b/docs/docs-redirect-index.html
@@ -0,0 +1,8 @@
+<html>

+<head>

+<meta http-equiv="refresh" content="0;url=framework/index.html">

+</head>

+<body>

+<a href="framework/index.html">click here if you are not redirected</a>

+</body>

+</html>

diff --git a/docs/docs-redirect.html b/docs/docs-redirect.html
new file mode 100644
index 0000000..4e0743e
--- /dev/null
+++ b/docs/docs-redirect.html
@@ -0,0 +1,8 @@
+<html>

+<head>

+<meta http-equiv="refresh" content="0;url=docs/offline.html">

+</head>

+<body>

+<a href="docs/offline.html">click here if you are not redirected</a>

+</body>

+</html>

diff --git a/docs/docs-samples-redirect.html b/docs/docs-samples-redirect.html
new file mode 100644
index 0000000..4e549e6
--- /dev/null
+++ b/docs/docs-samples-redirect.html
@@ -0,0 +1,8 @@
+<html>

+<head>

+<meta http-equiv="refresh" content="0;url=../../samples/">

+</head>

+<body>

+<a href="../../samples/">click here if you are not redirected</a>

+</body>

+</html>

diff --git a/docs/html/app.yaml b/docs/html/app.yaml
new file mode 100644
index 0000000..9ffb775
--- /dev/null
+++ b/docs/html/app.yaml
@@ -0,0 +1,38 @@
+application: androidappdocs-staging
+version: 1
+runtime: python
+api_version: 1
+
+# This file defines two mutually exclusive 
+# hander blocks:
+# - a handler for use on a local dev_appserver
+#   during development or non-production doc build
+# - a handler for use on a production gae 
+#   instance. This handler requires that the
+#   docs files in the app have been compressed 
+#   with divide_and_compress.py and that main.py
+#   and gae_shell/ are present.
+#
+# Only one of the handler blocks should be
+# uncommented at any given time. By default,
+# the development handler is exposed. 
+
+handlers:
+
+# DEVELOPMENT HANDLER
+# (this handler block *must* be commented
+# out before pushing to a production server)
+- url: /
+  static_dir: /
+
+# PRODUCTION GAE HANDLER
+#- url: /gae_shell/static
+#  static_dir: gae_shell/static
+#  expiration: 1d
+#
+#- url: /gae_shell/.*
+#  script: /gae_shell/shell.py
+#  login: admin
+#
+#- url: .*
+#  script: main.py
diff --git a/docs/html/blog/blog_toc.cs b/docs/html/blog/blog_toc.cs
new file mode 100644
index 0000000..b2a73f5
--- /dev/null
+++ b/docs/html/blog/blog_toc.cs
Binary files differ
diff --git a/docs/html/blog/index.jd b/docs/html/blog/index.jd
new file mode 100644
index 0000000..835c55d
--- /dev/null
+++ b/docs/html/blog/index.jd
@@ -0,0 +1,4 @@
+page.title=Android Developer Blog
+@jd:body
+
+FIXME
diff --git a/docs/html/community/index.jd b/docs/html/community/index.jd
new file mode 100644
index 0000000..2df4c01
--- /dev/null
+++ b/docs/html/community/index.jd
@@ -0,0 +1,118 @@
+community=true
+page.title=Community
+@jd:body
+
+	<div id="mainBodyFluid">
+			<h1>Community</h1>
+			<p>Welcome to the Android developers community! We're glad you're here and invite you to participate in these discussions. Before posting, please read the <a href="http://source.android.com/discuss/android-discussion-groups-charter">Groups Charter</a> that covers the community guidelines.</p>
+
+<p class="note"><strong>Note:</strong> If you are seeking discussion about Android source code (not application development),
+then please refer to the <a href="http://source.android.com/discuss">Open Source Project Mailing lists</a>.</p>
+
+<p style="margin-bottom".5em"><strong>Contents</strong></p>
+<ol class="toc">
+  <li><a href="#BeforeYouPost">Before you post</a></li>
+  <li><a href="#ApplicationDeveloperLists">Application developer mailing lists</a></li>
+  <li><a href="#UsingEmail">Using email with the mailing lists</a></li>
+  <li><a href="#UsingIRC">Using IRC</a></li>
+</ol>
+
+<h2 id="BeforeYouPost">Before you post</h2>
+<p>Before writing a post, please try the following:</p>
+
+<ol>
+<li><a href="{@docRoot}guide/appendix/faq/index.html">Read the FAQs</a> The most common questions about developing Android applications are addressed in this frequently updated list.</li>
+<li><strong>Type in keywords of your questions in the main Android site's search bar</strong> (such as the one above). This search encompasses all previous discussions, across all groups, as well as the full contents of the site, documentation, and blogs. Chances are good that somebody has run into the same issue before.</li>
+<li><b>Search the mailing list archives</b> to see whether your questions have already been discussed.
+  </li>
+</ol>
+
+<p>If you can't find your answer, then we encourage you to address the community.
+As you write your post, please do the following:
+<ol>
+<li><b>Read
+the <a href="http://sites.google.com/a/android.com/opensource/discuss/android-discussion-groups-charter">mailing list charter</a></b> that covers the community guidelines. 
+</li>
+<li><b>Select the most appropriate mailing list for your question</b>. There are several different lists for 
+developers, described below.</li>
+<li>
+    <b>Be very clear</b> about your question
+in the subject -- it helps everyone, both those trying to answer your
+question as well as those who may be looking for information in the
+future.</li>
+<li><b>Give plenty of details</b> in your post to
+help others understand your problem. Code or log snippets, as well as
+pointers to screenshots, may also be helpful. For a great guide to
+phrasing your questions, read <a href="http://www.catb.org/%7Eesr/faqs/smart-questions.html">How To Ask Questions The Smart Way</a>.
+  </li>
+</ol>
+
+
+<h3 id="ApplicationDeveloperLists">Application developer mailing lists</h3>
+<ul>
+<li><b>Android beginners</b> - You're new to Android application development. You want to figure out how to get started with the Android SDK and the basic Android APIs? Start here. This list is open to any discussion around beginner-type questions for developers using the SDK; this is a great way to get up and running with your new application on the Android platform. Ask about getting your development environment set up, get help with the first steps of Android development (your first User Interface, your first permission, your first file on the Android filesystem, your first app on the Android Market...). Be sure to check the archives first before asking new questions. Please avoid advanced subjects, which belong on android-developers, and user questions, which will get a better reception on android-discuss.
+<ul>
+<li>Subscribe using Google Groups:&nbsp;<a href="http://groups.google.com/group/android-beginners">android-beginners</a></li>
+<li>Subscribe via email:&nbsp;<a href="mailto:android-beginners-subscribe@googlegroups.com">android-beginners-subscribe@googlegroups.com</a><a href="mailto:android-platform-subscribe@googlegroups.com">
+</a></li>
+</ul>
+</li>
+
+<li><b>Android developers</b> - You're now an experienced Android application developer. You've grasped the basics of Android app development, you're comfortable using the SDK, now you want to move to advanced topics. Get help here with troubleshooting applications, advice on implementation, and strategies for improving your application's performance and user experience. This is the not the right place to discuss user issues (use android-discuss for that) or beginner questions with the Android SDK (use android-beginners for that).
+<ul>
+<li>Subscribe using Google Groups:&nbsp;<a href="http://groups.google.com/group/android-developers">android-developers</a></li>
+<li>Subscribe via email:&nbsp;<a href="mailto:android-developers-subscribe@googlegroups.com">android-developers-subscribe@googlegroups.com</a><a href="mailto:android-platform-subscribe@googlegroups.com">
+</a></li>
+</ul>
+</li>
+
+<li><b>Android discuss</b> - The "water cooler" of Android discussion. You can discuss just about anything Android-related here, ideas for the Android platform, announcements about your applications, discussions about Android devices, community resources... As long as your discussion is related to Android, it's on-topic here. However, if you have a discussion here that could belong on another list, you are probably not reaching all of your target audience here and may want to consider shifting to a more targeted list.
+<ul>
+<li>Subscribe using Google Groups:&nbsp;<a href="http://groups.google.com/group/android-discuss">android-discuss</a></li>
+<li>Subscribe via email:&nbsp;<a href="mailto:android-discuss-subscribe@googlegroups.com">android-discuss-subscribe@googlegroups.com</a><a href="mailto:android-platform-subscribe@googlegroups.com">
+    </a></li>
+</ul>
+</li>
+
+<li><b>Android security discuss</b> - A place for open discussion on secure development, emerging security concerns, and best practices for and by android developers. Please don't disclose vulnerabilities directly on this list, you'd be putting all Android users at risk.
+<ul>
+<li>Subscribe using Google Groups:&nbsp;<a href="http://groups.google.com/group/android-security-discuss">android-security-discuss</a></li>
+<li>Subscribe via email:&nbsp;<a href="mailto:android-security-discuss@googlegroups.com">android-secuirty-discuss@googlegroups.com</a><a href="mailto:android-platform-subscribe@googlegroups.com">
+    </a></li>
+</ul>
+</li>
+
+<li><b>Android security announce</b> - A low-volume group for security-related announcements by the Android Security Team.
+<ul>
+<li>Subscribe using Google Groups:&nbsp;<a href="http://groups.google.com/group/android-security-announce">android-security-announce</a></li>
+<li>Subscribe via email:&nbsp;<a href="mailto:android-security-announce-subscribe@googlegroups.com">android-security-announce-subscribe@googlegroups.com</a>
+<a href="mailto:android-platform-subscribe@googlegroups.com">    </a></li>
+</ul>
+</li>
+</ul>
+
+
+
+<h2 id="UsingEmail">Using email with the mailing lists</h2>
+<p>Instead of using the <a href="http://groups.google.com/">Google Groups</a> site, you can use your email client of choice to participate in the mailing lists.</p>
+<p>To subscribe to a group without using the Google Groups site, use the link under "subscribe via email" in the lists above.</p>
+<p>To set up how you receive mailing list postings by email:</p>
+
+<ol><li>Sign into the group via the Google Groups site. For example, for the android-framework group you would visit <a href="http://groups.google.com/group/android-framework">http://groups.google.com/group/android-framework</a>.</li>
+<li>Click "Edit
+my membership" on the right side.</li>
+<li>Under "How do
+you want to read this group?" select one of the email options. </li>
+</ol>
+
+<h2 id="UsingIRC">Using IRC</h2>
+<p>The Android community is using the #android channel on the irc.freenode.net server.
+</p>
+
+
+
+
+
+
+
+</div>
diff --git a/docs/html/favicon.ico b/docs/html/favicon.ico
new file mode 100644
index 0000000..d8884b7
--- /dev/null
+++ b/docs/html/favicon.ico
Binary files differ
diff --git a/docs/html/googleb38c1d60b7ba5d19.html b/docs/html/googleb38c1d60b7ba5d19.html
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docs/html/googleb38c1d60b7ba5d19.html
diff --git a/docs/html/guide/appendix/app-intents.jd b/docs/html/guide/appendix/app-intents.jd
new file mode 100644
index 0000000..102183b
--- /dev/null
+++ b/docs/html/guide/appendix/app-intents.jd
@@ -0,0 +1,106 @@
+page.title=Reference of Available Intents
+@jd:body
+
+<p>This document describes the default applications and settings that Google provides
+    in their standard Android implementation. </p>
+<h3>Intents handled by Google Android applications<a name="googleintents" id="googleintents"></a></h3>
+ <p> Android ships with Activities that handle the following Intent URI/Action pairs. </p>
+  <table width="100%" border="1">
+      <tr>
+          <th scope="col">Scheme</th>
+          <th scope="col">Action<br />
+              android.intent.action.<em>value</em></th>
+          <th scope="col">Description</th>
+      </tr>
+      <tr>
+          <td>http://<em>web_address</em><br />
+              https://<em>web_address</em></td>
+          <td>VIEW</td>
+          <td>Open a browser window to the URL specified. </td>
+      </tr>
+      <tr>
+          <td>&quot;&quot; (empty string) <br />
+          http://<em>web_address</em><br />
+          https://<em>web_address</em></td>
+          <td>WEB_SEARCH</td>
+          <td>Opens the file at the location on the device in the browser. </td>
+      </tr>
+      <tr>
+          <td height="103">tel: <em>phone_number</em></td>
+          <td>CALL</td>
+          <td><p>Calls the entered phone number. Valid telephone numbers as defined
+              in <a href="http://tools.ietf.org/html/rfc3966">the IETF RFC 3966</a> are
+              accepted. Valid examples include the following:</p>
+              <ul>
+                  <li>tel:2125551212 </li>
+                  <li>tel:
+                      (212) 555 1212</li>
+              </ul>
+              <p>The dialer is good at normalizing some kinds of schemes: for example
+                  telephone numbers, so the schema described isn't strictly required
+                  in the {@link android.net.Uri#parse(java.lang.String)
+                  Uri(URI string)} factory. However, if you have not tried a
+                  schema or are unsure whether it can be handled, use the {@link
+                  android.net.Uri#fromParts(java.lang.String, java.lang.String,
+                  java.lang.String) Uri.fromParts(scheme, ssp, fragment)} factory
+              instead.</p>
+              <p><strong><em>Note:</em></strong>&nbsp;&nbsp;&nbsp;This requires your
+              application to request the following permission in your manifest: <code>&lt;uses-permission
+              id=&quot;android.permission.CALL_PHONE&quot; /&gt;</code></p></td>
+      </tr>
+      <tr>
+          <td><p>tel:<em>phone_number</em><br />
+          voicemail:</p>          </td>
+          <td>DIAL</td>
+          <td><p>Dials (but does not actually initiate the call) the number given
+                  (or the stored voicemail on the phone). Telephone number normalization
+                  described for CALL applies to DIAL as well. </p>              </td>
+      </tr>
+      <tr>
+          <td>geo:<em>latitude</em>,<em>longitude</em><br />
+              geo:<em>latitude</em>,<em>longitude</em>?z=<em>zoom</em><br />
+              geo:0,0?q=<em>my+street+address</em><br />
+              geo:0,0?q=<em>business+near+city</em><br />
+          </td>
+          <td>VIEW</td>
+          <td>Opens the Maps application to the given location or query. The Geo URI scheme
+              (not fully supported) is <a href="http://tools.ietf.org/html/draft-mayrhofer-geo-uri-00">currently under
+              development</a>.<p>
+              The <em>z</em> field specifies the zoom level. A zoom level of 1 shows the whole Earth, centered at the
+              given <em>lat</em>,<em>lng</em>. A zoom level of 2 shows a quarter of the Earth, and so on. The highest
+              zoom level is 23. A larger zoom level will be clamped to 23.
+          </td>
+      </tr>
+      <tr>
+          <td>google.streetview:cbll=<em>lat</em>,<em>lng</em>&amp;cbp=1,<em>yaw</em>,,<em>pitch</em>,<em>zoom</em>&amp;mz=<em>mapZoom</em>
+          </td>
+          <td>VIEW</td>
+          <td>Opens the Street View application to the given location. The URI scheme is
+            based on the syntax used for Street View panorama information in Google Maps URLs.<p>
+            The cbll field is required. The cbp and mz fields are optional.<p>
+     <table border="1">
+       <tr><th>Parameter</th><th>Description</th></tr>
+       <tr><td>lat</td><td>latitude</td></tr>
+       <tr><td>lng</td><td>longitude</td></tr>
+       <tr><td>yaw</td><td>Panorama center-of-view in degrees clockwise from North.<br />
+       <b>Note:</b> The two commas after the yaw parameter are required. They are present
+       for backwards-compatibility reasons.</td></tr>
+       <tr><td>pitch</td><td>Panorama center-of-view in degrees from
+           -90 (look straight up) to 90 (look straight down.)</td></tr>
+       <tr><td>zoom</td><td>Panorama zoom. 1.0 = normal zoom, 2.0 = zoomed in 2x, 3.0 = zoomed in 4x, and so on.<br />
+       A zoom of 1.0 is 90 degree horizontal FOV for a nominal                                             
+       landscape mode 4 x 3 aspect ratio display.                                                          
+       Android phones in portrait mode will adjust the zoom so that                                        
+       the vertical FOV is approximately the same as the landscape vertical                                
+       FOV. This means that the horizontal FOV of an Android phone in portrait                             
+       mode is much narrower than in landscape mode. This is done to minimize                              
+       the fisheye lens effect that would be present if a 90 degree horizontal                             
+       FOV was used in portrait mode.</td></tr>
+       <tr><td>mapZoom</td><td>The map zoom of the map location associated with this panorama. This value is passed on to the
+       Maps activity when the Street View "Go to Maps" menu item is chosen. It corresponds to the <em>z</em> paramaeter in
+       the geo: intent.</td></tr>
+       </table>
+          </td>
+      </tr>
+  </table>
+  <p></p>
diff --git a/docs/html/guide/appendix/faq/commontasks.jd b/docs/html/guide/appendix/faq/commontasks.jd
new file mode 100644
index 0000000..9c79bdd
--- /dev/null
+++ b/docs/html/guide/appendix/faq/commontasks.jd
@@ -0,0 +1,812 @@
+page.title=Common Tasks and How to Do Them in Android
+parent.title=FAQs, Tips, and How-to
+parent.link=index.html
+@jd:body
+
+<ul>
+    <li><a href="#neweclipseandroidproject">Creating an Android Application using
+    the Eclipse plugin</a></li>
+    <li><a href="#newandroidprojectnoeclipse">Creating an Android Application without
+    the Eclipse plugin</a></li>
+    <li><a href="#addexternallibrary">Adding an External Library (.jar) using Eclipse</a></li>
+    <li><a href="#implementcallbacks">Implementing Activity callbacks</a> (Android
+        calls your activity at various key moments in its life cycle. You must know
+        how to handle each of these to draw your screen, initialize class members,
+        and acquire data.)</li>
+    <li><a href="#opennewscreen">Opening a new screen</a></li>
+    <li><a href="#listening">Listening for button clicks </a></li>
+    <li><a href="#configurewindowproperties">Configuring general window properties </a></li>
+    <li><a href="#localhostalias">Referring to localhost from the emulated environment</a></li>
+    <li><a href="#appstate">Storing and retrieving state</a></li>
+    <li><a href="{@docRoot}guide/topics/data/data-storage.html#preferences">Storing and retrieving preferences</a></li>
+    <li><a href="#storingandretrieving">Storing and retrieving larger or more complex
+            persistent data</a> (files and data) </li>
+    <li><a href="#playback">Playing audio, video, still, or other media files</a></li>
+    <li><a href="#broadcastreceivers">Listening for and broadcasting global messages
+        and setting alarms</a></li>
+    <li><a href="#alerts">Displaying alerts </a></li>
+    <li><a href="#progressbar">Displaying a progress bar</a> </li>
+    <li><a href="#addmenuitems">Adding items to the screen menu</a> </li>
+    <li><a href="#webpage">Display a web page</a> </li>
+    <li><a href="#binding">Binding to data</a></li>
+    <li><a href="#handle">Getting a Handle to a Screen Element</a></li>
+    <li><a href="#captureimages">Capture images from the phone camera </a></li>
+    <li><a href="#threading">Handling expensive operations in the UI thread</a></li>
+    <li><a href="#selectingtext">Selecting, highlighting, or styling portions of
+            text</a></li>
+    <li><a href="#querymap">Utilizing attributes in a Map query</a></li>
+    <li><a href="#filelist">List of files for an Android application</a></li>
+    <li><a href="#logging">Print messages to a log file</a></li>
+</ul>
+<p>The ApiDemos sample application includes many, many examples of common
+tasks and UI features. See the code inside
+<code>&lt;sdk&gt;samples/ApiDemos</code> and the other sample applications
+under the <code>samples/</code> folder in the SDK.</p>
+
+
+<h2 id="neweclipseandroidproject">Creating an Android Application using the Eclipse Plugin</h2>
+
+<p>Using the Android Eclipse plugin is the fastest and easiest way
+to start creating a new Android application. The plugin automatically generates
+the correct project structure for your application, and keeps the resources
+compiled for you automatically.</p>
+
+<p>It is still a good idea to know what is going on though. Take a look at <a
+href="{@docRoot}guide/topics/fundamentals.html">Application Fundamentals</a> 
+to understand the basics of how an Android application works.</p> 
+
+<p>You should also take a look at the ApiDemos application and the other sample
+applications included in the SDK, in the <code>&lt;sdk&gt;/samples/ 
+folder in the SDK.</p>
+
+<p>Finally, a great way to started with Android development in Eclipse is to
+follow both the <a href="{@docRoot}guide/tutorials/hello-world.html">Hello,
+World</a> and <a
+href="{@docRoot}guide/tutorials/notepad/index.html">Notepad</a> code
+tutorials. In particular, the start of the Hello Android tutorial is an
+excellent introduction to creating a new Android application in Eclipse.</p>
+
+<h2 id="newandroidprojectnoeclipse">Creating an Android Application without the Eclipse Plugin</h2>
+
+<p>This topic describes the manual steps in creating an Android application.
+Before reading this, you should read <a
+href="{@docRoot}guide/topics/fundamentals.html">Application Fundamentals</a> 
+to understand the basics of how an Android application works. You might also 
+want to look at the sample code included with the Android SDK, in the 
+<code>&lt;sdk&gt;/samples/</code> directory. </p>
+
+<p>Here is a list of the basic steps in building an application.</p>
+<ol>
+    <li><strong>Create your required resource files</strong> &nbsp;&nbsp;This includes
+        the AndroidManifest.xml global description file, string files that your application
+        needs, and layout files describing your user interface. A full list of optional
+        and required files and syntax details for each is given in <a href="#filelist">File
+        List for an Android Application</a>. </li>
+    <li><strong>Design your user interface</strong> &nbsp;&nbsp;See <a
+    href="{@docRoot}guide/topics/ui/index.html">User Interface</a> for
+    details on elements of the Android screen. </li>
+    <li><strong>Implement your Activity </strong>(this page)<strong>&nbsp;&nbsp; </strong> You
+        will create one class/file for each screen in your application. Screens will
+        inherit from an {@link android.app android.app} class, typically {@link android.app.Activity
+        android.app.Activity} for basic screens, {@link android.app.ListActivity
+        android.app.ListActivity} for list screens, or {@link android.app.Dialog
+        android.app.Dialog} for dialog boxes. You will implement the required callbacks
+        that let you draw your screen, query data, and commit changes, and also perform
+        any required tasks such as opening additional screens or reading data from
+        the device. Common tasks, such as opening a new screen or reading data from
+        the device, are described below.
+        The list of files you'll need for your application are described in <a href="#filelist">List
+        of Files for an Android Application</a>. </li>
+    <li><strong><a href="{@docRoot}guide/developing/other-ide.html#buildingwithant">Build and install your
+                package</a>.</strong> The Android SDK has some nice tools for generating
+                projects and debugging code. </li>
+</ol>
+
+<h2 id="addexternallibrary">Adding an External Library (.jar) using Eclipse</h2>
+<p>
+You can use a third party JAR in your application by adding it to your Eclipse project as follows:
+</p>
+<ol>
+<li>
+In the <strong>Package Explorer</strong> panel, right-click on your project and select <strong>Properties</strong>.
+<li>
+Select <strong>Java Build Path</strong>, then the tab <strong>Libraries</strong>.
+<li>
+Press the <strong>Add External JARs...</strong> button and select the JAR file.
+</ol>
+<p>
+Alternatively, if you want to include third party JARs with your package, create a new directory for them within your project and select <strong>Add Library...</strong> instead.</p>
+<p>
+It is not necessary to put external JARs in the assets folder.
+</p>
+
+<a name="implementcallbacks" id="implementcallbacks"></a>
+<h2>Implementing Activity Callbacks</h2>
+<p>Android calls a number of callbacks to let you draw your screen, store data before
+    pausing, and refresh data after closing. You must implement at least some of
+    these methods. See <a href="{@docRoot}guide/topics/fundamentals.html#lcycles">Lifecycles</a>
+    discussion in Application Fundamentals to learn when and in what order these methods 
+    are called. Here are some of the standard types of screen classes that Android provides:</p>
+<ul>
+    <li>{@link android.app.Activity android.app.Activity} - This is a standard screen,
+        with no specialization.</li>
+    <li>{@link android.app.ListActivity android.app.ListActivity} - This is a screen
+        that is used to display a list of something. It hosts a ListView object,
+        and exposes methods to let you identify the selected item, receive callbacks
+        when the selected item changes, and perform other list-related actions. </li>
+    <li>{@link android.app.Dialog android.app.Dialog} - This is a small, popup dialog-style
+        window that isn't intended to remain in the history stack. (It is not resizeable
+        or moveable by the user.)</li>
+</ul>
+
+<a name="opennewscreen" id="opennewscreen"></a><h2>Opening a New Screen</h2>
+<p>Your Activity will often need to open another Activity screen as it progresses.
+    This new screen can be part of the same application or part of another application,
+    the new screen can be floating or full screen, it can return a result, and you
+    can decide whether to close this screen and remove it from the history stack
+    when you are done with it, or to keep the screen open in history. These next
+    sections describe all these options. </p>
+<h3>Floating or full?<a name="floatingorfull" id="floatingorfull"></a></h3>
+<p>When you open a new screen you can decide whether to make it transparent or floating,
+    or full-screen. The choice of new screen affects the event sequence of events
+    in the old screen (if the new screen obscures the old screen, a different
+    series of events is called in the old screen). See <a
+    href="{@docRoot}guide/topics/fundamentals.html#lcycles">Lifecycles</a> discussion
+    in Application Fundamentals for details. </p> 
+<p>Transparent or floating windows are implemented in three
+    standard ways: </p>
+<ul>
+    <li>Create an {@link android.app.Dialog app.Dialog} class </li>
+    <li>Create an {@link android.app.AlertDialog app.AlertDialog} class </li>
+    <li>Set the {@link android.R.style#Theme_Dialog} <em>theme</em> attribute to <code>&#064;android:style/Theme.Dialog</code>
+        in your AndroidManifest.xml file. For example:    
+</ul>
+<blockquote>
+    <pre>&lt;activity class=&quot;AddRssItem&quot; android:label=&quot;Add an item&quot; android:theme=&quot;&#064;android:style/Theme.Dialog&quot;/&gt;
+</pre>
+</blockquote>
+<p>Calling startActivity() or startActivityForResult() will open a new screen in whatever
+    way it defines itself (if it uses a floating theme it will be floating,
+    otherwise it will be full screen). </p>
+<h3>Opening a Screen </h3>
+<p>When you want to open a new screen, you can either explicitly specify the activity
+    class to open, or you can let the operating system decide which screen to open,
+    based upon the data and various parameters you pass in. A screen is opened by
+    calling {@link android.app.Activity#startActivity(android.content.Intent) startActivity}
+    and passing in an {@link android.content.Intent Intent} object, which specifies
+    the criteria for the handling screen. To specify a specific screen, call Intent.setClass
+    or setClassName with the exact activity class to open. Otherwise, set a variety
+    of values and data, and let Android decide which screen is appropriate to open.
+    Android will find one or zero Activities that match the specified requirements;
+    it will never open multiple activities for a single request. More information
+    on Intents and how Android resolves them to a specific class is given in the
+    {@link android.content.Intent Intent} topic. </p>
+<a name="intentexamples" id="intentexamples"></a><h3>Some Intent examples </h3>
+<p>The following snippet loads the com.android.samples.Animation1 class, and
+    passes it some arbitrary data.:</p>
+<pre>Intent myIntent = new Intent();
+myIntent.setClassName(&quot;com.android.samples&quot;, &quot;com.android.samples.Animation1&quot;);
+myIntent.putExtra(&quot;com.android.samples.SpecialValue&quot;, &quot;Hello, Joe!&quot;); // key/value pair, where key needs current package prefix.
+startActivity(myIntent);    </pre>
+<p>The next snippet requests that a Web page be opened by specifying the VIEW action,
+    and a URI data string starting with &quot;http://&quot; schema:</p>
+<pre>Intent myIntent = new Intent(Intent.VIEW_ACTION, Uri.parse(&quot;http://www.google.com&quot;));</pre>
+<p>Here is the intent filter from the AndroidManifest.xml file for com.android.browser:</p>
+<pre>&lt;intent-filter&gt;
+    &lt;action android:name=&quot;android.intent.action.VIEW&quot; /&gt;
+    &lt;category android:name=&quot;android.intent.category.DEFAULT&quot; /&gt;
+    &lt;scheme android:name=&quot;http&quot; /&gt;
+    &lt;scheme android:name=&quot;https&quot; /&gt;
+    &lt;scheme android:name=&quot;file&quot; /&gt;
+&lt;/intent-filter&gt; </pre>
+<p>Android defines a number of standard values, for instance the action constants
+    defined by {@link android.content.Intent}. You can define custom values, but
+    both the caller and handler must use them. See the &lt;intent-filter&gt;
+    tag description in <a href="{@docRoot}guide/topics/manifest/manifest-intro.html">The AndroidManifest.xml
+    File</a> for more information on the manifest syntax for the handling
+    application. </p>
+<a name="returningaresult" id="returningaresult"></a><h3>Returning a Result from a Screen</h3>
+<p>A window can return a result after it closes. This result will be passed back
+    into the calling Activity's {@link android.app.Activity#onActivityResult(int,int,android.content.Intent)
+    onActivityResult()} method, which can supply an Intent containing arbitrary data, along with
+    the request code passed to startActivityForResult(). Note that you must call the {@link
+    android.app.Activity#startActivityForResult(android.content.Intent,int) startActivityForResult()}
+    method that accepts a request code parameter to get this callback. The following
+    code demonstrates opening a new screen and retrieving a result. </p>
+<pre>// Open the new screen.
+public void onClick(View v){
+    // Start the activity whose result we want to retrieve.  The
+    // result will come back with request code GET_CODE.
+    Intent intent = new Intent(this, com.example.app.ChooseYourBoxer.class);
+    startActivityForResult(intent, CHOOSE_FIGHTER);
+}
+
+// Listen for results.
+protected void onActivityResult(int requestCode, int resultCode, Intent data){
+    // See which child activity is calling us back.
+    switch (resultCode) {
+        case CHOOSE_FIGHTER:
+            // This is the standard resultCode that is sent back if the
+            // activity crashed or didn't doesn't supply an explicit result.
+            if (resultCode == RESULT_CANCELED){
+                myMessageboxFunction("Fight cancelled");
+            } 
+            else {
+                myFightFunction(data);
+            }
+        default:
+            break;
+    }
+}
+
+// Class SentResult
+// Temporary screen to let the user choose something.
+    private OnClickListener mLincolnListener = new OnClickListener(){
+        public void onClick(View v) {
+            Bundle stats = new Bundle();
+            stats.putString("height","6\'4\""); 
+            stats.putString("weight", "190 lbs");
+            stats.putString("reach", "74\"");
+            setResult(RESULT_OK, "Lincoln", stats);
+            finish();
+        }
+    };
+
+    private OnClickListener mWashingtonListener = new OnClickListener() {
+        public void onClick(View v){
+            Bundle stats = new Bundle();
+            stats.putString("height","6\'2\""); 
+            stats.putString("weight", "190 lbs");
+            stats.putString("reach", "73\"");
+            setResult(RESULT_OK, "Washington", Bundle);
+            finish();
+        }
+    };
+	</pre>
+<h3>Lifetime of the new screen </h3>
+<p>An activity can remove itself from the history stack by calling {@link android.app.Activity#finish()
+    Activity.finish()} on itself, or the activity that opened the screen can call
+    {@link android.app.Activity#finishActivity(int) Activity.finishActivity()}
+    on any screens that it opens to close them. </p>
+<a name="listening" id="listening"></a><h2>Listening for Button Clicks</h2>
+<p>Button click and other UI event capturing are covered in <a href="{@docRoot}guide/topics/ui/ui-events.html">Handling UI Events</a> on the UI Design page.</p>
+<a name="configurewindowproperties" id="configurewindowproperties"></a><h2>Configuring General Window Properties</h2>
+<p>You can set a number of general window properties, such as whether to display
+    a title, whether the window is floating, and whether it displays an icon, by
+    calling methods on the {@link android.view.Window Window} member
+    of the underlying View object for the window. Examples include calling {@link
+    android.app.Activity#getWindow() getWindow().requestFeature()} (or the convenience
+    method {@link android.app.Activity#requestWindowFeature(int) requestWindowFeature(<em>some_feature</em>)})
+    to hide the title. Here is an example of hiding the title bar:</p>
+<pre>//Hide the title bar
+requestWindowFeature(Window.FEATURE_NO_TITLE);
+</pre>
+<a name="localhostalias" id="localhostalias"></a><h2>Referring to localhost from the emulated environment</h2>
+<p>
+If you need to refer to your host computer's <em>localhost</em>, such as when you 
+want the emulator client to contact a server running on the same host, use the alias 
+<code>10.0.2.2</code> to refer to the host computer's loopback interface. 
+From the emulator's perspective, localhost (<code>127.0.0.1</code>) refers to its own 
+loopback interface.
+</p>
+<a name="appstate" id="appstate"></a><h2>Storing and Retrieving State</h2>
+<p>If your application is dumped from memory because of space concerns, it will lose
+    all user interface state information such as checkbox state and text box values
+    as well as class member values. Android calls {@link android.app.Activity#onSaveInstanceState(android.os.Bundle)
+    Activity.onSaveInstanceState} before it pauses the application. This method hands in a {@link
+    android.os.Bundle Bundle} that can be used to store name/value pairs that will
+    persist and be handed back to the application even if it is dropped from memory.
+    Android will pass this Bundle back to you when it calls {@link android.app.Activity#onCreate(android.os.Bundle)
+    onCreate()}. This Bundle only exists while the application is still in the history
+    stack (whether or not it has been removed from memory) and will be lost when
+    the application is finalized. See the topics for {@link android.app.Activity#onSaveInstanceState} and
+    {@link android.app.Activity#onCreate} for
+    examples of storing and retrieving state.</p>
+<p>Read more about the lifecycle of an application in <a href="{@docRoot}guide/topics/fundamentals.html">Application Fundamentals</a>.</p>
+<h3>Storing and Retrieving Larger or More Complex Persistent Data<a name="storingandretrieving" id="storingandretrieving"></a></h3>
+<p>Your application can store files or complex collection objects, and reserve them
+    for private use by itself or other activities in the application, or it can expose
+    its data to all other applications on the device. See <a href="{@docRoot}guide/topics/data/data-storage.html">Storing,
+    Retrieving, and Exposing Data</a> to learn how to store and retrieve private data,
+    how to store and retrieve common data from the device, and how to expose your
+    private data to other applications.</p>
+<a name="playback" id="playback"></a><h2>Playing Media Files</h2>
+<p>Please see the document <a href="{@docRoot}guide/topics/media/index.html">Audio and Video</a> for more details.</p>
+<a name="broadcastreceivers" id="broadcastreceivers"></a><h2>Listening For and Broadcasting Global Messages, and Setting Alarms</h2>
+<p>You can create a listening class that can be notified or even instantiated whenever
+    a specific type of system message is sent. 
+</p>
+<p>The listening classes, called broadcast receivers, extend {@link android.content.BroadcastReceiver
+    BroadcastReceiver}. If you want Android to instantiate the object whenever an appropriate
+    intent notification is sent, define the receiver with a <code>&lt;receiver&gt;</code> element
+    in the AndroidManifext.xml file. If the caller is expected to instantiate the
+    object in preparation to receive a message, this is not required. The receiver
+    will get a call to their {@link android.content.BroadcastReceiver#onReceive(android.content.Context,android.content.Intent)
+    BroadcastReceiver.onReceive()} method. A receiver can define an <code>&lt;intent-filter&gt;</code> tag
+    that describes the types of messages it will receive. Just as Android's IntentResolver
+    will look for appropriate Activity matches for a startActivity() call, it will
+    look for any matching Receivers (but it will send the message to all matching
+    receivers, not to the &quot;best&quot; match). </p>
+<p>To send a notification, the caller creates an {@link android.content.Intent Intent}
+    object and calls {@link android.app.Activity#sendBroadcast(android.content.Intent)
+    Context.sendBroadcast()} with that Intent. Multiple recipients can receive
+    the same message. You can broadcast an Intent message to an intent receiver in
+    any application, not only your own. If the receiving class is not registered
+    using <code>&lt;receiver&gt;</code> in its manifest, you can dynamically instantiate
+    and register a receiver by calling {@link android.content.Context#registerReceiver(android.content.BroadcastReceiver,android.content.IntentFilter)
+    Context.registerReceiver()}. </p>
+<p>Receivers can include intent filters to specify what kinds of intents they are
+    listening for. Alternatively, if you expect a single known caller to contact
+    a single known receiver, the receiver does not specify an intent filter, and
+    the caller specifies the receiver's class name in the Intent by calling {@link
+    android.content.Intent#setClassName(java.lang.String, java.lang.String) Intent.setClassName()}
+    with the recipient's class name. The recipient receives a {@link android.content.Context
+    Context} object that refers to its own package, not to the package of the sender.</p>
+<p><em><strong>Note:</strong></em>&nbsp;&nbsp;&nbsp;If a receiver or broadcaster
+    enforces permissions, your application might need to request permission
+    to send or receive messages from that object. You can request permission by using
+    the &lt;uses-permission&gt; tag in the manifest. </p>
+<p>Here is a code snippet of a sender and receiver. This example does not demonstrate
+    registering receivers dynamically. For a full code example, see the AlarmService
+    class in the ApiDemos project.</p>
+<h3>Sending the message</h3>
+<pre>// We are sending this to a specific recipient, so we will
+// only specify the recipient class name. 
+Intent intent = new Intent(this, AlarmReceiver.class);
+intent.putExtra(&quot;message&quot;,&quot;Wake up.&quot;);
+sendBroadcast(intent);
+</pre>
+<h3>Receiving the message</h3>
+<p><strong>Receiver AndroidManifest.xml </strong>(because there is no intent filter
+    child, this class will only receive a broadcast when the receiver class is specified
+    by name, as is done in this example):</p>
+<pre>
+&lt;receiver class=".AlarmReceiver" /&gt;</pre>
+<p><strong>Receiver Java code: </strong></p>
+<pre>
+public class AlarmReceiver extends BroadcastReceiver{
+    // Display an alert that we've received a message.    
+    &#064;Override 
+    public void onReceive(Context context, Intent intent){
+	    // Send a text notification to the screen.
+        NotificationManager nm = (NotificationManager)
+        context.getSystemService(Context.NOTIFICATION_SERVICE);
+        nm.notifyWithText(R.id.alarm,
+                          &quot;Alarm!!!&quot;,
+                          NotificationManager.LENGTH_SHORT,
+                          null);
+   }
+}   </pre>
+<h3>Other system messages</h3>
+<p>You can listen for other system messages sent by Android as well, such as USB
+    connection/removal messages, SMS arrival messages, and timezone changes. See
+    {@link android.content.Intent} for a list of broadcast messages to listen for.
+    Messages are marked &quot;Broadcast Action&quot; in the documentation. </p>
+<h3>Listening for phone events<a name="phoneevents" id="phoneevents"></a></h3>
+<p>The {@link android.telephony android.telephony} package overview page describes how to
+    register to listen for phone events. </p>
+<a name="alarms" id="alarms"></a><h3>Setting Alarms </h3>
+<p>Android provides an {@link android.app.AlarmManager AlarmManager} service that
+    will let you specify an Intent to send at a designated time. This intent is typically
+    used to start an application at a preset time. (Note: If you want to send
+    a notification to a sleeping or running application, use {@link android.os.Handler
+    Handler} instead.)</p>
+<a name="alerts" id="alerts"></a><h2>Displaying Alerts</h2>
+<p>There are two major kinds of alerts that you may display to the user:
+(1) Normal alerts are displayed in response to a user action, such as
+trying to perform an action that is not allowed.  (2) Out-of-band alerts,
+called notifications, are
+displayed as a result of something happening in the background, such as the
+user receiving new e-mail.</p>
+
+<a name="dialogsandalerts" id="dialogsandalerts"></a><h3>Normal Alerts</h3>
+
+<p>Android provides a number of ways for you to show popup notifications to your
+    user as they interact with your application. </p>
+<table width="100%" border="1">
+    <tr>
+        <th scope="col">Class</th>
+        <th scope="col">Description</th>
+    </tr>
+    <tr>
+        <td>{@link android.app.Dialog app.Dialog}</td>
+        <td>A generic floating dialog box with a layout that you design. </td>
+    </tr>
+    <tr>
+        <td><p>{@link android.app.AlertDialog app.AlertDialog}</p></td>
+        <td>A popup alert dialog with two buttons (typically OK and Cancel) that
+            take callback handlers. See the section after this table for more details. </td>
+    </tr>
+    <tr>
+        <td>{@link android.app.ProgressDialog ProgressDialog} </td>
+        <td>A dialog box used to indicate progress of an operation with a known progress
+            value or an indeterminate length (setProgress(bool)). See <strong>Views</strong> &gt; <strong>Progress Bar</strong> in
+            ApiDemos for examples. </td>
+    </tr>
+    <tr>
+        <td>Activity</td>
+        <td>By setting the theme of an activity to
+            {@link android.R.style#Theme_Dialog 
+            android:theme=&quot;android:style/Theme.Dialog&quot;}, 
+            your activity will take on
+            the appearance of a normal dialog, floating on top of whatever was
+            underneath it.  You usually set the theme through the
+            {@link android.R.attr#theme android:theme} attribute in your AndroidManifest.xml.
+            The advantage of this
+            over Dialog and AlertDialog is that Application has a much better managed
+            life cycle than dialogs: if a dialog goes to the background and is killed,
+            you cannot recapture state, whereas Application exposes a {@link android.os.Bundle
+            Bundle} of saved values in <code>onCreate()</code> to help you maintain state.</td>
+    </tr>
+</table>
+<h3>AlertDialog</h3>
+<p>This is a basic warning dialog box that lets you configure a message, button text,
+    and callback. You can create one by calling using the {@link 
+    android.app.AlertDialog.Builder} class, as shown here. </p>
+<pre>private Handler mHandler = new Handler() {
+    public void handleMessage(Message msg) {
+        switch (msg.what) {
+            case ACCEPT_CALL:
+            answer(msg.obj);
+            break;
+    
+            case BOUNCE_TO_VOICEMAIL:
+            voicemail(msg.obj);
+            break;
+    
+        }
+    }
+};
+
+
+private void IncomingMotherInlawCall(Connection c) {
+    String Text;
+    
+    // &quot;Answer&quot; callback.
+    Message acceptMsg = Message.obtain();
+    acceptMsg.target = mHandler;
+    acceptMsg.what = ACCEPT_CALL;
+    acceptMsg.obj = c.getCall();
+    
+    // &quot;Cancel&quot; callback.
+    final Message rejectMsg = Message.obtain();
+    rejectMsg.target = mHandler;
+    rejectMsg.what = BOUNCE_TO_VOICEMAIL;
+    rejectMsg.obj = c.getCall();
+
+    new AlertDialog.Builder(this)
+      .setMessage("Phyllis is calling")
+      .setPositiveButton("Answer", acceptMsg)
+      .setOnCanceListener(new OnCancelListener() {
+        public void onCancel(DialogInterface dialog) {
+          rejectMsg.sendToTarget();
+        }});
+      .show();
+}    </pre>
+
+<h3>Notifications</h3>
+
+<p>Out-of-band alerts should always be displayed using the
+{@link android.app.NotificationManager}, which allows you to tell the user
+about something they may be interested in without disrupting what they are
+currently doing.  A notification can be anything from a brief pop-up box
+informing the user of the new information, through displaying a persistent
+icon in the status bar, to vibrating, playing sounds, or flashing lights to
+get the user's attention.  In all cases, the user must explicitly shift their
+focus to the notification before they can interact with it.</p>
+
+<p>The following code demonstrates using NotificationManager to display a basic text
+    popup when a new SMS message arrives in a listening service, and provides the
+    current message count. You can see several more examples in the ApiDemos application,
+    under app/ (named <em>notification</em>*.java).</p>
+<pre>static void setNewMessageIndicator(Context context, int messageCount){
+   // Get the static global NotificationManager object.
+   NotificationManager nm = NotificationManager.getDefault();</p>
+
+   // If we're being called because a new message has been received, 
+   // then display an icon and a count. Otherwise, delete the persistent
+   // message.
+   if (messageCount &gt; 0) {
+      nm.notifyWithText(myApp.NOTIFICATION_GUID,      // ID for this notification.
+                messageCount + &quot; new message&quot; + messageCount &gt; 1 ? &quot;s&quot;:&quot;&quot;, // Text to display.
+                NotificationManager.LENGTH_SHORT); // Show it for a short time only.
+   }
+}</pre>
+<p>To display a notification in the status bar and have it launch an intent when
+    the user selects it (such as the new text message notification does), call {@link
+    android.app.NotificationManager#notify(int, android.app.Notification) NotificationManager.notify()},
+    and pass in vibration patterns, status bar icons, or Intents to associate with
+    the notification. </p>
+<a name="progressbar" id="progressbar"></a><h2>Displaying a Progress Bar</h2>
+<p>An activity can display a progress bar to notify the user that something is happening.
+    To display a progress bar in a screen, call {@link android.app.Activity#requestWindowFeature(int)
+    Activity.requestWindowFeature(Window.FEATURE_PROGRESS)}. To set the value
+    of the progress bar, call {@link android.view.Window#setFeatureInt(int,int)
+    Activity.getWindow().setFeatureInt(Window.FEATURE_PROGRESS, <em>level</em>)}.
+    Progress bar values are from 0 to 9,999, or set the value to 10,000 to make the
+    progress bar invisible. </p>
+<p>You can also use the {@link android.app.ProgressDialog ProgressDialog} class,
+    which enables a  dialog box with an embedded progress bar to send a &quot;I'm working
+    on it&quot; notification to the user. </p>
+<a name="addmenuitems" id="addmenuitems"></a><h2>Adding Items to the Screen Menu</h2>
+<p>See <a href="{@docRoot}guide/topics/ui/menus.html">Creating Menus</a>.</p>
+
+<a name="webpage" id="webpage"></a><h2>Display a Web Page</h2>
+<p>Use the {@link android.webkit.WebView webkit.WebView} object. </p>
+<a name="binding" id="binding"></a><h2>Binding to Data</h2>
+<p>You can bind a ListView to a set of underlying data by using a shim class called
+    {@link android.widget.ListAdapter ListAdapter} (or a subclass). ListAdapter subclasses
+    bind to a variety of data sources, and expose a common set of methods such as
+    getItem() and getView(), and uses them to pick View items to display in its list.
+    You can extend ListAdapter and override getView() to create your own custom list
+    items. There are essentially only two steps you need to perform to bind to data: </p>
+<ol>
+    <li>Create a ListAdapter object and specify its data source</li>
+    <li>Give the ListAdapter to your ListView object.</li>
+</ol>
+<p>That's it!</p>
+<p>Here's an example of binding a ListActivity screen to the results from a cursor
+    query. (Note that the setListAdapter() method shown is a convenience method that
+    gets the page's ListView object and calls setAdapter() on it.)</p>
+<pre>// Run a query and get a Cursor pointing to the results.
+Cursor c = People.query(this.getContentResolver(), null);
+startManagingCursor(c);
+
+// Create the ListAdapter. A SimpleCursorAdapter lets you specify two interesting things:
+// an XML template for your list item, and
+// The column to map to a specific item, by ID, in your template.
+ListAdapter adapter = new SimpleCursorAdapter(this,  
+                android.R.layout.simple_list_item_1,  // Use a template that displays a text view
+                c,                                    // Give the cursor to the list adapter
+                new String[] {People.NAME} ,          // Map the NAME column in the people database to...
+                new String[] {"text1"});              // The "text1" view defined in the XML template
+setListAdapter(adapter);</pre>
+<p>See view/List4 in the ApiDemos project for an example of extending ListAdapter
+    for a new data type. </p>
+
+<a name="handle"></a>
+
+<h2>Getting a Handle to a Screen Element</h2>
+<p>You can get a handle to a screen element by calling {@link
+android.app.Activity#findViewById(int) Activity.findViewById}. You can then use
+the handle to set or retrieve any values exposed by the object. </p>
+<a name="captureimages" id="captureimages"></a><h2>Capture Images from the Phone Camera</h2>
+<p>You can hook into the device's camera onto your own Canvas object by using the
+    {@link android.hardware.Camera Camera} class. See that class's documentation,
+    and the ApiDemos project's Camera Preview application (Graphics/Camera Preview)
+    for example code. </p>
+
+
+<a name="threading" id="threading"></a><h2>Handling Expensive Operations in the UI Thread</h2>
+<p>Avoid performing long-running operations (such as network I/O) directly in the UI thread &mdash; 
+the main thread of an application where the UI is run &mdash; or your application may be blocked 
+and become unresponsive. Here is a brief summary of the recommended approach for handling expensive operations:</p>
+<ol>
+<li>Create a Handler object in your UI thread</li>
+<li>Spawn off worker threads to perform any required expensive operations</li>
+<li>Post results from a worker thread back to the UI thread's handler either through a Runnable or a {@link android.os.Message}</li>
+<li>Update the views on the UI thread as needed</li>
+</ol>
+
+<p>The following outline illustrates a typical implementation:</p>
+
+<pre>
+public class MyActivity extends Activity {
+
+    [ . . . ]
+    // Need handler for callbacks to the UI thread
+    final Handler mHandler = new Handler();
+
+    // Create runnable for posting
+    final Runnable mUpdateResults = new Runnable() {
+        public void run() {
+            updateResultsInUi();
+        }
+    };
+
+    &#64;Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        [ . . . ]
+    }
+
+    protected void startLongRunningOperation() {
+
+        // Fire off a thread to do some work that we shouldn't do directly in the UI thread
+        Thread t = new Thread() {
+            public void run() {
+                mResults = doSomethingExpensive();
+                mHandler.post(mUpdateResults);
+            }
+        };
+        t.start();
+    }
+
+    private void updateResultsInUi() {
+
+        // Back in the UI thread -- update our UI elements based on the data in mResults
+        [ . . . ]
+    }
+}
+</pre>
+
+<p>For further discussions on this topic, see 
+<a href="{@docRoot}guide/practices/design/responsiveness.html">Designing for Responsiveness</a> 
+and the {@link android.os.Handler} documentation.</p>
+
+<a name="selectingtext" id="selectingtext"></a><h2>Selecting, Highlighting, or Styling Portions of Text</h2>
+<p>You can highlight or style the formatting of strings or substrings of text in
+    a TextView object. There are two ways to do this:</p>
+<ul>
+    <li>If you use a <a href="{@docRoot}guide/topics/resources/available-resources.html#stringresources">string resource</a>,
+        you can add some simple styling, such as bold or italic using HTML notation.
+        The currently supported tags are: <code>B</code> (bold),
+        <code>I</code> (italic), <code>U</code> (underline),
+        <code>TT</code> (monospace), <code>BIG</code>, <code>SMALL</code>,
+        <code>SUP</code> (superscript), <code>SUB</code> (subscript),
+        and <code>STRIKE</code> (strikethrough).
+        So, for example, in res/values/strings.xml you could declare this:<br />
+        <code>&lt;resource&gt;<br />
+        &nbsp;&nbsp;&nbsp;&nbsp;&lt;string&gt;id=&quot;@+id/styled_welcome_message&quot;&gt;We
+        are &lt;b&gt;&lt;i&gt;so&lt;/i&gt;&lt;/b&gt; glad to see you.&lt;/string&gt;<br />
+        &lt;/resources&gt;</code></li>
+    <li>To style text on the fly, or to add highlighting or more complex styling,
+        you must use the Spannable object as described next. </li>
+</ul>
+<p>To style text on the fly, you must make sure the TextView is using {@link android.text.Spannable}
+    storage for the text (this will always be true if the TextView is an EditText),
+    retrieve its text with {@link android.widget.TextView#getText}, and call {@link
+    android.text.Spannable#setSpan}, passing in a new style class from the {@link
+    android.text.style} package and the selection range. </p>
+<p>The following code snippet demonstrates creating a string with a highlighted section,
+    italic section, and bold section, and adding it to an EditText object. </p>
+<pre>// Get our EditText object.
+EditText vw = (EditText)findViewById(R.id.text);
+
+// Set the EditText's text.
+vw.setText("Italic, highlighted, bold.");
+
+// If this were just a TextView, we could do:
+// vw.setText("Italic, highlighted, bold.", TextView.BufferType.SPANNABLE);
+// to force it to use Spannable storage so styles can be attached.
+// Or we could specify that in the XML.
+
+// Get the EditText's internal text storage
+Spannable str = vw.getText();
+
+// Create our span sections, and assign a format to each.
+str.setSpan(new StyleSpan(android.graphics.Typeface.ITALIC), 0, 7, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+str.setSpan(new BackgroundColorSpan(0xFFFFFF00), 8, 19, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+str.setSpan(new StyleSpan(android.graphics.Typeface.BOLD), 21, str.length() - 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+</pre>
+
+<a name="querymap" id="querymap"></a><h2>Utilizing attributes in a Map query</h2>
+<p>
+When using a search intent to ask the Maps activity to search for something, the Maps activity responds to the following attributes in the optional context bundle:
+</p>
+<pre>
+               float "centerLatitude" default 0.0f
+               float "centerLongitude" default 0.0f
+               float "latitudeSpan" default 0.0f
+               float "longitudeSpan" default 0.0f
+               int "zoomLevel" default 10
+</pre>
+<p>
+This context information is used to center the search result in a particular area, and is equivalent to adjusting the Map activity to the described location and zoom level before issuing the query.
+</p>
+<p>
+If the latitudeSpan, longitudeSpan, and zoomLevel attributes are not consistent, then it is undefined which one takes precedence.
+</p>
+
+<a name="filelist" id="filelist"></a><h2>List of Files for an Android Application</h2>
+<p>The following list describes the structure and files of an Android application.
+    Many of these files can be built for you (or stubbed out) by the activitycreator
+    application shipped in the tools/ menu of the SDK. </p>
+<table width="100%" border="0">
+    <tr>
+        <td width="28%" valign="top">MyApp/<br /></td>
+        <td width="72%" valign="top">&nbsp;</td>
+    </tr>
+    <tr>
+        <td valign="top">&nbsp;&nbsp;&nbsp;&nbsp;AndroidManifest.xml</td>
+        <td valign="top">(<em>required</em>) Advertises the screens that this application provides,
+            where they can be launched (from the main program menu or elsewhere),
+            any content providers it implements and what kind of data they handle,
+            where the implementation classes are, and other application-wide
+            information. Syntax details for this file are described in <a href="{@docRoot}guide/topics/manifest/manifest-intro.html">The AndroidManifest.xml File</a>.</td>
+    </tr>
+    <tr>
+        <td valign="top">&nbsp;&nbsp;&nbsp;&nbsp;src/<br />
+        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;/<em>myPackagePath</em>/.../<em>MyClass</em>.java</td>
+        <td valign="top">(<em>required</em>) This folder holds all the source code files for your
+            application, inside the appropriate package subfolders. </td>
+    </tr>
+    <tr>
+        <td valign="top">&nbsp;&nbsp;&nbsp;&nbsp;res/</td>
+        <td valign="top">(<em>required</em>) This folder holds all the <em>resources</em> for
+            your application. Resources are external data files or description files
+            that are compiled into your code at build time. Files in different folders
+            are compiled differently, so you must put the proper resource into the
+            proper folder. (See <a href="{@docRoot}guide/topics/resources/resources-i18n.html">Resources</a> for details.)</td>
+    </tr>
+    <tr>
+        <td valign="top">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;anim/<br />
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<em>animation1</em>.xml<br />
+        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<em>...</em></td>
+        <td valign="top">(<em>optional</em>) Holds any animation XML description files that the
+            application uses. The format of these files is described in <a href="{@docRoot}guide/topics/resources/resources-i18n.html">Resources</a>. </td>
+    </tr>
+    <tr>
+        <td valign="top">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;drawable/<br />
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<em>some_picture</em>.png<br />
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<em>some_stretchable</em>.9.png<br />
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<em>some_background</em>.xml<br />
+        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;...</td>
+        <td valign="top">(<em>optional</em>) Zero or more files that will be compiled to {@link
+            android.graphics.drawable android.graphics.drawable} resources. Files
+            can be image files (png, gif, or other) or XML files describing other
+            graphics such as bitmaps, stretchable bitmaps, or gradients. Supported
+            bitmap file formats are PNG (preferred), JPG, and GIF (discouraged),
+            as well as the custom 9-patch stretchable bitmap format. These formats
+            are described in <a href="{@docRoot}guide/topics/resources/resources-i18n.html">Resources</a>. </td>
+    </tr>
+    <tr>
+        <td valign="top">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;layout/<br />
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<em>screen_1_layout</em>.xml<br />
+        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;...<br /></td>
+        <td valign="top">(<em>optional</em>) Holds all the XML files describing screens or parts
+            of screens. Although you could create a screen in Java, defining them
+            in XML files is typically easier. A layout file is similar in concept
+            to an HTML file that describes the screen layout and components. See <a href="{@docRoot}guide/topics/ui/index.html">User Interface</a> for more information about designing screens, and <a href="{@docRoot}guide/topics/resources/available-resources.html#layoutresources">Available Resource Types</a> for the syntax of these files.</td>
+    </tr>
+    <tr>
+        <td valign="top">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;values/<br />
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;arrays<br />
+  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;          &nbsp;classes.xml<br />
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;colors.xml<br />
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;dimens.xml<br />
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;            strings.xml<br />
+        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;styles.xml<br />
+        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;values.xml<br /></td>
+        <td valign="top"><p>(<em>optional</em>) XML files describing additional resources
+                such as strings, colors, and styles. The naming, quantity, and number
+                of these files are not enforced--any XML file is compiled, but these
+                are the standard names given to these files. However, the syntax
+                of these files is prescribed by Android, and described in <a href="{@docRoot}guide/topics/resources/resources-i18n.html">Resources</a>. </p>
+        </td>
+    </tr>
+    <tr>
+        <td valign="top">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;xml/</td>
+        <td valign="top">(<em>optional</em>) XML files that can be read at run time on the device. </td>
+    </tr>
+    <tr>
+        <td valign="top">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;raw/</td>
+        <td valign="top">(<em>optional</em>) Any files to be copied directly to the device. </td>
+    </tr>
+</table>
+
+
+<a name="logging" ></a>
+<h2>Print Messages to a Log File</h2>
+
+<p>To write log messages from your application:</p>
+<ol><li>Import <code>android.util.Log</code>.</li>
+    <li>Use <code>Log.v()</code>, <code>Log.d()</code>, <code>Log.i()</code>,
+    <code>Log.w()</code>, or <code>Log.e()</code> to log messages.
+    (See the {@link android.util.Log} class.)<br/> E.g., 
+    <code>Log.e(this.toString(), "error: " + err.toString())</code></li>
+    <li>Launch <a href="{@docRoot}guide/developing/tools/ddms.html">DDMS</a> from a terminal
+    by executing <code>ddms</code> in your Android SDK <code>/tools</code> path.</li>
+    <li>Run your application in the Android emulator.</li>
+    <li>From the DDMS application, select the emulator 
+    (e.g., "emulator-5554") and click <b>Device > Run logcat...</b>
+    to view all the log data.</li>
+</ol>
+<p class="note"><strong>Note:</strong> If you are running Eclipse and 
+encounter a warning about the VM debug port when opening DDMS, you can ignore it
+if you're only interested in logs. However, if you want to further inspect and
+control your processes from DDMS, then you should close Eclipse before launching DDMS so that 
+it may use the VM debugging port.</p>
+
+
diff --git a/docs/html/guide/appendix/faq/framework.jd b/docs/html/guide/appendix/faq/framework.jd
new file mode 100644
index 0000000..76a19c5
--- /dev/null
+++ b/docs/html/guide/appendix/faq/framework.jd
@@ -0,0 +1,198 @@
+page.title=Android Application Framework FAQ
+parent.title=FAQs, Tips, and How-to
+parent.link=index.html
+@jd:body
+
+<ul>
+  <li><a href="#1">Do all the Activities and Services of an
+  application run in a single process?</a></li>
+  <li><a href="#2">Do all Activities run in the main thread of
+  an application process?</a></li>
+  <li><a href="#3">How do I pass complicated data structures
+  from one Activity/Service to another?</a></li>
+  <li><a href="#4">How can I check if an Activity is already
+  running before starting it?</a></li>
+  <li><a href="#5">If an Activity starts a remote service,is
+  there any way for the Service to pass a message back to the Activity?</a></li>
+  <li><a href="#6">How to avoid getting the Application not
+  responding dialog?</a></li>
+  <li><a href="#7">How does an application know if a package is
+  added or removed?</a></li>
+</ul>
+
+<!-- ------------------------------------------------------------------ -->
+
+<a name="1" id="1"></a>
+
+<h2>Do all the Activities and Services of an application run in a
+single process?</h2>
+
+<p>All Activities and Services in an application run in a single process by
+default. If needed, you can declare an <code>android:process</code> attribute
+in your manifest file, to explicitly place a component (Activity/Service) in
+another process.</p>
+
+<!-- ------------------------------------------------------------------ -->
+
+<a name="2" id="2"></a>
+
+<h2>Do all Activities run in the main thread of an application
+process?</h2>
+
+<p>By default, all of the application code in a single process runs
+in the main UI thread. This is the same thread
+that also handles UI events. The only exception is the code that handles
+IPC calls coming in from other processes. The system maintains a
+separate pool of transaction threads in each process to dispatch all
+incoming IPC calls. The developer should create separate threads for any
+long-running code, to avoid blocking the main UI thread.</p>
+
+<!-- ------------------------------------------------------------------ -->
+
+<a name="3" id="3"></a>
+
+<h2>How do I pass data between Activities/Services within a single
+application?</h2>
+
+<p>It depends on the type of data that you want to share:</p>
+
+<h3>Primitive Data Types</h3>
+
+<p>To share primitive data between Activities/Services in an
+application, use Intent.putExtras(). For passing primitive data that
+needs to persist use the 
+<a href="{@docRoot}guide/topics/data/data-storage.html#preferences">
+Preferences</a> storage mechanism.</p>
+
+<h3>Non-Persistent Objects</h3>
+
+<p>For sharing complex non-persistent user-defined objects for short
+duration, the following approaches are recommended:
+</p>
+  <h4>The android.app.Application class</h4>
+  <p>The android.app.Application is a base class for those who need to
+maintain global application state. It can be accessed via
+getApplication() from any Activity or Service. It has a couple of
+life-cycle methods and will be instantiated by Android automatically if
+your register it in AndroidManifest.xml.</p>
+
+  <h4>A public static field/method</h4>
+  <p>An alternate way to make data accessible across Activities/Services is to use <em>public static</em>
+fields and/or methods. You can access these static fields from any other
+class in your application. To share an object, the activity which creates your object sets a
+static field to point to this object and any other activity that wants to use
+this object just accesses this static field.</p>
+
+  <h4>A HashMap of WeakReferences to Objects</h4>
+  <p>You can also use a HashMap of WeakReferences to Objects with Long
+keys. When an activity wants to pass an object to another activity, it
+simply puts the object in the map and sends the key (which is a unique
+Long based on a counter or time stamp) to the recipient activity via
+intent extras. The recipient activity retrieves the object using this
+key.</p>
+
+  <h4>A Singleton class</h4>
+  <p>There are advantages to using a static Singleton, such as you can
+refer to them without casting getApplication() to an
+application-specific class, or going to the trouble of hanging an
+interface on all your Application subclasses so that your various
+modules can refer to that interface instead. </p>
+<p>But, the life cycle of a static is not well under your control; so
+to abide by the life-cycle model, the application class should initiate and
+tear down these static objects in the onCreate() and onTerminate() methods
+of the Application Class</p>
+</p>
+
+<h3>Persistent Objects</h3>
+
+<p>Even while an application appears to continue running, the system
+may choose to kill its process and restart it later. If you have data
+that you need to persist from one activity invocation to the next, you
+need to represent that data as state that gets saved by an activity when
+it is informed that it might go away.</p>
+
+<p>For sharing complex persistent user-defined objects, the
+following approaches are recommended:
+<ul>
+  <li>Application Preferences</li>
+  <li>Files</li>
+  <li>contentProviders</li>
+  <li>SQLite DB</li>
+</ul>
+</p>
+
+<p>If the shared data needs to be retained across points where the application
+process can be killed, then place that data in persistent storage like
+Application Preferences, SQLite DB, Files or ContentProviders. Please refer to
+the <a href="{@docRoot}guide/topics/data/data-storage.html">Data Storage</a>
+for further details on how to use these components.</p>
+
+
+<!-- ------------------------------------------------------------------ -->
+
+<a name="4" id="4"></a>
+
+<h2>How can I check if an Activity is already running before starting
+it?</h2>
+
+<p>The general mechanism to start a new activity if its not running&mdash;
+or to bring the activity stack to the front if is already running in the
+background&mdash; is the to use the NEW_TASK_LAUNCH flag in the startActivity()
+call.</p>
+
+<!-- ------------------------------------------------------------------ -->
+
+<a name="5" id="5"></a>
+
+<h2>If an Activity starts a remote service, is there any way for the
+Service to pass a message back to the Activity?</h2>
+
+<p>The remote service can define a callback interface and register it with the
+clients to callback into the clients. The 
+{@link android.os.RemoteCallbackList RemoteCallbackList} class provides methods to
+register and unregister clients with the service, and send and receive
+messages.</p>
+
+<p>The sample code for remote service callbacks is given in <a
+href="{@docRoot}guide/samples/ApiDemos/src/com/example/android/apis/app/RemoteService.html">ApiDemos/RemoteService</a></p>
+
+<!-- ------------------------------------------------------------------ -->
+
+<a name="6" id="6"></a>
+
+<h2>How to avoid getting the Application not responding dialog?</h2>
+
+<p>Please read the <a href="{@docRoot}guide/practices/design/responsiveness.html">Designing for Responsiveness</a> 
+document.</p>
+
+
+<!-- ------------------------------------------------------------------ -->
+
+<a name="7" id="7"></a>
+
+<h2>How does an application know if a package is added or removed?
+</h2>
+
+<p>Whenever a package is added, an intent with PACKAGE_ADDED action
+is broadcast by the system. Similarly when a package is removed, an
+intent with PACKAGE_REMOVED action is broadcast. To receive these
+intents, you should write something like this:
+<pre>
+       &lt;receiver android:name ="com.android.samples.app.PackageReceiver"&gt;
+            &lt;intent-filter&gt;
+             &lt;action android:name="android.intent.action.PACKAGE_ADDED"/&gt;
+              &lt;action android:name="android.intent.action.PACKAGE_REMOVED"/&gt;            
+            
+              &lt;data android:scheme="package" /&gt;
+            &lt;/intent-filter&gt;
+        &lt;/receiver&gt;
+  </pre>
+  <br>
+Here PackageReceiver is a BroadcastReceiver class.Its onReceive()
+method is invoked, every time an application package is installed or
+removed.
+
+</p>
+
+<!-- ------------------------------------------------------------------ -->
+
diff --git a/docs/html/guide/appendix/faq/index.jd b/docs/html/guide/appendix/faq/index.jd
new file mode 100644
index 0000000..90415ae
--- /dev/null
+++ b/docs/html/guide/appendix/faq/index.jd
@@ -0,0 +1,15 @@
+page.title=FAQs, Tips, and How-to
+@jd:body
+
+<dl>
+    <dt><a href="commontasks.html">Common Development Tasks and How To Do Them</a></dt>
+    <dd>Quick and to the point &mdash; how-to's for a variety of development tasks you are likely to use.</dd>
+    <dt><a href="framework.html">Application Framework FAQ</a></dt>
+    <dd>Common questions about the Android Application Framework.</dd>
+    <dt><a href="troubleshooting.html">Troubleshooting Tips</a></dt>
+    <dd>Answers to help you troubleshoot common problems.</dd>
+    <dt><a href="licensingandoss.html">Open Source Licensing FAQ</a></dt>
+    <dd>Common topics around licensing and Android Open Source</dd>
+    <dt><a href="security.html">Android Security FAQ</a></dt>
+    <dd>Answers to common questions about Android security.</dd>
+</dl>
diff --git a/docs/html/guide/appendix/faq/licensingandoss.jd b/docs/html/guide/appendix/faq/licensingandoss.jd
new file mode 100644
index 0000000..c267fe81
--- /dev/null
+++ b/docs/html/guide/appendix/faq/licensingandoss.jd
@@ -0,0 +1,19 @@
+page.title=Android Open Source Licensing FAQ
+parent.title=FAQs, Tips, and How-to
+parent.link=index.html
+@jd:body
+
+<ul>
+    <li><a href="#mirror">Where can I find the open source components of Android?</a></li>
+    <li><a href="#timeline">When will we see more code released under open source licenses?</a></li>
+    <li><a href="#apache2">Why are you releasing the code under the Apache License instead of GPLv2?</a></li>
+</ul>
+
+<a name="mirror" id="mirror"></a><h2>Where can I find the open source components of Android?</h2>
+<p>The source code for the full Android stack is available from the <a href="http://source.android.com">Android Open Source Project </a> site. 
+
+<p>Other mirrored GPL and LGPL'd components are available at <a href="http://code.google.com/p/android/downloads/list"><code>http://code.google.com/p/android/downloads/list</code></a>.</p>
+<p>Notices for other licenses can be found within the SDK.</p>
+
+<a name="apache2" id="apache2"></a><h2>Why are you releasing the code under the Apache License instead of GPLv2?</h2>
+<p>One of the best explanations for the reasoning behind releasing code under Apache2 can be found in a <a href="http://arstechnica.com/news.ars/post/20071106-why-google-chose-the-apache-software-license-over-gplv2.html">ArsTechnica article</a> by Ryan Paul.</p>
diff --git a/docs/html/guide/appendix/faq/security.jd b/docs/html/guide/appendix/faq/security.jd
new file mode 100644
index 0000000..b0d832b
--- /dev/null
+++ b/docs/html/guide/appendix/faq/security.jd
@@ -0,0 +1,156 @@
+page.title=Android Security FAQ
+parent.title=FAQs, Tips, and How-to
+parent.link=index.html
+@jd:body
+
+<ul>
+    <li><a href="#secure">Is Android Secure?</a></li>
+    <li><a href="#issue">I think I found a security flaw. How do I report
+    it?</a></li>
+    <li><a href="#informed">How can I stay informed of Android security
+    announcements?</a></li>
+    <li><a href="#use">How do I securely use my Android phone?</a></li>
+    <li><a href="#malware">I think I found malicious software being distributed
+    for Android. How can I help?</a></li>
+    <li><a href="#fixes">How will Android-powered devices receive security fixes?</a>
+    </li>
+    <li><a href="#directfix">Can I get a fix directly from the Android Platform
+    Project?</a></li>
+</ul>
+
+
+<a name="secure" id="secure"></a><h2>Is Android secure?</h2>
+
+<p>The security and privacy of our users' data is of primary importance to the
+Android Open Source Project. We are dedicated to building and maintaining one
+of the most secure mobile platforms available while still fulfilling our goal
+of opening the mobile device space to innovation and competition.</p>
+
+<p>The Android Platform provides a rich <a
+href="http://code.google.com/android/devel/security.html">security model</a>
+that allows developers to request the capabilities, or access, needed by their 
+application and to define new capabilities that other applications can request.
+The Android user can choose to grant or deny an application's request for
+certain capabilities on the handset.</p>
+
+<p>We have made great efforts to secure the Android platform, but it is
+inevitable that security bugs will be found in any system of this complexity.
+Therefore, the Android team works hard to find new bugs internally and responds
+quickly and professionally to vulnerability reports from external researchers.
+</p>
+
+
+<a name="issue" id="issue"></a><h2>I think I found a security flaw. How do I
+report it?</h2>
+
+<p>You can reach the Android security team at <a
+href="mailto:security@android.com">security@android.com</a>. If you like, you
+can protect your message using our <a
+href="http://code.google.com/android/security_at_android_dot_com.txt">PGP
+key</a>.</p>
+
+<p>We appreciate researchers practicing responsible disclosure by emailing us 
+with a detailed summary of the issue and keeping the issue confidential while 
+users are at risk. In return, we will make sure to keep the researcher informed
+of our progress in issuing a fix and will properly credit the reporter(s) when
+we announce the patch. We will always move swiftly to mitigate or fix an 
+externally-reported flaw and will publicly announce the fix once patches are 
+available to users.</p>
+
+
+<a name="informed" id="informed"></a><h2>How can I stay informed of Android
+security announcements?</h2>
+
+<p>An important part of sustainably securing a platform, such as, Android is
+keeping the user and security community informed of bugs and fixes. We will
+publicly announce security bugs when the fixes are available via postings to
+the <a
+href="http://groups.google.com/group/android-security-announce">android-security-announce</a>
+group on Google Groups. You can subscribe to this group as you would a mailing
+list and view the archives here.</p>
+
+<p>For more general discussion of Android platform security, or how to use
+security features in your Android application, please subscribe to <a
+href="http://groups.google.com/group/android-security-discuss">android-security-discuss</a>.
+</p>
+
+
+<a name="use" id="use"></a><h2>How do I securely use my Android phone?</h2>
+
+<p>As an open platform, Android allows users to load software from any
+developer onto a device.  As with a home PC, the user must be
+aware of who is providing the software they are downloading and must decide
+whether they want to grant the application the capabilities it requests.
+This decision can be informed by the user's judgment of the software
+developer's trustworthiness, and where the software came from.</p>
+
+<p>Despite the security protections in Android, it is important
+for users to only download and install software from developers they trust.
+More details on how Android users can make smart security decisions will be
+released when consumer devices become available.</p>
+
+
+<a name="malware" id="malware"></a><h2>I think I found malicious software being
+distributed for Android. How can I help?</h2>
+
+<p>Like any other open platform, it will be possible for unethical developers
+to create malicious software, known as <a
+href="http://en.wikipedia.org/wiki/Malware">malware</a>, for Android. If you
+think somebody is trying to spread malware, please let us know at <a 
+href="mailto:security@android.com">security@android.com</a>. Please include as
+much detail about the application as possible, with the location it is
+being distributed from and why you suspect it of being malicious software.</p>
+
+<p>The term <i>malicious software</i> is subjective, and we cannot make an 
+exhaustive definition.  Some examples of what the Android Security Team believes
+to be malicious software is any application that:
+<ul>
+    <li>drains the device's battery very quickly;</li>
+    <li>shows the user unsolicited messages (especially messages urging the
+    user to buy something);</li>
+    <li>resists (or attempts to resist) the user's effort to uninstall it;</li>
+    <li>attempts to automatically spread itself to other devices;</li>
+    <li>hides its files and/or processes;</li>
+    <li>discloses the user's private information to a third party, without the
+    user's knowledge and consent;</li>
+    <li>destroys the user's data (or the device itself) without the user's
+    knowledge and consent;</li>
+    <li>impersonates the user (such as by sending email or buying things from a
+    web store) without the user's knowledge and consent; or</li>
+    <li>otherwise degrades the user's experience with the device.</li>
+</ul>
+</p>
+
+
+<a name="fixes" id="fixes"></a><h2>How will Android-powered devices receive security
+fixes?</h2>
+
+<p>The manufacturer of each device is responsible for distributing software
+upgrades for it, including security fixes. Many devices will update themselves
+automatically with software downloaded "over the air", while some devices
+require the user to upgrade them manually.</p>
+
+<p>When Android-powered devices are publicly available, this FAQ will provide links how
+Open Handset Alliance members release updates.</p>
+
+<a name="directfix" id="directfix"></a><h2>Can I get a fix directly from the
+Android Platform Project?</h2>
+
+<p>Android is a mobile platform that will be released as open source and
+available for free use by anybody. This means that there will be many
+Android-based products available to consumers, and most of them will be created
+without the knowledge or participation of the Android Open Source Project. Like
+the maintainers of other open source projects, we cannot build and release
+patches for the entire ecosystem of products using Android. Instead, we will
+work diligently to find and fix flaws as quickly as possible and to distribute
+those fixes to the manufacturers of the products.</p>
+
+<p>In addition, We will add security fixes to the open source distribution of
+Android and publicly announce the changes on <a 
+href="http://groups.google.com/group/android-security-announce">android-security-announce</a>.
+</p>
+
+<p>If you are making an Android-powered device and would like to know how you can 
+properly support your customers by keeping abreast of software updates, please
+contact us at <a
+href="mailto:info@openhandsetalliance.com">info@openhandsetalliance.com</a>.</p>
diff --git a/docs/html/guide/appendix/faq/troubleshooting.jd b/docs/html/guide/appendix/faq/troubleshooting.jd
new file mode 100644
index 0000000..7c703e6
--- /dev/null
+++ b/docs/html/guide/appendix/faq/troubleshooting.jd
@@ -0,0 +1,305 @@
+page.title=Troubleshooting
+parent.title=FAQs, Tips, and How-to
+parent.link=index.html
+@jd:body
+
+
+<p>Here are some tips and tricks for common Android errors. Don't forget to use the
+    ddms logcat capability to get a deeper view when errors occur. See <a href="{@docRoot}guide/developing/debug-tasks.html">Debugging</a> for more debugging tips. </p>
+<ul>
+    <li><a href="#installeclipsecomponents">ADT Installation Error: "requires plug-in org.eclipse.wst.sse.ui".</a></li>
+    <li><a href="#nodevice">ADB reports &quot;no device&quot; when an emulator is running</a></li>
+    <li><a href="#noapp">My new application/activity isn't showing up in the device application
+        list </a></li>
+    <li><a href="#noupdate">I updated my app, but the updates don't seem to be showing up on
+    the device</a></li>
+    <li><a href="#layout_wilih">I'm getting a &quot;Binary XML file line #2: You must supply a layout_wilih
+    attribute&quot; error when I start an application</a></li>
+    <li><a href="#permission">My request to (<em>make a call, catch an incoming SMS, receive
+        a notification, send an intent to an Android application</em>) is being
+        ignored</a></li>
+    <li><a href="#build">Help! My project won't build in Eclipse</a></li>
+    <li><a href="#eclipse">Eclipse isn't talking to the emulator</a></li>
+    <li><a href="#majorminor">When I go to preferences in Eclipse and select "Android", I get the following error message: Unsupported major.minor version 49.0.</a></li>
+    <li><a href="#apidemosreinstall">I can't install ApiDemos apps in my IDE because of a signing error</a></li>
+    <li><a href="#signingcalendar">I can't compile my app because the build tools generated an expired debug certificate</a></li>
+    <li><a href="#addjunit">I can't run a JUnit test class in Eclipse/ADT</a></li>
+</ul>
+
+<a name="installeclipsecomponents" id="installeclipsecomponents"></a><h2>ADT Installation Error: "requires plug-in org.eclipse.wst.sse.ui".</h2>
+<p>
+The "Android Editors" feature of the ADT Plugin requires specific Eclipse components, such as WST. If you
+encounter this error message during ADT installation, you need to install the
+required Eclipse components and then try the ADT installation again. Follow the steps below to install the required components for the 
+Android Editors feature, based on the version of Eclipse that you are using.</p>
+
+<table style="font-size:100%">
+<tr><th>Eclipse 3.3 (Europa)</th><th>Eclipse 3.4 (Ganymede)</th></tr>
+<tr>
+<td width="50%">
+<ol>
+<li>From the dialog where you select the <strong>Update sites to visit</strong>, select the checkboxes for both the
+ADT site, and the Callisto/Europa/Ganymede Discovery Site (you may want to
+check <strong>Automatically select mirrors</strong> at the bottom).</li>
+<li>Click <strong>Finish</strong>.</li>
+<li>In the <strong>Next</strong> dialog, select the Android Plugins.</li>
+<li>Now, expand the tree item of the discovery site. It seems that if you
+don't do it, it doesn't load the content of the discovery site.</li>
+<li>On the right, click <strong>Select required</strong>. This will select all the components
+that are required to install the Android plugin (wst, emf, etc...).</li>
+<li>Click <strong>Next</strong>, accept the agreement, click <strong>Install All</strong>, and restart Eclipse.</li>
+</ol>
+</td>
+<td>
+<ol>
+    <li>Select <strong>Help</strong> &gt; <strong>Software Updates...</strong></li>
+    <li>Select the <strong>Installed Software</strong> tab.</li>
+    <li>Click <strong>Update...</strong></li>
+    <li>If an update for ADT is available, select it and click <strong>Finish</strong>.</li>
+</ol>
+</td>
+</tr>
+</table>
+
+
+</p>
+<a name="nodevice"></a><h2>ADB reports &quot;no device&quot; when an emulator is running</h2>
+    <p>Try restarting adb by stopping it (<code>adb
+        kill-server</code>) then any other adb command to restart it.</p>
+
+<a name="noapp"></a><h2>My new application/activity isn't showing up in the
+        applications list </h2>
+<ul>
+    <li>You often must restart your device or emulator before a new activity shows
+        up in the applications list. This is particularly true when it is a completely
+        new application with a new AndroidManifest.xml file.</li>
+    <li>If this is for a new activity in an existing AndroidManifest.xml file, did
+        you include an <code>&lt;activity&gt;</code> tag for your app (or a <code>&lt;service&gt;</code>        tag
+        for a service, or a <code>&lt;receiver&gt;</code> tag for a receiver, etc.)? </li>
+    <li>Make sure that your AndroidManifest.xml file is valid. Errors in attribute
+        values, such as the <em>value </em> attribute in <code>&lt;action <em>value</em>=&quot;<em>&lt;something&gt;</em>&quot;&gt;</code>
+        will often not be caught by compilers, but will prevent your application
+        from being displayed because the intent filter will not be matched. Extra
+        spaces or other characters can often sneak into these strings.</li>
+    <li>Did you send your .apk file to the device (<a href="{@docRoot}guide/developing/tools/adb.html#move">adb install</a>)?</li>
+    <li>Run logcat on your device (<code>adb logcat</code>)
+        and then install your .apk file. Check the logcat output to see whether the
+        application is being installed and recognized properly. Here's sample output
+        from a successful installation:
+<pre>I/FileObserver( 414): *** onEvent wfd: 3 mask: 8 path: MyRSSReader.apk
+D/PackageManager( 414): Scanning package: /data/app/MyRSSReader.apk
+D/PackageManager( 414): Adding package com.example.codelab.rssexample
+D/PackageManager( 414): Registered content provider: my_rss_item, className = com.example.codelab.rssexample.RssContentProvider, isSyncable = false
+D/PackageManager( 414): Providers: com.example.codelab.rssexample.RssContentProvider
+D/PackageManager( 414): Activities: com.example.codelab.rssexample.MyRssReader com.example.codelab.rssexample.MyRssReader2 </pre>
+    </li>
+	<li>If logcat shows that the package manager is having problems loading the manifest
+	    file, force your manifest to be recompiled by adding a space in the file and
+	    compiling it.</li>
+</ul>
+<a name="noupdate"></a><h2>I updated my app, but the updates don't seem to be showing up on the device</h2>
+    <p>Did you remember to send your .apk file to the device (<a href="{@docRoot}guide/developing/tools/adb.html#move">adb
+        install</a>)?</p>
+
+<a name="layout_wilih"></a><h2>I'm getting a &quot;Binary XML file line #2: You must supply a layout_wilih
+    attribute&quot; error
+    when I start an application (but I declare a layout_wilih attribute <em>right
+        there!!!</em>)</h2>
+<ul>
+    <li>Make sure that the SDK you are building with is the same version as the Android
+        OS that you are running on. </li>
+    <li>Make sure that you're calling setContentView() early in your onCreate() method.
+        Calling other methods, such as setListAdapter() before calling setContentView()
+        can sometimes create odd errors when Android tries to access screen elements
+        that haven't been set before.</li>
+</ul>
+<a name="permission"></a><h2>My request to (<em>make a call, catch an incoming SMS,
+receive a notification, send an intent to an Android application</em>) is being
+ignored</h2>
+    <p>You might not have permission (or might not have requested permission) to
+        call this activity or receive this intent. Many standard Android activities,
+        such as making a call, have a permission assigned to it to prevent arbitrary
+        applications from sending or receiving requests. See <a
+        href="{@docRoot}guide/topics/security/security.html">Security and
+        Permissions</a> for more information on permissions, and 
+		{@link android.Manifest.permission Manifest.permission} for a list of
+        standard permissions supported by the Android platform.
+</p>
+<a name="build"></a><h2>Help! My project won't build in Eclipse</h2>
+<p>If your project doesn't build, you may notice symptoms such as new
+resources added in the <code>res/</code> sub-folders not showing up in the R class,
+the emulator not being started, not being able to run the application, or even seeming to run an old version of the application.</p>
+<p>To troubleshoot these types of problems, first try:</p>
+<ol>
+  <li>Switch to the DDMS view in Eclipse (if you don't already have it open):
+    <ol type="a">
+      <li>From the menu select <code>Window &gt; Open Perspective &gt; Other</code></li>      
+      <li>Select DDMS from the list and hit OK</li>
+    </ol>
+  </li>
+  <li>In the Devices panel (top right panel by default), click on the down triangle
+  to bring up the panel menu</li>
+  <li>Select <code>Reset ADB</code> from the menu, and then try running the
+  application again</li>
+</ol>
+<p>If the above still doesn't work, you can try these steps:</p>
+<ol>
+  <li>
+    Check the console and problems tabs at the bottom of the Eclipse UI
+  </li>
+  <li>
+    If there are problems listed in either place, they should give you a clue
+    what is wrong
+  </li>
+  <li>
+    If you aren't sure if the problems are fresh or stale, clear the console
+    with a right click &gt; Clear, then clean the project
+  </li>
+  <li>
+    To clean the project (a good idea with any kind of build error), select
+    Project &gt; Clean from the eclipse main menu, then select the project you
+    are working on (or clean all)
+  </li>
+</ol>
+<a name="eclipse"></a><h2>Eclipse isn't talking to the emulator</h2>
+<p>When communication doesn't seem to be happening between Eclipse and the emulator, symptoms can include: nothing happening when you press run, the emulator hanging waiting
+for a debugger to connect, or errors that Eclipse reports about not being able
+to find the emulator or shell. By far the most common symptom is that when you press run, the emulator starts (or
+is already running), but the application doesn't start.</p>
+<p>
+You may find any of these steps will fix the problem and with practice you
+probably can figure out which one you need to do for your particular issue, but
+to start with, the safest option is to run through all of them in order:</p>
+<ol>
+  <li>
+    Quit the emulator if it is running
+  </li>
+  <li>
+    Check that any emulator processes are killed (sometimes they    can hang, use ps on unix or mac, or task manager in the process view on
+    windows).
+  </li>
+  <li>
+    Quit Eclipse
+  </li>
+  <li>
+    From the command line, type: 
+<pre>adb kill-server </pre>
+  </li>
+  <li>
+    Start Eclipse and try again
+  </li>
+</ol>
+
+<a name="majorminor"></a><h2>When I go to preferences in Eclipse and select "Android", I get the following error message: Unsupported major.minor version 49.0.</h2>
+<p>This error is displayed if you are using an older version of the JDK. Please make sure you are using JDK version 5 or 6.</p>
+
+<h2 id="apidemosreinstall">I can't install ApiDemos apps in my IDE because of a signing error</a></h2>
+
+<p>The Android system requires that all applications be signed, as described in 
+	<a href="{@docRoot}guide/publishing/app-signing.html">Signing Your Applications</a>. The ApiDemos 
+applications included with the SDK are preinstalled on the emulator and for that reason have been 
+compiled and signed with a private key.</p>
+
+If you want to modify or run one of the ApiDemos apps from Eclipse/ADT or other IDE, you can do so 
+so only after you uninstall the <em>preinstalled</em> version of the app from the emulator. If 
+you try to run an ApiDemos apps from your IDE without removing the preinstalled version first, 
+you will get errors similar to: </p>
+
+<pre>[2008-08-13 15:14:15 - ApiDemos] Re-installation failed due to different application signatures.
+[2008-08-13 15:14:15 - ApiDemos] You must perform a full uninstall of the application. WARNING: ...This will remove the application data!
+[2008-08-13 15:14:15 - ApiDemos] Please execute 'adb uninstall com.android.samples' in a shell.</pre>
+
+<p>The error occurs because, in this case, you are attempting to install another copy of ApiDemos 
+onto the emulator, a copy that is signed with a different certificate (the Android IDE tools will 
+have signed the app with a debug certificate, where the existing version was already signed with 
+a private certificate). The system does not allow this type of reinstallation.  </p>
+
+<p>To resolve the issue, you need to fully uninstall the preinstalled and then reinstall it using 
+the adb tool. Here's how to do that:</p>
+
+<ol>
+  <li>In a terminal, change to the tools directory of the SDK.</li>
+  <li>If no emulator instance is running, start an emulator using using the command <code>emulator &</code>.</li>
+  <li>Uninstall the preinstalled app using the command <code>adb uninstall com.android.samples</code>.</li>
+  <li>Reinstall the app using the command <code>adb install &lt;path to the ApiDemos.apk&gt;</code>. If you are 
+  working in Eclipse/ADT, you can just compile and run the app in the normal way. </li>
+</ol>
+
+<p>Note that if multiple emulator instances are running, you need to direct your uninstall/install 
+commands to the emulator instance that you are targeting. To do that you can add the 
+<code>-s &lt;serialNumber&gt;</code> to the command, for example: </p>
+
+<pre>adb -s emulator-5556 install</pre>
+
+<p>For more information about adb, see the <a href="{@docRoot}guide/developing/tools/adb.html">Android Debug Bridge</a> 
+documentation.</p>
+
+
+<h2 id="signingcalendar">I can't compile my app because the build tools generated an expired debug certificate</h2>
+
+<p>If your development machine uses a locale that has a non-Gregorian calendar, you may encounter problems when first trying to compile and run your application. Specifically, you may find that the Android build tools won't compile your application because the debug key is expired. </p>
+
+<p>The problem occurs because the Keytool utility &mdash; included in the JDK and used by the Android build tools &mdash; fails to properly handle non-Gregorian locales and may create validity dates that are in the past. That is, it may generate a debug key that is already expired, which results in the compile error.</p>
+
+<p>If you encounter this problem, follow these steps to work around it: </p>
+
+<ol>
+<li>First, delete the debug keystore/key already generated by the Android build tools. Specifically, delete the <code>debug.keystore</code> file. On Linux/Mac OSX, the file is stored in <code>~/.android</code>. On Windows XP, the file is stored in <code>
+C:\Documents and Settings\&lt;user&gt;\Local Settings\Application Data\Android</code>. On Windows Vista, the file is stored in <code>
+C:\Users\&lt;user&gt;\AppData\Local\Android</code></li>
+<li>Next, you can either
+<ul>
+<li>Temporarily change your development machine's locale (date and time) to one that uses a Gregorian calendar, for example, United States. Once the locale is changed, use the Android build tools to compile and install your app. The build tools will regenerate a new keystore and debug key with valid dates. Once the new debug key is generated, you can reset your development machine to the original locale. </li>
+<li>Alternatively, if you do not want to change your machine's locale settings, you can generate the keystore/key on any machine using the Gregorian calendar, then copy the <code>debug.keystore</code> file from that computer to the proper location on your development machine. </li>
+</ul>
+</li>
+</ol>
+
+<p>This problem has been verified on Windows and may apply to other platforms. </p>
+
+<p>For general information about signing Android applications, see 
+<a href="{@docRoot}guide/publishing/app-signing.html">Signing Your Applications</a>. </p>
+
+<h2 id="addjunit">I can't run a JUnit test class in Eclipse/ADT</h2>
+
+<p>If you are developing on Eclipse/ADT, you can add JUnit test classes to your application. However, you may get an error when trying to run such a class as a JUnit test:</p>
+
+<pre>Error occurred during initialization of VM
+java/lang/NoClassDefFoundError: java/lang/ref/FinalReference</pre>
+
+<p>This error occurs because android.jar does not include complete Junit.* class implementations, but includes stub classes only. </p>
+
+<p>To add a JUnit class, you have to set up a JUnit configuration:. 
+
+<ol>
+<li>In the Package Explorer view, select your project. </li>
+<li>Open the launch configuration manager.
+         <ul>
+            <li>In Eclipse 3.3 (Europa), select <strong>Run </strong>&gt; 
+              <strong>Open Run Dialog... </strong>or <strong>Run </strong>&gt; 
+              <strong>Open Debug Dialog... </strong>.
+            </li>
+
+            <li>In Eclipse 3.4 (Ganymede), select <strong>Run </strong>&gt; 
+              <strong>Run Configurations... </strong>or <strong>Run </strong>&gt; 
+              <strong>Debug Configurations... </strong>.
+            </li>
+        </ul>
+    </li>
+<li>In the configuration manager, right-click the "JUnit" configuration type and select <strong>New</strong></li>
+<li>In the new configuration's <strong>Test</strong> tab, specify the project and test class, as well as any options for running the test. </li>
+<li>In the new configuration's <strong>Classpath</strong> tab, find "Android Library" under Bootstrap Entries and remove it.  </li>
+<li>Still in the <strong>Classpath</strong> tab, select Bootstrap Entries and click the Advanced button. </li>
+<ol type="a">
+<li>Choose Add Library and click OK.</li>
+<li>Select JRE System Library and click Next. </li>
+<li>Select Workspace Default JRE and click Finish.</li>
+</ol>
+<li>Select Bootstrap Entries again and click Advanced.</li>
+<ol type="a">
+<li>Choose Add Library and click OK.</li>
+<li>Select JUnit 3 and click Finish. </li>
+</ol>
+</ol>
+<p>When configured in this way, your JUnit test class should now run properly.</p>
+
diff --git a/docs/html/guide/appendix/g-app-intents.jd b/docs/html/guide/appendix/g-app-intents.jd
new file mode 100644
index 0000000..d4f97c8
--- /dev/null
+++ b/docs/html/guide/appendix/g-app-intents.jd
@@ -0,0 +1,112 @@
+page.title=Intents List: Invoking Google Applications on Android Devices
+@jd:body
+
+<div class="sidebox">
+For more information about intents, see the <a href="{@docRoot}guide/topics/intents/intents-filters.html">Intents and Intent Filters</a>.
+</div>
+
+<p>The table below lists the intents that your application can send, to invoke Google applications on Android devices in certain ways. For each action/uri pair, the table describes how the receiving Google application handles the intent. </p>
+
+<p>Note that this list is not comprehensive.</p>
+
+  <table>
+      <tr>
+          <th scope="col">Target Application</th>
+          <th scope="col">Intent URI</th>
+          <th scope="col">Intent Action</th>
+          <th scope="col">Result</th>
+      </tr>
+      <tr>
+          <td rowspan="2">Browser</td>
+          <td>http://<em>web_address</em><br />
+              https://<em>web_address</em></td>
+          <td>VIEW</td>
+          <td>Open a browser window to the URL specified. </td>
+      </tr>
+      <tr>
+          <td>&quot;&quot; (empty string) <br />
+          http://<em>web_address</em><br />
+          https://<em>web_address</em></td>
+          <td>WEB_SEARCH</td>
+          <td>Opens the file at the location on the device in the browser. </td>
+      </tr>
+      <tr>
+          <td rowspan="2">Dialer</td>
+          <td height="103">tel: <em>phone_number</em></td>
+          <td>CALL</td>
+          <td><p>Calls the entered phone number. Valid telephone numbers as defined
+              in <a href="http://tools.ietf.org/html/rfc3966">the IETF RFC 3966</a> are
+              accepted. Valid examples include the following:</p>
+              <ul>
+                  <li>tel:2125551212 </li>
+                  <li>tel:
+                      (212) 555 1212</li>
+              </ul>
+              <p>The dialer is good at normalizing some kinds of schemes: for example
+                  telephone numbers, so the schema described isn't strictly required
+                  in the {@link android.net.Uri#parse(java.lang.String)
+                  Uri(URI string)} factory. However, if you have not tried a
+                  schema or are unsure whether it can be handled, use the {@link
+                  android.net.Uri#fromParts(java.lang.String, java.lang.String,
+                  java.lang.String) Uri.fromParts(scheme, ssp, fragment)} factory
+              instead.</p>
+              <p><strong><em>Note:</em></strong>&nbsp;&nbsp;&nbsp;This requires your
+              application to request the following permission in your manifest: <code>&lt;uses-permission
+              id=&quot;android.permission.CALL_PHONE&quot; /&gt;</code></p></td>
+      </tr>
+      <tr>
+          <td><p>tel:<em>phone_number</em><br />
+          voicemail:</p>          </td>
+          <td>DIAL</td>
+          <td><p>Dials (but does not actually initiate the call) the number given
+                  (or the stored voicemail on the phone). Telephone number normalization
+                  described for CALL applies to DIAL as well. </p>              </td>
+      </tr>
+      <tr>
+          <td>Google Maps</td>
+          <td>geo:<em>latitude</em>,<em>longitude</em><br />
+              geo:<em>latitude</em>,<em>longitude</em>?z=<em>zoom</em><br />
+              geo:0,0?q=<em>my+street+address</em><br />
+              geo:0,0?q=<em>business+near+city</em><br />
+          </td>
+          <td>VIEW</td>
+          <td>Opens the Maps application to the given location or query. The Geo URI scheme
+              (not fully supported) is <a href="http://tools.ietf.org/html/draft-mayrhofer-geo-uri-00">currently under
+              development</a>.<p>
+              The <em>z</em> field specifies the zoom level. A zoom level of 1 shows the whole Earth, centered at the
+              given <em>lat</em>,<em>lng</em>. A zoom level of 2 shows a quarter of the Earth, and so on. The highest
+              zoom level is 23. A larger zoom level will be clamped to 23.
+          </td>
+      </tr>
+      <tr>
+          <td>Google Streetview</td>          
+<td>google.streetview:cbll=<em>lat</em>,<em>lng</em>&amp;cbp=1,<em>yaw</em>,,<em>pitch</em>,<em>zoom</em>&amp;mz=<em>mapZoom</em>
+          </td>
+          <td>VIEW</td>
+          <td>Opens the Street View application to the given location. The URI scheme is
+            based on the syntax used for Street View panorama information in Google Maps URLs.<p>
+            The cbll field is required. The cbp and mz fields are optional.<p>
+     <table border:none>
+       <tr><td><em>lat</em></td><td>latitude</td></tr>
+       <tr><td><em>lng</em></td><td>longitude</td></tr>
+       <tr><td><em>yaw</em></td><td>Panorama center-of-view in degrees clockwise from North.<br />
+       <b>Note:</b> The two commas after the yaw parameter are required. They are present
+       for backwards-compatibility reasons.</td></tr>
+       <tr><td><em>pitch</em></td><td>Panorama center-of-view in degrees from
+           -90 (look straight up) to 90 (look straight down.)</td></tr>
+       <tr><td><em>zoom</em></td><td>Panorama zoom. 1.0 = normal zoom, 2.0 = zoomed in 2x, 3.0 = zoomed in 4x, and so on.<br />
+       A zoom of 1.0 is 90 degree horizontal FOV for a nominal landscape mode 4
+x 3 aspect ratio display Android phones in portrait mode will adjust the zoom so
+that the vertical FOV is approximately the same as the landscape vertical FOV.
+This means that the horizontal FOV of an Android phone in portrait mode is much
+narrower than in landscape mode. This is done to minimize the fisheye lens
+effect that would be present if a 90 degree horizontal FOV was used in portrait
+mode.</td></tr>
+       <tr><td><em>mapZoom</em></td><td>The map zoom of the map location associated with this panorama. This value is passed on to the
+       Maps activity when the Street View "Go to Maps" menu item is chosen. It corresponds to the <em>z</em> paramaeter in
+       the geo: intent.</td></tr>
+       </table>
+          </td>
+      </tr>
+  </table>
+  <p></p>
diff --git a/docs/html/guide/appendix/glossary.jd b/docs/html/guide/appendix/glossary.jd
new file mode 100644
index 0000000..ef81631
--- /dev/null
+++ b/docs/html/guide/appendix/glossary.jd
@@ -0,0 +1,293 @@
+page.title=Glossary
+@jd:body
+
+<p>The list below defines some of the basic terminology of the Android platform. </p>
+    <dl>
+    <dt id="apk">.apk file</dt> <dd>Android application package file. Each
+    Android application is compiled and packaged in a single file that
+    includes all of the application's code (.dex files), resources, assets,
+    and manifest file. The application package file can have any name but
+    <em>must</em> use the <code>.apk</code> extension. For example:
+    <code>myExampleAppname.apk</code>. For convenience, an application package
+    file is often referred to as an ".apk".
+    <p>Related: <a href="#application">Application</a>.</p>
+</dd>
+
+    <dt id="dex">.dex file </dt>
+    <dd>Compiled Android application code file. 
+       <p>Android programs are compiled into .dex (Dalvik Executable) files, which
+        are in turn zipped into a single .apk file on the device. .dex files can
+        be created by automatically translating compiled applications written in
+        the Java programming language.</dd>
+
+    <dt id="action">Action</dt>
+    <dd>A description of something that an Intent sender wants done. An action is
+        a string value assigned to an Intent. Action strings can be defined by Android
+        or by a third-party developer. For example, android.intent.action.VIEW
+        for a Web URL, or com.example.rumbler.SHAKE_PHONE for a custom application
+        to vibrate the phone. 
+    <p>Related: <a href="#intent">Intent</a>.</p>
+    </dd>
+
+    <dt id="activity">Activity</dt>
+    <dd>A single screen in an application, with supporting Java code, derived
+    from the {@link android.app.Activity} class. Most commonly, an activity is
+    visibly represented by a full screen window that can receive and handle UI
+    events and perform complex tasks, because of the Window it uses to render
+    its window. Though an Activity is typically full screen, it can also be
+    floating or transparent.</dd>
+
+    <dt id="adb">adb</dt>
+    <dd>Android Debug Bridge, a command-line debugging application included with the
+        SDK. It provides tools to browse the device, copy tools on the device, and
+        forward ports for debugging. If you are developing in Eclipse using the
+		ADT Plugin, adb is integrated into your development environment. See 
+		<a href="{@docRoot}guide/developing/tools/adb.html">Android Debug Bridge</a>
+		for more information. </dd>
+
+    <dt id="application">Application</dt>
+    <dd>From a component perspective, an Android application consists of one
+    or more activities, services, listeners, and intent receivers. From a
+    source file perspective, an Android application consists of code,
+    resources, assets, and a single manifest. During compilation, these files
+    are packaged in a single file called an application package file (.apk).
+    <p>Related: <a href="#apk">.apk</a>, <a href="#activity">Activity</a></p></dd>
+
+    <dt id="canvas">Canvas</dt>
+    <dd>A drawing surface that handles compositing of the actual bits against
+    a Bitmap or Surface object. It has methods for standard computer drawing
+    of bitmaps, lines, circles, rectangles, text, and so on, and is bound to a
+    Bitmap or Surface. Canvas is the simplest, easiest way to draw 2D objects
+    on the screen. However, it does not support hardware acceleration, as
+    OpenGL ES does. The base class is {@link android.graphics.Canvas}.
+    <p>Related: <a href="#drawable">Drawable</a>, <a href="#opengles">OpenGL
+    ES</a>.</p></dd>
+
+    <dt id="contentprovider">Content Provider</dt>
+    <dd>A data-abstraction layer that you can use to safely expose your
+    application's data to other applications. A content provider is built on
+    the {@link android.content.ContentProvider} class, which handles content
+    query strings of a specific format to return data in a specific format.
+    See <a href="{@docRoot}guide/topics/providers/content-providers.html">
+	Content Providers</a> topic for more information.
+    <p>Related: <a href="#uri">URI Usage in Android</a></p></dd>
+
+    <dt id="dalvik">Dalvik</dt>
+    <dd>The Android platform's virtual machine. The Dalvik VM is an
+    interpreter-only virtual machine that executes files in the Dalvik
+    Executable (.dex) format, a format that is optimized for efficient storage
+    and memory-mappable execution. The virtual machine is register-based, and
+    it can run classes compiled by a Java language compiler that have been
+    transformed into its native format using the included &quot;dx&quot; tool.
+    The VM runs on top of Posix-compliant operating systems, which it relies
+    on for underlying functionality (such as threading and low level memory
+    management). The Dalvik core class library is intended to provide a
+    familiar development base for those used to programming with Java Standard
+    Edition, but it is geared specifically to the needs of a small mobile
+    device.</dd>
+
+    <dt id="ddms">DDMS</dt>
+    <dd>Dalvik Debug Monitor Service, a GUI debugging application included
+    with the SDK. It provides screen capture, log dump, and process
+    examination capabilities. If you are developing in Eclipse using the ADT
+    Plugin, DDMS is integrated into your development environment. See <a
+    href="{@docRoot}guide/developing/tools/ddms.html">Dalvik Debug Monitor
+    Server</a> to learn more about the program.</dd>
+
+    <dt id="dialog">Dialog</dt> <dd> A floating window that that acts as a lightweight
+    form. A dialog can have button controls only and is intended to perform a
+    simple action (such as button choice) and perhaps return a value. A dialog
+    is not intended to persist in the history stack, contain complex layout,
+    or perform complex actions. Android provides a default simple dialog for
+    you with optional buttons, though you can define your own dialog layout.
+    The base class for dialogs is {@link android.app.Dialog Dialog}. 
+    <p>Related: <a href="#activity">Activity</a>.</p></dd>
+
+    <dt id="drawable">Drawable</dt>
+    <dd>A compiled visual resource that can be used as a background, title, or
+    other part of the screen. A drawable is typically loaded into another UI
+    element, for example as a background image. A drawable is not able to
+    receive events, but does assign various other properties such as "state"
+    and scheduling, to enable subclasses such as animation objects or image
+    libraries. Many drawable objects are loaded from drawable resource files
+    &mdash; xml or bitmap files that describe the image. Drawable resources
+    are compiled into subclasses of {@link android.graphics.drawable}. For
+    more information about drawables and other resources, see <a
+    href="{@docRoot}guide/topics/resources/resources-i18n.html">Resources</a>. 
+    <p>Related: <a href="#resources">Resources</a>, <a href="#canvas">Canvas
+    </a></p></dd>
+
+    <dt id="intent">Intent</dt>
+    <dd>An message object that you can use to launch or communicate with other
+    applications/activities asynchronously. An Intent object is an instance of
+    {@link android.content.Intent}. It includes several criteria fields that you can
+    supply, to determine what application/activity receives the Intent and
+    what the receiver does when handling the Intent. Available criteria include
+    include the desired action, a category, a data string, the MIME type of
+    the data, a handling class, and others. An application sends
+    an Intent to the Android system, rather than sending it directly to
+    another application/activity. The application can send the Intent to a
+    single target application or it can send it as a broadcast, which can in
+    turn be handled by multiple applications sequentially. The Android system
+    is responsible for resolving the best-available receiver for each Intent,
+    based on the criteria supplied in the Intent and the Intent Filters
+    defined by other applications. For more information, see <a
+    href="{@docRoot}guide/topics/intents/intents-filters.html">Intents and
+    Intent Filters</a>. 
+    <p>Related: <a href="#intentfilter">Intent Filter</a>, <a
+    href="#broadcastreceiver">Broadcast Receiver</a>.</p></dd>
+
+    <dt id="intentfilter">Intent Filter</dt>
+    <dd>A filter object that an application declares in its manifest file, to
+    tell the system what types of Intents each of its components is willing to
+    accept and with what criteria. Through an intent filter, an application
+    can express interest in specific data types, Intent actions, URI formats,
+    and so on. When resolving an Intent, the system evaluates all of the
+    available intent filters in all applications and passes the Intent to the
+    application/activity that best matches the Intent and criteria. For more
+    information, see <a
+    href="{@docRoot}guide/topics/intents/intents-filters.html">Intents and
+    Intent Filters</a>. 
+    <p>Related: <a href="#intent">Intent</a>, <a
+    href="#broadcastreceiver">Broadcast Receiver</a>.</p></dd>
+
+    <dt id="broadcastreceiver">Broadcast Receiver </dt>
+    <dd>An application class that listens for Intents that are broadcast,
+    rather than being sent to a single target application/activity. The system
+    delivers a broadcast Intent to all interested broadcast receivers, which
+    handle the Intent sequentially. 
+    <p>Related: <a href="#intent">Intent</a>, <a href="#intentfilter">Intent 
+    Filter</a>.</p> </dd>
+	
+    <dt id="layoutresource">Layout Resource</dt>
+    <dd>An XML file that describes the layout of an Activity screen. 
+    <p>Related: <a href="#resources">Resources</a></p></dd>
+
+    <dt id="manifest">Manifest File</dt>
+    <dd>An XML file that each application must define, to describe the
+    application's package name, version, components (activities, intent
+    filters, services), imported libraries, and describes the various
+    activies, and so on. See <a
+    href="{@docRoot}guide/topics/manifest/manifest-intro.html">The
+    AndroidManifest.xml File</a> for complete information.</dd>
+
+    <dt id="ninepatch">Nine-patch / 9-patch / Ninepatch image</dt>
+    <dd>A resizeable bitmap resource that can be used for backgrounds or other
+    images on the device. See <a
+    href="{@docRoot}guide/topics/resources/available-resources.html#ninepatch">
+    Nine-Patch Stretchable Image</a> for more information. 
+    <p>Related: <a href="#resources">Resources</a>.</p></dd>
+
+    <dt id="opengles">OpenGL ES</dt>
+    <dd> Android provides OpenGL ES libraries that you can use for fast,
+    complex 3D images. It is harder to use than a Canvas object, but
+    better for 3D objects. The {@link android.opengl} and 
+    {@link javax.microedition.khronos.opengles} packages expose 
+    OpenGL ES functionality. 
+    <p>Related: <a href="#canvas">Canvas</a>, <a href="#surface">Surface</a></p></dd>
+
+    <dt id="resources">Resources</dt>
+    <dd>Nonprogrammatic application components that are external to the
+    compiled application code, but which can be loaded from application code
+    using a well-known reference format. Android supports a variety of
+    resource types, but a typical application's resources would consist of UI
+    strings, UI layout components, graphics or other media files, and so on.
+    An application uses resources to efficiently support localization and
+    varied device profiles and states. For example, an application would
+    include a separate set of resources for each supported local or device
+    type, and it could include layout resources that are specific to the
+    current screen orientation (landscape or portrait). For more information
+    about resources, see <a
+    href="{@docRoot}guide/topics/resources/index.html"> Resources and
+    Assets</a>. The resources of an application are always stored in the
+    <code>res/*</code> subfolders of the project. </dd>
+
+    <dt id="service">Service</dt>
+    <dd>An object of class {@link android.app.Service} that runs in the
+    background (without any UI presence) to perform various persistent
+    actions, such as playing music or monitoring network activity. 
+    <p>Related: <a href="#activity">Activity</a></p></dd>
+
+    <dt id="surface">Surface</dt>
+    <dd>An object of type {@link android.view.Surface} representing a block of
+    memory that gets composited to the screen. A Surface holds a Canvas object
+    for drawing, and provides various helper methods to draw layers and resize
+    the surface. You should not use this class directly; use 
+    {@link android.view.SurfaceView} instead. 
+    <p>Related: <a href="#canvas">Canvas</a></p></dd>
+
+    <dt id="surfaceview">SurfaceView</dt>
+    <dd>A View object that wraps a Surface for drawing, and exposes methods to
+    specify its size and format dynamically. A SurfaceView provides a way to
+    draw independently of the UI thread for resource-intensive operations
+    (such as games or camera previews), but it uses extra memory as a result.
+    SurfaceView supports both Canvas and OpenGL ES graphics. The base class is
+    {@link android.view.SurfaceView}.
+    <p>Related: <a href="#canvas">Surface</a></p></dd>
+
+    <dt id="theme">Theme</dt>
+    <dd>A set of properties (text size, background color, and so on) bundled
+    together to define various default display settings. Android provides a
+    few standard themes, listed in {@link android.R.style} (starting with
+    &quot;Theme_&quot;). </dd>
+
+    <dt id="uri">URIs in Android</dt>
+    <dd>Android uses URI strings as the basis for requesting data in a content
+    provider (such as to retrieve a list of contacts) and for requesting
+    actions in an Intent (such as opening a Web page in a browser). The URI
+    scheme and format is specialized according to the type of use, and an
+    application can handle specific URI schemes and strings in any way it
+    wants. Some URI schemes are reserved by system components. For example,
+    requests for data from a content provider must use the
+    <code>content://</code>. In an Intent, a URI using an <code>http://</code>
+    scheme will be handled by the browser. </dd>
+
+    <dt id="view">View</dt>
+	<dd>An object that draws to a rectangular area on the screen and handles
+    click, keystroke, and other interaction events. A View is a base class for
+    most layout components of an Activity or Dialog screen (text boxes,
+    windows, and so on). It receives calls from its parent object (see
+    viewgroup, below)to draw itself, and informs its parent object about where
+    and how big it would like to be (which may or may not be respected by the
+    parent). For more information, see {@link android.view.View}. 
+    <p>Related: <a href="#viewgroup">Viewgroup</a>, <a href="#widget">Widget
+    </a></p></dd>
+
+    <dt id="viewgroup">Viewgroup</dt>
+    <dd> A container object that groups a set of child Views. The viewgroup is
+    responsible for deciding where child views are positioned and how large
+    they can be, as well as for calling each to draw itself when appropriate.
+    Some viewgroups are invisible and are for layout only, while others have
+    an intrinsic UI (for instance, a scrolling list box). Viewgroups are all
+    in the {@link android.widget widget} package, but extend 
+    {@link android.view.ViewGroup ViewGroup}. 
+    <p>Related: <a href="#view">View</a></p></dd>
+
+    <dt id="widget">Widget</dt>
+    <dd>One of a set of fully implemented View subclasses that render form
+    elements and other UI components, such as a text box or popup menu.
+    Because a widget is fully implemented, it handles measuring and drawing
+    itself and responding to screen events. Widgets are all in the 
+    {@link android.widget} package. </dd>
+
+ <!-- 
+    <dt id="panel">Panel</dt>
+    <dd> A panel is a concept not backed by a specific class. It is a View of
+    some sort that is tied in closely to a parent window, but can handle
+    clicks and perform simple functions related to its parent. A panel floats
+    in front of its parent, and is positioned relative to it. A common example
+    of a panel (implemented by Android) is the options menu available to every
+    screen. At present, there are no specific classes or methods for creating
+    a panel &mdash; it's more of a general idea. </dd>
+-->
+
+    <dt id="panel">Window</dt>
+    <dd>In an Android application, an object derived from the abstract class
+    {@link android.view.Window} that specifies the elements of a generic
+    window, such as the look and feel (title bar text, location and content of
+    menus, and so on). Dialog and Activity use an implementation of this class
+    to render a window. You do not need to implement this class or use windows
+    in your application. </dd>
+
+
+</dl>
\ No newline at end of file
diff --git a/docs/html/guide/appendix/index.jd b/docs/html/guide/appendix/index.jd
new file mode 100644
index 0000000..6b25e34
--- /dev/null
+++ b/docs/html/guide/appendix/index.jd
@@ -0,0 +1,13 @@
+page.title=Appendix
+@jd:body
+
+<dl>
+    <dt><a href="media-formats.html">Supported Android Media Formats</a></dt>
+    <dd>A list of media codecs included in the Android platform.</dd>
+    <dt><a href="g-app-intents.html">Intents List: Invoking Google Applications on Android Devices</a></dt>
+    <dd>Intents you can send to invoke Google applications on Android devices.</dd>
+    <dt><a href="faq/index.html">FAQs, Tips, and How-to</a></dt>
+    <dd>How to get things done in Android.</dd>
+    <dt><a href="glossary.html">Glossary</a></dt>
+    <dd>Glossary of Android terminology.</dd>
+</dl>
diff --git a/docs/html/guide/appendix/media-formats.jd b/docs/html/guide/appendix/media-formats.jd
new file mode 100644
index 0000000..5419ad6
--- /dev/null
+++ b/docs/html/guide/appendix/media-formats.jd
@@ -0,0 +1,197 @@
+page.title=Android Supported Media Formats
+@jd:body
+
+<p>The <a href="#core">Core Media Formats</a> table below describes the media format support built into the Android platform. Note that any given mobile device may provide support for additional formats or file types not listed here. </p>
+<p>For your convenience, the table <a href="#g1">T-Mobile G1 Media Formats</a> describes the additional media formats supported by the T-Mobile G1 device. </p>
+
+
+<h2 id="core">Core Media Formats</h2>
+
+<table>
+<tbody>
+<tr>
+
+<th>Type</th>
+<th>Format</th>
+<th>Encoder</th>
+<th>Decoder</th>
+<th>Details</th>
+<th>File Type(s) Supported</th>
+</tr>
+
+<tr>
+<td rowspan="9">Audio</td>
+<td>AAC LC/LTP</td>
+<td>&nbsp;</td>
+<td style="text-align: center;">X</td>
+<td rowspan="3">Mono/Stereo content in any combination of standard bit rates up to 160 kbps and sampling rates from 8 to 48kHz</td>
+<td rowspan="3">3GPP (.3gp) and MPEG-4 (.mp4, .m4a). No support for raw AAC (.aac)</td>
+</tr>
+
+<tr>
+<td>HE-AACv1 (AAC+)</td>
+<td>&nbsp;</td>
+<td style="text-align: center;">X</td>
+</tr>
+
+<tr>
+<td>HE-AACv2 (enhanced AAC+)</td>
+<td>&nbsp;</td>
+<td style="text-align: center;">X</td>
+</tr>
+
+<tr>
+<td>AMR-NB</td>
+<td style="text-align: center;">X</td>
+<td style="text-align: center;">X</td>
+<td>4.75 to 12.2 kbps sampled @ 8kHz</td>
+<td>3GPP (.3gp)
+</td>
+</tr>
+
+<tr>
+<td>AMR-WB</td>
+<td>&nbsp;</td>
+<td style="text-align: center;">X</td>
+<td>9 rates from 6.60 kbit/s to 23.85 kbit/s sampled @ 16kHz</td>
+<td>3GPP (.3gp)</td>
+</tr>
+
+<tr>
+<td>MP3</td>
+<td>&nbsp;</td>
+<td style="text-align: center;">X</td>
+<td>Mono/Stereo 8-320Kbps constant (CBR) or variable bit-rate (VBR)
+</td>
+<td>MP3 (.mp3)</td>
+</tr>
+
+<tr>
+<td>MIDI</td>
+<td>&nbsp;</td>
+<td style="text-align: center;">X</td>
+<td>MIDI Type 0 and 1. DLS Version 1 and 2. XMF and Mobile XMF. Support for ringtone formats RTTTL/RTX, OTA, and iMelody </td>
+<td>Type 0 and 1 (.mid, .xmf, .mxmf). Also RTTTL/RTX (.rtttl, .rtx), OTA (.ota), and iMelody (.imy)</td>
+</tr>
+
+<tr>
+<td>Ogg Vorbis</td>
+<td>&nbsp;</td>
+<td style="text-align: center;">X</td>
+<td>&nbsp;</td>
+<td>Ogg (.ogg)</td>
+</tr>
+
+<tr>
+<td>PCM/WAVE</td>
+<td>&nbsp;</td>
+<td style="text-align: center;">X</td>
+<td>8- and 16-bit linear PCM (rates up to limit of hardware)</td>
+<td>WAVE (.wav)</td>
+</tr>
+
+<tr>
+<td rowspan="4">Image</td>
+<td>JPEG</td>
+<td style="text-align: center;">X</td>
+<td style="text-align: center;">X</td>
+<td>base+progressive</td>
+<td>JPEG (.jpg)</td>
+</tr>
+
+<tr>
+<td>GIF</td>
+<td>&nbsp;</td>
+<td style="text-align: center;">X</td>
+<td>&nbsp;</td>
+<td>GIF (.gif)</td>
+</tr>
+
+<tr>
+<td>PNG</td>
+<td>&nbsp;</td>
+<td style="text-align: center;">X</td>
+<td>&nbsp;</td>
+<td>PNG (.png)</td>
+</tr>
+
+<tr>
+<td>BMP</td>
+<td>&nbsp;</td>
+<td style="text-align: center;">X</td>
+<td>&nbsp;</td>
+<td>BMP (.bmp)</td>
+</tr>
+
+ 
+<tr>
+<td rowspan="3">Video</td>
+<td>H.263</td>
+<td style="text-align: center;">X</td>
+<td style="text-align: center;">X</td>
+<td>&nbsp;</td>
+<td>3GPP (.3gp)</td>
+</tr>
+
+<tr>
+<td>H.264</td>
+<td style="text-align: center;">X</td>
+<td style="text-align: center;">X</td>
+<td>&nbsp;</td>
+<td>3GPP (.3gp) and MPEG-4 (.mp4)</td>
+</tr>
+
+<tr>
+<td>MPEG4 SP</td>
+<td>&nbsp;</td>
+<td>&nbsp;</td>
+<td>&nbsp;</td>
+<td>3GPP (.3gp)</td>
+</tr>
+
+</tbody></table>
+
+<h2 id="g1">T-Mobile G1 Media Formats</h2>
+
+<p>In addition to the core media formats supported in the Android platform, the T-Mobile G1 also supports the formats listed below.</p>
+
+<table>
+<tbody>
+
+<tr>
+<th>Type</th>
+<th>Format</th>
+<th>Encoder</th>
+<th>Decoder</th>
+<th>Details</th>
+<th>File Type(s) Supported</th>
+</tr>
+
+<tr>
+<td>Audio</td>
+<td>WMA</td>
+<td>&nbsp;</td>
+<td>X</td>
+<td>Supports WMA standard L1-L3:
+<ul>
+<li>L1: 64 kbps - 161 kbps @ 44.1kHz</li>
+<li>L2: &lt;=161 kbps &lt;=48 kHz</li>
+<li>L3: &lt;385 kbps &lt;=48 kHz</li>
+</ul>
+Mono and stereo profiles with 16-bits per sample. Decoder does not support WMA Pro, Lossless, or Speech codecs.
+</td>
+<td>Windows Media Audio (.wma)</td>
+</tr>
+
+<tr>
+<td>Video</td>
+<td>WMV</td>
+<td>&nbsp;</td>
+<td>X</td>
+<td>Versions 7, 8 and 9. Simple profile only</td>
+<td>Windows Media Video (.wmv)</td>
+</tr>
+</tbody></table>
+
+
+<p>Note that Windows Media codecs are not part of the Android platform and require special licensing from Microsoft or an authorized developer such as Packet Video.</p>
diff --git a/docs/html/guide/basics/appmodel.jd b/docs/html/guide/basics/appmodel.jd
new file mode 100644
index 0000000..323fc9b
--- /dev/null
+++ b/docs/html/guide/basics/appmodel.jd
@@ -0,0 +1,261 @@
+page.title=Application Model
+@jd:body
+<h1>Android Application Model: Applications, Tasks, Processes, and Threads</h1>
+
+<p>In most operating systems, there is a strong 1-to-1 correlation between
+the executable image (such as the .exe on Windows) that an application lives in,
+the process it runs in, and the icon and application the user interacts with.
+In Android these associations are much more fluid, and it is important to
+understand how the various pieces can be put together.</p>
+
+<p>Because of the flexible nature of Android applications, there is some
+basic terminology that needs to be understood when implementing the
+various pieces of an application:</p>
+
+<ul>
+<li><p>An <strong>android package</strong> (or <strong>.apk</strong> for short)
+is the file containing an application's code and its resources.  This is the
+file that an application is distributed in and downloaded by the user when
+installing that application on their device.</p></li>
+
+<li><p>A <strong>task</strong> is generally what the user perceives as
+an "application" that can be launched: usually a task has an icon in the
+home screen through which it is accessed, and it is available as a top-level
+item that can be brought to the foreground in front of other
+tasks.</p></li>
+
+<li><p>A <strong>process</strong> is a low-level kernel process in which
+an application's code is running.  Normally all of the code in a
+.apk is run in one, dedicated process for that .apk; however, the
+{@link android.R.styleable#AndroidManifestApplication_process process} tag
+can be used to modify where that code is run, either for
+{@link android.R.styleable#AndroidManifestApplication the entire .apk}
+or for individual
+{@link android.R.styleable#AndroidManifestActivity activity},
+{@link android.R.styleable#AndroidManifestReceiver receiver},
+{@link android.R.styleable#AndroidManifestService service}, or
+{@link android.R.styleable#AndroidManifestProvider provider}, components.</p></li>
+</ul>
+
+<h2 id="Tasks">Tasks</h2>
+
+<p>A key point here is: <em>when the user sees as an "application," what
+they are actually dealing with is a task</em>.  If you just create a .apk
+with a number of activities, one of which is a top-level entry point (via
+an {@link android.R.styleable#AndroidManifestIntentFilter intent-filter} for
+the action <code>android.intent.action.MAIN</code> and
+category <code>android.intent.category.LAUNCHER</code>), then there will indeed
+be one task created for your .apk, and any activities you start from there
+will also run as part of that task.</p>
+
+<p>A task, then, from the user's perspective your application; and from the
+application developer's perspective it is one or more activities the user
+has traversed through in that task and not yet closed, or an activity stack.
+A new task is created by
+starting an activity Intent with the {@link android.content.Intent#FLAG_ACTIVITY_NEW_TASK
+Intent.FLAG_ACTIVITY_NEW_TASK} flag; this Intent will be used as the root Intent of
+the task, defining what task it is.  Any activity started without this flag
+will run in the same task as the activity that is starting it (unless that
+activity has requested a special launch mode, as discussed later).  Tasks can
+be re-ordered: if you use FLAG_ACTIVITY_NEW_TASK but there is already a task
+running for that Intent, the current task's activity stack will be brought
+to the foreground instead of starting a new task.</p>
+
+<p>FLAG_ACTIVITY_NEW_TASK must only be used with care: using it says that,
+from the user's perspective, a new application starts at this point.  If this
+is not the behavior you desire, you should not be creating a new task.  In
+addition, you should only use the new task flag if it is possible for the user
+to navigate from home back to where they are and launch the same Intent as a
+new task.  Otherwise, if the user presses HOME instead of BACK from the task
+you have launched, your task and its activities will be ordered behind the
+home screen without a way to return to them.</p>
+
+<h3>Task Affinities</h3>
+
+<p>In some cases Android needs to know which task an activity belongs to even when
+it is not being launched in to a specific task.  This is accomplished through
+task affinities, which provide a unique static name for the task that one or more
+activities are intended to run in.  The default task affinity for an activity
+is the name of the .apk package name the activity is implemented in.  This
+provides the normally expected behavior, where all of the activities in a
+particular .apk are part of a single application to the user.</p>
+
+<p>When starting a new activity without the
+{@link android.content.Intent#FLAG_ACTIVITY_NEW_TASK
+Intent.FLAG_ACTIVITY_NEW_TASK} flag, task affinities have no impact on the
+task the new activity will run in: it will always run in the task of the
+activity that is starting it.  However, if the NEW_TASK flag is being used,
+then the affinity will be used to determine if a task already exists with
+the same affinity.  If so, that task will be brought to the front and the
+new activity launched at the top of that task.</p>
+
+<p>This behavior is most useful for situations where you must use the
+NEW_TASK flag, in particular launching activities from status bar notifications
+or home screen shortcuts.  The result is that, when the user launches your
+application this way, its current task state will be brought to the foreground,
+and the activity they now want to look at placed on top of it.</p>
+
+<p>You can assign your own task affinities in your manifest's
+{@link android.R.styleable#AndroidManifestApplication application} tag for
+all activities in the .apk, or the
+{@link android.R.styleable#AndroidManifestActivity activity} tag of
+individual activities.  Some examples of how this can be used are:</p>
+
+<ul>
+<li>If your .apk contains multiple top-level applications that the user can
+launch, then you will probably want to assign different affinities to each
+of the activities that the users sees for your .apk.  A good convention for
+coming up with distinct names is to append your .apk's package name with
+a colon separated string.  For example, the "com.android.contacts" .apk
+may have the affinities "com.android.contacts:Dialer" and
+"com.android.contacts:ContactsList".</ul>
+<li>If you are replacing a notification, shortcut, or other such "inner"
+activity of an application that can be launched from outside of it, you may
+need to explicitly set the taskAffinity of your replacement activity to be
+the same as the application you are replacing.  For example, if you are
+replacing the contacts details view (which the user can make and invoke
+shortcuts to), you would want to set the taskAffinity to
+"com.android.contacts".</li>
+</ul>
+
+<h3>Launch Modes and Launch Flags</h3>
+
+<p>The main way you control how activities interact with tasks is through
+the activity's
+{@link android.R.styleable#AndroidManifestActivity_launchMode launchMode}
+attribute and the {@link android.content.Intent#setFlags flags} associated
+with an Intent.  These two parameters can work together in various ways
+to control the outcome of the activity launch, as described in their
+associated documentation.  Here we will look at some common use cases and
+combinations of these parameters.</p>
+
+<p>The most common launch mode you will use (besides the default
+<code>standard</code> mode) is <code>singleTop</code>.  This does not have
+an impact on tasks; it just avoids starting the same activity multiple times
+on the top of a stack.
+
+<p>The <code>singleTask</code> launch mode has a major
+impact on tasks: it causes the activity to always be started in
+a new task (or its existing task to be brought to the foreground).  Using
+this mode requires a lot of care in how you interact with the rest of the
+system, as it impacts every path in to the activity.  It should only be used
+with activities that are front doors to the application (that is, which
+support the MAIN action and LAUNCHER category).</p>
+
+<p>The <code>singleInstance</code> launch mode is even more specialized, and
+should only be used in applications that are implemented entirely as one
+activity.</p>
+
+<p>A situation you will often run in to is when another entity (such as the
+{@link android.app.SearchManager} or {@link android.app.NotificationManager})
+starts one of your activities.  In this case, the
+{@link android.content.Intent#FLAG_ACTIVITY_NEW_TASK
+Intent.FLAG_ACTIVITY_NEW_TASK} flag must be used, because the activity is
+being started outside of a task (and the application/task may not even
+exist).  As described previously, the standard behavior in this situation
+is to bring to the foreground the current task matching the new activity's
+affinity and start the new activity at the top of it.  There are, however,
+other types of behavior that you can implement.</p>
+
+<p>One common approach is to also use the
+{@link android.content.Intent#FLAG_ACTIVITY_CLEAR_TOP
+Intent.FLAG_ACTIVITY_CLEAR_TOP} flag in conjunction with NEW_TASK.  By doing so,
+if your task is already running, then it will be brought to the foreground,
+all of the activities on its stack cleared except the root activity, and the
+root activity's {@link android.app.Activity#onNewIntent} called with the
+Intent being started.  Note that the activity often also use the <code>singleTop</code>
+or <code>singleTask</code> launch mode when using this approach, so that
+the current instance is given the new intent instead of requiring that it
+be destroyed and a new instance started.</p>
+
+<p>Another approach you can take is to set the notification activity's
+<code>android:taskAffinity</code> to the empty string "" (indicating no affinity)
+and setting the
+<code>{@link android.R.styleable#AndroidManifestActivity_noHistory
+android:noHistory}</code> and
+<code>{@link android.R.styleable#AndroidManifestActivity_excludeFromRecents
+android:excludeFromRecents}</code> attributes.
+This approach is useful if you would like the notification
+to take the user to a separate activity describing it, rather than return
+to the application's task.  By specifying these attributes, the activity will
+be finished whether the user leaves it with BACK or HOME and it will not
+show up in the recent tasks list; if the <code>noHistory</code> attribute
+isn't specified, pressing HOME will result in the activity and its task
+remaining in the system, possibly with no way to return to it.</p>
+
+<p>Be sure to read the documentation on the
+{@link android.R.styleable#AndroidManifestActivity_launchMode launchMode attribute}
+and the {@link android.content.Intent#setFlags Intent flags} for the details
+on these options.</p>
+
+<h2 id="Processes">Processes</h2>
+
+<p>In Android, processes are entirely an implementation detail of applications
+and not something the user is normally aware of.  Their main uses are simply:</p>
+
+<ul>
+<li> Improving stability or security by putting untrusted or unstable code
+into another process.
+<li> Reducing overhead by running the code of multiple .apks in the same
+process.
+<li> Helping the system manage resources by putting heavy-weight code in
+a separate process that can be killed independently of other parts of the
+application.
+</ul>
+
+<p>As described previously, the
+{@link android.R.styleable#AndroidManifestApplication_process process} attribute
+is used to control the process that particular application components run in.
+Note that this attribute can not be used to violate security of the system: if
+two .apks that are not sharing the same user ID try to run in the same process,
+this will not be allowed and different distinct processes will be created for
+each of them.</p>
+
+<p>See the <a href="{@docRoot}devel/security.html">security</a> document for
+more information on these security restrictions.</p>
+
+<h2 id="Threads">Threads</h2>
+
+<p>Every process has one or more threads running in it.  In most situations, Android
+avoids creating additional threads in a process, keeping an application
+single-threaded unless it creates its own threads.  An important repercussion
+of this is that all calls to {@link android.app.Activity},
+{@link android.content.BroadcastReceiver}, and {@link android.app.Service}
+instances are made only from the main thread of the process they are running in.</p>
+
+<p>Note that a new thread is <strong>not</strong> created for each
+Activity, BroadcastReceiver, Service, or ContentProvider instance:
+these application components are instantiated in the desired process (all in the
+same process unless otherwise specified), in the main thread of that process.
+This means that none of these components (including services) should perform
+long or blocking operations (such as networking calls or computation loops)
+when called by the system, since this will block
+all other components in the process.  You can use the standard library
+{@link java.lang.Thread} class or Android's {@link android.os.HandlerThread}
+convenience class to perform long operations on another thread.</p>
+
+<p>There are a few important exceptions to this threading rule:</p>
+
+<ul>
+<li><p>Calls on to an {@link android.os.IBinder} or interface implemented on
+an IBinder are dispatched from the thread calling them or a thread pool in the
+local process if coming from another process, <em>not</em>
+from the main thread of their process.  In particular, calls on to the IBinder
+of a {@link android.app.Service} will be called this way.  (Though
+calls to methods on Service itself are done from the main thread.)
+This means that <em>implementations of IBinder interfaces must always be
+written in a thread-safe way, since they can be called from any number of
+arbitrary threads at the same time</em>.</p></li>
+
+<li><p>Calls to the main methods of {@link android.content.ContentProvider}
+are dispatched from the calling thread or main thread as with IBinder.  The
+specific methods are documented in the ContentProvider class.
+This means that <em>implementations of these methods must always be
+written in a thread-safe way, since they can be called from any number of
+arbitrary threads at the same time</em>.</p></li>
+
+<li><p>Calls on {@link android.view.View} and its subclasses are made from the
+thread that the view's window is running in.  Normally this will be the main
+thread of the process, however if you create a thread and show a window from
+there then the window's view hierarchy will be called from that thread.</p></li>
+</ul>
diff --git a/docs/html/guide/basics/building-blocks.jd b/docs/html/guide/basics/building-blocks.jd
new file mode 100644
index 0000000..b8a609e
--- /dev/null
+++ b/docs/html/guide/basics/building-blocks.jd
@@ -0,0 +1,76 @@
+page.title=Building Blocks
+@jd:body
+<h1>Android Building Blocks</h1>
+
+<p>You can think of an Android application as a collection of components, of
+various kinds. These components are for the most part quite loosely coupled,
+to the degree where you can accurately describe them as a federation of
+components rather than a single cohesive application.</p>
+
+<p>Generally, these components all run in the same system process. It's
+possible (and quite common) to create multiple threads within that process,
+and it's also possible to create completely separate child processes if you
+need to. Such cases are pretty uncommon though, because Android tries very
+hard to make processes transparent to your code.</p>
+
+<p>These are the most important parts of the Android APIs:</p>
+
+<dl>
+    <dt><a href="{@docRoot}devel/bblocks-manifest.html">AndroidManifest.xml</a></dt>
+    <dd>The AndroidManifest.xml file is the control file that tells the system
+    what to do with all the top-level components (specifically activities,
+    services, intent receivers, and content providers described below)
+    you've created.  For instance, this is the
+    "glue" that actually specifies which Intents your Activities receive.</dd>
+    
+    <dt>{@link android.app.Activity Activities}</dt>
+    <dd>An Activity is, fundamentally, an object that has a life cycle. An
+    Activity is a chunk of code that does some work; if necessary, that work
+    can include displaying a UI to the user. It doesn't have to, though - some
+    Activities never display UIs. Typically, you'll designate one of your
+    application's Activities as the entry point to your application. </dd>
+  
+  
+    <dt>{@link android.view.View Views}</dt>
+    <dd>A View is an object that knows how to draw itself to the screen.
+    Android user interfaces are comprised of trees of Views. If you want to
+    perform some custom graphical technique (as you might if you're writing a
+    game, or building some unusual new user interface widget) then you'd
+    create a View.</dd>
+  
+  
+    <dt>{@link android.content.Intent Intents}</dt>
+    <dd>An Intent is a simple message object that represents an "intention" to
+    do something. For example, if your application wants to display a web
+    page, it expresses its "Intent" to view the URI by creating an Intent
+    instance and handing it off to the system. The system locates some other
+    piece of code (in this case, the Browser) that knows how to handle that
+    Intent, and runs it. Intents can also be used to broadcast interesting
+    events (such as a notification) system-wide.</dd>
+  
+  
+    <dt>{@link android.app.Service Services}</dt>
+    <dd>A Service is a body of code that runs in the background. It can run in
+    its own process, or in the context of another application's process,
+    depending on its needs. Other components "bind" to a Service and invoke
+    methods on it via remote procedure calls. An example of a Service is a
+    media player; even when the user quits the media-selection UI, she
+    probably still intends for her music to keep playing. A Service keeps the
+    music going even when the UI has completed.</dd>
+  
+  
+    <dt>{@link android.app.NotificationManager Notifications}</dt>
+    <dd>A Notification is a small icon that appears in the status bar. Users
+    can interact with this icon to receive information. The most well-known
+    notifications are SMS messages, call history, and voicemail, but
+    applications can create their own. Notifications are the
+    strongly-preferred mechanism for alerting the user of something that needs
+    their attention.</dd>
+    
+    <dt>{@link android.content.ContentProvider ContentProviders}</dt>
+    <dd>A ContentProvider is a data storehouse that provides access to data on
+    the device; the classic example is the ContentProvider that's used to
+    access the user's list of contacts. Your application can access data that
+    other applications have exposed via a ContentProvider, and you can also
+    define your own ContentProviders to expose data of your own.</dd>
+</dl>
diff --git a/docs/html/guide/basics/fixme-gs-core-packages.jd b/docs/html/guide/basics/fixme-gs-core-packages.jd
new file mode 100644
index 0000000..5281990
--- /dev/null
+++ b/docs/html/guide/basics/fixme-gs-core-packages.jd
@@ -0,0 +1,92 @@
+page.title=Getting Started
+@jd:body
+<h1>Getting Started with Android</h1>
+ 
+<p>To get started with Android, please read the following sections first:</p>
+<dl>
+    <dt><a href="{@docRoot}intro/installing.html">Installing the SDK and
+    Plugin</a></dt>
+    <dd>How to install the Android SDK and Eclipse plugin.</dd>
+    <dt><a href="{@docRoot}intro/develop-and-debug.html">Developing and Debugging</a></dt>
+    <dd>An introduction to developing and debugging Android applications in Eclipse,
+    plus information on using other IDEs.</dd>
+    <dt><a href="{@docRoot}intro/hello-android.html">Hello Android</a></dt>
+    <dd>Writing your first Android Application, the ever popular Hello World,
+    Android style.</dd>
+    <dt><a href="{@docRoot}intro/anatomy.html">Anatomy of an App</a></dt>
+    <dd>A guide to the structure and architecture of an Android
+    Application. This guide will help you understand the pieces that make up
+    an Android app.</dd>
+    <dt><a href="{@docRoot}intro/tutorial.html">Notepad Tutorial</a></dt>
+    <dd>This tutorial document will lead you through
+    constructing a real Android Application: A notepad which can create, edit
+    and delete notes, and covers many of the basic concepts with practical
+    examples.</dd>
+    <dt><a href="{@docRoot}intro/tools.html">Development Tools</a></dt>
+    <dd>The
+    command line tools included with the SDK, what they do, and how to use
+    them.</dd>
+    <dt><a href="{@docRoot}intro/appmodel.html">Application Model</a></dt>
+    <dd>A guide to Applications, Tasks, Processes, and Threads.
+    These are the elements that define the way your application is run by the 
+    system and presented to the user.</dd>
+    <dt><a href="{@docRoot}intro/lifecycle.html">Application Life Cycle</a></dt>
+    <dd>The important life-cycle details for
+    Applications and the Activities running inside of them.</dd>
+
+</dl>
+
+<h2>Other Introductory Material</h2>
+<p>After reading the sections above, the following Getting Started information is also very useful:</p>
+
+
+<h3>Core Packages</h3>
+<p> These are the basic packages that make up the Android SDK for writing
+applications. The packages are organized as layers, listed here from
+lowest-level to highest.</p>
+
+<dl>
+    <dt>{@link android.util}</dt>
+    <dd>contains various low-level utility classes, such
+    as specialized container classes, XML utilities, etc.</dd>
+    <dt>{@link android.os}</dt>
+    <dd> provides basic operating system services, message
+    passing, and inter-process communication.</dd>
+    <dt>{@link android.graphics}</dt><dd>is the core rendering package.</dd>
+    <dt>{@link android.text}, {@link android.text.method}, {@link
+    android.text.style}, and {@link android.text.util} </dt>
+    <dd>supply a rich set of
+    text processing tools, supporting rich text, input methods, etc.</dd>
+    <dt>{@link android.database}</dt>
+    <dd>contains low-level APIs for working with
+    databases.</dd>
+    <dt>{@link android.content}</dt>
+    <dd>provides various services for accessing data
+    on the device: applications installed on the device and their associated
+    resources, and content providers for persistent dynamic data.</dd>
+    <dt>{@link android.view}</dt>
+    <dd>is the core user-interface framework.</dd>
+    <dt>{@link android.widget}</dt>
+    <dd>supplies standard user interface elements
+    (lists, buttons, layout managers, etc) built from the view package.</dd>
+    <dt>{@link android.app}</dt>
+    <dd>provides the high-level application model,
+    implemented using Activities.</dd>
+</dl>
+
+<h3>Other Notable Packages</h3>
+
+<p> These packages provide additional domain-specific features of the Android
+platform. They are not necessary for basic application development.</p>
+
+<dl>
+    <dt>{@link android.provider}</dt>
+    <dd>contains definitions for various standard
+    content providers included with the platform.</dd>
+    <dt>{@link android.telephony}</dt>
+    <dd>provides APIs for interacting with the
+    device's phone stack.</dd>
+    <dt>{@link android.webkit}</dt>
+    <dd>includes various APIs for working with
+    web-based content.</dd>
+</dl>
diff --git a/docs/html/guide/basics/index.html b/docs/html/guide/basics/index.html
new file mode 100644
index 0000000..4881acf
--- /dev/null
+++ b/docs/html/guide/basics/index.html
@@ -0,0 +1,8 @@
+<html>
+<head>
+<meta http-equiv="refresh" content="0;url=../index.html">
+</head>
+<body>
+<a href="../index.html">click here</a> if you are not redirected.
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/html/guide/basics/what-is-android.jd b/docs/html/guide/basics/what-is-android.jd
new file mode 100644
index 0000000..b75321b
--- /dev/null
+++ b/docs/html/guide/basics/what-is-android.jd
@@ -0,0 +1,135 @@
+page.title=What is Android?
+@jd:body
+
+<p>Android is a software stack for mobile devices that includes an operating
+system, middleware and key applications. The <a
+href="http://code.google.com/android/download.html">Android SDK</a>
+provides the tools and APIs necessary to begin developing applications on the
+Android platform using the Java programming language.</p>
+
+<h2>Features</h2>
+
+<ul>
+    <li><strong>Application framework</strong> enabling reuse and replacement
+    of components</li>
+    <li><strong>Dalvik virtual machine</strong> optimized for mobile
+        devices</li>
+    <li><strong>Integrated browser</strong> based on the open source <a
+    href="http://webkit.org/">WebKit</a> engine </li>
+    <li><strong>Optimized graphics</strong> powered by a custom 2D graphics library; 3D
+    graphics based on the OpenGL ES 1.0 specification (hardware acceleration
+    optional)</li>
+    <li><strong>SQLite</strong> for structured data storage</li>
+    <li><strong>Media support</strong> for common audio, video, and still
+    image formats (MPEG4, H.264, MP3, AAC, AMR, JPG, PNG,
+    GIF)</li>
+    <li><strong>GSM Telephony</strong> (hardware dependent)</li>
+    <li><strong>Bluetooth, EDGE, 3G, and WiFi</strong> (hardware dependent)</li>
+    <li><strong>Camera, GPS, compass, and accelerometer</strong> (hardware dependent)</li>
+    <li><strong>Rich development environment</strong> including a device
+    emulator, tools for debugging, memory and performance profiling, and a plugin for the Eclipse IDE</li>
+</ul>
+
+<a name="os_architecture" id="os_architecture"></a>
+<h2>Android Architecture</h2> 
+
+<p>The following diagram shows the major components of the Android operating
+system. Each section is described in more detail below.</p>
+
+<p><img src="{@docRoot}images/system-architecture.jpg" alt="Android System Architecture" width="713" height="512"></p>
+
+<a name="applications" id="applications"></a>
+<h2>Applications</h2>
+
+<p>Android will ship with a set of core applications including an email
+client, SMS program, calendar, maps, browser, contacts, and
+others. All applications are written using the Java programming language.</p>
+
+<a name="application_framework" id="application_framework"></a>
+<h2>Application Framework</h2>
+
+<p>Developers have full access to the same framework APIs used by the core
+applications. The application architecture is designed to simplify the reuse
+of components; any application can publish its capabilities and any other
+application may then make use of those capabilities (subject to security
+constraints enforced by the framework). This same mechanism allows components
+to be replaced by the user.</p>
+
+<p>Underlying all applications is a set of services and systems, including:
+<ul>
+    <li>A rich and extensible set of <a
+    href="{@docRoot}guide/tutorials/views/index.html">Views</a> that can be used to
+    build an application, including lists, grids, text boxes, buttons, and even
+    an embeddable web browser</li>
+    <li><a href="{@docRoot}guide/topics/providers/content-providers.html">Content
+    Providers</a> that enable applications to access data from other
+    applications (such as Contacts), or to share their own data</li> <li>A <a
+    href="{@docRoot}guide/topics/resources/resources-i18n.html">Resource
+    Manager</a>, providing access to non-code resources such as localized
+    strings, graphics, and layout files</li>
+    <li>A {@link android.app.NotificationManager Notification Manager} that enables
+    all applications to display custom alerts in the status bar</li>
+    <li>An {@link android.app.Activity Activity Manager} that manages the
+    lifecycle of applications and provides a common navigation backstack</li>
+</ul>
+
+<p>For more details and a walkthrough of an application, see the <a
+href="{@docRoot}guide/tutorials/notepad/index.html">Notepad Tutorial</a>.</p>
+    
+<a name="libraries" id="libraries"></a>
+<h2>Libraries</h2>
+
+<p>Android includes a set of C/C++ libraries used by various components of the
+Android system. These capabilities are exposed to developers through the
+Android application framework. Some of the core libraries are listed below:</p>
+<ul>
+    <li><strong>System C library</strong> - a BSD-derived implementation of
+    the standard C system library (libc), tuned for embedded Linux-based
+    devices</li>
+    <li><strong>Media Libraries</strong> - based on PacketVideo's OpenCORE;
+    the libraries support playback and recording of many popular audio and video
+    formats, as well as static image files, including MPEG4, H.264, MP3, AAC,
+    AMR, JPG, and PNG</li>
+    <li><strong>Surface Manager</strong> - manages access to the display
+    subsystem and seamlessly composites 2D and 3D graphic layers from multiple
+    applications</li>
+    <li><strong>LibWebCore</strong> - a modern web browser engine which
+    powers both the Android browser and an embeddable web view</li>
+    <li><strong>SGL</strong> - the underlying 2D graphics
+    engine</li>
+    <li><strong>3D libraries</strong> - an implementation based on
+    OpenGL ES 1.0 APIs; the libraries use either hardware 3D acceleration
+    (where available) or the included, highly optimized 3D software
+    rasterizer</li>
+    <li><strong>FreeType</strong> - bitmap and vector font rendering</li>
+    <li><strong>SQLite</strong> - a powerful and lightweight relational
+    database engine available to all applications</li>
+</ul>
+
+<a name="runtime" id="runtime"></a>
+
+<h2>Android Runtime</h2>
+
+<p>Android includes a set of core libraries that provides most of
+the functionality available in the core libraries of the Java programming
+language.</p>
+
+<p>Every Android application runs in its own process, with its own instance of
+the Dalvik virtual machine. Dalvik has been written so that a device can run
+multiple VMs efficiently. The Dalvik VM executes files in the Dalvik
+Executable (.dex) format which is optimized for minimal memory
+footprint. The VM is register-based, and runs classes
+compiled by a Java language compiler that have been transformed into the .dex
+format by the included &quot;dx&quot; tool.</p>
+
+<p>The Dalvik VM relies on the Linux kernel for underlying functionality such
+as threading and low-level memory management.</p>
+
+<a name="kernel" id="kernel"></a>
+
+<h2>Linux Kernel</h2>
+
+<p>Android relies on Linux version 2.6 for core system services such as
+security, memory management, process management, network stack, and driver
+model. The kernel also acts as an abstraction layer between the hardware and
+the rest of the software stack.</p>
diff --git a/docs/html/guide/developing/app-signing.jd b/docs/html/guide/developing/app-signing.jd
new file mode 100644
index 0000000..582dfb2
--- /dev/null
+++ b/docs/html/guide/developing/app-signing.jd
@@ -0,0 +1,428 @@
+page.title=Signing Your Applications
+@jd:body
+
+<p>The Android system requires that all installed applications be digitally
+signed with a certificate whose private key is held by the application's
+developer. The system uses the certificate as a means of identifying the author of
+an application and establishing trust relationships between applications, rather
+than for controlling which applications the user can install. The certificate
+does not need to be signed by a certificate authority: it is perfectly
+allowable, and typical, for Android applications to use self-signed
+certificates.</p>
+
+<p>The important points to understand about signing Android applications are:</p>
+
+<ul>
+  <li>All applications <em>must</em> be signed. The system will not install an application 
+that is not signed.</li>
+  <li>You can use self-signed certificates to sign your applications. No certificate authority 
+is needed.</li>
+  <li>When you are ready to publish your application, you must sign it with a suitable private 
+key. You can not publish an application that is signed with the default key generated 
+by the SDK tools. 
+  </li>
+  <li>The system tests a signer certificate's expiration date only at install time. If an 
+application's signer certificate expires after the application is installed, the application 
+will continue to function normally.</li>
+  <li>You can use standard tools &mdash; Keytool and Jarsigner &mdash; to generate keys and 
+sign your application .apk files.</li>
+</ul>
+
+<p>The Android system will not install or run an application that is not signed appropriately. This 
+applies wherever the Android system is run, whether on an actual device or on the emulator. 
+For this reason, you must set up signing for your application before you will be able to 
+run or debug it on an emulator or device.</p>
+
+<p>The Android SDK tools assist you in signing your applications when debugging. Both the ADT Plugin 
+for Eclipse and the Ant build tool offer two signing modes &mdash; debug mode and release mode. 
+
+<ul>
+<li>In debug mode, the build tools use the Keytool utility, included in the JDK, to create 
+a keystore and key with a known alias and password. At each compilation, the tools then use 
+the debug key to sign the application .apk file. Because the password is known, the tools 
+don't need to prompt you for the keystore/key password each time you compile.</li>
+
+<li>When your application is ready for release, you compile it in release signing mode. 
+In this mode, the tools compile your .apk <em>without</em> signing it. You must then sign
+the .apk manually &mdash; <span style="color:red">with your private key</span> &mdash; 
+using Jarsigner (or similar tool). If you do not have a suitable private key already, 
+you can run Keytool manually to generate your own keystore/key and then sign your 
+application with Jarsigner.</li>
+</ul>
+
+<h2>Signing Strategies</h2>
+
+<p>Some aspects of application signing may affect how you approach the development
+of your application, especially if you are planning to release multiple
+applications. </p>
+
+<p>In general, the recommended strategy for all developers is to sign
+all of your applications with the same certificate, throughout the expected
+lifespan of your applications. There are several reasons why you should do so: </p>
+
+<ul>
+<li>Application upgrade &mdash; As you release upgrades to your
+application, you will want to sign the upgrades with the same certificate, if you
+want users to upgrade seamlessly to the new version. When the system is 
+installing an update to an application, if any of the certificates in the 
+new version match any of the certificates in the old version, then the 
+system allows the update. If you sign the version without using a matching
+certificate, you will also need to assign a different package name to the 
+application &mdash; in this case, the user installs the new version as a 
+completely new application. 
+
+<li>Application modularity &mdash; The Android system allows applications that
+are signed by the same certificate to run in the same process, if the
+applications so request, so that the system treats them as a single application.
+In this way you can deploy your application in modules, and users can update
+each of the modules independently if needed.</li>
+
+<li>Code/data sharing through permissions &mdash; The Android system provides
+signature-based permissions enforcement, so that an application can expose
+functionality to another application that is signed with a specified
+certificate. By signing multiple applications with the same certificate and
+using signature-based permissions checks, your applications can share code and
+data in a secure manner. </li>
+
+</li>
+
+</ul>
+
+<p>Another important consideration in determining your signing strategy is 
+how to set the validity period of the key that you will use to sign your 
+applications.</p>
+
+<ul>
+<li>If you plan to support upgrades for a single application, you should ensure 
+that your key has a validity period that exceeds the expected lifespan of
+that application. A validity period of 25 years or more is recommended. 
+When your key's validity period expires, users will no longer be
+able to seamlessly upgrade to new versions of your application.</li>
+
+<li>If you will sign multiple distinct applications with the same key, 
+you should ensure that your key's validity period exceeds the expected 
+lifespan of <em>all versions of all of the applications</em>, including 
+dependent applications that may be added to the suite in the future. </li>
+
+<li>If you plan to publish your application(s) on Android Market, the
+key you use to sign the application(s) must have a validity period 
+ending after 22 October 2033. The Market server enforces this requirement
+to ensure that users can seamlessly upgrade Market applications when
+new versions are available. </li>
+</ul>
+
+<p>As you design your application, keep these points in mind and make sure to
+use a <a href="#cert">suitable certificate</a> to sign your applications. </p>
+
+<h2 id="setup">Basic Setup for Signing</h2>
+
+<p>To support the generation of a keystore and debug key, you should first make sure that 
+Keytool is available to the SDK build 
+tools. In most cases, you can tell the SDK build tools how to find Keytool by making sure 
+that your JAVA_HOME environment variable is set and that it references a suitable JDK. 
+Alternatively, you can add the JDK version of Keytool to your PATH variable.</p>
+
+<p>If you are developing on a version of Linux that originally came with GNU Compiler for 
+Java, make sure that the system is using the JDK version of Keytool, rather than the gcj 
+version. If Keytool is already in your PATH, it might be pointing to a symlink at 
+/usr/bin/keytool. In this case, check the symlink target to make sure that it points 
+to the Keytool in the JDK.</p>
+
+<p>If you will release your application to the public, you will also need to have
+the Jarsigner tool available on your machine. Both Jarsigner and Keytool are included
+in the JDK. </p>
+
+<h2>Signing in Debug Mode</h2>
+
+<p>The Android build tools provide a debug signing mode that makes it easier for you 
+to develop and debug your application, while still meeting the Android system
+requirement for signing your .apk when it is installed in the emulator or a device. </p>
+
+<p>If you are developing in Eclipse/ADT and have set up Keytool as described
+above, signing in debug mode is enabled by default. When you run or debug your
+application, ADT signs the .apk for you and installs it on the emulator. No
+specific action on your part is needed, provided ADT has access to Keytool.</p>
+
+<p>If you use Ant to build your .apk files, debug signing mode 
+is enabled by default, assuming that you are using a build.xml file generated by the 
+activitycreator tool included in the latest SDK. When you run Ant against build.xml to 
+compile your app, the build script generates a keystore/key and signs the .apk for you. 
+No specific action on your part is needed.</p>
+
+<p>Note that you can not release your application to the public if it is signed only with
+the debug key. </p>
+
+<h2>Signing for Public Release</h2>
+
+<p>When your application is ready for release to other users, you must:</p>
+<ol>
+<li>Compile the application in release mode</li>
+<li>Obtain a suitable private key, and then</li>
+<li>Sign the application with your private key</li>
+<li>Secure your private key</li>
+</ol>
+
+<p>The sections below provide information about these steps. </p>
+
+<h3>Compiling for Release</h3>
+
+<p>To prepare your application for release, you must first compile it in release mode. 
+In release mode, the Android build tools compile your application as usual, 
+but without signing it with the debug key.  </p>
+
+<p>If you are developing in Eclipse/ADT, right-click the project in the Package 
+pane and select <strong>Android Tools</strong> > <strong>Export Application 
+Package</strong>. You can then specify the file location for the unsigned .apk. 
+Alternatively, you can follow the "Exporting the unsigned .apk" 
+link in the Manifest Editor overview page. </p>
+
+<p>If you are using Ant, all you need to do is specify the build target 
+"release" in the Ant command. For example, if you are running Ant from the 
+directory containing your build.xml file, the command would look like this:</p>
+
+<pre>$ ant release</pre>
+
+<p>The build script compiles the application .apk without signing it. 
+
+<p>Note that you can not release your application unsigned, or signed with the debug key.</p>
+
+<h3 id="cert">Obtaining a Suitable Private Key</h3>
+
+<p>In preparation for signing your application, you must first ensure that 
+you have a suitable private key with which to sign. A suitable private 
+key is one that:</p>
+
+<ul>
+<li>Is in your possession</li>
+<li>Represents the personal, corporate, or organizational entity to be identified 
+with the application</li>
+<li>Has a validity period that exceeds the expected lifespan of the application
+or application suite. A validity period of more than 25 years is recommended. 
+<p>If you plan to publish your application(s) on Android Market, note that a 
+validity period ending after 22 October 2033 is a requirement. You can not upload an
+application if it is signed with a key whose validity expires before that date. 
+</p></li>
+<li>Is not the debug key generated by the Android SDK tools. </li>
+</ul>
+
+<p>The key may be self-signed. If you do not have a suitable key, you must 
+generate one using Keytool. Make sure that you have Keytool available, as described
+in <a href="#setup">Basic Setup</a>.</p>
+
+<p>To generate a self-signed key with Keytool, use the <code>keytool</code>
+command and pass any of the options listed below (and any others, as
+needed). </p>
+
+<p class="warning">Before you run Keytool, make sure to read <a
+href="#secure-key">Securing Your Key</a> for a discussion of how to keep your
+key secure and why doing so is critically important to you and to users. In
+particular, when you are generating your key, you should select strong
+passwords for both the keystore and key.</p>
+
+<table>
+<tr>
+<th>Keytool Option</th>
+<th>Description</th>
+</tr>
+<tr>
+<td><code>-genkey</code></td><td>Generate a key pair (public and private
+keys)</td>
+</tr>
+<tr>
+<td><code>-v</code></td><td>Enable verbose output.</td>
+</tr>
+<tr>
+<td><code>-keystore&nbsp;&lt;keystore-name&gt;.keystore</code></td><td>A name
+for the keystore containing the private key.</td>
+</tr>
+<tr>
+<td><code>-storepass &lt;password&gt;</code></td><td><p>A password for the
+keystore.</p><p>As a security precaution, do not include this option 
+in your command line unless you are working at a secure computer.
+If not supplied, Keytool prompts you to enter the password. In this 
+way, your password is not stored in your shell history.</p></td>
+</tr>
+<tr>
+<td><code>-alias &lt;alias_name&gt;</code></td><td>An alias for the key.</td>
+</tr>
+<tr>
+<td><code>-keyalg &lt;alg&gt;</code></td><td>The encryption algorithm to use 
+when generating the key.</td>
+</tr>
+<tr>
+<td><code>-dname &lt;name&gt;</code></td><td><p>A Distinguished Name that describes
+who created the key. The value is used as the issuer and subject fields in the
+self-signed certificate. </p><p>Note that you do not need to specify this option
+in the command line. If not supplied, Jarsigner prompts you to enter each 
+of the Distinguished Name fields (CN, OU, and so on).</p></td>
+</tr>
+<tr>
+<td><code>-validity &lt;valdays&gt;</code></td><td><p>The validity period for the
+key, in days. </p><p><strong>Note:</strong> A value of 9500 or greater is recommended.</p></td>
+</tr>
+<tr>
+<td><code>-keypass &lt;password&gt;</code></td><td><p>The password for the key.</p>
+<p>As a security precaution, do not include this option 
+in your command line unless you are working at a secure computer.
+If not supplied, Keytool prompts you to enter the password. In this 
+way, your password is not stored in your shell history.</p></td>
+</tr>
+</table>
+
+
+<p>Here's an example of a Keytool command that generates a private key:</p>
+
+<pre>$ keytool -genkey -v -keystore my-release-key.keystore 
+-alias alias_name -keyalg RSA -validity 9500</pre>
+
+<p>Running the example command above, Keytool prompts you to provide
+passwords for the keystore and key, and to provide the Distinguished
+Name fields for your key. It then generates the keystore as a file called
+<code>my-release-key.keystore</code>. The keystore and key are 
+protected by the passwords you entered. The keystore contains 
+a single key, valid for 9500 days. The alias is a name that you &mdash;
+will use later, to refer to this keystore when signing your application. </p>
+
+<p>For more information about Keytool, see the documentation at
+<a
+href="http://java.sun.com/j2se/1.5.0/docs/tooldocs/#security">
+http://java.sun.com/j2se/1.5.0/docs/tooldocs/#security</a></p>
+
+<h3>Signing Your Application</h3>
+
+<p>When you are ready to actually sign your .apk for release, you can do so
+using the Jarsigner tool. Make sure that you have Jarsigner available on your
+machine, as described in <a href="#setup">Basic Setup</a>. Also, make sure that
+the keystore containing your private key is  available.</p>
+
+<p>To sign your application, you run Jarsigner, referencing both the
+application's .apk and the keystore containing the private key with which to
+sign the .apk. The table below shows the options you could use. <p>
+
+<table>
+<tr>
+<th>Jarsigner Option</th>
+<th>Description</th>
+</tr>
+<tr>
+<td><code>-keystore&nbsp;&lt;keystore-name&gt;.keystore</code></td><td>The name of
+the keystore containing your private key.</td>
+</tr>
+<tr>
+<td><code>-verbose</code></td><td>Enable verbose output.</td>
+</tr>
+<tr>
+<td><code>-storepass &lt;password&gt;</code></td><td><p>The password for the
+keystore. </p><p>As a security precaution, do not include this option 
+in your command line unless you are working at a secure computer.
+If not supplied, Jarsigner prompts you to enter the password. In this 
+way, your password is not stored in your shell history.</p></td>
+</tr>
+<tr>
+<td><code>-keypass &lt;password&gt;</code></td><td><p>The password for the private
+key. </p><p>As a security precaution, do not include this option 
+in your command line unless you are working at a secure computer.
+If not supplied, Jarsigner prompts you to enter the password. In this 
+way, your password is not stored in your shell history.</p></td>
+</tr>
+</table>
+
+<p>Here's how you would use Jarsigner to sign an application package called
+<code>my_application.apk</code>, using the example keystore created above. 
+</p>
+
+<pre>$ jarsigner -verbose -keystore my-release-key.keystore 
+my_application.apk alias_name</pre>
+
+<p>Running the example command above, Jarsigner prompts you to provide
+passwords for the keystore and key. It then modifies the APK 
+in-place, meaning the .apk is now signed. Note that you can sign an 
+APK multiple times with different keys.</p>
+
+<p>To verify that your .apk is signed, you can use a command like this:</p>
+
+<pre>$ jarsigner -verify my_signed.apk</pre>
+
+<p>If the .apk is signed properly, Jarsigner prints "jar verified". 
+If you want more details, you can try one of these commands:</p>
+
+<pre>$ jarsigner -verify -verbose my_application.apk</pre>
+
+<p>or</p>
+
+<pre>$ jarsigner -verify -verbose -certs my_application.apk</pre>
+
+<p>The command above, with the <code>-certs</code> option added, will show you the 
+"CN=" line that describes who created the key.</p>
+
+<p class="note">Note: if you see "CN=Android Debug", this means the .apk was
+signed with the debug key generated by the Android SDK. If you intend to release
+your application, you must sign it with your private key instead of the debug
+key.</p>
+
+<p>For more information about Jarsigner, see the documentation at
+<a href="http://java.sun.com/j2se/1.5.0/docs/tooldocs/#security">
+http://java.sun.com/j2se/1.5.0/docs/tooldocs/#security</a></p>
+
+<h3 id="secure-key">Securing Your Private Key</h3>
+
+<p>Maintaining the security of your private key is of critical importance, both
+to you and to the user. If you allow someone to use your key, or if you leave
+your keystore and passwords in an unsecured location such that a third-party
+could find and use them, your authoring identity and the trust of the user
+are compromised. </p>
+
+<p>If a third party should manage to take your key without your knowledge or 
+permission, that person could sign and distribute applications that maliciously
+replace your authentic applications or corrupt them. Such a person could also
+sign and distribute applications under your identity that attack other 
+applications or the system itself, or corrupt or steal user data. </p>
+
+<p>Your reputation as a developer entity depends on your securing your private
+key properly, at all times, until the key is expired. Here are some tips for
+keeping your key secure: </p>
+
+<ul>
+<li>Select strong passwords for the keystore and key.</li>
+<li>When you generate your key with Keytool, <em>do not</em> supply the 
+<code>-storepass</code> and <code>-keypass</code> options at the command line. 
+If you do so, your passwords will be available in your shell history, 
+which any user on your computer could access.</li>
+<li>Similarly, when signing your applications with Jarsigner, 
+<em>do not</em> supply the <code>-storepass</code> and <code>-keypass</code> 
+options at the command line. </li>
+<li>Do not give or lend anyone your private key, and do not let unauthorized
+persons know your keystore and key passwords.</li>
+</ul>
+
+<p>In general, if you follow common-sense precautions when generating, using,
+and storing your key, it will remain secure. </p>
+
+<h2>Expiry of the Debug Certificate</h2>
+
+<p>The self-signed certificate used to sign your application in debug mode (the default on 
+Eclipse/ADT and Ant builds) will have an expiration date of 365 days from its creation date.</p>
+
+<p>When the certificate expires, you will get a build error. On Ant builds, the error 
+looks like this:</p>
+
+<pre>debug:
+[echo] Packaging bin/samples-debug.apk, and signing it with a debug key...
+[exec] Debug Certificate expired on 8/4/08 3:43 PM</pre>
+
+<p>In Eclipse/ADT, you will see a similar error in the Android console.</p>
+
+<p>To fix this problem, simply delete the <code>debug.keystore</code> file. On Linux/Mac OSX, 
+the file is stored in <code>~/.android</code>. OOn Windows XP, the file is stored in <code>
+C:\Documents and Settings\&lt;user&gt;\Local Settings\Application Data\Android</code>. 
+On Windows Vista, the file is stored in <code>
+C:\Users\&lt;user&gt;\AppData\Local\Android</code>.</p>
+
+<p>The next time you build, the build tools will regenerate a new keystore and debug key.</p>
+
+<p>Note that, if your development machine is using a non-Gregorian locale, the build 
+tools may erroneously generate an already-expired debug certificate, so that you get an 
+error when trying to compile your application. For workaround information, see the 
+troubleshooting topic <a href="{@docRoot}kb/troubleshooting.html#signingcalendar">
+I&nbsp;can't&nbsp;compile my app because the build tools generated an expired debug 
+certificate</a>. </p>
\ No newline at end of file
diff --git a/docs/html/guide/developing/debug-tasks.jd b/docs/html/guide/developing/debug-tasks.jd
new file mode 100644
index 0000000..6b7c27a
--- /dev/null
+++ b/docs/html/guide/developing/debug-tasks.jd
@@ -0,0 +1,207 @@
+page.title=Debugging Tasks
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+  <h2>In this document</h2>
+  <ol>
+    <li><a href="#tools">Tools</a></li>
+    <li><a href="#additionaldebugging">Debug and Test Settings</a></li>
+    <li><a href="#toptips">Top Debugging Tips</a></li>
+    <li><a href="#ide-debug-port">Configuring Your IDE to Attach to the Debugging Port</a></li>
+  </ol>
+</div>
+</div>
+
+<p>This document offers some helpful guidance to debugging applications on Android.
+
+
+<h2 id="tools">Tools</h2>
+<p>The Android SDK includes a fairly extensive set of tools to help you debug your programs: </p>
+<ul>
+    <li><a href="{@docRoot}guide/developing/tools/ddms.html"><strong>DDMS</strong></a> - A graphical program that
+        supports port forwarding (so you can set up breakpoints in your code in your
+        IDE), screen captures on the emulator, thread and stack information,
+        and many other features. You can also run logcat to retrieve your Log messages.
+        See the linked topic for more information. </li>
+    <li><strong><a href="{@docRoot}guide/developing/tools/ddms.html#logcat">logcat</a></strong> - Dumps a log of system
+        messages. The messages include a stack trace when the emulator throws an error,
+        as well as Log messages. To run logcat, see the linked topic.
+        
+    <pre>...
+I/MemoryDealer( 763): MemoryDealer (this=0x54bda0): Creating 2621440 bytes heap at 0x438db000
+<span style="background-color:#CCCCCC; border-bottom:medium">I/Logger( 1858): getView() requesting item number 0
+I/Logger( 1858): getView() requesting item number 1
+I/Logger( 1858): getView() requesting item number 2</span>
+D/ActivityManager( 763): Stopping: HistoryRecord{409dbb20 com.android.home.AllApps}
+...</pre>
+
+    </li>
+    <li><p><strong>{@link android.util.Log Android Log}</strong>- A logging
+        class to print out messages to a log file on the emulator. You can read messages
+        in real time if you run logcat on DDMS (covered next). Add a few logging
+        method calls to your code.</p>
+        <p>To use the <code>Log</code> class, you just call <code>Log.v()</code>
+        (verbose), <code>Log.d()</code> (debug), <code>Log.i()</code> (information), 
+        <code>Log.w()</code> (warning) or <code>Log.e</code> (error) depending
+        on the importance you wish to assign the log message.</p>
+                <code>Log.i(&quot;MyActivity&quot;, &quot;MyClass.getView()
+                &mdash; Requesting item number &quot; + position)</code>
+        <p>You can use logcat to read these messages</p></li>
+    <li><strong><a href="{@docRoot}guide/developing/tools/traceview.html">Traceview</a> </strong>- Android can save
+        a log of method calls and times to a logging file that you can view in a
+        graphical reader called Traceview. See the linked topic for more information. </li>
+</ul>
+<ul>
+    <li><a href="{@docRoot}guide/developing/eclipse-adt.html"><strong>Eclipse plugin</strong></a> - The ADT Plugin
+        for Eclipse integrates a number of these tools (ADB, DDMS, logcat output,
+    and other functionality). See the linked topic for more information. </li>
+    <li><strong>Debug and Test Device Settings</strong> - Android exposes several settings
+        that expose useful information such as CPU usage and frame rate. See <a href="#additionaldebugging">Debug
+        and Test Settings on the Emulator</a> below. </li>
+</ul>
+<p>Also, see the <a href="{@docRoot}guide/appendix/faq/troubleshooting.html">Troubleshooting</a> section
+    of the doc to figure out why your application isn't appearing on the emulator,
+    or why it's not starting. </p>
+
+
+<h2 id="additionaldebugging">Debug and Test Settings</h2>
+
+<p>With the <strong>Dev Tools</strong> application, you can turn on a number of settings that will make it easier to test
+    and debug your applications. To get to the development settings page on the emulator, launch the
+    <strong>Dev Tools</strong> application and open <strong>Development Settings</strong>.
+    This will open the development settings page with the following options (among
+    others):</p>
+<ul>
+    <li><strong>Debug app</strong>&nbsp;&nbsp;&nbsp;Selects the application that
+        will be debugged. You do not need to set this to attach a debugger, but setting
+        this value has two effects:
+        <ul>
+                <li>It will prevent Android from throwing an error if you pause on
+                    a breakpoint for a long time while debugging.</li>
+            <li>It will enable you to select the <em>Wait for Debugger</em> option
+                to pause application startup until your debugger attaches (described
+                next). </li>
+        </ul>
+    </li>
+    <li><strong>Wait for debugger </strong> &nbsp;&nbsp;
+        Blocks the selected application from loading until a debugger attaches. This
+            way you can set a breakpoint in onCreate(), which is important to debug
+            the startup process of an Activity. When you change this option, any
+            currently running instances of the selected application will be killed.
+            In order to check this box, you must have selected a debug application
+            as described in the previous option. You can do the same thing by adding
+            {@link android.os.Debug#waitForDebugger()} to your code. </li>
+    <li><strong>Immediately destroy activities</strong>&nbsp;&nbsp;&nbsp;Tells the
+        system to destroy an activity as soon as it is stopped (as if Android had to
+        reclaim memory).&nbsp; This is very useful for testing the {@link android.app.Activity#onSaveInstanceState}
+        / {@link android.app.Activity#onCreate(android.os.Bundle)} code path, which would
+        otherwise be difficult to force. Choosing this option will probably reveal
+        a number of problems in your application due to not saving state.</li>
+    <li><strong>Show screen updates</strong>&nbsp;&nbsp;&nbsp;
+        Flashes a momentary pink rectangle on any screen sections that are being
+            redrawn. This is very useful for discovering unnecessary screen drawing. </li>
+    <li><strong>Show CPU usage</strong>&nbsp;&nbsp;&nbsp;Displays CPU meters at the
+        top of the screen, showing how much the CPU is being used. The top red bar
+        shows overall CPU usage, and the green bar underneath it shows the CPU time
+        spent in compositing the screen. <em>Note: You cannot turn this feature off
+        once it is on, without restarting the emulator.</em> </li>
+    <li><strong>Show background</strong>&nbsp;&nbsp;&nbsp;Displays a background pattern
+        when no activity screens are visible. This typically does not happen, but
+        can happen during debugging. </li>
+</ul>
+<p>These settings will be remembered across emulator restarts. </p>
+
+<h2 id="toptips">Top Debugging Tips</h2>
+<!--
+<ul>
+    <li><a href="#stackdump">Quick stack dump</a></li>
+    <li><a href="#displayinfo">Displaying useful info on the emulator screen </a></li>
+    <li><a href="#dumpstate">Getting system state information from the emulator (dumpstate)</a></li>
+    <li><a href="#dumpsys">Getting application state information from the emulator (dumpsys)</a></li>
+    <li><a href="#radioinfo">Getting wireless connectivity information</a></li>
+    <li><a href="#loggingdata">Logging Trace Data</a></li>
+    <li><a href="#logradio">Logging  Radio Data </a></li>
+    <li><a href="#adb">Running adb</a></li>
+    <li><a href="#screencaps">Getting screen captures from the emulator</a></li>
+    <li><a href="#debughelpers">Using debug helper classes</a></li>
+</ul>
+-->
+<dl>
+<dt>Quick stack dump <a name="stackdump" id="stackdump"></a></dt>
+<dd>To obtain a stack dump from emulator, you can log
+in with <code>adb shell</code>, use &quot;ps&quot; to find the process you
+want, and then &quot;kill -3 &quot;. The stack trace appears in the log file.
+</dd>
+
+<dt>Displaying useful info on the emulator screen<a name="displayinfo" id="displayinfo"></a></dt>
+<dd>The device can display useful information such as CPU usage or highlights
+around redrawn areas. Turn these features on and off in the developer settings
+window as described in <a href="#additionaldebugging">Setting debug and test
+configurations on the emulator</a>.
+</dd>
+
+<dt>Getting system state information from the emulator (dumpstate)<a name="dumpstate" id="dumpstate"></a> </dt>
+<dd>You can access dumpstate information from the Dalvik Debug Monitor Service
+tool. See <a href="{@docRoot}guide/developing/tools/adb.html#dumpsys">dumpsys and
+dumpstate</a> on the adb topic page.</dd>
+
+<dt>Getting application state information from the emulator (dumpsys)<a name="dumpsys" id="dumpsys"></a></dt>
+<dd>You can access dumpsys information from the Dalvik Debug Monitor Service
+tool. See <a href="{@docRoot}guide/developing/tools/adb.html#dumpsys">dumpsys and
+dumpstate</a> on the adb topic page.</dd>
+
+<dt>Getting wireless connectivity information <a name="radioinfo" id="radioinfo"></a></dt>
+<dd>You can get information about wireless connectivity using the Dalvik Debug
+Monitor Service tool. From the <strong>Device</strong> menu, select &quot;Dump
+radio state&quot;.</dd>
+
+<dt>Logging Trace Data<a name="loggingdata" id="loggingdata"></a></dt>
+<dd>You can log method calls and other tracing data in an activity by calling
+android.os.Debug.startMethodTracing(). See <a
+href="{@docRoot}guide/developing/tools/traceview.html">Running the Traceview Debugging
+Program</a> for details. </dd>
+
+<dt>Logging Radio Data<a name="logradio" id="logradio"></a></dt>
+<dd>By default, radio information is not logged to the system (it is a lot of
+data). However, you can enable radio logging using the following commands:
+
+<pre>
+adb shell
+logcat -b radio
+</pre>
+</dd>
+
+<dt>Running adb<a name="adb" id="adb"></a></dt>
+<dd>Android ships with a tool called adb that provides various capabilities, including
+moving and syncing files to the emulator, forwarding ports, and running a UNIX
+shell on the emulator. See <a href="{@docRoot}guide/developing/tools/adb.html">Using adb</a> for details.</dd>
+
+<dt>Getting screen captures from the emulator<a name="screencaps" id="screencaps"></a></dt>
+<dd> Dalvik Debug Monitor Server (DDMS) can capture screenshots from the emulator.</dd>
+
+
+<a name="debughelpers"></a>
+
+<dt>Using debugging helper classes</dt>
+
+<dd>Android provides debug helper classes such as {@link android.util.Log
+    util.Log} and {@link android.os.Debug} for your convenience. </dd>
+</dl>
+
+<h2 id="ide-debug-port">Configuring Your IDE to Attach to the Debugging Port</h2>
+
+<p>DDMS will assign a specific debugging port to every virtual machine that it
+    finds on the emulator. You must either attach your IDE to that
+    port (listed on the Info tab for that VM), or you can use a default port 8700
+    to connect to whatever application is currently selected on the list of discovered
+    virtual machines.</p>
+<p>Your IDE should attach to your application running on the emulator, showing you
+    its threads and allowing you to suspend them, inspect their state, and set breakpoints.
+    If you selected &quot;Wait for debugger&quot; in the Development settings panel
+    the application will run when Eclipse connects, so you will need to set any breakpoints
+    you want before connecting.</p>
+<p>Changing either the application being debugged or the &quot;Wait for debugger&quot;
+    option causes the system to kill the selected application if it is currently
+        running. You can use this to kill your application if it is in a bad state
+        by simply going to the settings and toggling the checkbox.</p>
diff --git a/docs/html/guide/developing/device.jd b/docs/html/guide/developing/device.jd
new file mode 100644
index 0000000..35c0a1a
--- /dev/null
+++ b/docs/html/guide/developing/device.jd
@@ -0,0 +1,163 @@
+page.title=Developing on a Device
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+  <h2>In this document</h2>
+  <ol>
+    <li><a href="#devices">Available Devices</a>
+      <ol>
+        <li><a href="#g1">T-Mobile G1</a></li>
+        <li><a href="#dev-phone-1">Android Dev Phone 1</a></li>
+      </ol>
+    </li>
+    <li><a href="#setting-up">Setting up a Device for Development</a></li>
+  </ol>
+</div>
+</div>
+
+<p>When building mobile applications, it's vital to test them on real
+devices prior to releasing them to users. This page covers what you need to know, 
+including the types of devices that you can use, and how to set one up for
+developing and debugging.</p>
+
+
+<h2 id="devices">Available Devices</h2>
+<p>While developers can use regular
+consumer devices purchased at retail to test and use their apps, some developers
+may choose not to use a retail device, preferring an unlocked or no-contract
+device. Here are some options for obtaining devices capable of testing your applications.</p>
+
+
+<h3 id="g1">T-Mobile G1</h3>
+
+<p>The T-Mobile G1 device makes an excellent development device. You can write
+applications in the SDK and install them on the G1, then run them as users
+would, using the same hardware, system, and network.</p>
+
+<p>For more information about obtaining a G1, visit the <a
+href="http://www.t-mobileg1.com">T-Mobile G1 site</a>. </p>
+
+
+<h3 id="dev-phone-1">Android Dev Phone 1</h3>
+
+<div class="sidebox-wrapper">
+<div class="sidebox-inner">
+<p>Selected specs for Android Dev Phone 1:</p>
+<ul>
+<li>Touch screen</li>
+<li>Trackball</li>
+<li>3.2 megapixel camera with autofocus</li>
+<li>Wi-Fi</li>
+<li>GPS-enabled</li>
+<li>Bluetooth v2.0
+    <ul><li>Handsfree profile v1.5</li>
+        <li>Headset profile v1.0</li></ul></li>
+<li>3G WCDMA (1700/2100 MHz)</li>
+<li>Quad-band GSM (850/900/1800/1900 MHz)</li>
+<li>QWERTY slider keyboard</li>
+<li>Includes 1GB MicroSD card (can be replaced with up to 16GB card)</li>
+</ul>
+</div> 
+</div>
+<p>The Android Dev Phone 1 is a SIM-unlocked and hardware-unlocked device that
+is designed for advanced developers. The device ships with a system image that
+is fully compatible with Android 1.0, so you can rely on it when developing your
+applications. You can use any SIM in the device and can flash custom Android
+builds that will work with the unlocked bootloader. Unlike the bootloader on
+retail devices, the bootloader on the Android Dev Phone 1 does not enforce
+signed system images. The Android Dev Phone 1 should also appeal to developers 
+who live outside of T-Mobile geographies. </p>
+
+<p>To purchase an Android Dev Phone 1 device, you must first register as an
+Android developer on the Android Market site, if you haven't done so already.
+Once you've logged into your developer account on Android Market, you can
+purchase the device by following the link to "Development phones." To accommodate demand,
+there is a limit of 1 device per developer account, for now.</p>
+
+<p>The device currently costs $399 (USD) (including free shipping in the US),
+and is available for purchase in 18 international markets, including the
+US, UK, Germany, Japan, India, Canada, France, Taiwan, Spain, Australia,
+Singapore, Switzerland, Netherlands, Austria, Sweden, Finland, Poland, and
+Hungary.  We will continue to expand this program into new geographies over
+time.  Check this page for updated information.</p>
+
+<p>Note that Android Dev Phone 1 devices are <em>not</em> intended for
+non-developer end-users. Because the device can be configured with system
+software not provided by or supported by Google or any other company, end-users
+operate these devices at their own risk.</p>
+
+<p>For full device specs and more information about obtaining an Android Dev 
+Phone 1 device, see the <a href="http://market.android.com/publish">Android 
+Market</a> site.</p>
+
+
+<h2 id="setting-up">Setting up a Device for Development</h2>
+
+<p>With a T-mobile G1 or Android Dev Phone 1, you can develop and debug your Android applications just as you
+would on the emulator. There are just a few things to do before you can start.</p>
+<ol>
+  <li>Declare your application as "debuggable" in your Android Manifest.
+    <p>In Eclipse, you can do this from the <b>Application</b> tab when viewing the Manifest
+    (on the right side, set <b>Debuggable</b> to <em>true</em>). Otherwise, in the <code>AndroidManifest.xml</code>
+
+    file, add <code>android:debuggable="true"</code> to the <code>&lt;application></code> element.</p>
+  </li>
+  <li>Turn on "USB Debugging" on your device.
+    <p>On the device, go to the home screen, press <b>MENU</b>, select <b>Applications</b> > <b>Development</b>,
+    then enable <b>USB debugging</b>.</p>
+
+  </li>
+  <li>Setup your system to detect your device.
+    <ul>
+      <li>If you're developing on 32-bit Windows, you need to install the 32-bit USB driver for adb. 
+      The USB driver is included in the SDK package. To install it, follow these steps:</p>
+        <ol>
+          <li>Connect your Android device via USB. When the <em>Found New Hardware Wizard</em> appears, 
+          you'll be asked if you'd like Windows Update to search for software. Select <em>No, not this 
+          time</em> and click <b>Next</b>.</li>
+
+          <li>Select <em>Install from a list or specified location</em> and click <b>Next</b>.</li>
+          <li>Select <em>Search for the best driver in these locations</em>. Browse to the <code>usb_driver/x86</code> in the SDK package (<code>&lt;sdk&gt;\usb_driver\x86</code>).</li>
+          <li>Click <b>Finish</b>. The system should install the driver files as necessary. Your machine may require a reboot.</li>
+        </ol>
+      </li>
+      <li>If you're developing on 64-bit Windows Vista, you need to install the 64-bit USB driver for adb. 
+      The USB driver is included in the SDK package. To install it, follow these steps:</p>
+        <ol>
+          <li>Connect your Android device via USB. When the <em>Found New Hardware Wizard</em> appears, 
+          you'll be asked if you'd like Windows Update to search for software. Select <em>No, not this 
+          time</em> and click <b>Next</b>.</li>
+
+          <li>Select <em>Install from a list or specified location</em> and click <b>Next</b>.</li>
+          <li>Select <em>Search for the best driver in these locations</em>. Browse to the <code>usb_driver/amd64</code> in the SDK package (<code>&lt;sdk&gt;\usb_driver\amd64</code>).</li>
+          <li>Click <b>Finish</b>. The system should install the driver files as necessary. Your machine may require a reboot.</li>
+        </ol>
+      </li>
+      <li>If you're developing on Mac OS X, it just works. Skip this step.</li>
+      <li>If you're developing on Ubuntu Linux, you need to add a rules file:
+        <ol>
+          <li>Login as root and create this file: <code>/etc/udev/rules.d/50-android.rules</code>.
+            <p>For Gusty/Hardy, edit the file to read: <br/>
+              <code>SUBSYSTEM=="usb", SYSFS{idVendor}=="0bb4", MODE="0666"</code></p>
+
+            <p>For Dapper, edit the file to read: <br/>
+              <code>SUBSYSTEM=="usb_device", SYSFS{idVendor}=="0bb4", MODE="0666"</code></p>
+          </li>
+          <li>Now execute:<br/>
+              <code>chmod a+rx /etc/udev/rules.d/50-android.rules</code>
+          </li>
+        </ol>
+
+      </li>
+    </ul>
+  </li>
+</ol>
+<p>You can verify that your device is connected by executing <code>adb devices</code> from your 
+SDK tools/ directory. If connected, you'll see the device name listed as a "device."</p>
+<p>If using Eclipse, select run or debug as usual. You will be presented
+with a <b>Device Chooser</b> dialog that lists the available emulator(s) and connected device(s).
+Select the device to install and run the application there.</p>
+
+<p>If using the <a href="{@docRoot}guide/developing/tools/adb.html">Android Debug Bridge</a> (adb), 
+you can issue commands with the <code>-d</code> flag to target your connected device.</p>
diff --git a/docs/html/guide/developing/eclipse-adt.jd b/docs/html/guide/developing/eclipse-adt.jd
new file mode 100644
index 0000000..8c482ee
--- /dev/null
+++ b/docs/html/guide/developing/eclipse-adt.jd
@@ -0,0 +1,193 @@
+page.title=In Eclipse, with ADT
+@jd:body
+
+<p>The Android Development Tools (ADT) plugin for Eclipse adds powerful extensions to the Eclipse integrated development environment. It allows you to create and debug Android applications easier and faster. If you use Eclipse, the ADT plugin gives you an incredible boost in developing Android applications:</p>
+
+<ul>
+  <li>It gives you access to other Android development tools from inside the Eclipse IDE. For example, ADT lets you access the many capabilities of the DDMS tool: take screenshots, manage port-forwarding, set breakpoints, and view thread and process informationd irectly from Eclipse.</li>
+  <li>It provides a New Project Wizard, which helps you quickly create and set up all of the basic files you'll need for a new Android application.</li>
+  <li>It automates and simplifies the process of building your Android application.</li>
+  <li>It provides an Android code editor that helps you write valid XML for your Android manifest and resource files.</li>
+</ul>
+
+<p>To begin developing Android applications in the Eclipse IDE with ADT, you first need to download the Eclipse IDE and then download and install the ADT plugin. To do so, follow the steps given in <a href="{@docRoot}sdk/1.1_r1/installing.html#installingplugin">Installing the ADT Plugin</a>, in the installation documentation included with your SDK package. </p>
+
+<p>Once you've installed the ADT plugin, you begin by creating an Android 
+project and then set up a launch configuration. After that, you can write, run, and debug 
+your application.  </p>
+
+<p>The sections below provide instructions assuming that you have installed the ADT plugin 
+in your Eclipse environment. If you haven't installed the ADT plugin, you should do that 
+before using the instructions below. </p>
+
+<a name="creatingaproject" id="creatingaproject"></a>
+
+<h2>Creating an Android Project</h2>
+
+<p>The ADT plugin provides a New Project Wizard that you can use to quickly create an 
+Eclipse project for new or existing code. To create the project, follow these steps:</p>
+
+<a name="existingcode"></a>
+
+<ol>
+    <li>Select <strong>File</strong> &gt; <strong>New</strong> &gt; <strong>Project</strong></li>
+    <li>Select <strong>Android</strong> &gt; <strong>Android Project</strong>, and press <strong>Next</strong></li>
+    <li>Select the contents for the project:
+		<ul>
+			<li>Select <strong>Create new project in workspace</strong> to start a project for new code. 
+			<p>Enter the project name, the base package name, the name of a single Activity class to create as a stub .java file, and a name to use for your application.</p></li>
+			<li>Select <strong>Create project from existing source</strong> to start a project from existing code. Use this option if you want to build and run any of the sample applications included with the SDK. The sample applications are located in the samples/ directory in the SDK. 
+                        <p>Browse to the directory containing the existing source code and click OK. If the directory contains a valid Android manifest file, the ADT plugin fills in the package, activity, and application names for you.</p>
+                        </li>
+                </ul>
+    </li>
+    <li>Press <strong>Finish</strong>.</li>
+</ol>
+
+<p>The ADT plugin creates the these folders and
+        files for you as appropriate for the type of project:</p>
+
+        <ul>
+            <li>src/&nbsp;&nbsp;&nbsp;A
+                folder that includes your stub .java Activity file.</li>
+            <li>res/&nbsp;&nbsp;&nbsp;A folder for your
+                resources.</li>
+            <li>AndroidManifest.xml&nbsp;&nbsp;&nbsp;The
+                manifest for your project.   </li>
+        </ul>
+
+</ol>
+
+<a name="launchconfig" id="launchconfig"></a>
+
+<h2>Creating a Launch Configuration </h2>
+
+<p>Before you can run and debug your application in Eclipse, you must create a launch configuration for it. A launch configuration specifies the project to launch, the Activity to start, the emulator options to use, and so on. </p>
+
+<p>To create a launch configuration for the application, follow these steps as appropriate for your Eclipse version:</p>
+
+<ol>
+
+    <li>Open the launch configuration manager.
+         <ul>
+            <li>In Eclipse 3.3 (Europa), select <strong>Run </strong>&gt; 
+              <strong>Open Run Dialog... </strong>or <strong>Run </strong>&gt; 
+              <strong>Open Debug Dialog... </strong>as appropriate.
+            </li>
+            <li>In Eclipse 3.4 (Ganymede), select <strong>Run </strong>&gt; 
+              <strong>Run Configurations... </strong>or <strong>Run </strong>&gt; 
+              <strong>Debug Configurations... </strong>as appropriate.
+            </li>
+        </ul>
+    </li>
+    <li>In the project type list on the left, locate the <strong> Android Application</strong> item and double-click it (or right-click &gt; <strong>New</strong>), to create a new launch configuration.</li>
+    <li>Enter a name for your configuration.</li>
+    <li>On the Android tab, browse for the project and Activity to start.</li>
+    <li>On the Target tab, set the desired screen and network properties, as well as any other <a href="{@docRoot}guide/developing/tools/emulator.html#startup-options">emulator startup options</a>.</li>
+    <li>You can set additional options on the Common tab as desired.</li>
+	<li>Press <strong>Apply</strong> to save the launch configuration, or press <strong>Run</strong> or <strong>Debug</strong> (as appropriate).</li>
+
+</ol>
+
+
+<h2 id="sign_in_adt">Setting Up Application Signing</h2>
+
+<p>As you begin developing Android applications, you should understand that all
+Android applications must be digitally signed before the system will install
+them on the emulator or an actual device. </p>
+
+<p>The ADT plugin helps you get started quickly by signing your .apk files with
+a debug key, prior to installing them on the emulator. This means that you can
+compile your application and install it on the emulator without having to
+generate your own private key. However, please note that if you intend to
+publish your application, you <em>must</em> sign the application with your own
+private key, rather than the debug key generated by the SDK tools. </p>
+
+<p>To sign your applications, the ADT plugin requires the Keytool utility
+included in the JDK. To set up your development environment for
+signing, you need to make sure that Keytool is available on your
+machine that the ADT plugin knows how to find it. </p>
+
+<p>In most cases, you can tell the SDK build tools how to find Keytool by making
+sure that your JAVA_HOME environment variable is set and that it references a 
+suitable JDK. Alternatively, you can add the JDK version of Keytool to your 
+PATH variable.</p>
+
+<p>If you are developing on a version of Linux that originally came with Gnu
+Compiler for Java, make sure that the system is using the JDK version of
+Keytool, rather than the gcj version. If keytool is already in your PATH, it
+might be pointing to a symlink at /usr/bin/keytool. In this case, check the
+symlink target to make sure that it points to the keytool in the JDK.</p>
+
+<p>In all cases, please read and understand <a
+href="{@docRoot}guide/publishing/app-signing.html">Signing Your
+Applications</a>, which provides an overview of application signing on Android
+and what it means to you as an Android application developer. </p>
+
+
+<a name="installingrunningdebugging" id="installingrunningdebugging"></a>
+
+<h2>Running and Debugging an Application</h2>
+
+<p>Once you've set up the project and launch configuration for your application, you can run or debug it as described below.</p>
+
+From the Eclipse main menu, select <strong>Run</strong> &gt; <strong>Run</strong> or <strong>Run</strong> &gt; <strong>Debug</strong> as appropriate, to run or debug the active launch configuration. </li>
+
+<p>Note that the active launch configuration is the one most recently selected in the Run configuration manager. It does not necessarily correspond to the application that is selected in the Eclipse Navigation pane (if any).</p>
+
+<p>To set or change the active launch configuration, use the launch configuration manager. See <a href="#launchconfig">Creating a Launch Configuration</a> for information about how to access the launch configuration manager.</strong>.</p>
+
+<p>Running or debugging the application triggers these actions:</p>
+<ul><li>Starts the emulator, if it is not already running. </li>
+                    <li>Compiles the project, if there have been changes since the last build, and installs the application on the emulator. </li>
+                    <li><strong>Run</strong> starts the application. </li>
+            		<li><strong>Debug</strong> starts the application in "Wait for debugger" mode, then opens the Debug perspective and attaches the Eclipse Java debugger to the application.</li>
+
+        </ul>
+
+
+<h2 id="tips">Eclipse Tips </h2>
+	<h3>Executing arbitrary Java expressions in Eclipse<a name="arbitraryexpressions" id="arbitraryexpressions"></a></h3>
+	<p>You can execute arbitrary code when paused at a breakpoint in Eclipse. For example,
+	    when in a function with a String argument called &quot;zip&quot;, you can get
+	    information about packages and call class methods. You can also invoke arbitrary
+	    static methods: for example, entering <code>android.os.Debug.startMethodTracing()</code> will
+	    start dmTrace. </p>
+	<p>Open a code execution window, select <strong>Window</strong>&gt;<strong>Show
+	        View</strong>&gt;<strong>Display</strong> from the main menu to open the
+	        Display window, a simple text editor. Type your expression, highlight the
+	        text, and click the 'J' icon (or CTRL + SHIFT + D) to run your
+	        code. The code runs in the context of the selected thread, which must be
+	        stopped at a breakpoint or single-step point. (If you suspend the thread
+	        manually, you have to single-step once; this doesn't work if the thread is
+	        in Object.wait().)</p>
+	<p>If you are currently paused on a breakpoint, you can simply highlight and execute
+	    a piece of source code by pressing CTRL + SHIFT + D. </p>
+	<p>You can highlight a block of text within the same scope by pressing ALT +SHIFT
+	    + UP ARROW to select larger and larger enclosing blocks, or DOWN ARROW to select
+	    smaller blocks. </p>
+	<p>Here are a few sample inputs and responses in Eclipse using the Display window.</p>
+	<table width="100%" border="1">
+	    <tr>
+	        <th scope="col">Input</th>
+	        <th scope="col">Response</th>
+	    </tr>
+	    <tr>
+	        <td><code>zip</code></td>
+	        <td><code>(java.lang.String) /work/device/out/linux-x86-debug/android/app/android_sdk.zip</code></td>
+	    </tr>
+	    <tr>
+	        <td><code>zip.endsWith(&quot;.zip&quot;)</code></td>
+	        <td><code>(boolean) true</code></td>
+	    </tr>
+	    <tr>
+	        <td><code>zip.endsWith(&quot;.jar&quot;)</code></td>
+	        <td><code>(boolean) false</code></td>
+	    </tr>
+	</table>
+	<p>You can also execute arbitrary code when not debugging by using a scrapbook page.
+	    Search the Eclipse documentation for &quot;scrapbook&quot;.</p>
+	
+		<h3>Running DDMS Manually</h3>
+
+		<p>Although the recommended way to debug is to use the ADT plugin, you can manually run DDMS and configure Eclipse to debug on port 8700. (<strong>Note: </strong>Be sure that you have first started <a href="{@docRoot}guide/developing/tools/ddms.html">DDMS</a>). </p>
diff --git a/docs/html/guide/developing/index.html b/docs/html/guide/developing/index.html
new file mode 100644
index 0000000..4881acf
--- /dev/null
+++ b/docs/html/guide/developing/index.html
@@ -0,0 +1,8 @@
+<html>
+<head>
+<meta http-equiv="refresh" content="0;url=../index.html">
+</head>
+<body>
+<a href="../index.html">click here</a> if you are not redirected.
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/html/guide/developing/other-ide.jd b/docs/html/guide/developing/other-ide.jd
new file mode 100644
index 0000000..7bcb509
--- /dev/null
+++ b/docs/html/guide/developing/other-ide.jd
@@ -0,0 +1,167 @@
+page.title=In Other IDEs
+@jd:body
+
+<p>The recommended way to develop an Android application is to use 
+        <a href="{@docRoot}guide/developing/eclipse-adt.html">Eclipse with the Android
+        Development Tools (ADT) plugin</a>, provided in the SDK. The ADT plugin 
+        provides editing, building,and debugging functionality integrated right into the IDE. </p>
+
+<p>However, if you'd rather develop your application in another IDE, such as IntelliJ, 
+        or use Eclipse without the ADT plugin, you can do that instead. The SDK
+	provides the tools you need to set up, build, and debug your application. 
+ </p>
+
+
+<h2>Creating an Android Project </h2>
+
+<p>The Android SDK includes <code>activityCreator</code>, a program that generates a number of stub files for your project, as well as a build file. You can use the program to create an Android project for new code or from existing code, such as the sample applications included in the SDK. For Linux and Mac, the SDK provides <code>activitycreator</code> and for Windows, <code>activityCreator.bat</code>, a batch script. Regardless of platform, you can use <code>activitycreator</code> in the same way. </p>
+
+<p>To run <code>activityCreator</code> and create an Android project, follow these steps:</p>
+
+<ol>
+    <li> In the command line, change to the <code>tools/</code> directory of the SDK and create a new directory for your project files. If you are creating a project from existing code, change to the root folder of your application instead. </li>
+
+    <li><p>Run <code>activityCreator</code>. In the command, you must specify a fully-qualified class name as an argument. If you are creating a project for new code, the class represents the name of a stub class that the script will create. If you are creating a project from existing code, you must specify the name of one Activity class in the package. Command options for the script include:
+<ul>
+	<li><code>--out &lt;folder&gt;</code> which sets the output directory. By default, the output directory is the current directory. If you created a new directory for your project files, use this option to point to it. </li>
+	<li><code>--ide intellij</code>, which generates IntelliJ IDEA project files in the newly created project</li>
+</ul>
+</li>
+</ol>
+
+<p>Here's an example:</p>	
+<pre>
+~/android_linux_sdk/tools $ ./activityCreator.py --out myproject your.package.name.ActivityName
+package: your.package.name
+out_dir: myproject
+activity_name: ActivityName
+~/android_linux_sdk/tools $ </pre>
+
+<p>The <code>activityCreator</code> script generates the following files and directories (but will not overwrite existing ones):</p>
+
+<ul>
+    <li><code>AndroidManifest.xml</code> The application manifest file, synced to the specified Activity class for the project.</li>
+    <li><code>build.xml</code> An <code>Ant</code> file that you can use to build/package the application.</li>
+    <li><code>src<em>/your/package/name/ActivityName</em>.java</code>&nbsp;The Activity class you specified on input.</li>
+    <li><code><em>your_activity</em>.iml, <em>your_activity</em>.ipr, 
+        <em>your_activity</em>.iws&nbsp;&nbsp;&nbsp;</code> [<em>only
+            with the <code>-ide intelliJ</code> flag</em>] intelliJ project
+            files. </li>
+    <li><code>res/</code> &nbsp;&nbsp;A directory to hold resources. </li>
+    <li><code>src/</code> &nbsp;&nbsp;&nbsp;The source directory.
+    <li><code>bin/</code> &nbsp;&nbsp;&nbsp;The output directory for the build script.</li>
+</ul>
+
+<p>You can now move your folder wherever you want for development, but keep in mind
+    that you'll have to use the <a href="{@docRoot}guide/developing/tools/adb.html">adb</a> program in the <code>tools/</code> folder to
+    send files to the emulator, so you'll need access between your solution and 
+    the <code>tools/</code> folder. </p>
+
+<p>Also, you should refrain from moving the
+    location of the SDK directory, since this will break the build scripts (they
+    will need to be manually updated to reflect the new SDK location before they will
+    work again).</p>
+<a name="buidingwithant"></a>
+<h2 id="antbuild">Building the Application with Ant</h2>
+<p>Use the Ant <code>build.xml</code> file generated by 
+   <code>activityCreator</code> to build your application.</p>
+<ol>
+  <li>If you don't have it, you can obtain Ant from the 
+    <a href="http://ant.apache.org/">Apache Ant home page</a>. Install it and make
+    sure it is on your executable path. </li>
+	<li>Before calling Ant, you need to declare the JAVA_HOME environment variable to specify the path to where the JDK is installed.
+        <p class="note"><strong>Note:</strong> When installing JDK on Windows, the default is to install in the "Program Files" directory. This location will cause <code>ant</code> to fail, because of the space. To fix the problem, you can specify the JAVA_HOME variable like this: <code>set JAVA_HOME=c:\Prora~1\Java\<jdkdir></code>. The easiest solution, however, is to install JDK in a non-space directory, for example: <code>c:\java\jdk1.6.0_02</code>. </p>
+        </li>
+	
+
+  <li>If you have not done so already, follow the instructions for Creating a 
+  New Project above to set up the project.</li>
+  <li>You can now run the Ant build file by simply typing ant in the same folder
+  as the build.xml file for your project. Each time you change
+  a source file or resource, you should run ant again and it will package up the
+  latest version of the application for you to deploy.</li>
+</ol>
+
+<h2 id="sign_in_other">Setting Up Application Signing</h2>
+
+<p>As you begin developing Android applications, you should understand that all
+Android applications must be digitally signed before the system will install
+them on the emulator or an actual device. </p>
+
+<p>The Android build tools help you get started quickly by signing your .apk
+files with a debug key, prior to installing them on the emulator. This means
+that you can compile your application and install it on the emulator without
+having to generate your own private key. However, please note that if you intend
+to publish your application, you <em>must</em> sign the application with your
+own private key, rather than the debug key generated by the SDK tools. </p>
+
+<p>To sign your applications, the ADT plugin requires the Keytool utility
+included in the JDK. To set up your development environment for
+signing, all you need to do is make sure that Keytool is available on your
+machine that the build tools know how to find it. </p>
+
+<p>In most cases, you can tell the SDK build tools how to find Keytool by making
+sure that 
+your JAVA_HOME environment variable is set and that it references a suitable
+JDK. Alternatively, 
+you can add the JDK version of Keytool to your PATH variable.</p>
+
+<p>If you are developing on a version of Linux that originally came with Gnu
+Compiler for Java, 
+make sure that the system is using the JDK version of Keytool, rather than the
+gcj version. 
+If keytool is already in your PATH, it might be pointing to a symlink at
+/usr/bin/keytool. 
+In this case, check the symlink target to make sure that it points to the
+keytool in the JDK.</p>
+
+<p>In all cases, please read and understand <a
+href="{@docRoot}guide/publishing/app-signing.html">Signing Your
+Applications</a>, which provides an overview of application signing on Android
+and what it means to you as an Android application developer. </p>
+
+
+<h2>Running an Android Application</h2>
+<p>To run a compiled
+    application, you will upload the .apk file to the <code>/data/app/ </code>directory
+    in the emulator using the <a href="{@docRoot}guide/developing/tools/adb.html">adb</a> tool as described here:</p>
+<ol>
+    <li>Start the emulator (run <code><em>&lt;your_sdk_dir&gt;</em>/tools/emulator</code> from the command line)</li>
+    <li>On the emulator, navigate to the home screen (it is best not to have that
+        application running when you reinstall it on the emulator; press the <strong>Home</strong> key
+    to navigate away from that application).</li>
+    <li>Run <code>adb install <em>myproject</em>/bin/&lt;<em>appname</em>&gt;.apk</code> to upload
+        the executable. So, for example, to install the Lunar Lander sample, navigate
+        in the command line to <code><em>&lt;your_sdk_dir&gt;</em>/sample/LunarLander</code> and type <code>../../tools/adb&nbsp;install&nbsp;bin/LunarLander.apk</code></li>
+    <li>In the emulator, open the list of available applications, and scroll down to
+        select and start your application. </li>
+</ol>
+<p class="note"><strong>Note:</strong> When you install an Activity for the
+        first time, you might have to restart the emulator before it shows up in the
+        application launcher, or other applications can call it. This is because
+        the package manager usually only examines manifests completely on emulator
+        startup.</p>
+
+<h2>Attaching a Debugger to Your Application</h2>
+<p>This section describes how to display debug information on the screen (such
+    as CPU usage), as well as how to hook up your IDE to debug running applications
+    on the emulator. </p>
+
+<p>Attaching a debugger is automated using the Eclipse plugin,
+    but you can configure other IDEs to listen on a debugging port to receive debugging
+    information.</p>
+<ol>
+    <li><strong>Start the <a href="{@docRoot}guide/developing/tools/ddms.html">Dalvik Debug Monitor Server (DDMS)
+                tool </a>, </strong> which
+        acts as a port forwarding service between your IDE and the emulator.</li>
+    <li><strong>Set 
+        optional debugging configurations on
+        your emulator</strong>, such as blocking application startup for an activity
+        until a debugger is attached. Note that many of these debugging options
+        can be used without DDMS, such as displaying CPU usage or screen refresh
+        rate on the emulator.</li>
+    <li><strong>Configure your IDE to attach to port 8700 for debugging.</strong> We
+        include information on <a href="{@docRoot}guide/developing/debug-tasks.html#ide-debug-port">
+        how to set up Eclipse to debug your project</a>. </li>
+
+</ol>
diff --git a/docs/html/guide/developing/tools/aapt.jd b/docs/html/guide/developing/tools/aapt.jd
new file mode 100644
index 0000000..40a209d
--- /dev/null
+++ b/docs/html/guide/developing/tools/aapt.jd
@@ -0,0 +1,20 @@
+page.title=Using aapt
+@jd:body
+
+<p><strong>aapt</strong> stands for Android Asset Packaging Tool and is included in the <code>tools/</code> directory of the SDK. This tool allows you to view, create, and update Zip-compatible archives (zip, jar, apk). It can also compile resources into binary assets.
+</p>
+<p>
+Though you probably won't often use <strong>aapt</strong> directly, build scripts and IDE plugins can utilize this tool to package the apk file that constitutes an Android application.
+</p>
+<p>
+For more usage details, open a terminal, go to the <code>tools/</code> directory, and run the command:
+</p>
+<ul>
+  <li><p>Linux or Mac OS X:</p>
+	<pre>./aapt</pre>
+  </li>
+  <li><p>Windows:</p>
+	<pre>aapt.exe</pre>
+  </li>
+</ul>
+
diff --git a/docs/html/guide/developing/tools/adb.jd b/docs/html/guide/developing/tools/adb.jd
new file mode 100644
index 0000000..b111047
--- /dev/null
+++ b/docs/html/guide/developing/tools/adb.jd
@@ -0,0 +1,699 @@
+page.title=Android Debug Bridge
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+  <h2>ADB quickview</h2>
+  <ul>
+<li>Manage the state of an emulator or device</li>
+<li>Run shell commands on a device</li>
+<li>Manage port forwarding on an emulator or device</li>
+<li>Copy files to/from an emulator or device</li>
+  </ul>
+
+  <h2>In this document</h2>
+  <ol>
+<li><a href="#issuingcommands">Issuing ADB Commands</a></li>
+<li><a href="#devicestatus">Querying for Emulator/Device Instances</a></li>
+<li><a href="#directingcommands">Directing Commands to a Specific Emulator/Device Instance</a></li>
+<li><a href="#move">Installing an Application</a></li>
+<li><a href="#forwardports">Forwarding Ports</a></li>
+<li><a href="#copyfiles">Copying Files to or from an Emulator/Device Instance</a></li>
+<li><a href="#commandsummary">Listing of adb Commands </a></li>
+<li><a href="#shellcommands">Issuing Shell Commands</a></li>
+<li><a href="#logcat">Enabling logcat Logging</a></li>
+<li><a href="#stopping">Stopping the adb Server</a></li>
+  </ol>
+
+  <h2>See also</h2>
+  <ol>
+    <li><a href="emulator.html">Emulator</a></li>
+  </ol>
+
+</div>
+</div>
+
+<!-- 
+<p>Android Debug Bridge (adb) is a versatile tool that </a>. </p>
+
+<p>Some of ways you can use adb include:</p>
+
+<ul>
+
+</ul>
+<p>The sections below introduce adb and describe many of its common uses. </p>
+
+<h2>Contents</h2>
+<dl>
+<dt><a href="#overview">Overview</a></dt>
+<dt><a href="#issuingcommands">Issuing adb Commands</a></dt>
+<dt><a href="#devicestatus">Querying for Emulator/Device Instances</a></dt>
+<dt><a href="#directingcommands">Directing Commands to a Specific Emulator/Device Instance</a></dt>
+<dt><a href="#move">Installing an Application</a></dt>
+<dt><a href="#forwardports">Forwarding Ports</a></dt>
+<dt><a href="#copyfiles">Copying Files to or from an Emulator/Device Instance</a></dt>
+<dt><a href="#commandsummary">Listing of adb Commands </a></dt>
+<dt><a href="#shellcommands">Issuing Shell Commands</a></dt>
+    <dd><a href="#sqlite">Examining sqlite3 Databases from a Remote Shell</a></dd>
+    <dd><a href="#monkey">UI/Application Exerciser Monkey</a></dd>
+	<dd><a href="#othershellcommands">Other Shell Commands</a></dd>
+<dt><a href="#logcat">Enabling logcat Logging</a> </dt>
+	<dd><a href="#usinglogcat">Using logcat Commands</a></dd>
+	<dd><a href="#filteringoutput">Filtering Log Output</a></dd>
+	<dd><a href="#outputformat">Controlling Log Output Format</a></dd>
+	<dd><a href="#alternativebuffers">Viewing Alternative Log Buffers</a></dd>
+	<dd><a href="#stdout">Viewing stdout and stderr</a></dd>
+	<dd><a href="#logcatoptions">Listing of logcat Command Options</a></dd>
+<dt><a href="#stopping">Stopping the adb Server</a> </dt>
+</dl>
+
+<a name="overview"></a>
+
+<h2>Overview</h2>
+-->
+<p>Android Debug Bridge (adb) is a versatile tool lets you manage the state of an emulator instance or Android-powered device. It is a client-server program that includes three components: </p>
+
+<ul>
+  <li>A client, which runs on your development machine. You can invoke a client from a shell by issuing an adb command. Other Android tools such as the ADT plugin and DDMS also create adb clients. </li>
+  <li>A server, which runs as a background process on your development machine. The server manages communication between the client and the adb daemon running on an emulator or device. </li>
+  <li>A daemon, which runs as a background process on each emulator or device instance. </li>
+</ul>
+
+<p>When you start an adb client, the client first checks whether there is an adb server process already running. If there isn't, it starts the server process. When the server starts, it binds to local TCP port 5037 and listens for commands sent from adb clients&mdash;all adb clients use port 5037 to communicate with the adb server. </p>
+
+<p>The server then sets up connections to all running emulator/device instances. It locates emulator/device instances by scanning odd-numbered ports in the range 5555 to 5585, the range used by emulators/devices. Where the server finds an adb daemon, it sets up a connection to that port. Note that each emulator/device instance acquires a pair of sequential ports &mdash; an even-numbered port for console connections and an odd-numbered port for adb connections. For example: </p>
+
+<blockquote>
+Emulator 1, console: 5554<br/>
+Emulator 1, adb: 5555<br>
+Emulator 2, console: 5556<br>
+Emulator 2, adb: 5557 ...
+</blockquote>
+
+<p>As shown, the emulator instance connected to adb on port 5555 is the same as the instance whose console listens on port 5554. </p>
+
+<p>Once the server has set up connections to all emulator instances, you can use adb commands to control and access those instances. Because the server manages connections to emulator/device instances and handles commands from multiple adb clients, you can control any emulator/device instance from any client (or from a script).</p>
+
+<p>The sections below describe the commands that you can use to access adb capabilities and manage the state of an emulator/device. Note that if you are developing Android applications in Eclipse and have installed the ADT plugin, you do not need to access adb from the command line. The ADT plugin provides a trasparent integration of adb into the Eclipse IDE. However, you can still use adb directly as necessary, such as for debugging.</p>
+
+<a name="issuingcommands"></a>
+
+<h2>Issuing adb Commands</h2>
+
+<p>You can issue adb commands from a command line on your development machine or from a script. The usage is: </p>
+
+    <pre>adb [-d|-e|-s &lt;serialNumber&gt;] &lt;command&gt; </pre>
+
+<p>When you issue a command, the program invokes an adb client. The client is not specifically associated with any emulator instance, so if multiple emulators/devices are running, you need to use the <code>-d</code> option to specify the target instance to which the command should be directed. For more information about using this option, see <a href="#directingcommands">Directing Commands to a Specific Emulator/Device Instance</a>. </p>
+
+<a name="devicestatus"></a>
+
+<h2>Querying for Emulator/Device Instances</h2>
+
+<p>Before issuing adb commands, it is helpful to know what emulator/device instances are connected to the adb server. You can generate a list of attached emulators/devices using the <code>devices</code> command: </p>
+
+	<pre>adb devices</pre>
+
+<p>In response, adb prints this status information for each instance:</p>
+
+<ul>
+	<li>Serial number &mdash; A string created by adb to uniquely identify an emulator/device instance by its 
+        console port number. The format of the serial number is <code>&lt;type&gt;-&lt;consolePort&gt;</code>. 
+        Here's an example serial number: <code>emulator-5554</code></li>
+	<li>State &mdash; The connection state of the instance. Three states are supported: 
+		<ul>
+		<li><code>offline</code> &mdash; the instance is not connected to adb or is not responding.</li>
+		<li><code>device</code> &mdash; the instance is now connected to the adb server. Note that this state does not 
+                    imply that the Android system is fully booted and operational, since the instance connects to adb 
+                    while the system is still booting. However, after boot-up, this is the normal operational state of 
+                    an emulator/device instance.</li>
+		</ul>
+	</li>
+</ul>
+
+<p>The output for each instance is formatted like this: </p>
+
+	<pre>[serialNumber] [state]</pre>
+
+<p>Here's an example showing the <code>devices</code> command and its output:</p>
+
+	<pre>$ adb devices
+List of devices attached 
+emulator-5554&nbsp;&nbsp;device
+emulator-5556&nbsp;&nbsp;device
+emulator-5558&nbsp;&nbsp;device</pre>
+
+<p>If there is no emulator/device running, adb returns <code>no device</code>.</p>
+
+
+<a name="directingcommands"></a>
+
+<h2>Directing Commands to a Specific Emulator/Device Instance</h2>
+
+<p>If multiple emulator/device instances are running, you need to specify a target instance when issuing adb commands. To so so, use the <code>-s</code> option in the commands. The usage for the <code>-s</code> option is:</p>
+
+    <pre>adb -s &lt;serialNumber&gt; &lt;command&gt; </pre>
+	
+<p>As shown, you specify the target instance for a command using its adb-assigned serial number. You can use the <code>devices</code> command to obtain the serial numbers of running emulator/device instances. </p>
+
+<p>Here is an example: </p>
+
+	<pre>adb -s emulator-5556 install helloWorld.apk</pre>
+
+<p>Note that, if you issue a command without specifying a target emulator/device instance using <code>-s</code>, adb generates an error. 
+
+<a name="move"></a>
+
+<h2>Installing an Application</h2>
+<p>You can use adb to copy an application from your development computer and install it on an emulator/device instance. To do so, use the <code>install</code> command. With the command, you must specify the path to the .apk file that you want to install:</p>
+
+<pre>adb install &lt;path_to_apk&gt;</pre>
+
+<p>For more information about how to create an .apk file that you can install on an emulator/device instance, see <a href="{@docRoot}guide/developing/tools/aapt.html">Android Asset Packaging Tool</a> (aapt). </p>
+
+<p>Note that, if you are using the Eclipse IDE and have the ADT plugin installed, you do not need to use adb (or aapt) directly to install your application on the emulator/device. Instead, the ADT plugin handles the packaging and installation of the application for you. </p>
+
+
+<a name="forwardports"></a>
+
+<h2>Forwarding Ports</h2>
+
+    <p>You can use the <code>forward</code> command to set up arbitrary port forwarding &mdash; forwarding of requests on a specific host port to a different port on an emulator/device instance. Here's how you would set up forwarding of host port 6100 to emulator/device port 7100:</p>
+<pre>adb forward tcp:6100 tcp:7100</pre>
+    <p>You can also use adb to set up forwarding to named abstract UNIX domain sockets, as illustrated here:</p>
+<pre>adb forward tcp:6100 local:logd </pre>
+
+<a name="copyfiles"></a>
+
+<h2>Copying Files to or from an Emulator/Device Instance</h2>
+
+<p>You can use the adb commands <code>pull</code> and <code>push</code> to copy files to and from an emulator/device instance's data file. Unlike the <code>install</code> command, which only copies an .apk file to a specific location, the <code>pull</code> and <code>push</code> commands let you copy arbitrary directories and files to any location in an emulator/device instance. </p>
+
+<p>To copy a file or directory (recursively) <em>from</em> the emulator or device, use</p>
+<pre>adb pull &lt;remote&gt; &lt;local&gt;</pre> 
+
+<p>To copy a file or directory (recursively) <em>to</em> the emulator or device, use</p>
+    <pre>adb push &lt;local&gt; &lt;remote&gt;</pre> 
+
+<p>In the commands, <code>&lt;local&gt;</code> and <code>&lt;remote&gt;</code> refer to the paths to the target files/directory on your development machine (local) and on the emulator/device instance (remote).</p>
+
+<p>Here's an example: </p>
+<pre>adb push foo.txt /sdcard/foo.txt</pre>
+
+<a name="commandsummary"></a>
+
+<h2>Listing of adb Commands</h2>
+
+<p>The table below lists all of the supported adb commands and explains their meaning and usage. </p>
+
+
+<table>
+<tr>
+	<th>Category</th>
+	<th>Command</th>
+	<th>Description</th>
+	<th>Comments</th>
+</tr>
+
+<tr>
+<td rowspan="3">Options</td>
+<td><code>-d</code></td>
+<td>Direct an adb command to the only attached USB device.</td>
+<td>Returns an error if more than one USB device is attached.</td>
+</tr>
+
+<tr>
+<td><code>-e</code></td>
+<td>Direct an adb command to the only running emulator instance.</td>
+<td>Returns an error if more than one emulator instance is running. </td>
+</tr>
+
+<tr>
+<td><code>-s&nbsp;&lt;serialNumber&gt;</code></td>
+<td>Direct an adb command a specific emulator/device instance, referred to by its adb-assigned serial number (such as "emulator-5556").</td>
+<td>If not specified, adb generates an error.</td>
+</tr>
+
+<tr>
+<td rowspan="3">General</td>
+<td><code>devices</code></td>
+<td>Prints a list of all attached emulator/device instances.</td>
+<td>See <a href="#devicestatus">Querying for Emulator/Device Instances</a> for more information.</td>
+</tr>
+
+<tr>
+<td><code>help</code></td>
+<td>Prints a list of supported adb commands.</td>
+<td>&nbsp;</td>
+</tr>
+
+<tr>
+<td><code>version</code></td>
+<td>Prints the adb version number. </td>
+<td>&nbsp;</td>
+</tr>
+
+<tr>
+<td rowspan="3">Debug</td>
+<td ><code>logcat&nbsp;[&lt;option&gt;] [&lt;filter-specs&gt;]</code></td>
+<td>Prints log data to the screen. </td>
+<td>&nbsp;</td>
+</tr>
+
+<tr>
+<td><code>bugreport</code></td>
+<td>Prints <code>dumpsys</code>, <code>dumpstate</code>, and <code>logcat</code> data to the screen, for the purposes of bug reporting. </td>
+<td>&nbsp;</td>
+</tr>
+
+<tr>
+<td><code>jdwp</code></td>
+<td>Prints a list of available JDWP processes on a given device. </td>
+<td>You can use the <code>forward jdwp:&lt;pid&gt;</code> port-forwarding specification to connect to a specific JDWP process. For example: <br>
+    <code>adb forward tcp:8000 jdwp:472</code><br>
+    <code>jdb -attach localhost:8000</code></p>
+ </td>
+</tr>
+
+<tr>
+<td rowspan=3">Data</td>
+<td><code>install&nbsp;&lt;path-to-apk&gt;</code></td>
+<td>Pushes an Android application (specified as a full path to an .apk file) to the data file of an emulator/device. </td>
+<td>&nbsp;</td>
+</tr>
+
+<tr>
+<td><code>pull&nbsp;&lt;remote&gt;&nbsp;&lt;local&gt;</code></td>
+<td>Copies a specified file from an emulator/device instance to your development computer. </td>
+<td>&nbsp;</td>
+</tr>
+
+<tr>
+<td><code>push&nbsp;&lt;local&gt;&nbsp;&lt;remote&gt;</code></td>
+<td>Copies a specified file from your development computer to an emulator/device instance. </td>
+<td>&nbsp;</td>
+</tr>
+
+<tr>
+<td rowspan="2">Ports and Networking</td>
+<td><code>forward&nbsp;&lt;local&gt;&nbsp;&lt;remote&gt;</code></td>
+<td>Forwards socket connections from a specified local port to a specified remote port on the emulator/device instance. </td>
+<td>Port specifications can use these schemes: 
+<ul><li><code>tcp:&lt;portnum&gt;</code></li>
+<li><code>local:&lt;UNIX domain socket name&gt;</code></li>
+<li><code>dev:&lt;character device name&gt;</code></li>
+<li><code>jdwp:&lt;pid&gt;</code></li></ul>
+</td>
+</tr>
+
+<tr>
+<td><code>ppp&nbsp;&lt;tty&gt;&nbsp;[parm]...</code></td>
+<td>Run PPP over USB.
+<ul>
+<li><code>&lt;tty&gt;</code> &mdash; the tty for PPP stream. For example <code>dev:/dev/omap_csmi_ttyl</code>. </li>
+<li><code>[parm]... </code> &mdash zero or more PPP/PPPD options, such as <code>defaultroute</code>, <code>local</code>, <code>notty</code>, etc.</li></ul>
+
+<p>Note that you should not automatically start a PDP connection. </p></td>
+<td></td>
+</tr>
+
+<tr>
+<td rowspan="3">Scripting</td>
+<td><code>get-serialno</code></td>
+<td>Prints the adb instance serial number string.</td>
+<td rowspan="2">See <a href="#devicestatus">Querying for Emulator/Device Instances</a> for more information. </td>
+</tr>
+
+<tr>
+<td><code>get-state</code></td>
+<td>Prints the adb state of an emulator/device instance.</td>
+</td>
+</tr>
+
+<tr>
+<td><code>wait-for-device</code></td>
+<td>Blocks execution until the device is online &mdash; that is, until the instance state is <code>device</code>.</td>
+<td>You can prepend this command to other adb commands, in which case adb will wait until the emulator/device instance is connected before issuing the other commands. Here's an example: 
+<pre>adb wait-for-device shell getprop</pre>
+
+Note that this command does <em>not</em> cause adb to wait until the entire system is fully booted. For that reason, you should not prepend it to other commands that require a fully booted system. As an example, the <code>install</code> requires the Android package manager, which is available only after the system is fully booted. A command such as 
+
+<pre>adb wait-for-device install &lt;app&gt;.apk</pre>
+
+would issue the <code>install</code> command as soon as the emulator or device instance connected to the adb server, but before the Android system was fully booted, so it would result in an error. </td>
+</tr>
+
+
+
+<tr>
+<td rowspan="2">Server</td>
+<td><code>start-server</code></td>
+<td>Checks whether the adb server process is running and starts it, if not.</td>
+<td>&nbsp;</td>
+</tr>
+
+<tr>
+<td><code>kill-server</code></td>
+<td>Terminates the adb server process.</td>
+<td>&nbsp;</td>
+</tr>
+
+
+
+<tr>
+<td rowspan="2">Shell</td>
+<td><code>shell</code></td>
+<td>Starts a remote shell in the target emulator/device instance.</td>
+<td rowspan="2">See <a href="#shellcommands">Issuing Shell Commands</a> for more information. </td>
+</tr>
+
+<tr>
+<td><code>shell&nbsp;[&lt;shellCommand&gt;]</code></td>
+<td>Issues a shell command in the target emulator/device instance and then exits the remote shell.</td>
+</tr>
+
+</table>
+
+
+<a name="shellcommands"></a>
+
+<h2>Issuing Shell Commands</h2>
+
+<p>Adb provides an ash shell that you can use to run a variety of commands on an emulator 
+or device. The command binaries are stored in the file system of the emulator or device, 
+in this location: </p>
+
+<pre>/system/bin/...</pre>
+
+<p>You can use the <code>shell</code> command to issue commands, with or without entering the adb remote shell on the emulator/device. </p>
+
+<p>To issue a single command without entering a remote shell, use the <code>shell</code> command like this: </p>
+
+	<pre>adb [-d|-e|-s {&lt;serialNumber&gt;}] shell &lt;shellCommand&gt;</pre>
+	
+<p>To drop into a remote shell on a emulator/device instance, use the <code>shell</code> command like this:</p>
+
+	<pre>adb [-d|-e|-s {&lt;serialNumber&gt;}] shell</pre>
+
+<p>When you are ready to exit the remote shell, use <code>CTRL+D</code> or <code>exit</code> to end the shell session. </p>
+
+<p>The sections below provide more information about shell commands that you can use.</p>
+      
+<a name="sqlite" id="sqlite"></a>
+
+<h3>Examining sqlite3 Databases from a Remote Shell</h3>
+
+<p>From an adb remote shell, you can use the 
+<a href="http://www.sqlite.org/sqlite.html">sqlite3</a> command-line program to 
+manage SQLite databases created by Android applications. The 
+<code>sqlite3</code> tool includes many useful commands, such as 
+<code>.dump</code> to print out the contents of a table and 
+<code>.schema</code> to print the SQL CREATE statement for an existing table. 
+The tool also gives you the ability to execute SQLite commands on the fly.</p>
+
+<p>To use <code>sqlite3</code>, enter a remote shell on the emulator instance, as described above, then invoke the tool using the <code>sqlite3</code> command. Optionally, when invoking <code>sqlite3</code> you can specify the full path to the database you want to explore. Emulator/device instances store SQLite3 databases in the folder <code><span chatdir="1"><span chatindex="259474B4B070F261">/data/data/<em>&lt;package_name&gt;</em>/databases</span></span>/</code>. </p>
+
+<p>Here's an example: </p>
+
+<pre>$ adb -s emulator-5554 shell
+# sqlite3 /data/data/com.example.google.rss.rssexample/databases/rssitems.db
+SQLite version 3.3.12
+Enter &quot;.help&quot; for instructions
+<em>.... enter commands, then quit...</em>
+sqlite&gt; .exit </pre>
+
+<p>Once you've invoked <code>sqlite3</code>, you can issue <code>sqlite3</code> commands in the shell. To exit and return to the adb remote shell, use <code>exit</code> or <code>CTRL+D</code>.
+
+
+<a name="monkey"></a>
+
+<h3>UI/Application Exerciser Monkey</h3>
+
+<p>The Monkey is a program that runs on your emulator or device and generates pseudo-random
+streams of user events such as clicks, touches, or gestures, as well as a number of system-level 
+events.  You can use the Monkey to stress-test applications that you are developing,
+in a random yet repeatable manner.</p>
+
+<p>The simplest way to use the monkey is with the following command, which will launch your
+application and send 500 pseudo-random events to it.</p>
+
+<pre>$ adb shell monkey -v -p your.package.name 500</pre>
+
+<p>For more information about command options for Monkey, see the complete 
+<a href="{@docRoot}guide/developing/tools/monkey.html" title="monkey">UI/Application Exerciser Monkey</a> documentation page.</p>
+
+
+<a name="othershellcommands"></a>
+
+<h3>Other Shell Commands</h3>
+
+<p>The table below lists several of the adb shell commands available. For a complete list of commands and programs, start an emulator instance and use the <code>adb -help</code> command. </p>
+
+<pre>adb shell ls /system/bin</pre>
+
+<p>Help is available for most of the commands. </p>
+
+<table>
+<tr>
+	<th>Shell Command</th>
+	<th>Description</th>
+	<th>Comments</th>
+</tr>
+
+<tr>
+<td><code>dumpsys</code></td>
+<td>Dumps system data to the screen.</td>
+<td rowspan=4">The <a href="{@docRoot}guide/developing/tools/ddms.html">Dalvik Debug Monitor Service</a> (DDMS) tool offers integrated debug environment that you may find easier to use.</td>
+</tr>
+
+<tr>
+<td><code>dumpstate</code></td>
+<td>Dumps state to a file.</td>
+</tr>
+
+<tr>
+<td><code>logcat&nbsp;[&lt;option&gt;]...&nbsp;[&lt;filter-spec&gt;]...</code></td>
+<td>Enables radio logging and prints output to the screen. </td>
+</tr>
+
+<tr>
+<td><code>dmesg</code></td>
+<td>Prints kernel debugging messages to the screen. </td>
+</tr>
+
+<tr>
+<td><code>start</code></td>
+<td>Starts (restarts) an emulator/device instance.</td>
+<td>&nbsp;</td>
+</tr>
+
+<tr>
+<td><code>stop</code></td>
+<td>Stops execution of an emulator/device instance.</td>
+<td>&nbsp;</td>
+</tr>
+
+</table>
+
+<a name="logcat"></a>
+
+<h2>Enabling logcat Logging</h2>
+
+<p>The Android logging system provides a mechanism for collecting and viewing system debug output. Logs from various applications and portions of the system are collected in a series of circular buffers, which then can be viewed and filtered by the <code>logcat</code> command.</p>
+
+<a name="usinglogcat"></a>
+
+<h3>Using logcat Commands</h3>
+
+<p>You can use the <code>logcat</code> command to view and follow the contents of the system's log buffers. The general usage is:</p>
+
+<pre>[adb] logcat [&lt;option&gt;] ... [&lt;filter-spec&gt;] ...</pre>
+
+<p>The sections below explain filter specifications and the command options. See <a href="#logcatoptions">Listing of logcat Command Options</a> for a summary of options. </p>
+
+<p>You can use the <code>logcat</code> command from your development computer  or from a remote adb shell in an emulator/device instance. To view log output in your development computer, you use</p>
+
+<pre>$ adb logcat</pre>
+
+<p>and from a remote adb shell you use</p>
+
+<pre># logcat</pre>
+
+<a name="filteringoutput"></a>
+
+<h3>Filtering Log Output</h3>
+
+<p>Every Android log message has a <em>tag</em> and a <em>priority</em> associated with it. </p>
+
+<ul>
+<li>The tag of a log message is a short string indicating the system component from which the message originates (for example, "View" for the view system). </li>
+
+<li>The priority is one of the following character values, ordered from lowest to highest priority:</li>
+
+<ul>
+    <li><code>V</code> &mdash; Verbose (lowest priority)</li>
+	<li><code>D</code> &mdash; Debug</li>
+	<li><code>I</code> &mdash; Info</li>
+	<li><code>W</code> &mdash; Warning</li>
+	<li><code>E</code> &mdash; Error</li>
+	<li><code>F</code> &mdash; Fatal</li>
+	<li><code>S</code> &mdash; Silent (highest priority, on which nothing is ever printed)</li>
+</ul>
+</ul>
+
+<p>You can obtain a list of tags used in the system, together with priorities, by running <code>logcat</code> and observing the first two columns 
+of each message, given as <code>&lt;priority&gt;/&lt;tag&gt;</code>. </p>
+
+<p>Here's an example of logcat output that shows that the message relates to priority level "I" and tag "ActivityManager":</p>
+
+<pre>I/ActivityManager(  585): Starting activity: Intent { action=android.intent.action...}</pre>
+
+<p>To reduce the log output to a manageable level, you can restrict log output using <em>filter expressions</em>. Filter expressions let you indicate to the system the tags-priority combinations that you are interested in &mdash; the system suppresses other messages for the specified tags. </p>
+
+<p>A filter expression follows this format <code>tag:priority ...</code>, where <code>tag</code> indicates the tag of interest and <code>priority</code> indicates the <em>minimum</em> level of priority to report for that tag.  Messages for that tag at or above the specified priority are written to the log. You can supply any number of <code>tag:priority</code> specifications in a single filter expression. The series of specifications is whitespace-delimited. </p>
+
+<p>Here's an example of a filter expression that suppresses all log messages except those with the tag "ActivityManager", at priority "Info" or above, and all log messages with tag "MyApp", with priority "Debug" or above:</p>
+
+<pre>adb logcat ActivityManager:I MyApp:D *:S</pre>
+
+<p>The final element in the above expression, <code>*:S</code>, sets the priority level for all tags to "silent", thus ensuring only log messages with "View" and "MyApp" are displayed. Using <code>*:S</code> is an excellent way to ensure that log output is restricted to the filters that you have explicitly specified &mdash; it lets your filters serve as a "whitelist" for log output.</p>
+
+<p>The following filter expression displays all log messages with priority level "warning" and higher, on all tags:</p>
+
+<pre>adb logcat *:W</pre>
+
+<p>If you're running <code>logcat</code> from your development computer (versus running it on a remote adb shell), you can also set a default filter expression by exporting a value for the environment variable <code>ANDROID_LOG_TAGS</code>:</p>
+
+<pre>export ANDROID_LOG_TAGS="ActivityManager:I MyApp:D *:S"</pre>
+
+<p>Note that <code>ANDROID_LOG_TAGS</code> filter is not exported to the emulator/device instance, if you are running <code>logcat</code> from a remote shell or using <code>adb shell logcat</code>.</p>
+
+
+<a name="outputformat"></a>
+
+<h3>Controlling Log Output Format</h3>
+
+<p>Log messages contain a number of metadata fields, in addition to the tag and priority. You can modify the output format for messages so that they display a specific metadata field. To do so, you use the <code>-v</code> option and specify one of the supported output formats listed below. </p>
+
+<ul>
+    <li><code>brief</code> &mdash; Display priority/tag and PID of originating process (the default format).</li>
+	<li><code>process</code> &mdash; Display PID only.</li>
+	<li><code>tag</code> &mdash; Display the priority/tag only. </li>
+	<li><code>thread</code> &mdash; Display process:thread and priority/tag only. </li>
+	<li><code>raw</code> &mdash; Display the raw log message, with no other metadata fields.</li>
+	<li><code>time</code> &mdash; Display the date, invocation time, priority/tag, and PID of the originating process.</li>
+	<li><code>long</code> &mdash; Display all metadata fields and separate messages with a blank lines.</li>
+</ul>
+
+<p>When starting <code>logcat</code>, you can specify the output format you want by using the <code>-v</code> option:</p>
+
+<pre>[adb] logcat [-v &lt;format&gt;]</pre>
+
+<p>Here's an example that shows how to generate messages in <code>thread</code> output format: </p>
+
+<pre>adb logcat -v thread</pre>
+
+<p>Note that you can only specify one output format with the <code>-v</code> option. </p>
+
+<a name="alternativebuffers"></a>
+
+<h3>Viewing Alternative Log Buffers </h3>
+
+<p>The Android logging system keeps multiple circular buffers for log messages, and not all of the log messages are sent to the default circular buffer. To see additional log messages, you can start <code>logcat</code> with the <code>-b</code> option, to request viewing of an alternate circular buffer. You can view any of these alternate buffers: </p>
+
+<ul>
+<li><code>radio</code> &mdash; View the buffer that contains radio/telephony related messages.</li>
+<li><code>events</code> &mdash; View the buffer containing events-related messages.</li>
+<li><code>main</code> &mdash; View the main log buffer (default)</li>
+</ul>
+
+<p>The usage of the <code>-b</code> option is:</p>
+
+<pre>[adb] logcat [-b &lt;buffer&gt;]</pre>
+
+<p>Here's an example of how to view a log buffer containing radio and telephony messages: </p>
+
+<pre>adb logcat -b radio</b></pre>
+
+<a name="stdout"></a>
+
+<h3>Viewing stdout and stderr</h3>
+
+<p>By default, the Android system sends <code>stdout</code> and <code>stderr</code> (<code>System.out</code> and <code>System.err</code>) output to <code>/dev/null</code>. In
+processes that run the Dalvik VM, you can have the system write a copy of the output to the log file. In this case, the system writes the messages to the log using the log tags <code>stdout</code> and <code>stderr</code>, both with priority <code>I</code>. </p>
+
+<p>To route the output in this way, you stop a running emulator/device instance and then use the shell command <code>setprop</code> to enable the redirection of output. Here's how you do it: </p>
+
+<pre>$ adb shell stop
+$ adb shell setprop log.redirect-stdio true
+$ adb shell start</pre>
+
+<p>The system retains this setting until you terminate the emulator/device instance. To use the setting as a default on the emulator/device instance, you can add an entry to <code>/data/local.prop</code>
+on the device.</p>
+
+<a name="logcatoptions"></a>
+
+<h3>Listing of logcat Command Options</h3>
+
+<table>
+<tr>
+	<th>Option</th>
+	<th>Description</th>
+</tr>
+
+<tr>
+<td><code>-b&nbsp;&lt;buffer&gt;</code></td>
+<td>Loads an alternate log buffer for viewing, such as <code>event</code> or <code>radio</code>. The <code>main</code> buffer is used by default. See <a href="#alternativebuffers">Viewing Alternative Log Buffers</a>.</td>
+</tr>
+
+<tr>
+<td><code>-c</code></td>
+<td>Clears (flushes) the entire log and exits. </td>
+</tr>
+
+<tr>
+<td><code>-d</code></td>
+<td>Dumps the log to the screen and exits.</td>
+</tr>
+
+<tr>
+<td><code>-f&nbsp;&lt;filename&gt;</code></td>
+<td>Writes log message output to <code>&lt;filename&gt;</code>. The default is <code>stdout</code>.</td>
+</tr>
+
+<tr>
+<td><code>-g</code></td>
+<td>Prints the size of the specified log buffer and exits. </td>
+</tr>
+
+<tr>
+<td><code>-n&nbsp;&lt;count&gt;</code></td>
+<td>Sets the maximum number of rotated logs to <code>&lt;count&gt;</code>. The default value is 4.  Requires the <code>-r</code> option.  </td>
+</tr>
+
+<tr>
+<td><code>-r&nbsp;&lt;kbytes&gt;</code></td>
+<td>Rotates the log file every <code>&lt;kbytes&gt;</code> of output. The default value is 16.  Requires the <code>-f</code> option.  </td>
+</tr>
+
+<tr>
+<td><code>-s</code></td>
+<td>Sets the default filter spec to silent. </td>
+</tr>
+
+<tr>
+<td><code>-v&nbsp;&lt;format&gt;</code></td>
+<td>Sets the output format for log messages. The default is <code>brief</code> format. For a list of supported formats, see <a href="#outputformat">Controlling Log Output Format</a>.</td>
+</tr>
+
+</table>
+
+<a name="stopping"></a>
+
+<h2>Stopping the adb Server</h2>
+
+<p>In some cases, you might need to terminate the adb server process and then restart it. For example, if adb does not respond to a command, you can terminate the server and restart it and that may resolve the problem. </p>
+
+<p>To stop the adb server, use the <code>kill-server</code>. You can then restart the server by issuing any adb command. </p>
+
+
diff --git a/docs/html/guide/developing/tools/adt.jd b/docs/html/guide/developing/tools/adt.jd
new file mode 100644
index 0000000..f28b24c
--- /dev/null
+++ b/docs/html/guide/developing/tools/adt.jd
@@ -0,0 +1,154 @@
+page.title=ADT Plugin
+@jd:body
+
+<p>The Android Development Tools (ADT) plugin adds powerful extensions to the Eclipse integrated development environment. It allows you to create and debug your Android applications easier and faster. If you use Eclipse, the ADT plugin gives you an incredible boost in developing Android applications:</p>
+
+<ul>
+  <li>It gives you access to other Android development tools from inside the Eclipse IDE. For example, ADT lets you access the many capabilities of the DDMS tool: take screenshots, manage port-forwarding, set breakpoints, and view thread and process informationd irectly from Eclipse.</li>
+  <li>It provides a New Project Wizard, which helps you quickly create and set up all of the basic files you'll need for a new Android application.</li>
+  <li>It automates and simplifies the process of building your Android application.</li>
+  <li>It provides an Android code editor that helps you write valid XML for your Android manifest and resource files.</li>
+</ul>
+
+<h2 id="installingplugin">Installing the Eclipse Plugin (ADT)</h2>
+
+<p>If you <em>will not</em> be using the Eclipse IDE, you do not need to download or install the ADT plugin.</p>
+
+<p>To download and install the ADT plugin, follow the steps below for your respective Eclipse version. </p>
+
+<table style="font-size:100%">
+<tr><th>Eclipse 3.3 (Europa)</th><th>Eclipse 3.4 (Ganymede)</th></tr>
+<tr>
+<td width="50%">
+<ol>
+    <li>Start Eclipse, then select <strong>Help</strong> &gt; <strong>Software Updates</strong> &gt; <strong>Find
+            and Install...</strong>. </li>
+
+    <li>In the dialog that appears, select <strong>Search for new features to install</strong> and click <strong>Next</strong>. </li>
+    <li>Click <strong>New Remote Site</strong>. </li>
+    <li>In the resulting dialog box, enter a name for the remote site (e.g. Android Plugin) and enter this as its URL:
+        <pre>https://dl-ssl.google.com/android/eclipse/</pre>
+        <p>Click <strong>OK</strong>.</p> </li>
+    <li>You should now see the new site added to the search list (and checked).
+        Click <strong>Finish</strong>. </li>
+    <li>In the subsequent Search Results dialog box, select the checkbox for
+    <strong>Android Plugin</strong> &gt; <strong>Developer Tools</strong>.
+    This will check both features:  "Android Developer Tools", and "Android
+    Editors". The Android Editors feature is optional, but recommended.  If
+    you choose to install it, you need the WST plugin mentioned earlier in this
+    page. Click <strong>Next</strong>. </li>
+    <li>Read the license agreement and then select <strong>Accept terms of the license agreement</strong>. 
+     Click <strong>Next</strong>. </li>
+    <li>Click <strong>Finish</strong>. </li>
+
+    <li>The ADT plugin is not signed; you can accept the installation anyway
+        by clicking <strong>Install All</strong>. </li>
+    <li>Restart Eclipse. </li>
+</ol>
+
+</td>
+<td>
+
+<ol>
+    <li>Start Eclipse, then select <strong>Help</strong> &gt; <strong>Software Updates...</strong>.
+    </li>
+    <li>In the dialog that appears, click the <strong>Available Software</strong> tab.
+    </li>
+    <li>Click <strong>Add Site...</strong>
+    </li>
+    <li>Enter this as the Location:
+      <pre>https://dl-ssl.google.com/android/eclipse/</pre>
+      <p>Click <strong>OK</strong>.</p></li>
+    <li>Back in the Available Software view, you should see the plugin. Select the checkbox next to 
+      <em>Developer Tools</em>  and click <strong>Install...</strong>
+    </li>
+    <li>On the subsequent Install window, "Android Developer Tools", and "Android Editors" should both be checked. 
+    The Android Editors feature is optional, but recommended.  If
+    you choose to install it, you need the WST plugin mentioned earlier in this
+    page. Click <strong>Next</strong>.
+     </li>
+    <li>Accept the license agreement and click <strong>Finish</strong>.</li>
+    <li>Restart Eclipse. </li>
+</ol>
+
+</td>
+</tr>
+</table>
+
+<h3 id="troubleshooting">Troubleshooting ADT Installation</h3>
+<p> 
+If you are having trouble downloading the ADT plugin after following the steps above, here are some suggestions: </p>
+
+<ul>
+	<li>In Step 4, try changing the remote update site URL to use <code>http</code>, rather than <code>https</code>. </li>
+	<li>If you are behind a firewall (such as a corporate firewall), make
+        sure that you have properly configured your proxy settings in Eclipse.
+        In Eclipse 3.3/3.4, you can configure proxy information from the main
+        Eclipse menu in <strong>Window</strong> (on Mac, <strong>Eclipse</strong>) &gt; <strong>Preferences</strong> &gt; <strong>General</strong> &gt; <strong>Network Connections</strong>.</li>
+</ul>
+<p> 
+If you are still unable to use Eclipse to download the ADT plugin, follow these steps to download and install the plugin from your computer:
+</p>
+<ol>
+<li><a href="{@docRoot}sdk/adt_download.html">Download the ADT zip file</a> (do not unpack it).
+<li>Follow steps 1 and 2 in the default install instructions (above).
+<li>In Eclipse 3.3, click <strong>New Archive Site...</strong>. <br/>
+    In Eclipse 3.4, click <strong>Add Site...</strong>, then <strong>Archive...</strong>
+<li>Browse and select the downloaded the zip file.
+<li>Follow the remaining procedures, above, starting from steps 5.
+</ol>
+<p> 
+Note that to update your plugin, you will have to follow these steps again instead of the default update instructions.</p>
+
+<p>Note that the "Android Editors" feature of ADT requires several optional 
+Eclipse components (for example, WST). If you encounter an error when 
+installing ADT, your Eclipse installion might not include those components. 
+For information about how to quickly add the necessary components to your 
+Eclipse installation, see the troubleshooting topic 
+<a href="{@docRoot}guide/appendix/faq/troubleshooting.html#installeclipsecomponents">ADT Installation Error: "requires plug-in org.eclipse.wst.sse.ui"</a>.</p>
+
+<h4>For Linux users</h4>
+<p>If you encounter this error when installing the ADT Plugin for Eclipse: 
+<pre>
+An error occurred during provisioning.
+Cannot connect to keystore.
+JKS</pre>
+<p>
+...then your development machine lacks a suitable Java VM. Installing Sun
+Java 6 will resolve this issue and you can then reinstall the ADT
+Plugin.</p>
+
+<a name="Updating_the_ADT_plugin" id="Updating_the_ADT_plugin"></a>
+
+<h2>Updating the ADT Plugin </h2>
+
+<p>In some cases, a new ADT plugin may become available for your existing version of the SDK. You can use the steps below to update 
+the ADT plugin from inside Eclipse. </p>
+
+<table style="font-size:100%">
+<tr><th>Eclipse 3.3 (Europa)</th><th>Eclipse 3.4 (Ganymede)</th></tr>
+<tr>
+<td width="50%">
+<ol>
+    <li> Select <strong>Help</strong> &gt; <strong>Software Updates</strong> &gt; <strong>Find and Install...</strong>. </li>
+    <li> Select <strong>Search for updates of the currently installed features</strong> and click <strong>Finish</strong>. </li>
+    <li> If an update for ADT is available, select and install. </li>
+</ol>
+
+<p> Alternatively, </p>
+<ol>
+    <li> Select <strong>Help</strong> &gt; <strong>Software Updates</strong> &gt; <strong>Manage Configuration</strong>. </li>
+    <li> Navigate down the tree and select <strong>Android Development Tools &lt;version&gt;</strong> </li>
+    <li> Select <strong>Scan for Updates</strong> under <strong>Available Tasks</strong>.</li>
+</ol>
+</td>
+<td>
+<ol>
+    <li>Select <strong>Help</strong> &gt; <strong>Software Updates...</strong></li>
+    <li>Select the <strong>Installed Software</strong> tab.</li>
+    <li>Click <strong>Update...</strong></li>
+    <li>If an update for ADT is available, select it and click <strong>Finish</strong>.</li>
+</ol>
+</td>
+</tr>
+</table>
diff --git a/docs/html/guide/developing/tools/aidl.jd b/docs/html/guide/developing/tools/aidl.jd
new file mode 100644
index 0000000..96e4fec
--- /dev/null
+++ b/docs/html/guide/developing/tools/aidl.jd
@@ -0,0 +1,302 @@
+page.title=Designing a Remote Interface Using AIDL
+@jd:body
+
+<p>Since each application runs in its own process, and you can write a service that
+runs in a different process from your Application's UI, sometimes you need to pass objects
+between processes.  On the Android platform, one process can not normally access the memory
+of another process.  So to talk, they need to decompose their objects into primitives that
+the operating system can understand, and "marshall" the object across that boundary for you.</p>
+
+<p>The code to do that marshalling is tedious to write, so we provide the AIDL tool to do it
+for you.</p>
+
+<p> AIDL (Android Interface Definition Language) is an <a
+href="http://en.wikipedia.org/wiki/Interface_description_language">IDL</a>
+language used to generate code that enables two processes on an Android-powered device
+to talk using interprocess communication (IPC). If you have code
+in one process (for example, in an Activity) that needs to call methods on an
+object in another process (for example, a Service), you would use AIDL to
+generate code to marshall the parameters.</p>
+<p>The AIDL IPC mechanism
+    is interface-based, similar to COM or Corba, but lighter weight. It uses a proxy
+    class to pass values between the client and the implementation. </p>
+<p>This page includes the following main topics: </p>
+<ul>
+    <li><a href="#implementing">Implementing  IPC Using AIDL</a></li>
+    <li><a href="#calling">Calling an .aidl (IPC) Class  </a></li>
+</ul>
+<h2>Implementing IPC Using AIDL <a name="implementing"></a></h2>
+<p>Follow these steps to implement an IPC service using AIDL.</p>
+<ol>
+    <li><strong><a href="#aidlsyntax">Create your .aidl file</a> </strong>- This
+        file defines an interface (<em>YourInterface</em>.aidl) that defines the
+        methods and fields available to a client. </li>
+    <li><strong>Add the .aidl file to your makefile</strong> - (the ADT Plugin for Eclipse
+            manages this for you). Android includes the compiler, called
+            AIDL, in the <code>tools/</code> directory. </li>
+    <li><strong><a href="#implementtheinterface">Implement your interface methods</a></strong> -
+        The AIDL compiler creates an interface in the Java programming language from your AIDL interface.
+        This interface has an inner abstract class named Stub that inherits the
+        interface (and implements a few additional methods necessary for the IPC
+        call). You must create a class that extends <em>YourInterface</em>.Stub
+        and implements the methods you declared in your .aidl file. </li>
+    <li><strong><a href="#exposingtheinterface">Expose your interface to clients</a></strong> - 
+        If you're writing a service, you should extend {@link
+        android.app.Service Service} and override {@link android.app.Service#onBind
+        Service.onBind(Intent)} to return an instance of your class that implements your
+        interface. </li>
+</ol>
+<h3>Create an .aidl File  <a name="aidlsyntax"></a></h3>
+<p>AIDL is a simple syntax that lets you declare an interface with one or more
+    methods, that can take parameters and return values. These parameters and return
+    values can be of any type, even other AIDL-generated interfaces.  <em>However, it
+    is important to note</em> that you <em>must</em> import all non-built-in types,
+    <em>even if they are defined in the same package as your interface</em>.
+    Here are the data types that AIDL can support: </p>
+<ul>
+    <li>Primitive Java programming language types (int, boolean, etc)
+        &mdash; No <code>import</code> statement is needed. </li>
+    <li>One of the following classes  (no <code>import</code> statements needed):
+        <ul>
+            <li><strong>String</strong></li>
+            <li><strong>List</strong> - All elements in the List must be one of the types
+                in this list, including other AIDL-generated interfaces and
+                parcelables.  List may optionally be used as a "generic" class (e.g.
+                List&lt;String&gt;).
+                The actual concrete class that the other side will receive
+                will always be an ArrayList, although the method will be generated
+                to use the List interface. </li>
+            <li><strong>Map</strong> - All elements in the Map must be of one of the
+                types in this list, including other AIDL-generated interfaces and
+                parcelables.  Generic maps, (e.g. of the form Map&lt;String,Integer&gt;
+                are not supported.
+                The actual concrete class that the other side will receive
+                will always be a HashMap, although the method will be generated
+                to use the Map interface.</li>
+            <li><strong>CharSequence</strong> - This is useful for the CharSequence
+                types used by {@link android.widget.TextView TextView} and other
+                widget objects. </li>
+        </ul>
+    </li>
+    <li>Other AIDL-generated interfaces, which are always passed by reference.
+        An <code>import</code> statement is always needed for these.</li>
+    <li>Custom classes that implement the <a href="#parcelable">Parcelable
+        protocol</a> and are passed by value.
+        An <code>import</code> statement is always needed for these.</li>
+</ul>
+<p>Here is the basic AIDL syntax:</p>
+<pre>// My AIDL file, named <em>SomeClass</em>.aidl
+// Note that standard comment syntax is respected.
+// Comments before the import or package statements are not bubbled up
+// to the generated interface, but comments above interface/method/field
+// declarations are added to the generated interface.
+
+// Include your fully-qualified package statement.
+package com.android.sample;
+
+// See the list above for which classes need
+// import statements (hint--most of them)
+import com.android.sample.IAtmService;
+
+// Declare the interface.
+interface IBankAccountService {
+    
+    // Methods can take 0 or more parameters, and
+    // return a value or void.
+    int getAccountBalance();
+    void setOwnerNames(in List&lt;String&gt; names);
+    
+    // Methods can even take other AIDL-defined parameters.
+    BankAccount createAccount(in String name, int startingDeposit, in IAtmService atmService);
+
+    // All non-Java primitive parameters (e.g., int, bool, etc) require
+    // a directional tag indicating which way the data will go. Available
+    // values are in, out, inout. (Primitives are in by default, and cannot be otherwise).
+    // Limit the direction to what is truly needed, because marshalling parameters
+    // is expensive.
+    int getCustomerList(in String branch, out String[] customerList);
+}</pre>
+
+<h3>Implementing the Interface <a name="implementtheinterface"></a></h3>
+<p>AIDL generates an interface file for you with the same name as your .aidl
+    file. If you are using the Eclipse plugin, AIDL will automatically be run as part of
+    the build process (you don't need to run AIDL first and then build your project).
+    If you are not using the plugin, you should run AIDL first. </p>
+<p>The generated interface
+    includes an abstract inner class named Stub that declares all the methods
+    that you declared in your .aidl file. Stub also defines a few helper methods,
+    most notably asInterface(), which takes  an IBinder (passed to a client's onServiceConnected()
+    implementation when applicationContext.bindService() succeeds), and returns an
+    instance of the interface used to call the IPC methods. See the section
+    <a href="#calling">Calling an IPC Method</a> for more details on how to make this cast.</p>
+<p>To implement your interface, extend <em>YourInterface</em>.Stub,
+    and implement the methods. (You can create the .aidl file and implement the stub
+    methods without building between--the Android build process will process .aidl
+files before .java files.) </p>
+<p>Here is an example of implementing an interface called IRemoteService, which exposes
+    a single method, getPid(), using an anonymous instance:</p>
+<pre>// No need to import IRemoteService if it's in the same project.
+private final IRemoteService.Stub mBinder = new IRemoteService.Stub(){
+    public int getPid(){
+        return Process.myPid();
+    }
+}</pre>
+<p>A few rules about implementing your interface: </p>
+<ul>
+    <li>No exceptions that you throw will be sent back to the caller.</li>
+    <li>IPC calls are synchronous. If you know that an IPC service takes more than
+        a few milliseconds to complete, you should not call it in the Activity/View thread,
+        because it might hang the application (Android might display an &quot;Application
+        is Not Responding&quot; dialog).
+        Try to call them in a separate thread. </li>
+    <li>Only methods are supported; you cannot declare static fields in an AIDL interface.</li>
+</ul>
+
+<h3>Exposing Your Interface to Clients<a name="exposingtheinterface" id="exposingtheinterface"></a></h3>
+<p>Now that you've got your interface implementation, you need to expose it to clients.
+    This is known as &quot;publishing your service.&quot; To publish a service,
+    inherit {@link android.app.Service Service} and implement {@link android.app.Service#onBind
+    Service.onBind(Intent)} to return an instance of the class that implements your interface.
+    Here's a code snippet of a service that exposes the IRemoteService
+    interface to clients. </p>
+<pre>public class RemoteService extends Service {
+...
+{@include development/samples/ApiDemos/src/com/example/android/apis/app/RemoteService.java
+    exposing_a_service}
+}</pre>
+
+<a name="parcelable"></a>
+<h3>Pass by value Parameters using Parcelables</h3>
+
+<p>If you have a class that you would like to send from one process to another through
+an AIDL interface, you can do that.  You must ensure that the code for your class is available
+to the other side of the IPC.  Generally, that means that you're talking to a service that you
+started.</p>
+<p>There are five parts to making a class support the Parcelable protocol:</b>
+<ol>
+<li>Make your class implement the {@link android.os.Parcelable} interface.</li>
+<li>Implement the method <code>public void writeToParcel(Parcel out)</code> that takes the
+current state of the object and writes it to a parcel.</li>
+<li>Implement the method <code>public void readFromParcel(Parcel in)</code> that reads the
+value in a parcel into your object.</li>
+<li>Add a static field called <code>CREATOR</code> to your class which is an object implementing
+the {@link android.os.Parcelable.Creator Parcelable.Creator} interface.</li>
+<li>Last but not least:
+<ul>
+<li>If you are developing with Eclipse/ADT, follow these steps:
+<ol type="a">
+<li>In the Package Explorer view, right-click on the project.</li>
+<li>Choose <strong>Android Tools</strong> > <strong>Create Aidl preprocess file
+for Parcelable classes</strong>.</li>
+<li>This will create a file called "project.aidl" in the root of the project.
+The file will be automatically used when compiling an aidl file that uses the
+parcelable classes.</li>
+</ol>
+</li>
+<li>If you are developing with Ant or are using a custom build process, create an aidl file
+that declares your parcelable class (as shown below). If you are using a custom build process,
+do not add the aidl file to your build. Similar to a header file in C, the aidl file isn't 
+compiled.</li>
+</ul>
+</li>
+</ul>
+<p>AIDL will use these methods and fields in the code it generates to marshall and unmarshall
+your objects.</p>
+<p>Here is an example of how the {@link android.graphics.Rect} class implements the
+Parcelable protocol.</p>
+
+<pre class="prettyprint">
+import android.os.Parcel;
+import android.os.Parcelable;
+
+public final class Rect implements Parcelable {
+    public int left;
+    public int top;
+    public int right;
+    public int bottom;
+
+    public static final Parcelable.Creator&lt;Rect&gt; CREATOR = new Parcelable.Creator&lt;Rect&gt;() {
+        public Rect createFromParcel(Parcel in) {
+            return new Rect(in);
+        }
+
+        public Rect[] newArray(int size) {
+            return new Rect[size];
+        }
+    };
+
+    public Rect() {
+    }
+
+    private Rect(Parcel in) {
+        readFromParcel(in);
+    }
+
+    public void writeToParcel(Parcel out) {
+        out.writeInt(left);
+        out.writeInt(top);
+        out.writeInt(right);
+        out.writeInt(bottom);
+    }
+
+    public void readFromParcel(Parcel in) {
+        left = in.readInt();
+        top = in.readInt();
+        right = in.readInt();
+        bottom = in.readInt();
+    }
+}
+</pre>
+
+<p>Here is Rect.aidl for this example</p>
+
+<pre class="prettyprint">
+package android.graphics;
+
+// Declare Rect so AIDL can find it and knows that it implements
+// the parcelable protocol.
+parcelable Rect;
+</pre>
+
+<p>The marshalling in the Rect class is pretty simple.  Take a look at the other
+methods on {@link android.os.Parcel} to see the other kinds of values you can write
+to a Parcel.</p>
+
+<p class="warning"><b>Warning:</b> Don't forget the security implications of receiving data from
+other processes.  In this case, the rect will read four numbers from the parcel,
+but it is up to you to ensure that these are within the acceptable range of
+values for whatever the caller is trying to do.  See
+<a href="{@docRoot}guide/topics/security/security.html">Security and Permissions</a> for more
+on how to keep your application secure from malware.</p>
+
+<h2>Calling an IPC Method <a name="calling"></a></h2>
+<p>Here are the steps a calling class should make to call your remote interface: </p>
+<ol>
+    <li>Declare a variable of the interface type that your .aidl file defined. </li>
+    <li>Implement {@link android.content.ServiceConnection ServiceConnection}. </li>
+    <li>Call {@link android.content.Context#bindService(android.content.Intent,android.content.ServiceConnection,int)
+        Context.bindService()}, passing in your ServiceConnection implementation. </li>
+    <li>In your implementation of {@link android.content.ServiceConnection#onServiceConnected(android.content.ComponentName,android.os.IBinder)
+        ServiceConnection.onServiceConnected()}, you will receive an {@link android.os.IBinder
+        IBinder} instance (called <em>service</em>). Call <code><em>YourInterfaceName</em>.Stub.asInterface((IBinder)<em>service</em>)</code>        to
+        cast the returned parameter to <em>YourInterface</em> type.</li>
+    <li>Call the methods that you defined on your interface. You should always trap
+        {@link android.os.DeadObjectException} exceptions, which are thrown when
+        the connection has broken; this will be the only exception thrown by remote
+        methods.</li>
+    <li>To disconnect, call {@link android.content.Context#unbindService(android.content.ServiceConnection)
+        Context.unbindService()} with the instance of your interface. </li>
+</ol>
+<p>A few comments on calling an IPC service:</p>
+<ul>
+    <li>Objects are reference counted across processes. </li>
+    <li>You can send anonymous objects
+        as method arguments. </li>
+</ul>
+<p>Here is some sample code demonstrating calling an AIDL-created service, taken
+    from the Remote Activity sample in the ApiDemos project.</p>
+<p>{@sample development/samples/ApiDemos/src/com/example/android/apis/app/RemoteServiceBinding.java
+    exposing_a_service}</p>
+
+
+
diff --git a/docs/html/guide/developing/tools/ddms.jd b/docs/html/guide/developing/tools/ddms.jd
new file mode 100644
index 0000000..fa04216
--- /dev/null
+++ b/docs/html/guide/developing/tools/ddms.jd
@@ -0,0 +1,250 @@
+page.title=Using Dalvik Debug Monitor Service (DDMS)
+@jd:body
+
+<p>Android ships with a debugging tool called the Dalvik Debug Monitor Service (DDMS),
+    which provides port-forwarding services, screen capture on the device, thread
+    and heap information on the device, logcat, process, and radio state information,
+    incoming call and SMS spoofing, location data spoofing, and more. This page
+    provides a modest discussion of DDMS features; it is not an exhaustive exploration of
+    all the features and capabilities.</p>
+
+<p>DDMS ships in the <code>tools/</code> directory of the SDK.
+    Enter this directory from a terminal/console and type <code>ddms</code> (or <code>./ddms</code> 
+    on Mac/Linux) to run it. DDMS will work with both the emulator and a connected device. If both are
+    connected and running simultaneously, DDMS defaults to the emulator.</p>
+
+<h2 id="how-ddms-works">How DDMS works</h2>
+<p>DDMS acts as a middleman to connect the IDE to the applications running on
+the device. On Android, every application runs in its own process, 
+each of which hosts its own virtual machine (VM). And each process
+listens for a debugger on a different port.</p>
+
+<p>When it starts, DDMS connects to <a href="{@docRoot}guide/developing/tools/adb.html">adb</a> and 
+starts a device monitoring service between the two, which will notify DDMS when a device is
+connected or disconnected. When a device is connected, a VM monitoring service is created
+between adb and DDMS, which will notify DDMS when a VM on the device is started 
+or terminated. Once a VM is running, DDMS retrieves the the VM's process ID (pid), via adb,
+and opens a connection to the VM's debugger, through the adb daemon (adbd) on the device. 
+DDMS can now talk to the VM using a custom wire protocol.</p>
+
+<p>For each VM on the device, DDMS opens a port upon which it will listen for a debugger. For the first VM, DDMS listens for a debugger on port 8600, the next on 8601, and so on. When a debugger connects to one of these ports, all traffic is forwarded between the debugger and the associated VM. Debugging can then process like any remote debugging session.</p>
+
+<p>DDMS also opens another local port, the DDMS "base port" (8700, by default), upon which it also listens for a debugger. When a debugger connects to this base port, all traffic is forwarded to the VM currently selected in DDMS, so this is typically where you debugger should connect.</p>
+
+<p>For more information on port-forwarding with DDMS,
+read <a href="{@docRoot}guide/developing/debug-tasks.html#ide-debug-port">Configuring your IDE to attach
+to port 8700 for debugging</a>.</p>
+
+<p class="note"><strong>Tip:</strong>
+You can set a number of DDMS preferences in <strong>File</strong> > <strong>Preferences</strong>.
+Preferences are saved to &quot;$HOME/.ddmsrc&quot;. </p>
+
+<p class="warning"><strong>Known debugging issues with Dalvik</strong><br/>
+Debugging an application in the Dalvik VM should work the same as it does
+in other VMs. However, when single-stepping out of synchronized code, the "current line"
+cursor may jump to the last line in the method for one step.</p>
+
+
+<h2 id="left-pane">Left Pane</h2>
+<p>The left side of the Debug Monitor shows each emulator/device currently found, with a list of 
+    all the VMs currently running within each. 
+    VMs are identified by the package name of the application it hosts.</p>
+<p>Use this list to find and attach to the VM
+    running the activity(ies) that you want to debug. Next to each VM in the
+    list is a &quot;debugger pass-through&quot; port (in the right-most column). 
+    If you connect your debugger to one of the the ports listed, you
+    will be connected to the corresponding VM on the device. However, when using 
+    DDMS, you need only connect to port 8700, as DDMS forwards all traffic here to the 
+    currently selected VM. (Notice, as you select a VM in the list, the listed port includes 8700.)
+    This way, there's no need to reconfigure the debugger's port each time you switch between VMs.</p>
+<p>When an application running on the device calls {@link android.os.Debug#waitForDebugger()}
+    (or you select this option in the <a href="{@docRoot}guide/developing/debug-tasks.html#additionaldebugging">developer
+    options</a>), a red icon will be shown next to the client name, while it waits for the 
+    debugger to attach to the VM. When a debugger is connected, the icon will turn green. </p>
+<p>If you see a crossed-out bug icon, this means that the DDMS was unable to complete a 
+connection between the debugger and the VM because it was unable to open the VM's local port.
+If you see this for all VMs on the device, it is likely because you have another instance of
+DDMS running (this includes the Eclipse plugin).</p>
+<p>If you see a question mark in place of an application package, this means that, 
+once DDMS received the application pid from adb, it
+somehow failed to make a successful handshake with the VM process. Try restarting DDMS.</p>
+
+
+<h2 id="right-pane">Right pane</h2>
+<p>On the right side, the Debug Monitor provides tabs that display useful information 
+and some pretty cool tools.</p>
+
+<h3 id="info">Info</h3>
+<p>This view shows some general information about the selected VM, including the process
+    ID, package name, and VM version.</p>
+
+<h3 id="threads">Threads</h3>
+<p> The threads view has a list of threads running in the process of the target VM.
+     To reduce the amount
+    of data sent over the wire, the thread updates are only sent when explicitly
+    enabled by toggling the &quot;threads&quot; button
+    in the toolbar. This toggle is maintained per VM. This tab includes the following
+    information: </p>
+<ul>
+    <li> <strong>ID</strong> - a VM-assigned unique thread ID. In Dalvik, these are
+        odd numbers starting from 3. </li>
+    <li> <strong>Tid</strong> - the Linux thread ID. For the main thread in a process,
+        this will match the process ID. </li>
+    <li> <strong>Status</strong> - the VM thread status. Daemon threads are
+        shown with an asterisk (*). This will be one of the following:
+        <ul>
+                <li> <em>running</em> - executing application code </li>
+            <li> <em>sleeping</em> - called Thread.sleep() </li>
+            <li> <em>monitor</em> - waiting to acquire a monitor lock </li>
+            <li> <em>wait</em> - in Object.wait() </li>
+            <li> <em>native</em> - executing native code </li>
+            <li> <em>vmwait</em> - waiting on a VM resource </li>
+            <li> <em>zombie</em> - thread is in the process of dying </li>
+            <li> <em>init</em> - thread is initializing (you shouldn't see this) </li>
+            <li> <em>starting</em> - thread is about to start (you shouldn't see
+                this either) </li>
+        </ul>
+    </li>
+    <li> <strong>utime</strong> - cumulative time spent executing user code, in &quot;jiffies&quot; (usually
+        10ms). Only available under Linux. </li>
+    <li> <strong>stime</strong> - cumulative time spent executing system code, in &quot;jiffies&quot;  (usually
+        10ms). </li>
+    <li> <strong>Name</strong> - the name of the thread</li>
+</ul>
+<p> &quot;ID&quot; and &quot;Name&quot; are set when the thread is started. The remaining
+    fields are updated periodically (default is every 4 seconds). </p>
+
+<h3 id="vm-heap">VM Heap</h3>
+<p> Displays some heap stats, updated during garbage collection. If, when a VM is selected,
+the VM Heap view says that heap updates are not enabled, click the "Show heap updates" button, 
+located in the top-left toolbar. Back in the VM Heap view, click <strong>Cause GC</strong> 
+to perform garbage collection and update the heap stats.</p>
+
+
+<h3 id="allocation-tracker">Allocation Tracker</h3>
+<p>In this view, you can track the memory allocation of each virtual machine.
+With a VM selected in the left pane, click <strong>Start Tracking</strong>, then 
+<strong>Get Allocations</strong> to view all allocations since tracking started. 
+The table below will be filled with all the relevant
+data. Click it again to refresh the list.</p>
+
+
+<h3 id="emulator-control">Emulator Control</h3>
+<p>With these controls, you can simulate special device states and activities.
+Features include:</p>
+<ul>
+<li><strong>Telephony Status</strong> - change the state of the phone's Voice and Data plans
+    (home, roaming, searching, etc.), and simulate different kinds of network Speed and Latency
+    (GPRS, EDGE, UTMS, etc.).</li>
+<li><strong>Telephony Actions</strong> - perform simulated phone calls and SMS messages to the emulator.</li>
+<li><strong>Location Controls</strong> - send mock location data to the emulator so that you can perform
+  location-aware operations like GPS mapping.
+
+<p>To use the Location Controls, launch your application in the Android emulator and open DDMS. 
+Click the Emulator Controls tab and scroll down to Location Controls.
+From here, you can:</p>
+<ul class="listhead">
+    <li>Manually send individual longitude/latitude coordinates to the device.
+	<p>Click <strong>Manual</strong>, 
+	select the coordinate format, fill in the fields and click <strong>Send</strong>.
+	</p>
+    </li>
+    <li>Use a GPX file describing a route for playback to the device.
+	<p>Click <strong>GPX</strong> and load the file. Once loaded,
+	click the play button to playback the route for your location-aware application.</p>	
+	<p>When performing playback from GPX, you can adjust the speed of 
+	playback from the DDMS panel and control playback with the pause and skip buttons.
+	DDMS will parse both the waypoints (<code>&lt;wpt></code>, in the first table), 
+        and the tracks (<code>&lt;trk></code>,
+	in the second table, with support for multiple segments, <code>&lt;trkseg></code>, 
+        although they are simply
+	concatenated). Only the tracks can be played. Clicking a waypoint in the first list simply
+	sends its coordinate to the device, while selecting a track lets you play it.</p>
+    </li>
+    <li>Use a KML file describing individual placemarks for sequenced playback to the device.
+	<p>Click <strong>KML</strong> and load the file. Once loaded,
+	click the play button to send the coordinates to your location-aware application.</p>
+	<p>When using a KML file, it is parsed for a <code>&lt;coordinates&gt;</code>
+    	element. The value of which should be a single 
+    	set of longitude, latitude and altitude figures. For example:</p>
+	<pre>&lt;coordinates>-122.084143,37.421972,4&lt;/coordinates></pre>
+	<p>In your file, you may include multiple <code>&lt;Placemark></code> elements, each containing
+	a <code>&lt;coordinates></code> element. When you do so, the collection of placemarks will 
+	be added as tracks. DDMS will send one placemark per second to the device.</p>
+	<p>One way to generate a suitable KML file is to find a location in Google Earth.
+	Right-click the location entry that appears on the left and select "Save place as..." 
+	with the save format set to Kml.</p>
+<p class="note"><strong>Note:</strong> DDMS does not support routes created with the 
+<code>&lt;MultiGeometry>&lt;LineString>lat1, long1, lat2, long2, ....&lt;/LineString>&lt;/MultiGeometry></code> methods.
+	There is also currently no support for the <code>&lt;TimeStamp></code> node inside
+	the <code>&lt;Placemark></code>.
+	Future releases may support timed placement and routes within a single coordinate element.</p>
+    </li>
+  </ul>
+  <p>For <em>additional</em> methods of setting up mocks of location-based data, see the 
+  <a href="{@docRoot}guide/topics/location/index.html">Location</a> topic.</p>
+  </li>
+</ul>
+
+
+<!-- <h4>Event Log</h4> -->
+
+
+<h2 id="file-explorer">File Explorer</h2>
+<p>With the File Explorer, you can view the device file system and perform basic management, 
+like pushing and pulling files. This circumvents using the <a href="{@docRoot}guide/developing/tools/adb.html">adb</a>
+<code>push</code> and <code>pull</code> commands, with a GUI experience.</p>
+<p>With DDMS open, select <strong>Device</strong> > <strong>File Explorer...</strong> to open the
+File Explorer window. You can drag-and-drop into the device directories, but cannot drag <em>out</em> of them.
+To copy files from the device, select the file and click the <strong>Pull File from Device</strong>
+button in the toolbar. To delete files, use the <strong>Delete</strong> button in the toolbar.</p>
+<p>If you're interested in using an SD card image on the emulator, you're still required to use
+the <code>mksdcard</code> command to create an image, and then mount it during emulator bootup. 
+For example, from the <code>/tools</code> directory, execute:</p>
+<pre>
+<b>$</b> mksdcard 1024M ./img
+<b>$</b> emulator -sdcard ./img
+</pre>
+<p>Now, when the emulator is running, the DDMS File Explorer will be able to read and write to the 
+sdcard directory. However, your files may not appear automatically. For example, if you add an
+MP3 file to the sdcard, the media player won't see them until you restart the emulator. (When restarting
+the emulator from command line, be sure to mount the sdcard again.)</p>
+<p>For more information on creating an SD card image, see the 
+<a href="{@docRoot}guide/developing/tools/othertools.html#mksdcard">Other Tools</a> document.</p>
+
+<h2 id="screen-capture">Screen Capture</h2>
+<p>You can capture screen images on the device or emulator by selecting <strong>Device</strong>
+    &gt; <strong>Screen capture...</strong> in the menu bar, or press CTRL-S.</p>
+
+<h2 id="exploring-processes">Exploring Processes</h2>
+<p>You can see the output of <code>ps -x</code> for a specific VM by selecting <strong>Device</strong>
+    &gt; <strong>Show process status</strong>... in the menu bar.</p>
+
+<h2 id="cause-a-gc-to-occur">Cause a GC to Occur</h2>
+<p>Cause garbage collection to occury by pressing the trash can button on the toolbar. </p>
+
+<h2 id="running-dumpsys-and-dumpstate">Running Dumpsys and Dumpstate on the Device (logcat)<a name="logcat" id="logcat"></a> </h2>
+<ul>
+        <li>To run <strong>dumpsys</strong> (logcat) from Dalvik, select <strong>Device</strong> &gt; 
+            <strong>Run logcat...</strong> in the menu bar.</li>
+    <li>To run <strong>dumpstate</strong> from Dalvik, select <strong>Device</strong> &gt; <strong>Dump device
+        state...</strong> in the menu bar. </li>
+</ul>
+
+<h2 id="examine-radio-state">Examine Radio State</h2>
+<p>By default, radio state is not output during a standard logcat (it is a lot of
+    information). To see radio information, either click <strong>Device</strong> &gt; <strong>Dump radio
+    state...</strong> or run logcat as described in <a href="{@docRoot}guide/developing/debug-tasks.html#logradio">Logging
+    Radio Information</a>. </p>
+
+<h2 id="stop-a-vitrual-machine">Stop a Virtual Machine </h2>
+<p>You can stop a virtual machine by selecting <strong>Actions</strong> &gt; <strong>Halt
+VM</strong>. Pressing this  button causes the VM to call <code>System.exit(1)</code>.</p>
+
+<h2 id="known-issues" style="color:#FF0000">Known issues with DDMS </h2>
+<p>DDMS has the following known limitations:</p>
+<ul>
+    <li>If you connect and disconnect a debugger, ddms drops and reconnects the
+        client so the VM realizes that the debugger has gone away. This will be fixed
+        eventually. </li>
+</ul>
diff --git a/docs/html/guide/developing/tools/draw9patch.jd b/docs/html/guide/developing/tools/draw9patch.jd
new file mode 100644
index 0000000..f25fabb
--- /dev/null
+++ b/docs/html/guide/developing/tools/draw9patch.jd
@@ -0,0 +1,58 @@
+page.title=Draw 9-patch
+@jd:body
+
+<p>The Draw 9-patch tool allows you to easily create a 
+   {@link android.graphics.NinePatch} graphic using a WYSIWYG editor.</p>
+<p>For an introduction to Nine-patch graphics and how they work, please read 
+the section on Nine-patch in the 
+<a href="{@docRoot}guide/topics/resources/available-resources.html#ninepatch">Ninepatch Images</a> topic.</p>
+
+<div class="sidebox" style="width:auto"><br/>
+<img src="{@docRoot}images/draw9patch-norm.png" alt="" height="300" width="341" />
+</div>
+
+<p>Here's a quick guide to create a Nine-patch graphic using the Draw 9-patch tool.
+You'll need the PNG image with which you'd like to create a NinePatch.</p>
+
+<ol>
+  <li>From a terminal, launch the <code>draw9patch</code> application from your SDK 
+    <code>/tools</code> directory.
+    </li>
+  <li>Drag your PNG image into the Draw 9-patch window 
+    (or <strong>File</strong> > <strong>Open 9-patch...</strong> to locate the file).
+    Your workspace will now open.
+    <p>The left pane is your drawing area, in which you can edit the lines for the
+     stretchable patches and content area. The right 
+     pane is the preview area, where you can preview your graphic when stretched.</p>
+    </li>
+  <li>Click within the 1-pixel perimeter to draw the lines that define the stretchable 
+    patches and (optional) content area. Right-click (or hold Shift and click, on Mac) to erase 
+    previously drawn lines.
+    </li>
+  <li>When done, select <strong>File</strong> > <strong>Save 9-patch...</strong>
+    <p>Your image will be saved with the <code>.9.png</code> file name.</p>
+    </li>
+</ol>
+    <p class="note"><strong>Note:</strong> A normal PNG file (<code>*.png</code>) will be 
+     loaded with an empty one-pixel border added around the image, in which you can draw 
+     the stretchable patches and content area.
+     A previously saved 9-patch file (<code>*.9.png</code>) will be loaded as-is, 
+     with no drawing area added, because it already exists.</p>
+
+<div class="sidebox" style="width:auto"><br/>
+<img src="{@docRoot}images/draw9patch-bad.png" alt="" height="300" width="341" />
+</div>
+
+<p>Optional controls include:</p>
+<ul>
+  <li><strong>Zoom</strong>: Adjust the zoom level of the graphic in the drawing area.</li>
+  <li><strong>Patch scale</strong>: Adjust the scale of the images in the preview area.</li>
+  <li><strong>Show lock</strong>: Visualize the non-drawable area of the graphic on mouse-over.</li>
+  <li><strong>Show patches</strong>: Preview the stretchable patches in the drawing area (pink is a 
+    stretchable patch).</li>
+  <li><strong>Show content</strong>: Highlight the content area in the preview images 
+    (purple is the area in which content is allowed).</li>
+  <li><strong>Show bad patches</strong>: Adds a red border around patch areas that may
+  produce artifacts in the graphic when stretched. Visual coherence of your stretched
+  image will be maintained if you eliminate all bad patches.</li>
+<ul>
diff --git a/docs/html/guide/developing/tools/emulator.jd b/docs/html/guide/developing/tools/emulator.jd
new file mode 100644
index 0000000..769491b4
--- /dev/null
+++ b/docs/html/guide/developing/tools/emulator.jd
@@ -0,0 +1,1736 @@
+page.title=Android Emulator
+@jd:body
+
+<img src="{@docRoot}images/emulator-hvga-p.png" alt="Image of the Android Emulator" width="271" height="524" style="margin-left:0em;margin-top:-4em;float:right;"/>
+
+<p>The Android SDK includes a mobile device emulator -- a virtual mobile device 
+that runs on your computer. The emulator lets you prototype, develop, and test 
+Android applications without using a physical device. </p>
+
+<p>The Android emulator mimics all of the typical hardware and software features 
+of a typical mobile device, except that it can not receive or place actual phone 
+calls. It provides a variety of navigation and control keys, which you can "press" 
+using your mouse or keyboard to generate events for your application. It also 
+provides a screen in which your application is displayed, together with any other 
+Android applications running. </p>
+
+<p>To help you model and test your application, the emulator lets your application 
+use the services of the Android platform to invoke other applications, access the 
+network, play audio and video, store and retrieve data, notify the user, and render 
+graphical transitions and themes. </p>
+
+<p>The emulator also includes a variety of debug capabilities, such as a console 
+from which you can log kernel output, simulate application interrupts (such as 
+arriving SMS messages or phone calls), and simulate latency effects and dropouts 
+on the data channel.</p>
+
+
+
+
+<div class="inline-toc" style="whitespace:nowrap;">
+<h4>In this document:</h4>
+<div class="g-unit g-first" style="whitespace:nowrap;width:35%;">
+<ol class="toc">
+<li><a href="#overview">Overview</a></li>
+<li><a href="#starting">Starting and Stopping the Emulator</a></li>
+<li><a href="#controlling">Controlling the Emulator</a></li>
+<li><a href="#startup-options">Emulator Startup Options</a></li>
+<li><a href="#diskimages">Working with Emulator Disk Images</a>
+	<ol class="toc">
+	<li><a href="#systemimages">System Images</a></li>
+	<li><a href="#runtimeimages">Runtime Images: User Data and SD Card</a></li>
+	<li><a href="#temporaryimages">Temporary Images</a></li>
+	</ol></li>
+<li><a href="#emulatornetworking">Emulator Networking</a>
+	<ol class="toc">
+	<li><a href="#networkaddresses">Network Address Space</a></li>
+	<li><a href="#networkinglimitations">Local Networking Limitations</a></li>
+	<li><a href="#redirections">Using Network Redirections</a></li>
+	<li><a href="#dns">Configuring the Emulator's DNS Settings</a></li>
+	<li><a href="#proxy">Using the Emulator with a Proxy</a></li>
+	<li><a href="#connecting">Interconnecting Emulator Instances</a></li>
+	<li><a href="#calling">Sending a Voice Call or SMS to Another Emulator Instance</a></li>
+	</ol></li>
+</ol>
+</div>
+
+<div class="g-unit" style="whitespace:nowrap;">
+<ol class="toc">
+<li><a href="#console">Using the Emulator Console</a>
+	<ol class="toc">
+	<li><a href="#portredirection">Port Redirections</a></li>
+	<li><a href="#geo">Geo Location Provider Emulation</a></li>
+	<li><a href="#events">Sending Events</a></li>
+	<li><a href="#power">Emulating Device Power Characteristics</a></li>
+	<li><a href="#netstatus">Network Status</a></li>
+	<li><a href="#netdelay">Network Delay Emulation</a></li>
+	<li><a href="#netspeed">Network Speed Emulation</a></li>
+	<li><a href="#telephony">Telephony Emulation</a></li>
+	<li><a href="#sms">SMS Emulation</a></li>
+	<li><a href="#vm">VM State</a></li>
+	<li><a href="#window">Emulator Window</a></li>
+	<li><a href="#terminating">Terminating an Emulator Instance</a></li>
+	</ol></li>
+<li><a href="#skins">Using Emulator Skins</a></li>
+<li><a href="#multipleinstances">Running Multiple Instances of the Emulator</a></li>
+<li><a href="#apps">Installing Applications on the Emulator</a></li>
+<li><a href="#sdcard">SD Card Emulation</a>
+	<ol class="toc">
+	<li><a href="#creating">Creating a Disk Image</a></li>
+	<li><a href="#copying">Copying Files to a Disk Image</a></li>
+	<li><a href="#loading">Loading the Disk Image at Emulator Startup</a></li>
+	</ol></li>
+<li><a href="#troubleshooting">Troubleshooting Emulator Problems</a></li>
+<li><a href="#limitations">Emulator Limitations</a></li>
+</ol>
+</div>
+
+</div>
+
+<a name="overview"></a>
+
+<h2>Overview</h2>
+
+<p>The Android emulator is a QEMU-based application that provides a virtual ARM
+mobile device on which you can run your Android applications. It provides a full
+Android system stack, down to the kernel level, and includes a set of
+preinstalled applications (such as the dialer) that you can access from your
+applications. It provides a skinnable mobile device UI, customizable key
+mappings, and a variety of commands and options for controlling the behaviors of
+the emulated environment.  </p>
+
+<p>The Android system image distributed in the SDK contains ARM machine code for
+the Android Linux kernel, the native libraries, the Dalvik VM, and the various
+Android package files (such as for for the Android framework and preinstalled
+applications). The emulator's QEMU layers provide dynamic binary translation of
+the ARM machine code to the OS and processor architecture of your development
+machine. </p>
+
+<p>Adding custom capabilities to the underlying QEMU services, the Android
+emulator supports many hardware features likely to be found on mobile devices,
+including: </p>
+
+<ul>
+  <li>An ARMv5 CPU and the corresponding memory-management unit (MMU)</li>
+  <li>A 16-bit LCD display</li>
+  <li>One or more keyboards (a Qwerty-based keyboard and associated Dpad/Phone
+buttons)</li>
+  <li>A sound chip with output and input capabilities</li>
+  <li>Flash memory partitions (emulated through disk image files on the
+development machine)</li>
+  <li>A GSM modem, including a simulated SIM Card</li>
+</li>
+</ul>
+
+<p>The sections below provide more information about the emulator and how to use
+it for developing Android applications.</p>
+
+<a name="starting"></a>
+
+<h2>Starting and Stopping the Emulator</h2>
+
+<p>During development and testing of your application, you install and run your
+application in the Android emulator. You can launch the emulator as a standalone
+application, from a command line, or you can use it as part of your Eclipse
+development environment. In either case, you can specify the startup options
+described in this document to control the emulator.
+ </p>
+
+<p>You can run your application on a single instance of the emulator or,
+depending on your needs, you can start multiple emulator instances and run your
+application in more than one emulated device. You can use the emulator's
+built-in commands to simulate GSM phone calling or SMS between emulator
+instances, and you can set up network redirections that allow emulators to send
+data to one another. For more information, see <a href="#telephony">Telephony
+Emulation</a>, <a href="#sms">SMS Emulation</a>, and 
+<a href="#emulatornetworking">Emulator Networking</a></p>
+
+<p>To start an instance of the emulator from the command line, change to the
+<code>tools/</code> folder of the SDK and enter <code>emulator</code> or
+<code>./emulator</code>. This initializes the Android system and you will see
+the emulator window appear on your screen. </p>
+
+<p>If you are working in Eclipse, the ADT plugin for Eclipse installs your
+application and starts the emulator automatically, when you run or debug 
+the application. You can specify emulator startup options in the Run/Debug 
+dialog, in the Target tab. When the emulator is running, you can issue 
+console commands as described later in this document.</p>
+
+<p>If you are not working in Eclipse, see <a href="#apps">Installing Applications
+on the Emulator</a> for information about how to install your application.</p>
+
+<p>To stop an emulator instance, just close the emulator's window.</p>
+
+<a name="controlling"></a>
+
+<h2>Controlling the Emulator</h2>
+
+<p>You can use emulator <a href="#startup-options">startup options</a> and <a
+href="#console">console commands</a> to control the behaviors and
+characteristics of the emulated environment itself.
+</p>
+
+<p>When the emulator is running, you can interact with the emulated mobile
+device just as you would an actual mobile device, except that you use your mouse
+pointer to &quot;touch&quot; the touchscreen and your keyboard keys to
+&quot;press&quot; the simulated device keys. </p>
+
+<p>The table below summarizes the mappings between the emulator keys and and 
+the keys of your keyboard. </p>
+
+<table  border="0" style="clear:left;">
+  <tr>
+    <th>Emulated Device Key </th>
+    <th>Keyboard Key </th>
+  </tr>
+  <tr>
+    <td>Home</td>
+    <td>HOME</td>
+  </tr>
+  <tr>
+    <td>Menu (left softkey)</td>
+    <td>F2 <em>or</em> Page-up button</td>
+  </tr>
+  <tr>
+    <td>Star (right softkey)</td>
+    <td>Shift-F2 <em>or </em>Page Down</td>
+  </tr>
+  <tr>
+    <td>Back</td>
+    <td>ESC</td>
+  </tr>
+  <tr>
+    <td>Call/dial button </td>
+    <td>F3</td>
+  </tr>
+  <tr>
+    <td>Hangup/end call button</td>
+    <td>F4</td>
+  </tr>
+  <tr>
+    <td>Search</td>
+    <td>F5 </td>
+  </tr>
+  <tr>
+    <td>Power button</td>
+    <td>F7 </td>
+  </tr>
+  <tr>
+    <td>Audio volume up button</td>
+    <td>KEYPAD_PLUS, Ctrl-5</td>
+  </tr>
+
+  <tr>
+    <td>Audio volume down button</td>
+    <td>KEYPAD_MINUS, Ctrl-F6</td>
+  </tr>
+  <tr>
+    <td>Camera button</td>
+    <td>Ctrl-KEYPAD_5, Ctrl-F3</td>
+  </tr>
+  <tr>
+    <td>Switch to previous layout orientation (for example, portrait, landscape)</td>
+    <td>KEYPAD_7, F11</td>
+  </tr>
+  <tr>
+    <td>Switch to next layout orientation (for example, portrait, landscape)</td>
+    <td>KEYPAD_9, F12</td>
+  </tr>
+  <tr>
+    <td>Toggle cell networking on/off</td>
+    <td>F8</td>
+  </tr>
+  <tr>
+    <td>Toggle code profiling</td>
+    <td>F9 (only with <code>-trace</code> startup option)</td>
+  </tr>
+  <tr>
+    <td>Toggle fullscreen mode</td>
+    <td>Alt-Enter</td>
+  </tr>
+  <tr>
+    <td>Toggle trackball mode</td>
+    <td>F6</td>
+  </tr>
+  <tr>
+    <td>Enter trackball mode temporarily (while key is pressed)</td>
+    <td>Delete</td>
+  </tr>
+  <tr>
+    <td>DPad left/up/right/down</td>
+    <td>KEYPAD_4/8/6/2</td>
+  </tr>
+  <tr>
+    <td>DPad center click</td>
+    <td>KEYPAD_5</td>
+  </tr>
+  <tr>
+    <td>Onion alpha increase/decrease</td>
+    <td>KEYPAD_MULTIPLY(*) / KEYPAD_DIVIDE(/)</td>
+  </tr>
+</table>
+
+<p>Note that, to use keypad keys, you must first disable NumLock on your development computer. </p>
+
+<a name="startup-options"></a>
+
+<h2> Emulator Startup Options</h2>
+<p>The emulator supports a variety of options that you can specify 
+when launching the emulator, to control its appearance or behavior. 
+Here's the command-line usage for launching the emulator with options: </p>
+
+<pre>emulator [-&lt;option&gt; [&lt;value&gt;]] ... [-&lt;qemu args&gt;]</pre>
+
+<p>The table below summarizes the available options.</p>
+
+<table>
+<tr>
+  <th width="10%" >Category</th>
+  <th width="20%" >Option</th>
+    <th width="30%" >Description</th>
+    <th width="40%" >Comments</th>
+</tr>
+
+<tr>
+  <td rowspan="8">Help</td>
+  <td><code>-help</code></td>
+  <td>Print a list of all emulator options.</td>
+  <td>&nbsp;</td>
+</tr>
+<tr>
+  <td><code>-help-all</code></td>
+  <td>Print help for all startup options.</td>
+  <td>&nbsp;</td>
+</tr>
+<tr>
+  <td><code>-help-&lt;option&gt;</code></td>
+  <td>Print help for a specific startup option.</td>
+  <td>&nbsp;</td>
+</tr>
+<tr>
+  <td><code>-help-debug-tags</code></td>
+  <td>Print a list of all tags for <code>-debug &lt;tags&gt;</code>.</td>
+  <td>&nbsp;</td>
+</tr>
+<tr>
+  <td><code>-help-disk-images</code></td>
+  <td>Print help for using emulator disk images.</td>
+  <td>&nbsp;</td>
+</tr>
+<tr>
+  <td><code>-help-environment</code></td>
+  <td>Print help for emulator environment variables.</td>
+  <td>&nbsp;</td>
+</tr><tr>
+  <td><code>-help-keys</code></td>
+  <td>Print the current mapping of keys.</td>
+  <td>&nbsp;</td>
+</tr>
+<tr>
+  <td><code>-help-keyset-file</code></td>
+  <td>Print help for defining a custom key mappings file.</td>
+  <td>&nbsp;</td>
+</tr>
+
+<tr>
+  <td rowspan="10">Disk Images</td>
+  <td><code>-cache&nbsp;&lt;filepath&gt;</code></td>
+  <td>Use &lt;filepath&gt; as the working cache partition image. </td>
+  <td>Optionally, you can specify a path relative to the current working directory. 
+  If no cache file is specified, the emulator's default behavior is to use a temporary file instead.
+  <p>For more information on disk images, use <code>-help-disk-images</code>.</p>
+</td></tr>
+<tr>
+  <td><code>-data&nbsp;&lt;filepath&gt;</code></td>
+  <td>Use &lt;filepath&gt; as the working user-data disk image. </td>
+  <td>Optionally, you can specify a path relative to the current working directory. 
+  If <code>-data</code> is not used, the emulator looks for a file named &quot;userdata-qemu.img&quot; 
+  in the directory specified in &lt;datadir&gt;. ~/.android/SDK-1.0 (on Linux/Mac) or 
+  C:\Documents and Settings\&lt;user&gt;\Local Settings\Application Data\Android\SDK-1.0 (on Windows). 
+  <p> If you use <code>-data &lt;filepath&gt;</code> but the file does not exist, the emulator creates 
+  a file at that location using the specified name. </p>
+  <p>See <a href="#multipleinstances">Running Multiple Emulator Instances</a> for information about how 
+  to use <code>-data</code> to let multiple emulator instances preserve their user data across sessions.</p>
+  <p>For more information on disk images, use <code>-help-disk-images</code>.</p>
+</td></tr>
+<!--
+<tr>
+  <td><code>-datadir &lt;dir&gt;</code></td>
+  <td>Search for the user-data disk image specified in <code>-data</code> in &lt;dir&gt;</td>
+  <td><code>&lt;dir&gt;</code> is a path relative to the current working directory. 
+
+<p>If you do not specify <code>-datadir</code>, the emulator looks for the user-data image in the 
+  directory ~/.android/SDK-1.0 (on Linux/Mac) or C:\Documents and Settings\&lt;user&gt;\Local Settings\Application 
+  Data\Android\SDK-1.0 (on Windows). </p><p>For more information on disk images, use <code>-help-disk-images</code>.</p>
+</td></tr>
+-->
+<tr>
+  <td><code>-image&nbsp;&lt;filepath&gt;</code></td>
+  <td>Use &lt;filepath&gt; as the system image.</td>
+  <td>Optionally, you can specify a path relative to the current working directory. 
+   Default is &lt;system&gt;/system.img.</td>
+</tr>
+<tr>
+  <td><code>-initdata&nbsp;&lt;filepath&gt;</code></td>
+  <td>When resetting the user-data image (through <code>-wipe-data</code>), copy the contents 
+  of this file to the new user-data disk image. By default, the emulator copies the <code>&lt;system&gt;/userdata.img</code>.</td>
+  <td>Optionally, you can specify a path relative to the current working directory. See also <code>-wipe-data</code>. <p>For more information on disk images, use <code>-help-disk-images</code>.</p></td>
+</tr>
+<tr>
+  <td><code>-kernel&nbsp;&lt;filepath&gt;</code></td>
+  <td>Use &lt;filepath&gt; as the emulated kernel.</td>
+  <td>Optionally, you can specify a path relative to the current working directory. </td>
+</tr>
+<tr>
+  <td><code>-nocache</code></td>
+  <td>Start the emulator without a cache partition.</td>
+  <td>See also <code>-cache &lt;file&gt;</code>.</td>
+</tr>
+<tr>
+  <td><code>-ramdisk&nbsp;&lt;filepath&gt;</code></td>
+  <td>Use &lt;filepath&gt; as the ramdisk image.</td>
+  <td>Default value is <code>&lt;system&gt;/ramdisk.img</code>. 
+  <p>Optionally, you can specify a path relative to the current working directory. For more information on disk images, use <code>-help-disk-images</code>.</p>
+</td>
+</tr>
+<tr>
+  <td><code>-sdcard&nbsp;&lt;filepath&gt;</code></td>
+  <td>Use &lt;file&gt; as the SD card image.</td>
+  <td>Default value is <code>&lt;system&gt;/sdcard.img</code>.
+  <p>Optionally, you can specify a path relative to the current working directory. For more information on disk images, use <code>-help-disk-images</code>.</p>
+</td>
+</tr>
+<tr>
+ <td><code>-system&nbsp;&lt;dirpath&gt;</code></td>
+ <td>Search for system, ramdisk and user data images in &lt;dir&gt;.</td>
+ <td><code>&lt;dir&gt;</code> is a directory path relative to the current 
+  working directory.</td>
+</tr>
+<tr>
+  <td><code>-wipe-data</code></td>
+  <td>Reset the current user-data disk image (that is, the file specified by <code>-datadir</code> and 
+  <code>-data</code>, or the default file). The emulator deletes all data from the user data image file, 
+  then copies the contents of the file at <code>-inidata</code> data to the image file before starting. 
+  </td>
+  <td>See also <code>-initdata</code>. 
+  <p>For more information on disk images, use <code>-help-disk-images</code>.</p>
+</td>
+</tr>
+<tr>
+  <td rowspan="9">Debug</td>
+  <td><code>-debug &lt;tags&gt;</code></td>
+  <td>Enable/disable debug messages for the specified debug tags.</td>
+  <td><code>&lt;tags&gt;</code> is a space/comma/column-separated list of debug component names. 
+  Use <code>-help-debug-tags</code> to print a list of debug component names that you can use. </td>
+</tr>
+<tr>
+  <td><code>-debug-&lt;tag&gt;</code></td>
+  <td>Enable/disable debug messages for the specified debug tag.</td>
+  <td rowspan="2">Use <code>-help-debug-tags</code> to print a list of debug component names that you can use in <code>&lt;tag&gt;</code>. </td>
+</tr>
+<tr>
+  <td><code>-debug-no-&lt;tag&gt;</code></td>
+  <td>Disable debug messages for the specified debug tag.</td>
+</tr>
+<tr>
+  <td><code>-logcat &lt;logtags&gt;</code></td>
+  <td>Enable logcat output with given tags.</td>
+  <td>If the environment variable ANDROID_LOG_TAGS is defined and not
+    empty, its value will be used to enable logcat output by default.</td>
+</tr>
+<tr>
+  <td><code>-shell</code></td>
+  <td>Create a root shell console on the current terminal.</td>
+  <td>You can use this command even if the adb daemon in the emulated system is broken. 
+  Pressing Ctrl-c from the shell stops the emulator instead of the shell.</td>
+</tr>
+<tr>
+  <td><code>-shell-serial&nbsp;&lt;device&gt;</code></td>
+  <td>Enable the root shell (as in <code>-shell</code> and specify the QEMU character 
+  device to use for communication with the shell.</td>
+  <td>&lt;device&gt; must be a QEMU device type. See the documentation for 'serial -dev' at 
+  <a href="http://www.bellard.org/qemu/qemu-doc.html#SEC10">http://www.bellard.org/qemu/qemu-doc.html#SEC10</a> 
+  for a list of device types.</p>
+
+<p>Here are some examples: </p>
+<ul>
+  <li><code>-shell-serial stdio</code> is identical to <code>-shell</code></li>
+  <li><code>-shell-serial tcp::4444,server,nowait</code> lets you communicate with the shell over TCP port 4444</li>
+  <li><code>-shell-serial fdpair:3:6</code> lets a parent process communicate with the shell using fds 3 (in) and 6 (out)</li>
+  <li><code>-shell-serial fdpair:0:1</code> uses the normal stdin and stdout fds, except that QEMU won't tty-cook the data.</li>
+  </ul>
+</td>
+</tr>
+<tr>
+  <td><code>-show-kernel &lt;name&gt;</code></td>
+  <td>Display kernel messages.</td>
+  <td>&nbsp;</td>
+</tr>
+<tr>
+  <td><code>-trace &lt;name&gt;</code></td>
+  <td>Enable code profiling (press F9 to start), written to a specified file.</td>
+  <td>&nbsp;</td>
+</tr>
+<tr>
+  <td><code>-verbose</code></td>
+  <td>Enable verbose output.</td>
+  <td>Equivalent to <code>-debug-init</code>. 
+<p>You can define the default verbose output options used by emulator instances in the Android environment variable 
+ANDROID_VERBOSE. Define the options you want to use in a comma-delimited list, specifying only the stem of each option: 
+<code>-debug-&lt;tags&gt;.</code> </p>
+<p>Here's an example showing ANDROID_VERBOSE defined with the <code>-debug-init</code> and <code>-debug-modem</code> options: 
+<p><code>ANDROID_VERBOSE=init,modem</code></p>
+<p>For more information about debug tags, use <code>&lt;-help-debug-tags&gt;</code>.</p>
+</td>
+</tr>
+<tr>
+  <td rowspan="6">Media</td>
+  <td><code>-audio &lt;backend&gt;</code></td>
+  <td>Use the specified audio backend.</td>
+  <td>&nbsp;</td>
+</tr>
+<tr>
+  <td><code>-audio-in &lt;backend&gt;</code></td>
+  <td>Use the specified audio-input backend.</td>
+  <td>&nbsp;</td>
+</tr>
+<tr>
+  <td><code>-audio-out &lt;backend&gt;</code></td>
+  <td>Use the specified audio-output backend.</td>
+  <td>&nbsp;</td>
+</tr>
+<!--<tr>
+  <td><code>-mic &lt;device or file&gt;</code></td>
+  <td>Use device or WAV file for audio input.</td>
+  <td>&nbsp;</td>
+</tr>
+-->
+<tr>
+  <td><code>-noaudio</code></td>
+  <td>Disable audio support in the current emulator instance.</td>
+  <td>&nbsp;</td>
+</tr>
+<tr>
+  <td><code>-radio &lt;device&gt;</code></td>
+  <td>Redirect radio modem interface to a host character device.</td>
+  <td>&nbsp;</td></tr>
+<tr>
+  <td><code>-useaudio</code></td>
+  <td>Enable audio support in the current emulator instance.</td>
+  <td>Enabled by default. </td>
+</tr>
+
+<tr>
+  <td rowspan="7">Network</td>
+  <td><code>-dns-server &lt;servers&gt;</code></td>
+  <td>Use the specified DNS server(s). </td>
+  <td>The value of <code>&lt;servers&gt;</code> must be a comma-separated list of up to 4 DNS server names or
+  IP addresses.</td>
+</tr>
+<tr>
+  <td><code>-http-proxy &lt;proxy&gt;</code></td>
+  <td>Make all TCP connections through a specified HTTP/HTTPS proxy</td>
+  <td>The value of <code>&lt;proxy&gt;</code> can be one of the following:<br>
+     <code>http://&lt;server&gt;:&lt;port&gt;</code><br>
+     <code>http://&lt;username&gt;:&lt;password&gt;@&lt;server&gt;:&lt;port&gt;</code>
+  <p>The <code>http://</code> prefix can be omitted. If the <code>-http-proxy &lt;proxy&gt;</code> command is not supplied,
+  the emulator looks up the <code>http_proxy</code> environment variable and automatically uses any value matching
+  the <code>&lt;proxy&gt;</code> format described above.</p></td>
+</tr>
+<tr>
+  <td><code>-netdelay &lt;delay&gt;</code></td>
+  <td>Set network latency emulation to &lt;delay&gt;.</td>
+  <td>Default value is <code>none</code>. See the table in <a href="#netdelay">Network Delay Emulation</a> for 
+  supported <code>&lt;delay&gt;</code> values. </td>
+</tr>
+<tr>
+  <td><code>-netfast</code></td>
+  <td>Shortcut for <code>-netspeed full -netdelay none</code></td>
+  <td>&nbsp;</td></tr>
+<tr>
+  <td><code>-netspeed &lt;speed&gt;</code></td>
+  <td>Set network speed emulation to &lt;speed&gt;.</td>
+  <td>Default value is <code>full</code>. See the table in <a href="#netspeed">Network Speed Emulation</a> for 
+  supported <code>&lt;speed&gt;</code> values. </td>
+</tr>
+<tr>
+  <td><code>-port &lt;port&gt;</code></td>
+  <td>Set the console port number for this emulator instance to <code>&lt;port&gt;</code>.</td>
+  <td>The console port number must be an even integer between 5554 and 5584, inclusive. <code>&lt;port&gt;</code>+1 
+  must also be free and will be reserved for ADB.</td>
+</tr>
+<tr>
+  <td><code>-report-console &lt;socket&gt;</code></td>
+  <td>Report the assigned console port for this emulator instance to a remote third party 
+  before starting the emulation. </td>
+  <td><code>&lt;socket&gt;</code> must use one of these formats:
+
+<p><code>tcp:&lt;port&gt;[,server][,max=&lt;seconds&gt;]</code></br>
+<code>unix:&lt;port&gt;[,server][,max=&lt;seconds&gt;]</code></p>
+
+<p>Use <code>-help-report-console</code></p> to view more information about this topic. </td>
+</tr>
+<tr>
+  <td rowspan="8">System</td>
+  <td><code>-cpu-delay &lt;delay&gt;</code></td>
+  <td>Slow down emulated CPU speed by &lt;delay&gt; </td>
+  <td>Supported values for &lt;delay&gt; are integers between 0 and 1000.
+
+<p>Note that the &lt;delay&gt; does not correlate to clock speed or other absolute metrics 
+&mdash; it simply represents an abstract, relative delay factor applied non-deterministically 
+in the emulator. Effective performance does not always 
+scale in direct relationship with &lt;delay&gt; values.</p>
+</td>
+</tr>
+<tr>
+  <td><code>-gps &lt;device&gt;</code></td>
+  <td>Redirect NMEA GPS to character device.</td>
+  <td>Use this command to emulate an NMEA-compatible GPS unit connected to
+  an external character device or socket. The format of <code>&lt;device&gt;</code> must be QEMU-specific 
+  serial device specification. See the documentation for 'serial -dev' at 
+  <a href="http://www.bellard.org/qemu/qemu-doc.html#SEC10">http://www.bellard.org/qemu/qemu-doc.html#SEC10</a>.
+</td>
+</tr>
+<tr>
+  <td><code>-nojni</code></td>
+  <td>Disable JNI checks in the Dalvik runtime.</td><td>&nbsp;</td></tr>
+<tr>
+  <td><code>-qemu</code></td>
+  <td>Pass arguments to qemu.</td>
+  <td>&nbsp;</td></tr>
+<tr>
+  <td><code>-qemu -h</code></td>
+  <td>Display qemu help.</td>
+  <td></td></tr>
+<tr>
+  <td><code>-radio &lt;device&gt;</code></td>
+  <td>Redirect radio mode to the specified character device.</td>
+  <td>The format of <code>&lt;device&gt;</code> must be QEMU-specific 
+  serial device specification. See the documentation for 'serial -dev' at 
+<a href="http://www.bellard.org/qemu/qemu-doc.html#SEC10">http://www.bellard.org/qemu/qemu-doc.html#SEC10</a>.
+</td>
+</tr>
+<tr>
+ <td><code>-timezone &lt;timezone&gt;</code></td>
+ <td>Set the timezone for the emulated device to &lt;timezone&gt;, instead of the host's timezone.</td>
+ <td><code>&lt;timezone&gt;</code> must be specified in zoneinfo format. For example:
+<p>"America/Los_Angeles"<br>
+"Europe/Paris"</p>
+</td>
+</tr>
+<tr>
+ <td><code>-version</code></td>
+ <td>Display the emulator's version number.</td>
+ <td>&nbsp;</td>
+</tr>
+<tr>
+  <td rowspan="12">UI</td>
+  <td><code>-dpi-device &lt;dpi&gt;</code></td>
+  <td>Scale the resolution of the emulator to match the screen size
+  of a physical device.</td>
+  <td>The default value is 165. See also <code>-scale</code>.</td>
+</tr>
+<tr>
+  <td><code>-no-boot-anim</code></td>
+  <td>Disable the boot animation during emulator startup.</td>
+  <td>Disabling the boot animation can speed the startup time for the emulator.</td>
+</tr>
+<tr>
+  <td><code>-no-window</code></td>
+  <td>Disable the emulator's graphical window display.</td>
+  <td>&nbsp;</td>
+</tr>
+<tr>
+  <td><code>-scale &lt;scale&gt;</code></td>
+  <td>Scale the emulator window. </td>
+  <td><code>&lt;scale&gt;</code> is a number between 0.1 and 3 that represents the desired scaling factor. You can 
+  also specify scale as a DPI value if you add the suffix "dpi" to the scale value. A value of "auto" 
+  tells the emulator to select the best window size.</td>
+</tr>
+<tr>
+  <td><code>-raw-keys</code></td>
+  <td>Disable Unicode keyboard reverse-mapping.</td>
+  <td>&nbsp;</td></tr>
+<tr>
+  <td><code>-noskin</code></td>
+  <td>Don't use any emulator skin.</td>
+  <td>&nbsp;</td></tr>
+<tr>
+  <td><code>-keyset &lt;file&gt;</code></td>
+  <td>Use the specified keyset file instead of the default.</td>
+  <td>The keyset file defines the list of key bindings between the emulator and the host keyboard. 
+  For more information, use <code>-help-keyset</code> to print information about this topic.
+</td>
+</tr>
+<tr>
+  <td><code>-onion &lt;image&gt;</code></td>
+  <td>Use overlay image over screen.</td>
+  <td>No support for JPEG. Only PNG is supported.</td></tr>
+<tr>
+  <td><code>-onion-alpha &lt;percent&gt;</code></td>
+  <td>Specify onion skin translucency  value (as percent).
+  <td>Default is 50.</td>
+</tr>
+<tr>
+  <td><code>-onion-rotation &lt;position&gt;</code></td>
+  <td>Specify onion skin rotation.
+  <td><code>&lt;position&gt;</code> must be one of the values 0, 1, 2, 3.</td>
+</tr>
+<tr>
+  <td><code>-skin &lt;skinID&gt;</code></td>
+  <td>Start the emulator with the specified skin. </td>
+  <td>The SDK includes a <a href="#skins">choice of four skins</a>:<br />
+      <li>HVGA-L (480x320, landscape)</li>
+      <li>HVGA-P (320x480, portrait) (default) </li>
+      <li>QVGA-L (320x240, landscape)</li>
+      <li>QVGA-P (240x320, portrait) </li>
+</td>
+</tr>
+<tr>
+  <td><code>-skindir &lt;dir&gt;</code></td>
+  <td>Search for emulator skins in &lt;dir&gt;. </td>
+  <td>&nbsp;</td></tr>
+</table>
+
+<a name="diskimages"></a>
+
+<h2>Working with Emulator Disk Images</h2>
+
+<p>The emulator uses mountable disk images stored on your development machine to
+simulate flash (or similar) partitions on an actual device. For example, it uses
+disk image containing an emulator-specific kernel, the Android system, a
+ramdisk image, and writeable images for user data and simulated SD card.</p>
+
+<p>To run properly, the emulator requires access to a specific set of disk image
+files. The Android SDK includes default versions of the required images, stored
+in predetermined locations in the SDK directory structure. At startup, the
+emulator looks for and reads the image files, using their default names and
+storage locations. </p>
+
+<p>To let you use alternate or custom versions of the image files, the emulator
+provides startup options that override the default locations and filenames of
+the image files. When you use the options, the emulator searches for the image
+file under the image name or location that you specify; if it can not locate the
+image, it reverts to using the default names and location.</p>
+
+<p>The emulator uses three types of image files: system image files, runtime
+image files, and temporary image files. The sections below describe how to
+override the location/name of each type of file. </p>
+
+<a name="systemimages"></a>
+<h3>System Images</h3>
+
+<p>System images contain system data and default settings without which the
+emulator can not run. The image files are read-only &mdash; the emulator reads
+the images at startup and does not modify them during the session.</p>
+
+<p>All of the system image files are stored in a single directory. By default,
+the system images are stored in the <code>lib/images</code>' under the
+emulator's program location. </p>
+
+<p>The emulator provides the <code>-system &lt;dir&gt;</code> startup option to
+let you override the location under which the emulator looks for the system
+images files. </p>
+
+<p>The emulator also provides startup options that let you override the names of
+the system images, as described in the table below. When you use one of the 
+options, the emulator looks in the default directory, or in a custom location
+(if you specified <code>-system &lt;dir&gt;</code>). Note that, if you provide
+alternate system image file, it must contain the same type of data as the
+default. For example, your override of the system.img file must point to a disk
+image containing an Android system. </p>
+
+
+<table>
+<tr>
+  <th width="10%" >Name</th>
+    <th width="30%" >Description</th>
+    <th width="40%" >Comments</th>
+</tr>
+
+<tr>
+  <td><code>kernel-qemu.img</code></td>
+  <td>The emulator-specific Linux kernel image</td>
+  <td>Override using <code>-kernel &lt;file&gt;</code></td>
+</tr>
+
+<tr>
+  <td><code>ramdisk.img</code></td>
+  <td>The ramdisk image used to boot the system.</td>
+  <td>Override using <code>-ramdisk &lt;file&gt;</code></td>
+</tr>
+
+<tr>
+  <td><code>system.img</code></td>
+  <td>The <em>initial</em> Android system image.</td>
+  <td>Override using <code>-image &lt;file&gt;</code></td>
+</tr>
+
+<tr>
+  <td><code>userdata.img</code></td>
+  <td>The <em>initial</em> user-data disk image</td>
+  <td>Override using <code>-initdata &lt;file&gt;</code>. Also see
+<code>-data &lt;file&gt;</code>, below.</td>
+</tr>
+
+</table>
+
+<a name="runtimeimages"></a>
+<h3>Runtime Images: User Data and SD Card</h3>
+
+<p>At runtime, the emulator reads and writes data on two disk images: a
+user-data image and (optionally) an SD card image. This emulates the user-data
+partition and removable storage media on actual device. </p>
+
+<p>The emulator provides a default user-data disk image. At startup, the emulator 
+creates the default image as a copy of the system user-data image (user-data.img), 
+described above. The emulator stores the default image in this location on 
+on your development machine: </p>
+
+<ul>
+  <li>Linux and OS X: <code>~/.android/SDK-1.0</code></li>
+  <li>Windows: <code>C:\Documents and Settings\&lt;user&gt;\Local Settings\Application Data\Android\SDK-1.0</code></li>
+</ul>
+
+<!--
+<p>The emulator provides a startup option, <code>-datadir &lt;dir&gt;</code>, 
+that you can use to override the location under which the emulator looks for the runtime
+image files. </p>
+-->
+
+<p>The emulator provides startup options to let you override the actual names and storage 
+locations of the runtime images to load, as described in the table below. When you use one 
+of these options, the emulator looks for the specified file(s) in the current working directory,
+in the default directory, or in a custom location (if you specified a path with the filename. </p>
+
+<table>
+<tr>
+  <th width="10%" >Name</th>
+    <th width="30%" >Description</th>
+    <th width="40%" >Comments</th>
+</tr>
+<tr>
+  <td><code>userdata-qemu.img</code></td>
+  <td>An image to which the emulator writes runtime user-data for a unique user.</td>
+  <td>Override using <code>-data &lt;filepath&gt;</code>, where <code>&lt;filepath&gt;</code> is the
+path the image, relative to the current working directory. If you supply a filename only, 
+the emulator looks for the file in the current working directory. If the file at <code>&lt;filepath&gt;</code> does
+not exist, the emulator creates an image from the default userdata.img, stores it under the name you
+specified, and persists user data to it at shutdown. </td>
+</tr>
+
+<tr>
+  <td><code>sdcard.img</code></td>
+  <td>An image representing an SD card inserted into the emulated device.</td>
+  <td>Override using <code>-sdcard &lt;filepath&gt;</code>, where <code>&lt;filepath&gt;</code> is the
+path the image, relative to the current working directory. If you supply a filename only, 
+the emulator looks for the file in the current working directory. </td>
+</tr>
+
+</table>
+
+<h4>User-Data Image</h4>
+
+<p>Each emulator instance uses a writeable user-data image to store user- and
+session-specific data. For example, it uses the image to store a unique user's
+installed application data, settings, databases, and files. </p>
+
+<p>At startup, the emulator attempts to load a user-data image stored during 
+a previous session. It looks for the file in the current working directory, 
+at the default location, as described above, and at the custom location/name 
+that you specified at startup. </p>
+
+<ul>
+<li>If it finds a user-data image, it mounts the image and makes it available to the system
+for reading/writing of user data. </li>
+<li>If it does not find one, it creates an image by copying the system user-data
+image (userdata.img), described above. At device power-off, the system persists
+the user data to the image, so that it will be available in the next session. 
+Note that the emulator stores the new disk image at the location/name that you
+specify in <code>-data</code> startup option.</li>
+</ul>
+
+<p>If you are planning to run multiple emulator instances concurrently, note
+that only the first emulator instance can persist user-data, if no explicit
+user-data image file is specified in the startup command. When running multiple
+emulator instances, you must specify a name for the image file to use (or
+create), by using the <code>-data &lt;name&gt;</code> option with a unique
+<code>&lt;name&gt;</code> value. For more information, see
+<a href="#multipleinstances">Running Multiple Emulator Instances</a>.</p>
+
+<h4>SD Card</h4>
+
+<P>Optionally, you can create a writeable disk image that the emulator can use
+to simulate removeable storage in an actual device. For information about how to create an 
+emulated SD card and load it in the emulator, see <a href="#sdcard">SD Card Emulation</a></p>
+
+<a name="temporaryimages"></a>
+<h3>Temporary Images</h3>
+
+<p>The emulator creates two writeable images at startup that it deletes at
+device power-off. The images are: </p>
+
+<ul>
+  <li>A writable copy of the Android system image</li>
+  <li>The <code>/cache</code> partition image</li>
+</ul>
+
+<p>The emulator does not permit renaming the temporary system image or
+persisting it at device power-off. </p>
+
+<p>The <code>/cache</code> partition image is initially empty, and is used by
+the browser to cache downloaded web pages and images. The emulator provides an 
+<code>-cache &lt;file&gt;</code>, which specifies the name of the file at which 
+to persist the <code>/cache</code> image at device power-off. If <code>&lt;file&gt;
+</code> does not exist, the emulator creates it as an empty file. </p>
+
+<p>You can also disable the use of the cache partition by specifying the
+<code>-nocache</code> option at startup. </p>
+
+
+<a name="emulatornetworking"></a>
+<h2>Emulator Networking</h2>
+
+<p>The emulator provides versatile networking capabilities that you can use to
+set up complex modeling and testing environments for your application. The
+sections below introduce the emulator's network architecture and capabilities.
+</p>
+
+<a name="networkaddresses"></a>
+<h3>Network Address Space</h3>
+
+<p>Each instance of the emulator runs behind a virtual router/firewall service
+that isolates it from your development machine's network interfaces and settings
+and from the internet. An emulated device can not see your development machine
+or other emulator instances on the network. Instead, it sees only that it is
+connected through Ethernet to a router/firewall.</p>
+
+<p>The virtual router for each instance manages the 10.0.2/24 network address
+space &mdash; all addresses managed by the router are in the form of
+10.0.2.&lt;xx&gt;, where &lt;xx&gt; is a number. Addresses within this space are
+pre-allocated by the emulator/router as follows:</p>
+
+<table>
+  <tr>
+    <th>Network Address</th>
+    <th>Description</th>
+  </tr>
+  <tr>
+    <td>10.0.2.1</td>
+    <td>Router/gateway address </td>
+  </tr>
+  <tr>
+    <td>10.0.2.2</td>
+    <td>Special alias to your host loopback interface (i.e., 127.0.0.1 on your
+development machine)</td>
+  </tr>
+  <tr>
+    <td>10.0.2.3</td>
+    <td>First DNS server</td>
+  </tr>
+  <tr>
+    <td>10.0.2.4 / 10.0.2.5 / 10.0.2.6</td>
+    <td>Optional second, third and fourth DNS server (if any) </td>
+  </tr>
+  <tr>
+    <td>10.0.2.15</td>
+    <td>The emulated device's own network/ethernet interface</td>
+  </tr>
+  <tr>
+    <td>127.0.0.1</td>
+    <td>The emulated device's own loopback interface </td>
+  </tr>
+</table>
+
+<p>Note that the same address assignments are used by all running emulator
+instances. That means that if you have two instances running concurrently on
+your machine, each will have its own router and, behind that, each will have an
+IP address of 10.0.2.15. The instances are isolated by a router and can
+<em>not</em> see each other on the same network. For information about how to
+let emulator instances communicate over TCP/UDP, see <a
+href="#connecting">Connecting Emulator Instances</a>.</p>
+
+<p>Also note that the address 127.0.0.1 on your development machine corresponds
+to the emulator's own loopback interface. If you want to access services running
+on your development machine's loopback interface (a.k.a. 127.0.0.1 on your
+machine), you should use the special address 10.0.2.2 instead.</p>
+
+<p>Finally, note that each emulated device's pre-allocated addresses are
+specific to the Android emulator and will probably be very different on real
+devices (which are also very likely to be NAT-ed, i.e., behind a
+router/firewall)</p>
+
+<a name="networkinglimitations"></a>
+<h3>Local Networking Limitations</h3>
+
+<p>Each emulator instance runs behind a virtual router, but unlike an actual
+device connected to a physical router, the emulated device doesn't have access
+to a physical network. Instead it runs as part of a normal application on your
+development machine. This means that it is subject to the same networking
+limitations as other applications on your machine:</p>
+
+<ul>
+  <li>Communication with the emulated device may be blocked by a firewall
+program running on your machine.</li>
+  <li>Communication with the emulated device may be blocked by another
+(physical) firewall/router to which your machine is connected.</li>
+</ul>
+
+<p>The emulator's virtual router should be able to handle all outbound TCP and
+UDP connections/messages on behalf of the emulated device, provided your
+development machine's network environment allows it to do so. There are no
+built-in limitations on port numbers or ranges except the one imposed by your
+host operating system and network.</p>
+
+<p>Depending on the environment, the emulator may not be able to support other
+protocols (such as ICMP, used for "ping") might not be supported. Currently, the
+emulator does not support IGMP or multicast. </p>
+
+<a name="redirections"></a>
+<h3>Using Network Redirections</h3>
+
+<p>To communicate with an emulator instance behind its virtual router, you need
+to set up network redirections on the virtual router. Clients can then connect
+to a specified guest port on the router, while the router directs traffic
+to/from that port to the emulated device's host port. </p>
+
+<p>To set up the network redirections, you create a mapping of host and guest
+ports/addresses on the the emulator instance. There are two ways to set up
+network redirections: using emulator console commands and using the ADB tool, as
+described below. </p>
+
+<a name="consoleredir"></a>
+<h4>Setting up Redirections through the Emulator Console</h4>
+
+<p>Each emulator instance provides a control console the you can connect to, to
+issue commands that are specific to that instance. You can use the
+<code>redir</code> console command to set up redirections as needed for an
+emulator instance. </p>
+
+<p>First, determine the console port number for the target emulator instance.
+For example, the console port number for the first emulator instance launched is
+5554. Next, connect to the console of the target emulator instance, specifying
+its console port number, as follows: </p>
+
+<pre><code>telnet localhost 5554</code></pre>
+
+<p>Once connected, use the <code>redir</code> command to work with redirections.
+To add a redirection, use:</a>. </p>
+
+<pre><code>add&nbsp;&lt;protocol&gt;:&lt;host-port&gt;:&lt;guest-port&gt;</code>
+</pre>
+
+<p>where <code>&lt;protocol&gt;</code> is either <code>tcp</code> or <code>udp</code>, 
+and <code>&lt;host-port&gt;</code> and <code>&lt;guest-port&gt;</code> sets the 
+mapping between your own machine and the emulated system, respectively. </p>
+
+<p>For example, the following command sets up a redirection that will handle all
+incoming TCP connections to your host (development) machine on 127.0.0.1:5000
+and will pass them through to the emulated system's 10.0.2.15:6000.:</p>
+
+<pre>redir add tcp:5000:6000</pre>
+
+<p>To delete a redirection, you can use the <code>redir del</code> command. To
+list all redirections for a specific instance, you can use <code>redir
+list</code>. For more information about these and other console commands, see 
+<a href="#console">Using the Emulator Console</a>. </p>
+
+<p>Note that port numbers are restricted by your local environment. this typically
+means that you cannot use host port numbers under 1024 without special
+administrator privileges.  Also, you won't be able to set up a redirection for a
+host port that is already in use by another process on your machine. In that
+case, <code>redir</code> generates an error message to that effect. </p>
+
+<a name="adbredir"></a>
+<h4>Setting Up Redirections through ADB</h4>
+
+<p>The Android Debug Bridge (ADB) tool provides port forwarding, an alternate
+way for you to set up network redirections. For more information, see <a
+href="{@docRoot}guide/developing/tools/adb.html#forwardports">Forwarding Ports</a> in the ADB
+documentation.</p>
+
+<p>Note that ADB does not currently offer any way to remove a redirection,
+except by killing the ADB server.</p>
+
+<a name="dns"></a>
+<h3>Configuring the Emulator's DNS Settings</h3>
+
+<p>At startup, the emulator reads the list of DNS servers that your system is
+currently using. It then stores the IP addresses of up to four servers on this
+list and sets up aliases to them on the emulated addresses 10.0.2.3, 10.0.2.4,
+10.0.2.5 and 10.0.2.6 as needed.  </p>
+
+<p>On Linux and OS X, the emulator obtains the DNS server addresses by parsing 
+the file <code>/etc/resolv.conf</code>. On Windows, the emulator obtains the 
+addresses by calling the <code>GetNetworkParams()</code> API. Note that this 
+usually means that the emulator ignores the content of your "hosts" file 
+(<code>/etc/hosts</code> on Linux/OS X, <code>%WINDOWS%/system32/HOSTS</code>
+ on Windows).</P>
+
+<p>When starting the emulator at the command line, you can also use the
+<code>-dns-server &lt;serverList&gt;</code> option to manually specify the
+addresses of DNS servers to use, where &lt;serverList&gt; is a comma-separated
+list of server names or IP addresses. You might find this option useful if you
+encounter DNS resolution problems in the emulated network (for example, an
+"Unknown Host error" message that appears when using the web browser).</p>
+
+<a name="proxy"></a>
+<h3>Using the Emulator with a Proxy</h3>
+
+<p>If your emulator must access the Internet through a proxy server, you can use
+the <code>-http-proxy &lt;proxy&gt;</code> option when starting the emulator, to
+set up the appropriate redirection. In this case, you specify proxy information
+in <code>&lt;proxy&gt;</code> in one of these formats:</p>
+
+<pre>http://&lt;machineName&gt;:&lt;port&gt;</pre>
+
+<p>or</p>
+
+<pre>http://&lt;username&gt;:&lt;password&gt;@&lt;machineName&gt;:&lt;port&gt;</pre>
+
+<p>The <code>-http-proxy</code> option forces the emulator to use the specified
+HTTP/HTTPS proxy for all outgoing TCP connections. Redirection for UDP is not
+currently supported.</p>
+
+<p>Alternatively, you can define the environment variable
+<code>http_proxy</code> to the value you want to use for
+<code>&lt;proxy&gt;</code>. In this case, you do not need to specify a value for
+<code>&lt;proxy&gt;</code> in the <code>-http-proxy</code> command &mdash; the
+emulator checks the value of the <code>http_proxy</code> environment variable at
+startup and uses its value automatically, if defined. </p>
+
+<p>You can use the <code>-verbose-proxy</code> option to diagnose proxy
+connection problems.</p>
+
+<a name="connecting"></a>
+<h3>Interconnecting Emulator Instances</h3>
+
+<p>To allow one emulator instance to communicate with another, you must set up
+the necessary network redirections as illustrated below. </p>
+
+<p>Assume that your environment is</p>
+
+<ul>
+  <li>A is you development machine</li>
+  <li>B is your first emulator instance, running on A</li>
+  <li>C is your second emulator instance, running on A too</li>
+</ul>
+
+<p>and you want to run a server on B, to which C will connect, here is how you
+could set it up: </p>
+
+<ol>
+  <li>Set up the server on B, listening to
+<code>10.0.2.15:&lt;serverPort&gt;</code></li>
+  <li>On B's console, set up a redirection from
+<code>A:localhost:&lt;localPort&gt;</code> to <code>
+B:10.0.2.15:&lt;serverPort&gt;</code></li>
+  <li>On C, have the client connect to 10.0.2.2:&lt;localPort&gt;</code></li>
+</ol>
+
+<p>For example, if you wanted to run an HTTP server, you can select
+<code>&lt;serverPort&gt;</code> as 80 and <code>&lt;localPort&gt;</code> as
+8080:</p>
+
+<ul>
+  <li>B listens on 10.0.2.15:80</li>
+  <li>On B's console, issue <code>redir add tcp:8080:80</code></li>
+  <li>C connects to 10.0.2.2:8080</li>
+</ul>
+
+<a name="calling"></a>
+<h3>Sending a Voice Call or SMS to Another Emulator Instance</h3>
+
+<p>The emulator automatically forwards simulated voice calls and SMS messages from one instance to another. To send a voice call or SMS, you use the dialer application and SMS application (if available) installed on one emulator </p>
+
+<p>To initiate a simulated voice call to another emulator instance:</p>
+<ol>
+<li>Launch the dialer application on the originating emulator instance.</li>
+<li>As the number to dial, enter the console port number of the instance you'd like to call. You can determine
+  the console port number of the target instance by checking its window title, where the
+  console port number is reported as "Android Emulator (&lt;port&gt;). </li>
+<li>Press "Dial". A new inbound call appears in the target emulator instance. </li>
+</ol>
+
+<p>To send an SMS message to another emulator instance, launch the SMS application (if available). Specify the console port number of the target emulator instance as as the SMS address, enter the message text, and send the message. The message is delivered to the target emulator instance. </p>
+
+<p>You can also connect to an emulator instance's console to simulate an incoming voice call or SMS. For more information, see <a href="#telephony">Telephony Emulation</a> and <a href="#sms">SMS Emulation</a>.
+
+<a name="console"></a>
+
+<h2>Using the Emulator Console</h2>
+
+<p>Each running emulator instance includes a console facility that lets you dynamically query and control the simulated device environment. For example, you can use the console to dynamically manage port redirections and network characteristics and simulate telephony events. To access the console and enter commands, you use telnet to connect to the console's port number. </p>
+<p>To connect to the console of any running emulator instance at any time, use this command: </p>
+
+<pre>telnet localhost &lt;console-port&gt;</pre>
+
+<p>An emulator instance occupies a pair of adjacent ports: a console port and an adb port. The port numbers differ by 1, with the adb port having the higher port number. The console of the first emulator instance running on a given machine uses console port 5554 and adb port 5555. Subsequent instances use port numbers increasing by two &mdash; for example, 5556/5557, 5558/5559, and so on. Up to 16 concurrent emulator instances can run a console facility. </p>
+
+<p>To connect to the emulator console, you must specify a valid console port. If multiple emulator instances are running, you need to determine the console port of the emulator instance you want to connect to. You can find the instance's console port listed in the title of the instance window. For example, here's the window title for an instance whose console port is 5554:</p>
+
+<p><code>Android Emulator (5554)</code></p>
+
+<p>Alternatively, you can use the <code>adb devices</code> command, which prints a list of running emulator instances and their console port numbers. For more information, see <a href="{@docRoot}guide/developing/tools/adb.html#devicestatus">Querying for Emulator/Device Instances</a> in the adb documentation.</p>
+
+<p class="note">Note: The emulator listens for connections on ports 5554-5587 and accepts connections only from localhost.</p>
+
+<p>Once you are connected to the console, you can then enter <code>help [command]</code> to see a list of console commands and learn about specific commands. </p>
+
+<p>To exit the console session, use <code>quit</code> or <code>exit</code>.</p>
+
+<p>The sections below describe the major functional areas of the console.</p>
+
+<a name="portredirection"></a>
+
+<h3>Port Redirection</h3>
+<p>You can use the console to add and remove port redirections while the emulator is running. After connecting to the console, you can manage port redirections in this way:</p>
+<pre>redir &lt;list|add|del&gt; </pre>
+
+<p>The <code>redir</code> command supports the subcommands listed in the table below. </p>
+
+<table>
+<tr>
+  <th width="25%" >Subcommand
+  <th width="30%" >Description</th>
+  <th width="35%">Comments</th>
+</tr>
+  
+  <tr>
+    <td><code>list</code></td>
+    <td>List the current port redirections.</td>
+  <td>&nbsp;</td>
+  </tr>
+
+  
+<tr>
+ <td><code>add&nbsp;&lt;protocol&gt;:&lt;host-port&gt;:&lt;guest-port&gt;</code></td>
+  <td>Add a new port redirection.</td>
+<td><li>&lt;protocol&gt; must be either &quot;tcp&quot; or &quot;udp&quot;</li>
+<li>&lt;host-port&gt; is the port number to open on the host</li>
+<li>&lt;guest-port&gt; is the port number to route data to on the emulator/device</li></td>
+</tr>
+<tr>
+  <td><code>del &lt;protocol&gt;:&lt;host-port&gt;</code></td>
+  <td>Delete a port redirection.</td>
+<td>See above for meanings of &lt;protocol&gt; and &lt;host-port&gt;.</td>
+</tr>
+</table>
+
+<a name="geo"></a>
+<h3>Geo Location Provider Emulation</h3>
+
+<p>The console provides commands to let you set the geo position used by an emulator emulated device. You can use the <code>geo</code> command to send a simple GPS fix to the emulator, without needing to use NMEA 1083 formatting. The usage for the command is: </p>
+
+<pre>geo &lt;fix|nmea&gt;</pre>
+
+<p>The <code>geo</code> command supports the subcommands listed in the table below. </p>
+
+<table>
+<tr>
+  <th width="25%" >Subcommand
+  <th width="30%" >Description</th>
+  <th width="35%">Comments</th>
+</tr>
+  
+  <tr>
+    <td><code>fix &lt;longitude&gt; &lt;latitude&gt; [&lt;altitude&gt;]</code></td>
+    <td>Send a simple GPS fix to the emulator instance.</td>
+  <td>Specify longitude and latitude in decimal degrees. Specify altitude in meters.</td>
+  </tr>
+<tr>
+  <td><code>nmea &lt;sentence&gt;</code></td>
+  <td>Send an NMEA 0183 sentence to the emulated device, as if it were sent from an emulated GPS modem.</td>
+<td><code>&lt;sentence&gt;</code> must begin with '$GP'. Only '$GPGGA' and '$GPRCM' sentences are currently supported.</td>
+</tr>
+</table>
+
+<p>You can issue the <code>geo</code> command to fix the GPS location as soon as an emulator instance is running. The emulator creates a mock location provider that sends it to GPS-aware applications as soon as they start and register location listeners. Any application can query the location manager to obtain the current GPS fix for the emulated device by calling:
+
+<pre>LocationManager.getLastKnownLocation("gps")</pre>
+
+<p>For more information about the Location Manager, see {@link android.location.LocationManager} and its methods.</p>
+
+<a name="events"></a>
+<h3>Hardware Events Emulation</h3>
+
+<p>You can use the <code>event</code> command to send various events to the emulator.The usage for the command is: </p>
+
+<pre>event &lt;send|types|codes|text&gt;</pre>
+
+<p>The <code>event</code> command supports the subcommands listed in the table below. </p>
+
+<table>
+<tr>
+  <th width="25	%" >Subcommand
+  <th width="30%" >Description</th>
+  <th width="35%">Comments</th>
+</tr>
+  
+  <tr>
+    <td><code>send &lt;type&gt;:&lt;code&gt;:&lt;value&gt; [...]</code></td>
+    <td>Send one or more events to the Android kernel. </td>
+  <td>You can use text names or integers for <code>&lt;type&gt;</code> and <code>&lt;value&gt;</code>.</td>
+  </tr>
+<tr>
+  <td><code>types</code></td>
+  <td>List all <code>&lt;type&gt;</code> string aliases supported by the <code>event</code> subcommands.</td>
+<td>&nbsp;</td>
+</tr>
+<tr>
+  <td><code>codes &lt;type&gt;</code></td>
+  <td>List all <code>&lt;codes&gt;</code> string aliases supported by the <code>event</code> 
+   subcommands for the specified <code>&lt;type&gt;</code>.</td>
+<td>&nbsp;</td>
+</tr>
+<tr>
+  <td><code>event text &lt;message&gt;</code></td>
+  <td>Simulate keypresses to send the specified string of characters as a message,</td>
+<td>The message must be a UTF-8 string. Unicode posts will be reverse-mapped according to the current device keyboard. Unsupported characters will be discarded silently.</td>
+</tr>
+</table>
+
+<a name="power"></a>
+<h3>Device Power Characteristics</h3>
+
+<p>You can use the <code>power</code> command to control the simulated power state of the emulator instance.The usage for the command is: </p>
+
+<pre>power &lt;display|ac|status|present|health|capactiy&gt;</pre>
+
+<p>The <code>event</code> command supports the subcommands listed in the table below. </p>
+
+<table>
+<tr>
+  <th width="25	%" >Subcommand
+  <th width="30%" >Description</th>
+  <th width="35%">Comments</th>
+</tr>
+  
+  <tr>
+    <td><code>display</code></td>
+    <td>Display battery and charger state.</td>
+  <td>&nbsp;</td>
+  </tr>
+<tr>
+  <td><code>ac &lt;on|off&gt;</code></td>
+  <td>Set AC charging state to on or off. </td>
+<td>&nbsp;</td>
+</tr>
+<tr>
+  <td><code>status &lt;unknown|charging|discharging|not-charging|full&gt;</code></td>
+  <td>Change battery status as specified.</td>
+<td>&nbsp;</td>
+</tr>
+
+<tr>
+  <td><code>present &lt;true|false&gt;</code></td>
+  <td>Set battery presence state.</td>
+<td>&nbsp;</td>
+</tr>
+<tr>
+  <td><code>health &lt;unknown|good|overheat|dead|overvoltage|failure&gt;</code></td>
+  <td>Set battery health state.</td>
+<td>&nbsp;</td>
+</tr>
+<tr>
+  <td><code>power health &lt;percent&gt;</code></td>
+  <td>Set remaining battery capacity state (0-100).</td>
+<td>&nbsp;</td>
+</tr>
+</table>
+
+<a name="netstatus"></a>
+<h3>Network Status</h3>
+
+<p>You can use the console to check the network status and current delay and speed characteristics. To do so, connect to the console and use the <code>netstatus</code> command. Here's an example of the command and its output. </p>
+
+<pre>network status
+</pre>
+
+<a name="netdelay"></a>
+<h3>Network Delay Emulation</h3>
+
+<p>The emulator lets you simulate various network latency levels, so that you can test your applicaton in an environment more typical of the actual conditions in which it will run. You can set a latency level or range at emulator startup or you can use the console to change the latency dynamically, while the application is running in the emulator. </p>
+<p>To set latency at emulator startup, use the  <code>-netdelay</code> emulator option with a supported <code>&lt;delay&gt;</code> value, as listed in the table below. Here are some examples:</p>
+<pre>emulator -netdelay gprs
+emulator -netdelay 40 100</pre>
+
+<p>To make dynamic changes to  network delay while the emulator is running, connect to the console and use the <code>netdelay</code> command with a supported <code>&lt;delay&gt;</code> value from the table below.  </p>
+
+<pre>network delay gprs</pre>
+
+<p>The format of network <delay> is one of the following (numbers are milliseconds):</p>
+
+<table style="clear:right;width:100%;">
+<tr>
+  <th width="30%" >Value</td>
+  <th width="35%" >Description</th><th width="35%">Comments</th></tr>
+  
+  <tr><td><code>gprs</code></td><td>GPRS</td>
+  <td>(min 150, max 550)</td>
+  </tr>
+
+<tr><td><code>edge</code></td><td>EDGE/EGPRS</td>
+<td>(min 80, max 400)</td>
+</tr>
+<tr><td><code>umts</code></td><td>UMTS/3G</td>
+<td>(min 35, max 200)</td>
+</tr>
+<tr><td><code>none</code></td><td>No latency</td><td>(min 0, max 0)</td></tr>
+<tr><td><code>&lt;num&gt;</code></td>
+<td>Emulate an exact latency  (milliseconds).</td>
+<td>&nbsp;</td></tr>
+<tr><td><code>&lt;min&gt;:&lt;max&gt;</code></td>
+<td>Emulate an specified latency range (min, max milliseconds).</td>
+<td>&nbsp;</td></tr>
+</table>
+
+<a name="netspeed"></a>
+<h3>Network Speed Emulation</h3>
+
+<p>The emulator also lets you simulate various network transfer rates. You can set a transfer rate or range at emulator startup or you can use the console to change the rate dynamically, while the application is running in the emulator. </p>
+<p>To set the network speed at emulator startup, use the  <code>-netspeed</code> emulator option with a supported <code>&lt;speed&gt;</code> value, as listed in the table below. Here are some examples:</p>
+<pre>emulator -netspeed gsm
+emulator -netspeed 14.4 80</pre>
+
+<p>To make dynamic changes to  network speed while the emulator is running, connect to the console and use the <code>netspeed</code> command with a supported <code>&lt;speed&gt;</code> value from the table below.  </p>
+
+<pre>network speed 14.4 80</pre>
+
+<p>The format of network <code>&lt;speed&gt;</code> is one of the following (numbers are
+kilobits/sec):</p>
+<table style="clear:right;width:100%;">
+<tbody>
+<tr>
+  <th width="30%">Value</td>
+  <th width="35%">Description</th><th width="35%">Comments</th></tr>
+  
+  <tr>
+  <td><code>gsm</code></td>
+  <td>GSM/CSD</td><td>(Up: 14.4, down: 14.4)</td></tr>
+<tr>
+  <td><code>hscsd</code></td>
+  <td>HSCSD</td><td>(Up: 14.4, down: 43.2)</td></tr>
+<tr>
+  <td><code>gprs</code></td>
+  <td>GPRS</td><td>(Up: 40.0, down: 80.0)</td></tr>
+<tr>
+  <td><code>edge</code></td>
+  <td>EDGE/EGPRS</td>
+  <td>(Up: 118.4, down: 236.8)</td>
+</tr>
+<tr>
+  <td><code>umts</code></td>
+  <td>UMTS/3G</td><td>(Up: 128.0, down: 1920.0)</td></tr>
+<tr>
+  <td><code>hsdpa</code></td>
+  <td>HSDPA</td><td>(Up: 348.0, down: 14400.0)</td></tr>
+<tr>
+  <td><code>full</code></td>
+  <td>no limit</td><td>(Up: 0.0, down: 0.0)</td></tr>
+<tr>
+  <td><code>&lt;num&gt;</code></td>
+  <td>Set an exact rate used for both upload and download.</td><td></td></tr>
+<tr>
+  <td><code>&lt;up&gt;:&lt;down&gt;</code></td>
+  <td>Set exact rates for upload and download separately.</td><td></td></tr>
+</table>
+
+
+<a name="telephony"></a>
+
+<h3>Telephony Emulation</h3>
+
+<p>The Android emulator includes its own GSM emulated modem that lets you simulate telephony functions in the emulator. For example, you can simulate inbound phone calls and establish/terminate data connections. The Android system handles simulated calls exactly as it would actual calls. The emulator does not support call audio in this release. </p>
+<p>You can use the console to access the emulator's telephony functions. After connecting to the console, you can use</p>
+<pre>gsm &lt;call|accept|busy|cancel|data|hold|list|voice|status&gt; </pre>
+<p>to invoke telephony functions. </p>
+<p>The <code>gsm</code> command supports the subcommands listed in the table below. </p>
+<table>
+  <tr>
+    <th >Subcommand </th>
+    <th width="25%">Description</th>
+    <th>Comments</th>
+  </tr>
+  <tr>
+    <td><code>call &lt;phonenumber&gt;</code></td>
+    <td>Simulate an inbound phone call from &lt;phonenumber&gt;.</td>
+    <td>&nbsp;</td>
+  </tr>
+  <tr>
+    <td><code>accept &lt;phonenumber&gt;</code></td>
+    <td>Accept an inbound call from &lt;phonenumber&gt; and change the call's state "active".</td>
+    <td>You can change a call's state to "active" only if its current state is "waiting" or "held".</td>
+  </tr>
+  <tr>
+    <td><code>busy &lt;phonenumber&gt;</code></td>
+    <td>Close an outbound call to &lt;phonenumber&gt; and change the call's state to "busy".</td>
+    <td>You can change a call's state to "busy" only if its current state is "waiting".</td>
+  </tr>
+  <tr>
+    <td><code>cancel &lt;phonenumber&gt;</code></td>
+    <td>Terminate an inbound or outbound phone call to/from &lt;phonenumber&gt;.</td>
+    <td>&nbsp;</td>
+  </tr>
+  <tr>
+    <td><code>data &lt;state&gt;</code></td>
+    <td>Change the state of the GPRS data connection to &lt;state&gt;.</td>
+    <td>Supported &lt;state&gt; values are:<br />
+          <li><code>unregistered</code> -- No network available</li>
+          <li><code>home</code> -- On local network, non-roaming</li>
+          <li><code>roaming</code> -- On roaming network</li>
+          <li><code>searching</code> -- Searching networks</li>
+          <li><code>denied</code> -- Emergency calls only</li>
+          <li><code>off</code> -- Same as 'unregistered'</li>
+      <li><code>on</code> -- same as 'home'</li>    </td>
+  </tr>
+  <tr>
+    <td><code>hold</code></td>
+    <td>Change the state of a call to "held". </td>
+    <td>You can change a call's state to "held" only if its current state is	 "active" or "waiting". </td>
+  </tr>
+  <tr>
+    <td><code>list</code></td>
+    <td>List all inbound and outbound calls and their states.</td>
+    <td>&nbsp;</td>
+  </tr>
+  <tr>
+    <td><code>voice &lt;state&gt;</code></td>
+    <td>Change the state of the GPRS voice connection to &lt;state&gt;.</td>
+    <td>Supported &lt;state&gt; values are:<br />
+    <li><code>unregistered</code> -- No network available</li>
+    <li><code>home</code> -- On local network, non-roaming</li>
+    <li><code>roaming</code> -- On roaming network</li>
+    <li><code>searching</code> -- Searching networks</li>
+    <li><code>denied</code> -- Emergency calls only</li>
+    <li><code>off</code> -- Same as 'unregistered'</li>
+    <li><code>on</code> -- Same as 'home'</li></td>
+  </tr>
+
+  <tr>
+    <td><code>status</code></td>
+    <td>Report the current GSM voice/data state.</td>
+    <td>Values are those described for the <code>voice</code> and <code>data</code> commands.</td>
+  </tr>
+</table>
+
+<a name="sms"></a>
+
+<h3>SMS Emulation</h3>
+
+<p>The Android emulator console lets you generate an SMS message and direct it to an emulator instance. Once you connect to an emulator instance, you can generate an emulated incoming SMS using this command:</p>
+
+<pre>sms send &lt;senderPhoneNumber&gt; &lt;textmessage&gt;</pre>
+
+<p>where <code>&lt;senderPhoneNumber&gt;</code> contains an arbitrary numeric string. </p>
+
+<p>The console forwards the SMS message to the Android framework, which passes it through to an application that handles that message type. </p>
+
+<a name="vm"></a>
+
+<h3>VM State</h3>
+
+<p>You can use the <code>vm</code> command to control the VM on an emulator instance.The usage for the command is: </p>
+
+<pre>vm &lt;start|stop|status&gt;</pre>
+
+<p>The <code>vm</code> command supports the subcommands listed in the table below. </p>
+
+<table>
+<tr>
+  <th width="25%" >Subcommand
+  <th width="30%" >Description</th>
+  <th width="35%">Comments</th>
+</tr>
+<tr>
+    <td><code>start</code></td>
+    <td>Start the VM on the instance. </td>
+  <td>&nbsp;</td>
+</tr>
+<tr>
+    <td><code>stop</code></td>
+    <td>Stop the VM on the instance. </td>
+  <td>&nbsp;</td>
+</tr>
+<tr>
+    <td><code>start</code></td>
+    <td>Display the current status of the VM (running or stopped). </td>
+  <td>&nbsp;</td>
+</tr>
+</table>
+
+
+<a name="window"></a>
+
+<h3>Emulator Window</h3>
+
+<p>You can use the <code>window</code> command to manage the emulator window. The usage for the command is: </p>
+
+<pre>window &lt;scale&gt;</pre>
+
+<p>The <code>vm</code> command supports the subcommands listed in the table below. </p>
+
+<table>
+<tr>
+  <th width="25%" >Subcommand
+  <th width="30%" >Description</th>
+  <th width="35%">Comments</th>
+</tr>
+<tr>
+    <td><code>scale &lt;scale&gt;</code></td>
+    <td>Scale the emulator window.</td>
+  <td>&lt;scale&gt; must be a number between 0.1 and 3 that describes the desired scaling factor. You can 
+  also specify scale as a DPI value if you add the suffix "dpi" to the scale value. A value of "auto" 
+  tells the emulator to select the best window size.</td>
+</tr>
+</table>
+
+
+<a name="terminating"></a>
+
+<h3>Terminating an Emulator Instance</h3>
+
+<p>You can terminate an emulator instance through the console, using the <code>kill</code> command.</p>
+
+
+<a name="skins"></a>
+
+<h2>Using Emulator Skins</h2>
+
+<p>You can run the emulator with any of four default skins, as described in the table below. To specify a skin, use <code>-skin &lt;skinID&gt;</code> when starting the emulator. </p>
+
+<p>For example: </p>
+
+<pre>emulator -skin HVGA-L</pre> 
+
+<p>Note that you must enter the <code>&lt;skinID&gt;</code> in uppercase letters (if your development computer is case-sensitive).</p>
+
+<table border="0" style="clear:left;padding:2em;">
+  <tr>
+    <th width="20%">skinID</th>
+    <th >Description</th>
+    <th >Skin</th>
+  </tr>
+  <tr>
+    <td><code>HVGA-L</code></td>
+    <td>480x320, landscape</td>
+    <td><img src="{@docRoot}images/e-mini-hvga-l.png" width="219" height="113"></td>
+  </tr>
+  <tr>
+    <td><code>HVGA-P</code></td>
+    <td>320x480, portrait (default)</td>
+    <td><img src="{@docRoot}images/e-mini-hvga-p.png" width="113" height="219"></td>
+  </tr>
+  <tr>
+    <td><code>QVGA-L</code></td>
+    <td>320x240, landscape</td>
+    <td><img src="{@docRoot}images/e-mini-qvga-l.png" width="119" height="197"></td>
+  </tr>
+  <tr>
+    <td><code>QVGA-P</code></td>
+    <td>240x320, portrait</td>
+    <td><img src="{@docRoot}images/e-mini-qvga-p.png" width="95" height="173"></td>
+  </tr>
+</table>
+
+<a name="multipleinstances"></a>
+
+<h2>Running Multiple Emulator Instances</h2>
+
+<p>You can run multiple instances of the emulator concurrently, if necessary. Each emulator instance can use a separate user-data image file and a different console port. This lets you manage each instance in isolation. </p>
+
+<p>However, if you will run multiple emulator instances, note that there are limitations on the capability of each instance to maintain its persistent user data &mdash; user settings and installed applications &mdash; across sessions. Specifically:</p>
+
+<ul>
+  <li>By default, only the first-launched emulator instance can preserve user data across sessions. When a session closes, 
+  the emulator stores the user data to a user-data image file &mdash; by default, it stores the data in the file 
+  <code>~/.android/SDK-1.0/userdata-qemu.img </code>(on Linux and Mac) or <code>C:\Documents and Settings\&lt;user&gt;\Local
+   Settings\Application Data\Android\SDK-1.0\userdata-qemu.img</code> (on Windows) in your development computer.</li>
+
+<li>Emulator instances that you start after the first instance (that are running concurrently) can also store user data during a session, but they <em>do not</em> preserve it for the next session, unless you have specified a unique user-data image file in which the data should be stored. </li>
+
+</ul>
+
+<p>To run multiple emulator instances and let each maintain user data across sessions, start the instances with the <code>-data</code> option (see <a href="#startup-options">Startup Options</a>) and supply the path to a user-data file. </p>
+
+<a name="apps"></a>
+
+<h2>Installing Applications on the Emulator</h2>
+
+<p>If you don't have access to Eclipse or the ADT Plugin, you can install 
+your application on the emulator <a href="{@docRoot}guide/developing/tools/adb.html#move">using 
+the adb utility</a>. Before installing the application, you need to package it 
+in a .apk file using the <a href="{@docRoot}guide/developing/tools/aapt.html">Android Asset Packaging Tool</a>. 
+Once the application is installed, you can start the emulator from the command 
+line, as described in this document, using any startup options necessary. 
+When the emulator is running, you can also connect to the emulator instance's 
+console to issue commands as needed.</p>
+
+<p>As you update your code, you periodically package and install it on the emulator. 
+The emulator preserves the application and its state data across restarts, 
+in a user-data disk partition. To ensure that the application runs properly 
+as you update it, you may need to delete the emulator's user-data partition. 
+To do so, start the emulator with the <code>-wipe-data</code> option. 
+For more information about the user-data partition and other emulator storage, 
+see <a href="#diskimages">Working with Emulator Disk Images</a>.</p>
+
+<a name="sdcard"></a>
+
+<h2>SD Card Emulation</h2>
+<p>You can create a disk image and then load it to the emulator at startup, to simulate the presence of a user's SD card in the device. The sections below describe how to create the disk image, how to copy files to it, and how to load it in the emulator at startup. </p>
+
+<p>Note that you can only load disk image at emulator startup. Similarly, you can not remove a simulated SD card from a running emulator. However, you can browse, send files to, and copy/remove files from a simulated SD card either with adb or the emulator. </p>
+
+<p>The emulator supports emulated SDHC cards, so you can create an SD card image of any size up to 128 gigabytes.</p>
+
+<a name="creating"></a>
+
+<h3>Creating  a Disk Image</h3>
+
+<p>You can use the mksdcard tool, included in the SDK, to create a FAT32 disk image that you can load in the emulator at startup. You can access mksdcard in the tools/ directory of the SDK and create a disk image like this: </p>
+
+<pre>mksdcard &lt;size&gt; &lt;file&gt;</pre>
+	
+<p>For example:</p>
+
+<pre>mksdcard 1024M sdcard1.iso</pre>
+
+<p>For more information, see <a href="{@docRoot}guide/developing/tools/othertools.html">Other Tools</a>. </p>
+
+<a name="copying"></a>
+<h3>Copying Files to a Disk Image</h3>
+
+<p>Once you have created the disk image, you can copy files to it prior to loading it in the emulator. To copy files, you can mount the image as a loop device and then copy the files to it, or you can use a utility such as mtools to copy the files directly to the image. The mtools package is available for Linux, Mac, and Windows.</p>
+
+<a name="loading"></a>
+<a name="step3" id="step3"></a>
+
+<h3>Loading the Disk Image at Emulator Startup</h3>
+<p>To load FAT32 disk image in the emulator, start the emulator with the <code>-sdcard</code> flag and specify the name and path of your image (relative to the current working directory): </p>
+
+<pre>emulator -sdcard &lt;filepath&gt;</pre>
+
+<a name="troubleshooting"></a>
+
+<h2>Troubleshooting Emulator Problems</h2>
+
+<p>The adb utility sees the emulator as an actual physical device. For this reason, you might have to use the -d flag with some common adb commands, such as <code>install</code>. The -d flag lets you specify which of several connected devices to use as the target of a command. If you don't specify -d, the emulator will target the first device in its list. For more information about adb, see <a href="{@docRoot}guide/developing/tools/adb.html">Android Debug Bridge</a>.</p>
+
+<p>For emulators running on Mac OS X, if you see an error &quot;Warning: No DNS servers found&quot; when starting the emulator, check to see whether you have an <code>/etc/resolv.conf</code> file. If not, please run the following line in a command window:</p>
+    <pre>ln -s /private/var/run/resolv.conf /etc/resolv.conf</pre>
+
+<p>See <a href="{@docRoot}guide/appendix/faq/index.html">Frequently Asked Questions</a> for more troubleshooting information. </p>
+
+<a name="limitations"></a>
+    <h2>Emulator Limitations</h2>
+    <p>In this release, the  limitations of the emulator include: </p>
+    <ul>
+      <li>No support for placing or receiving actual phone calls. You can simulate phone calls (placed and received) through the emulator console, however. </li>
+      <li>No support for USB connections</li>
+      <li>No support for camera/video capture (input).</li>
+      <li>No support for device-attached headphones</li>
+      <li>No support for determining connected state</li>
+      <li>No support for determining battery charge level and AC charging state</li>
+      <li>No support for determining SD card insert/eject</li>
+      <li>No support for Bluetooth</li>
+    </ul>
diff --git a/docs/html/guide/developing/tools/hierarchy-viewer.jd b/docs/html/guide/developing/tools/hierarchy-viewer.jd
new file mode 100644
index 0000000..431008c
--- /dev/null
+++ b/docs/html/guide/developing/tools/hierarchy-viewer.jd
@@ -0,0 +1,98 @@
+page.title=Hierarchy Viewer
+@jd:body
+
+<p>The Hierarchy Viewer application allows you to debug and optimize your user 
+interface. It provides a visual representation of the layout's View hierarchy 
+(the Layout View) and a magnified inspector of the display (the Pixel Perfect View). 
+</p>
+
+<p>To get the Hierarchy Viewer started:</p>
+<ol>
+  <li>Connect your device or launch an emulator.</li>
+  <li>From a terminal, launch <code>hierarchyviewer</code> from your SDK 
+    <code>/tools</code> directory.
+    </li>
+  <li>In the window that opens, you'll see a list of <strong>Devices</strong>. When a device is
+    selected, a list of currently active <strong>Windows</strong> is displayed 
+    on the right. The <em>&lt;Focused Window></em> is the window currently in 
+    the foreground, and also the default window loaded if you do not select another.
+    </li> 
+  <li>Select the window that you'd like to inspect and click 
+    <strong>Load View Hierarchy</strong>. The Layout View will be loaded. 
+    You can then load the Pixel Perfect View by clicking the second 
+    icon at the bottom-left of the window.
+    </li>
+</ol>
+
+<p>If you've navigated to a different window on the device, press <strong>Refresh Windows</strong>
+to refresh the list of available windows on the right.</p>
+
+<h2>Layout View</h2>
+<p>The Layout View offers a look at the View layout and properties. It has three views:</p>
+<ul>
+  <li>Tree View: a hierarchy diagram of the Views, on the left.</li>
+  <li>Properties View: a list of the selected View's properties, on the top-right.</li>
+  <li>Wire-frame View: a wire-frame drawing of the layout, on the bottom-right.</li>
+</ul>
+<br/>
+<img src="{@docRoot}images/hierarchyviewer-layout.png" alt="" height="509" width="700" />
+
+<p>Select a node in the Tree View to display the properties of that element in 
+the Properties View. When a node is selected, the Wire-frame View 
+also indicates the bounds of the element with a red rectangle.
+Double click a node in the tree (or select it, and click <strong>Display 
+View</strong>) to open a new window with a rendering of that element.</p>
+
+<p>The Layout View includes a couple other helpful features for debugging your layout: 
+<strong>Invalidate</strong> and <strong>Request Layout</strong>. These buttons execute the
+respective View calls, {@link android.view.View#invalidate()} and {@link android.view.View#requestLayout()},
+on the View element currently selected in the tree. Calling these methods on any View can
+be very useful when simultaneously running a debugger on your application.</p>
+
+<p>The Tree View can be resized by adjusting the zoom slider, below
+the diagram. The number of View elements in the window is also given here. You 
+should look for ways to minimize the number of Views. The fewer View elements there
+are in a window, the faster it will perform.</p>
+
+<p>If you interact with the device and change the focused View, the diagram will not automatically refresh.
+You must reload the Layout View by clicking <strong>Load View Hierarchy</strong>.
+
+
+<h2>Pixel Perfect View</h2>
+<p>The Pixel Perfect View provides a magnified look at the current device window. It has three views:</p>
+<ul>
+  <li>Explorer View: shows the View hierarchy as a list, on the left.</li>
+  <li>Normal View: a normal view of the device window, in the middle.</li>
+  <li>Loupe View: a magnified, pixel-grid view of the device window, on the right.</li>
+</ul>
+<br/>
+<img src="{@docRoot}images/hierarchyviewer-pixelperfect.png" alt="" height="509" width="700" />
+
+<p>Click on an element in the Explorer View and a "layout box" will be drawn in the
+Normal View to indicate the layout position of that element. The layout box uses multiple rectangles, to indicate the normal bounds, the padding and the margin (as needed). The purple or green rectangle indicates 
+the normal bounds of the element (the height and width). The inner white or black rectangle indicates 
+the content bounds, when padding is present. A  black or white rectangle outside the normal purple/green
+rectangle indicates any present margins. 
+(There are two colors for each rectangle, in order to provide the best contrast
+based on the colors currently in the background.)</p> 
+
+<p>A very handy feature for designing your UI is the ability to overlay an image in the Normal and Loupe
+Views. For example, you might have a mock-up image of how you'd like to layout your interface. 
+By selecting <strong>Load...</strong> from the controls in the Normal View, you can choose the
+image from your computer and it will be placed atop the preview. Your chosen image will anchor at the bottom left corner of the screen. You can then adjust the opacity of the overlay and begin fine-tuning your layout to match the mock-up.</p>
+
+<p>The Normal View and Loupe View refresh at regular intervals (5 seconds by default), but the 
+Explorer View does not. If you navigate away and focus on a different View, then you should refresh the 
+Explorer's hierarchy by clicking <strong>Load View Hierarchy</strong>. This is even true 
+when you're working in a window that holds multiple Views that are not always visible. If you do not,
+although the previews will refresh, clicking a View in the Explorer will not provide the proper layout box
+in the Normal View, because the hierarchy believes you are still focused on the prior View.</p>
+
+<p>Optional controls include:</p>
+<ul>
+  <li><strong>Overlay</strong>: Load an overlay image onto the view and adjust its opacity.</li>
+  <li><strong>Refresh Rate</strong>: Adjust how often the Normal and Loupe View refresh their display.</li>
+  <li><strong>Zoom</strong>: Adjust the zoom level of the Loupe View.</li>
+</ul>
+
+
diff --git a/docs/html/guide/developing/tools/index.jd b/docs/html/guide/developing/tools/index.jd
new file mode 100644
index 0000000..b491a4f
--- /dev/null
+++ b/docs/html/guide/developing/tools/index.jd
@@ -0,0 +1,88 @@
+page.title=Tools Overview
+@jd:body
+
+<img src="{@docRoot}assets/images/android_wrench.png" alt="" align="right">
+
+<p>The Android SDK includes a variety of custom tools that help you develop mobile 
+applications on the Android platform. The most important of these are the Android 
+Emulator and the Android Development Tools plugin for Eclipse, but the SDK also 
+includes a variety of other tools for debugging, packaging, and installing your 
+applications on the emulator. </p>
+
+<dl>
+    <dt><a href="emulator.html">Android Emulator</a></dt>
+    <dd>A virtual mobile device that runs on your computer. You use the emulator to design, 
+    debug, and test your applications in an actual Android run-time environment. </dd>
+    
+  <dt><a href="adt.html">Android Development Tools Plugin</a> (for the Eclipse IDE)</dt>
+          <dd>The ADT plugin adds powerful extensions to the Eclipse integrated environment, 
+          making creating and debugging your Android applications easier and faster. If you 
+          use Eclipse, the ADT plugin gives you an incredible boost in developing Android 
+          applications.</dd>
+
+	  <dt><a href="hierarchy-viewer.html">Hierarchy Viewer</a></dt>
+	    <dd>The Hierarchy Viewer tool allows you to debug and optimize your user interface.
+	    It provides a visual representation of your layout's hierarchy of Views and a magnified inspector
+	    of the current display with a pixel grid, so you can get your layout just right.
+	    </dd>
+
+	  <dt><a href="draw9patch.html">Draw 9-patch</a></dt>
+	    <dd>The Draw 9-patch tool allows you to easily create a 
+	    {@link android.graphics.NinePatch} graphic using a WYSIWYG editor. It also previews stretched 
+	     versions of the image, and highlights the area in which content is allowed.
+	    </dd>
+
+  <dt><a href="ddms.html" >Dalvik Debug Monitor 
+      Service</a> (ddms)</dt>
+	    <dd>Integrated with Dalvik, the Android platform's custom VM, this tool 
+	    lets you manage processes on an emulator or device and assists in debugging. 
+	    You can use it to kill processes, select a specific process to debug, 
+	    generate trace data, view heap and thread information, take screenshots 
+	    of the emulator or device, and more. </dd>
+			
+  <dt><a href="adb.html" >Android Debug Bridge</a> (adb)</dt>
+                  <dd>The adb tool lets you install your application's .apk files on an 
+                  emulator or device and access the emulator or device from a command line. 
+                  You can also use it to link a standard debugger to application code running 
+                  on an Android emulator or device.</dd>
+
+  <dt><a href="aapt.html">Android Asset 
+          Packaging Tool</a> (aapt)</dt>
+                  <dd>The aapt tool lets you create .apk files containing the binaries and 
+                  resources of Android applications.</dd>
+
+  <dt><a href="aidl.html" >Android Interface 
+  Description Language</a> (aidl)</dt>
+            <dd>Lets you generate code for an interprocess interface, such as what
+            a service might use.</dd>
+
+  <dt><a href="adb.html#sqlite">sqlite3</a></dt>
+      <dd>Included as a convenience, this tool lets you access the SQLite data 
+      files created and used by Android applications.</dd>
+
+  <dt><a href="traceview.html" >Traceview</a></dt>
+            <dd> This tool produces graphical analysis views of trace log data that you 
+            can generate from your Android application. </dd>
+
+  <dt><a href="othertools.html#mksdcard">mksdcard</a></dt>
+            <dd>Helps you create a disk image that you can use with the emulator, 
+                      to simulate the presence of an external storage card (such as an SD card).</dd>
+
+  <dt><a href="othertools.html#dx">dx</a></dt>
+                  <dd>The dx tool rewrites .class bytecode into Android bytecode 
+                                          (stored in .dex files.)</dd>
+
+  <dt><a href="monkey.html">UI/Application 
+  Exerciser Monkey</a></dt>
+      <dd>The Monkey is a program that runs on your emulator or device and generates pseudo-random
+      streams of user events such as clicks, touches, or gestures, as well as a number of system-
+      level events.  You can use the Monkey to stress-test applications that you are developing,
+      in a random yet repeatable manner.</dd>
+
+  <dt><a  href="othertools.html#activitycreator">activitycreator</a></dt>
+            <dd>A script that generates <a
+                        href="http://ant.apache.org/" title="Ant">Ant</a> build files that 
+                        you can use to compile your Android applications. If you are developing 
+                        on Eclipse with the ADT plugin, you won't need to use this script. </dd>
+</dl>
+
diff --git a/docs/html/guide/developing/tools/monkey.jd b/docs/html/guide/developing/tools/monkey.jd
new file mode 100644
index 0000000..9a2ab6f
--- /dev/null
+++ b/docs/html/guide/developing/tools/monkey.jd
@@ -0,0 +1,240 @@
+page.title=UI/Application Exerciser Monkey
+@jd:body
+
+<p>The Monkey is a program that runs on your 
+<a href="{@docRoot}guide/developing/tools/emulator.html">emulator</a> or device and generates pseudo-random
+streams of user events such as clicks, touches, or gestures, as well as a number of system-level 
+events.  You can use the Monkey to stress-test applications that you are developing, in a random 
+yet repeatable manner.</p>
+
+<a name="overview"></a>
+<h2>Overview</h2>
+
+<p>The Monkey is a command-line tool that that you can run on any emulator
+instance or on a device.  It sends a pseudo-random stream of 
+user events into the system, which acts as a stress test on the application software you are 
+developing.</p>
+
+<p>The Monkey includes a number of options, but they break down into four primary
+categories:</p>
+
+<ul>
+  <li>Basic configuration options, such as setting the number of events to attempt.</li>
+  <li>Operational constraints, such as restricting the test to a single package.</li>
+  <li>Event types and frequencies.</li>
+  <li>Debugging options.</li>
+</ul>
+
+<p>When the Monkey runs, it generates events and sends them to the system.  It also <i>watches</i>
+the system under test and looks for three conditions, which it treats specially:</p>
+
+<ul>
+  <li>If you have constrained the Monkey to run in one or more specific packages, it 
+  watches for attempts to navigate to any other packages, and blocks them.</li>
+  <li>If your application crashes or receives any sort of unhandled exception, the Monkey
+  will stop and report the error.</li>
+  <li>If your application generates an <i>application not responding</i> error, the Monkey
+  will stop and report the error.</li>
+</ul>
+
+<p>Depending on the verbosity level you have selected, you will also see reports on the progress
+of the Monkey and the events being generated.</p>
+
+<a name="basics"></a>
+<h2>Basic Use of the Monkey</h2>
+
+<p>You can launch the Monkey using a command line on your development machine or from a script. 
+Because the Monkey runs in the emulator/device environment, you must launch it from a shell in 
+that environment.  You can do this by prefacing <code>adb shell</code> to each command, 
+or by entering the shell and entering Monkey commands directly.</p>
+<p>The basic syntax is: </p>
+
+<pre>$ adb shell monkey [options] &lt;event-count&gt;</pre>
+    
+<p>With no options specified, the Monkey will launch in a quiet (non-verbose) mode, and will send 
+events to any (and all) packages installed on your target.  Here is a more typical command line,
+which will launch your application and send 500 pseudo-random events to it:</p>
+
+<pre>$ adb shell monkey -p your.package.name -v 500</pre>
+
+<a name="reference"></a>
+<h2>Command Options Reference</h2>
+
+<p>The table below lists all options you can include on the Monkey command line.</p>
+
+<table>
+<tr>
+  <th>Category</th>
+  <th>Option</th>
+  <th>Description</th>
+</tr>
+
+<tr>
+<td rowspan="2">General</td>
+<td><code>--help</code></td>
+<td>Prints a simple usage guide.</td>
+</tr>
+
+<tr>
+<td><code>-v</code></td>
+<td>Each -v on the command line will increment the verbosity level.  
+Level 0 (the default) provides little information beyond startup notification, test completion, and
+final results.  
+Level 1 provides more details about the test as it runs, such as individual events being sent to 
+your activities.  
+Level 2 provides more detailed setup information such as activities selected or not selected for 
+testing.</td>
+</tr>
+
+<tr>
+<td rowspan="10">Events</td>
+<td><code>-s &lt;seed&gt;</code></td>
+<td>Seed value for pseudo-random number generator.  If you re-run the Monkey with the same seed 
+value, it will generate the same sequence of events.</td>
+</tr>
+
+<tr>
+<td><code>--throttle &lt;milliseconds&gt;</code></td>
+<td>Inserts a fixed delay between events.  You can use this option to slow down the Monkey.  
+If not specified, there is no delay and the events are generated as rapidly as possible.</td>
+</tr>
+
+<tr>
+<td><code>--pct-touch &lt;percent&gt;</code></td>
+<td>Adjust percentage of touch events.  
+(Touch events are a down-up event in a single place on the screen.)</td>
+</tr>
+
+<tr>
+<td><code>--pct-motion &lt;percent&gt;</code></td>
+<td>Adjust percentage of motion events.
+(Motion events consist of a down event somewhere on the screen, a series of pseudo-random
+movements, and an up event.)</td>
+</tr>
+
+<tr>
+<td><code>--pct-trackball &lt;percent&gt;</code></td>
+<td>Adjust percentage of trackball events.
+(Trackball events consist of one or more random movements, sometimes followed by a click.)</td>
+</tr>
+
+<tr>
+<td><code>--pct-nav &lt;percent&gt;</code></td>
+<td>Adjust percentage of "basic" navigation events.
+(Navigation events consist of up/down/left/right, as input from a directional input device.)</td>
+</tr>
+
+<tr>
+<td><code>--pct-majornav &lt;percent&gt;</code></td>
+<td>Adjust percentage of "major" navigation events.
+(These are navigation events that will typically cause actions within your UI, such as
+the center button in a 5-way pad, the back key, or the menu key.)</td>
+</tr>
+
+<tr>
+<td><code>--pct-syskeys &lt;percent&gt;</code></td>
+<td>Adjust percentage of "system" key events.
+(These are keys that are generally reserved for use by the system, such as Home, Back, Start Call,
+End Call, or Volume controls.)</td>
+</tr>
+
+<tr>
+<td><code>--pct-appswitch &lt;percent&gt;</code></td>
+<td>Adjust percentage of activity launches.  At random intervals, the Monkey will issue a startActivity() call, as a way of maximizing
+coverage of all activities within your package.</td>
+</tr>
+
+<tr>
+<td><code>--pct-anyevent &lt;percent&gt;</code></td>
+<td>Adjust percentage of other types of events.  This is a catch-all for all other types of events such as keypresses, other less-used
+buttons on the device, and so forth.</td>
+</tr>
+
+<tr>
+<td rowspan="2">Constraints</td>
+<td><code>-p &lt;allowed-package-name&gt;</code></td>
+<td>If you specify one or more packages this way, the Monkey will <i>only</i> allow the system
+to visit activities within those packages.  If your application requires access to activities in
+other packages (e.g. to select a contact) you'll need to specify those packages as well.
+If you don't specify any packages, the Monkey will allow the system to launch activities
+in all packages.  To specify multiple packages, use the -p option multiple times &mdash; one -p 
+option per package.</td>
+</tr>
+
+<tr>
+<td><code>-c &lt;main-category&gt;</code></td>
+<td>If you specify one or more categories this way, the Monkey will <i>only</i> allow the 
+system to visit activities that are listed with one of the specified categories.  
+If you don't specify any categories, the Monkey will select activities listed with the category
+Intent.CATEGORY_LAUNCHER or Intent.CATEGORY_MONKEY.  To specify multiple categories, use the -c
+option multiple times &mdash; one -c option per category.</td>
+</tr>
+
+<tr>
+<td rowspan="8">Debugging</td>
+<td><code>--dbg-no-events</code></td>
+<td>When specified, the Monkey will perform the initial launch into a test activity, but
+will not generate any further events.
+For best results, combine with -v, one or more package constraints, and a non-zero throttle to keep the Monkey
+running for 30 seconds or more.  This provides an environment in which you can monitor package
+transitions invoked by your application.</td>
+</tr>
+
+<tr>
+<td><code>--hprof</code></td>
+<td>If set, this option will generate profiling reports immediately before and after
+the Monkey event sequence.
+This will generate large (~5Mb) files in data/misc, so use with care.  See 
+<a href="{@docRoot}guide/developing/tools/traceview.html" title="traceview">Traceview</a> for more information
+on trace files.</td>
+</tr>
+
+<tr>
+<td><code>--ignore-crashes</code></td>
+<td>Normally, the Monkey will stop when the application crashes or experiences any type of 
+unhandled exception.  If you specify this option, the Monkey will continue to send events to
+the system, until the count is completed.</td>
+</tr>
+
+<tr>
+<td><code>--ignore-timeouts</code></td>
+<td>Normally, the Monkey will stop when the application experiences any type of timeout error such
+as a "Application Not Responding" dialog.  If you specify this option, the Monkey will continue to 
+send events to the system, until the count is completed.</td>
+</tr>
+
+<tr>
+<td><code>--ignore-security-exceptions</code></td>
+<td>Normally, the Monkey will stop when the application experiences any type of permissions error,
+for example if it attempts to launch an activity that requires certain permissions.  If you specify
+this option, the Monkey will continue to send events to the system, until the count is 
+completed.</td>
+</tr>
+
+<tr>
+<td><code>--kill-process-after-error</code></td>
+<td>Normally, when the Monkey stops due to an error, the application that failed will be left
+running.  When this option is set, it will signal the system to stop the process in which the error
+occurred.
+Note, under a normal (successful) completion, the launched process(es) are not stopped, and
+the device is simply left in the last state after the final event.</td>
+</tr>
+
+<tr>
+<td><code>--monitor-native-crashes</code></td>
+<td>Watches for and reports crashes occurring in the Android system native code. If --kill-process-after-error is set, the system will stop.</td>
+</tr>
+
+<tr>
+<td><code>--wait-dbg</code></td>
+<td>Stops the Monkey from executing until a debugger is attached to it.</td>
+</tr>
+
+</table>
+
+<!-- TODO: add a section called "debugging" that covers ways to use it, 
+need to clear data, use of the seed, etc. -->
+
+<!-- TODO: add a section that lays down a contract for Monkey output so it can be
+scripted safely. -->
+
diff --git a/docs/html/guide/developing/tools/othertools.jd b/docs/html/guide/developing/tools/othertools.jd
new file mode 100644
index 0000000..eaa0b76
--- /dev/null
+++ b/docs/html/guide/developing/tools/othertools.jd
@@ -0,0 +1,104 @@
+page.title=Other Tools
+@jd:body
+
+<p>The sections below describe other tools that you can use when building Android applications. </p>
+
+<p>All of the tools are included in the Android SDK and are accessible from the <code>tools/</code> directory.</p>
+
+<h2>Contents</h2>
+
+<dl>
+    <dt><a href="#mksdcard">mksdcard</a></dt>
+    <dt><a href="#dx">dx</a></dt>
+    <dt><a href="#activitycreator">activitycreator</a></dd>
+</dl>
+
+<a name="mksdcard"></a>
+
+<h2>mksdcard</h2>
+
+<p>The mksdcard tool lets you quickly create a FAT32 disk image that you can load in the emulator, to simulate the presence of an SD card in the device. Here is the usage for mksdcard:</p>
+
+<pre>mksdcard [-l label] &lt;size&gt;[K|M] &lt;file&gt;</pre>
+
+</p>The table below lists the available options/arguments</p>
+
+<table>
+<tr>
+	<th>Argument</th>
+	<th>Description</th>
+</tr>
+
+<tr>
+	<td><code>-l</code></td>
+	<td>A volume label for the disk image to create. </td>
+</tr>
+
+<tr>
+	<td><code>size</code></td>
+	<td>An integer that specifies the size (in bytes) of disk image to create. 
+You can also specify size in kilobytes or megabytes, by appending a "K" or "M" to &lt;size&gt;. For example, <code>1048576K</code>, <code>1024M</code>.</td>
+</tr>
+
+<tr>
+	<td><code>file</code></td>
+	<td>The path/filename of the disk image to create. </td>
+</tr>
+
+</table>
+
+<p>Once you have created the disk image file, you can load it in the emulator at startup using the emulator's -sdcard option. For more information, see <a href="{@docRoot}guide/developing/tools/emulator.html">Android Emulator</a>.</p>
+
+<pre>emulator -sdcard &lt;file&gt;</pre>
+
+<a name="dx"></a>
+
+<h2>dx</h2>
+
+<p>The dx tool lets you generate Android bytecode from .class files. The tool converts target files and/or directories to Dalvik executable format (.dex) files, so that they can run in the Android environment. It can also dump the class files in a human-readable format and run a target unit test. You can get the usage and options for this tool by using <code>dx --help</code>.</p>
+
+<a name="activitycreator"></a>
+
+<h2>activitycreator</h2>
+
+<p>If you aren't using the Eclipse IDE and ADT plugin, you can use the the activitycreator script to get started with a new application. When you run the script, it creates the structure of a minimal Android application that you can build on and extend to meet your needs. </p>
+
+<p>For Linux and Mac, the SDK provides <code>activitycreator</code>, a shell script, and for Windows <code>activitycreator.bat</code>, a batch script that runs an executable. Regardless of platform, the usage for the script is the same:</p>
+
+<pre>activitycreator [--out &lt;folder&gt;] [--ide intellij] your.package.name.ActivityName</pre>
+
+<table>
+<tr>
+	<th>Option</th>
+	<th>Description</th>
+</tr>
+
+<tr>
+	<td><code>--out &lt;folder&gt;</code></td>
+	<td>Specifies where to create the files/folders. </td>
+</tr>
+
+<tr>
+	<td><code>--ide intellij</code></td>
+	<td>Creates project files for IntelliJ</td>
+</tr>
+
+</table>
+
+
+<p>When run, the script creates these files: </p>
+
+ <ul>
+	<li>AndroidManifest.xml -- The application manifest file.</li>
+	<li>build.xml -- An Ant script to build/package the application.</li>
+	<li>res -- The resource directory.</li>
+	<li>src -- The source directory.</li>
+	<li>src/your/package/name/ActivityName.java -- The Activity class. </li>
+	<li>bin -- The output folder for the compiled .apk (when built by Ant).</li>
+</ul>
+
+<p>When you are ready, you can use Ant to <a href="{@docRoot}guide/developing/other-ide.html#antbuild">build the project</a> so that you can run it on the emulator.</p>
+
+<p>If you are using Eclipse with the ADT plugin, you do not need to use activitycreator. You can use the New Project Wizard, provided by the ADT plugin, instead. </p>
+
+
diff --git a/docs/html/guide/developing/tools/traceview.jd b/docs/html/guide/developing/tools/traceview.jd
new file mode 100644
index 0000000..dd3f4bb
--- /dev/null
+++ b/docs/html/guide/developing/tools/traceview.jd
@@ -0,0 +1,310 @@
+page.title=Traceview: A Graphical Log Viewer
+@jd:body
+
+<p>Traceview is a graphical viewer for execution logs
+saved by your application. The sections below describe how to use the program. </p>
+
+<h2>Contents</h2>
+
+<dl>
+    <dt><a href="#creatingtracefiles">Creating Trace Files</a></dt>
+    <dt><a href="#copyingfiles">Copying Trace Files to a Host Machine</a></dt>
+    <dt><a href="#runningtraceview">Viewing Trace Files in Traceview</a></dt>
+            <dd><a href="#timelinepanel">Timeline Panel</a></dd>
+        	<dd><a href="#profilepanel">Profile Panel</a></dd>
+    <dt><a href="#format">Traceview File Format</a></dd>
+        	<dd><a href="#datafileformat">Data File Format</a><dd>
+        	<dd><a href="#keyfileformat">Key File Format</a></dd>
+	<dt><a href="#knownissues">Traceview Known Issues</a></dd>
+    <dt><a href="#dmtracedump">Using dmtracedump</a></dt>
+</dl>
+
+<a name="creatingtracefiles"></a>
+
+<h2>Creating Trace Files</h2>
+
+<p>To use Traceview, you need to generate log files containing the trace information you want to analyze. To do that, you  include the {@link android.os.Debug}
+  class in your code and call its methods to start and stop logging of trace information
+  to disk. When your application quits, you can then use Traceview to examine the log files
+  for useful run-time information such
+  as method calls and run times. </p>
+<p>To create the trace files, include the {@link android.os.Debug} class and call one
+  of the {@link android.os.Debug#startMethodTracing() startMethodTracing()} methods. 
+  In the call, you specify a base name for the trace files that the system generates. 
+  To stop tracing, call {@link android.os.Debug#stopMethodTracing() stopMethodTracing()}.
+  These methods start and stop method tracing across the entire virtual machine. For 
+  example, you could call startMethodTracing() in your activity's onCreate()
+  method, and call stopMethodTracing() in that activity's onDestroy() method.</p>
+
+<pre>
+    // start tracing to "/sdcard/calc.trace"
+    Debug.startMethodTracing("calc");
+    // ...
+    // stop tracing
+    Debug.stopMethodTracing();
+</pre>
+
+<p>When your application calls startMethodTracing(), the system creates a
+file called <code>&lt;trace-base-name>.trace</code>.  This contains the
+binary method trace data and a mapping table with thread and method names.</p>
+
+<p>The system then begins buffering the generated trace data, until your application calls 
+	stopMethodTracing(), at which time it writes the buffered data to the
+	output file.
+	If the system reaches the maximum buffer size before stopMethodTracing() 
+	is called, the system stops tracing and sends a notification
+	to the console. </p>
+
+<p>Interpreted code will run more slowly when profiling is enabled.  Don't
+try to generate absolute timings from the profiler results (i.e. "function
+X takes 2.5 seconds to run").  The times are only
+useful in relation to other profile output, so you can see if changes
+have made the code faster or slower. </p>
+
+<p>When using the Android emulator, you must create an SD card image upon which
+the trace files will be written. For example, from the <code>/tools</code> directory, you 
+can create an SD card image and mount it when launching the emulator like so:</p>
+<pre>
+<b>$</b> mksdcard 1024M ./imgcd 
+<b>$</b> emulator -sdcard ./img
+</pre>
+<p>For more information, read about the 
+<a href="{@docRoot}guide/developing/tools/othertools.html#mksdcard">mksdcard tool</a>.</p>
+	
+<p>The format of the trace files is described <a href="#format">later 
+   in this document</a>. </p>
+
+<a name="copyingfiles"></a>
+
+<h2>Copying Trace Files to a Host Machine</h2>
+<p>After your application has run and the system has created your trace files <code>&lt;trace-base-name>.trace</code>
+    on a device or emulator, you must copy those files to your development computer.   You can use <code>adb pull</code> to copy
+    the files. Here's an example that shows how to copy an example file,
+    calc.trace, from the default location on the emulator to the /tmp directory on
+the emulator host machine:</p>
+<pre>adb pull /sdcard/calc.trace /tmp</pre>
+
+
+<a name="runningtraceview"></a>
+
+<h2>Viewing Trace Files in Traceview</h2>
+<p>To run traceview and view the trace files, enter <code>traceview &lt;trace-base-name></code>.
+    For example, to run Traceview on the example files copied in the previous section,
+    you would use: </p>
+    <pre>traceview /tmp/calc</pre>
+
+	<p>Traceview loads the log files and displays their data in a window that has two panels:</p>
+	<ul>
+		<li>A <a href="#timelinepanel">timeline panel</a> -- describes when each thread
+	    and method started and stopped</li>
+    	<li>A <a href="#timelinepanel">profile panel</a> -- provides a summary of what happened inside a method</li>
+	</ul>
+	<p>The sections below provide addition information about the traceview output panes. </p>
+
+<a name="timelinepanel"></a>
+
+<h3>Timeline Panel  </h3>
+<p>The image below shows a close up of the timeline panel. Each thread&rsquo;s
+    execution is shown in its own row, with time increasing to the right. Each method
+    is shown in another color (colors are reused in a round-robin fashion starting
+    with the methods that have the most inclusive time). The thin lines underneath
+    the first row show the extent (entry to exit) of all the calls to the selected
+    method. The method in this case is LoadListener.nativeFinished() and it was
+    selected in the profile view. </p>
+<p><img src="/images/traceview_timeline.png" alt="Traceview timeline panel" width="893" height="284"></p>
+<a name="profilepanel"></a>
+<h3>Profile Panel</h3>
+<p>The image below shows the profile pane. The profile pane shows a
+    summary of all the time spent in a method. The table shows
+    both the inclusive and exclusive times (as well as the percentage of the total
+    time). Exclusive time is the time spent in the method. Inclusive time is the
+    time spent in the method plus the time spent in any called functions. We refer
+    to  calling methods as &quot;parents&quot; and called methods as &quot;children.&quot;
+    When a method is selected (by clicking on it), it expands to show the parents
+    and children. Parents are shown with a purple background and children
+    with a yellow background. The last column in the table shows the number of calls
+    to this method plus the number of recursive calls. The last column shows the
+    number of calls out of the total number of calls made to that method. In this
+    view, we can see that there were 14 calls to LoadListener.nativeFinished(); looking
+    at the timeline panel shows that one of those calls took an unusually
+    long time.</p>
+<p><img src="/images/traceview_profile.png" alt="Traceview profile panel." width="892" height="630"></p>
+
+<a name="format"></a>
+<h2>Traceview File Format</h2>
+<p>Tracing creates two distinct pieces of output: a <em>data</em> file,
+    which holds the trace data, and a <em>key</em> file, which
+    provides a mapping from binary identifiers to thread and method names.
+	The files are concatenated when tracing completes, into a
+	single <em>.trace</em> file. </p>
+
+<p class="note"><strong>Note:</strong> The previous version of Traceview did not concatenate 
+these files for you. If you have old key and data files that you'd still like to trace, you 
+can concatenate them yourself with <code>cat mytrace.key mytrace.data > mytrace.trace</code>.</p>
+
+<a name="datafileformat"></a>
+
+<h3>Data File Format</h3>
+<p>The data file is binary, structured as
+    follows (all values are stored in little-endian order):</p>
+<pre>* File format:
+* header
+* record 0
+* record 1
+* ...
+*
+* Header format:
+* u4 magic 0x574f4c53 ('SLOW')
+* u2 version
+* u2 offset to data
+* u8 start date/time in usec
+*
+* Record format:
+* u1 thread ID
+* u4 method ID | method action
+* u4 time delta since start, in usec
+</pre>
+<p>The application is expected to parse all of the header fields, then seek
+    to &quot;offset to data&quot; from the start of the file. From there it just
+    reads
+    9-byte records until EOF is reached.</p>
+<p><em>u8 start date/time in usec</em> is the output from gettimeofday().
+    It's mainly there so that you can tell if the output was generated yesterday
+    or three months ago.</p>
+<p><em>method action</em> sits in the two least-significant bits of the
+    <em>method</em> word. The currently defined meanings are:    </p>
+<ul>
+    <li>0 - method entry </li>
+    <li>1 - method exit </li>
+    <li>2 - method &quot;exited&quot; when unrolled by exception handling </li>
+    <li>3 - (reserved)</li>
+</ul>
+<p>An unsigned 32-bit integer can hold about 70 minutes of time in microseconds.
+</p>
+
+<a name="keyfileformat"></a>
+	
+<h3>Key File Format</h3>
+<p>The key file is a plain text file divided into three sections. Each
+    section starts with a keyword that begins with '*'. If you see a '*' at the start
+    of a line, you have found the start of a new section.</p>
+<p>An example file might look like this:</p>
+<pre>*version
+1
+clock=global
+*threads
+1 main
+6 JDWP Handler
+5 Async GC
+4 Reference Handler
+3 Finalizer
+2 Signal Handler
+*methods
+0x080f23f8 java/io/PrintStream write ([BII)V
+0x080f25d4 java/io/PrintStream print (Ljava/lang/String;)V
+0x080f27f4 java/io/PrintStream println (Ljava/lang/String;)V
+0x080da620 java/lang/RuntimeException	&lt;init&gt;	()V
+[...]
+0x080f630c android/os/Debug startMethodTracing ()V
+0x080f6350 android/os/Debug startMethodTracing (Ljava/lang/String;Ljava/lang/String;I)V
+*end</pre>
+<dl>
+    <dt><em>version section</em></dt>
+    <dd>The first line is the file version number, currently
+        1.
+        The second line, <code>clock=global</code>, indicates that we use a common
+        clock across all threads. A future version may use per-thread CPU time counters
+        that are independent for every thread.</dd>
+    <dt><em>threads section</em></dt>
+    <dd>One line per thread. Each line consists of two parts: the thread ID, followed
+        by a tab, followed by the thread name. There are few restrictions on what
+        a valid thread name is, so include everything to the end of the line.</dd>
+    <dt><em>methods section </em></dt>
+    <dd>One line per method entry or exit. A line consists of four pieces,
+        separated by tab marks: <em>method-ID</em> [TAB] <em>class-name</em> [TAB] 
+        <em>method-name</em> [TAB] 
+        <em>signature</em> . Only
+        the methods that were actually entered or exited are included in the list.
+        Note that all three identifiers are required to uniquely identify a
+        method.</dd>
+</dl>
+<p>Neither the threads nor methods sections are sorted.</p>
+
+<a name="knownissues"></a>
+<h2>Traceview Known Issues</h2>
+<dl>
+	<dt>Threads</dt>
+	<dd>Traceview logging does not handle threads well, resulting in these two problems:
+<ol>
+  <li> If a thread exits during profiling, the thread name is not emitted; </li>
+    <li>The VM reuses thread IDs. If a thread stops and another starts, they
+        may get the same ID. </li>
+</ol>
+</dd>
+
+<a name="dmtracedump"></a>
+
+<h2>Using dmtracedump</h2>
+
+<p>The Android SDK includes dmtracedump, a tool that gives you an alternate way 
+	of generating graphical call-stack diagrams from trace log files. The tool 
+	uses the Graphviz Dot utility to create the graphical output, so you need to 
+	install Graphviz before running dmtracedump.</p>
+	
+<p>The dmtracedump tool generates the call stack data as a tree diagram, with each call 
+	represented as a node. It shows call flow (from parent node to child nodes) using 
+	arrows. The diagram below shows an example of dmtracedump output.</p>
+	
+<img src="{@docRoot}images/tracedump.png" width="485" height="401" style="margin-top:1em;"/>
+
+<p style="margin-top:1em;">For each node, dmtracedump shows <code>&lt;ref> <em>callname</em> (&lt;inc-ms>,
+	&lt;exc-ms>,&lt;numcalls>)</code>, where</p>
+
+<ul>
+		<li><code>&lt;ref></code> -- Call reference number, as used in trace logs</li>
+		<li><code>&lt;inc-ms></code> -- Inclusive elapsed time (milliseconds spent in method, including all child methods)</li>
+		<li><code>&lt;exc-ms></code> -- Exclusive elapsed time (milliseconds spent in method, not including any child methods)</li>
+		<li><code>&lt;numcalls></code> -- Number of calls</li>
+</ul>
+
+<p>The usage for dmtracedump is: </p>
+
+<pre>dmtracedump [-ho] [-s sortable] [-d trace-base-name] [-g outfile] &lt;trace-base-name></pre>
+
+<p>The tool then loads trace log data from &lt;trace-base-name>.data and &lt;trace-base-name>.key. 
+	The table below lists the options for dmtracedump.</p>
+
+<table>
+<tr>
+  <th>Option</td>
+  <th>Description</th>
+</tr>
+  
+  <tr>
+	<td><code>-d&nbsp;&lt;trace-base-name> </code></td>
+	<td>Diff with this trace name</td>
+  </tr>
+  <tr>
+	<td><code>-g&nbsp;&lt;outfile> </code></td>
+	<td>Generate output to &lt;outfile></td>
+  </tr>
+  <tr>
+	<td><code>-h </code></td>
+	<td>Turn on HTML output</td>
+  </tr>
+  <tr>
+	<td><code>-o </code></td>
+	<td>Dump the trace file instead of profiling</td>
+  </tr>
+  <tr>
+	<td><code>-d&nbsp;&lt;trace-base-name> </code></td>
+	<td>URL base to the location of the sortable javascript file</td>
+  </tr>
+  <tr>
+	<td><code>-t&nbsp;&lt;percent> </code></td>
+	<td>Minimum threshold for including child nodes in the graph (child's inclusive 
+		time as a percentage of parent inclusive time). If this option is not used, 
+		the default threshold is 20%. </td>
+  </tr>
+
+</table>
diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs
new file mode 100644
index 0000000..77d3522
--- /dev/null
+++ b/docs/html/guide/guide_toc.cs
@@ -0,0 +1,189 @@
+<ul>
+
+<li><h2>Android Basics</h2>
+    <ul>
+      <li><a href="<?cs var:toroot ?>guide/basics/what-is-android.html">What Is Android?</a></li>
+<!--  <li><a style="color:gray;">The Android SDK</a></li> -->
+<!--  <li><a style="color:gray;">Walkthrough for Developers</a></li> -->
+      <!-- quick overview of what it's like to develop on Android -->
+    </ul>
+</li>
+
+<li><h2>Framework Topics</h2>
+    <ul>
+      <li><a href="<?cs var:toroot ?>guide/topics/fundamentals.html">Application Fundamentals</a></li>
+    </ul>
+    <ul>
+      <li class="toggle-list">
+        <div><a href="<?cs var:toroot ?>guide/topics/ui/index.html">User Interface</a></div>
+          <ul>
+            <li><a href="<?cs var:toroot ?>guide/topics/ui/declaring-layout.html">Declaring Layout</a></li>
+            <li><a href="<?cs var:toroot ?>guide/topics/ui/menus.html">Creating Menus</a></li>
+            <li><a href="<?cs var:toroot ?>guide/topics/ui/layout-objects.html">Common Layout Objects</a></li>
+            <li><a href="<?cs var:toroot ?>guide/topics/ui/binding.html">Binding to Data with AdapterView</a></li>
+            <li><a href="<?cs var:toroot ?>guide/topics/ui/ui-events.html">Handling UI Events</a></li>
+            <li><a href="<?cs var:toroot ?>guide/topics/ui/themes.html">Applying Styles and Themes</a></li>
+            <li><a href="<?cs var:toroot ?>guide/topics/ui/custom-components.html">Building Custom Components</a></li>
+            <li><a href="<?cs var:toroot ?>guide/topics/ui/how-android-draws.html">How Android Draws Views</a></li>
+          </ul>
+      </li>
+      <li class="toggle-list">
+        <div><a href="<?cs var:toroot ?>guide/topics/resources/index.html">Resources and Assests</a></div>
+          <ul>
+            <li><a href="<?cs var:toroot ?>guide/topics/resources/resources-i18n.html">Resources and I18n</a></li>
+            <li><a href="<?cs var:toroot ?>guide/topics/resources/available-resources.html">Available Resource Types</a></li>
+          </ul>
+      </li>
+      <li><a href="<?cs var:toroot ?>guide/topics/intents/intents-filters.html">Intents and Intent Filters</a></li>
+      <li><a href="<?cs var:toroot ?>guide/topics/data/data-storage.html">Data Storage</a></li>
+      <li><a href="<?cs var:toroot ?>guide/topics/providers/content-providers.html">Content Providers</a></li>
+<!--  <li><a style="color:gray;">Notifications</a></li> -->
+      <li><a href="<?cs var:toroot ?>guide/topics/security/security.html">Security and Permissions</a></li>
+<!--  <li><a style="color:gray;">Processes and Threads</a></li> -->
+<!--  <li><a style="color:gray;">Interprocess Communication</a></li> -->
+      <li class="toggle-list">
+        <div><a href="<?cs var:toroot ?>guide/topics/manifest/manifest-intro.html">The AndroidManifest.xml File</a></div>
+          <ul>
+            <li><a href="<?cs var:toroot ?>guide/topics/manifest/action-element.html">&lt;action&gt;</a></li>
+            <li><a href="<?cs var:toroot ?>guide/topics/manifest/activity-element.html">&lt;activity&gt;</a></li>
+            <li><a href="<?cs var:toroot ?>guide/topics/manifest/activity-alias-element.html">&lt;activity-alias&gt;</a></li>
+            <li><a href="<?cs var:toroot ?>guide/topics/manifest/application-element.html">&lt;application&gt;</a></li>
+            <li><a href="<?cs var:toroot ?>guide/topics/manifest/category-element.html">&lt;category&gt;</a></li>
+            <li><a href="<?cs var:toroot ?>guide/topics/manifest/data-element.html">&lt;data&gt;</a></li>
+            <li><a href="<?cs var:toroot ?>guide/topics/manifest/grant-uri-permission-element.html">&lt;grant-uri-permission&gt;</a></li>
+            <li><a href="<?cs var:toroot ?>guide/topics/manifest/instrumentation-element.html">&lt;instrumentation&gt;</a></li>
+            <li><a href="<?cs var:toroot ?>guide/topics/manifest/intent-filter-element.html">&lt;intent-filter&gt;</a></li>
+            <li><a href="<?cs var:toroot ?>guide/topics/manifest/manifest-element.html">&lt;manifest&gt;</a></li>
+            <li><a href="<?cs var:toroot ?>guide/topics/manifest/meta-data-element.html">&lt;meta-data&gt;</a></li>
+            <li><a href="<?cs var:toroot ?>guide/topics/manifest/permission-element.html">&lt;permission&gt;</a></li>
+            <li><a href="<?cs var:toroot ?>guide/topics/manifest/permission-group-element.html">&lt;permission-group&gt;</a></li>
+            <li><a href="<?cs var:toroot ?>guide/topics/manifest/permission-tree-element.html">&lt;permission-tree&gt;</a></li>
+            <li><a href="<?cs var:toroot ?>guide/topics/manifest/provider-element.html">&lt;provider&gt;</a></li>
+            <li><a href="<?cs var:toroot ?>guide/topics/manifest/receiver-element.html">&lt;receiver&gt;</a></li>
+            <li><a href="<?cs var:toroot ?>guide/topics/manifest/service-element.html">&lt;service&gt;</a></li>
+            <li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-library-element.html">&lt;uses-library&gt;</a></li>
+            <li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-permission-element.html">&lt;uses-permission&gt;</a></li>
+            <li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-sdk-element.html">&lt;uses-sdk&gt;</a></li>
+          </ul>
+      </li>
+    </ul>
+    <ul>
+      <li class="toggle-list">
+        <div><a href="<?cs var:toroot ?>guide/topics/graphics/index.html">Graphics</a></div>
+          <ul>
+            <li><a href="<?cs var:toroot ?>guide/topics/graphics/2d-graphics.html">2D Graphics</a></li>
+            <li><a href="<?cs var:toroot ?>guide/topics/graphics/opengl.html">3D with OpenGL</a></li>
+          </ul>
+      </li>
+      <li><a href="<?cs var:toroot ?>guide/topics/media/index.html">Audio and Video</a></li>
+<!--       <li class="toggle-list">
+        <div><a style="color:gray;">Sensors</a></div>
+          <ul>
+            <li><a style="color:gray;">Camera</a></li>
+            <li><a style="color:gray;">Compass</a></li>
+            <li><a style="color:gray;">Accelerometer</a></li>
+          </ul>
+      </li> -->
+      <li><a href="<?cs var:toroot ?>guide/topics/location/index.html">Location</a></li>
+<!--    <li class="toggle-list">
+        <div><a style="color:gray;">Wireless Controls</a></div>
+          <ul>
+            <li><a style="color:gray;">Wi-Fi</a></li>
+            <li><a style="color:gray;">Bluetooth</a></li>
+          </ul>
+      </li> -->
+<!--  <li><a style="color:gray;">Localization</a></li>  -->
+    </ul>
+</li>
+
+<li><h2>Developing</h2>
+    <ul>
+      <!--       <li><a style="color:gray;">Developing for Android</a></li>
+      signing, upgrading, selecting a package name, select device profile, touch, trackball, dpad available, etc. -->
+
+      <li><a href="<?cs var:toroot ?>guide/developing/eclipse-adt.html">In Eclipse, with ADT</a></li>
+      <li><a href="<?cs var:toroot ?>guide/developing/other-ide.html">In Other IDEs</a></li>
+      <li><a href="<?cs var:toroot ?>guide/developing/device.html">On a Device</a></li>
+      <li><a href="<?cs var:toroot ?>guide/developing/debug-tasks.html">Debugging Tasks</a></li>
+      <li class="toggle-list">
+        <div><a href="<?cs var:toroot ?>guide/developing/tools/index.html">Tools</a></div>
+          <ul>
+			<li><a href="<?cs var:toroot ?>guide/developing/tools/aapt.html">aapt</a></li>
+			<li><a href="<?cs var:toroot ?>guide/developing/tools/adb.html">adb</a></li>
+			<li><a href="<?cs var:toroot ?>guide/developing/tools/othertools.html#activitycreator">activitycreator</a></li>
+<!--			<li><a href="<?cs var:toroot ?>guide/developing/tools/adt.html">ADT Plugin</a></li>-->
+			<li><a href="<?cs var:toroot ?>guide/developing/tools/aidl.html" >aidl</a></li>
+			<li><a href="<?cs var:toroot ?>guide/developing/tools/ddms.html" >ddms</a></li>
+			<li><a href="<?cs var:toroot ?>guide/developing/tools/othertools.html#dx">dx</a></li>
+			<li><a href="<?cs var:toroot ?>guide/developing/tools/draw9patch.html">Draw 9-Patch</a></li>
+			<li><a href="<?cs var:toroot ?>guide/developing/tools/emulator.html">Emulator</a></li>
+			<li><a href="<?cs var:toroot ?>guide/developing/tools/hierarchy-viewer.html">Hierarchy Viewer</a></li>
+			<li><a href="<?cs var:toroot ?>guide/developing/tools/othertools.html#mksdcard">mksdcard</a></li>
+			<li><a href="<?cs var:toroot ?>guide/developing/tools/monkey.html">Monkey</a></li>
+			<li><a href="<?cs var:toroot ?>guide/developing/tools/adb.html#sqlite">sqlite3</a></li>
+			<li><a href="<?cs var:toroot ?>guide/developing/tools/traceview.html" >Traceview</a></li>
+		  </ul></li>
+<!--      <li><a href="<?cs var:toroot ?>guide/developing/instrumentation/index.html">Instrumentation</a></li>
+      <li><a style="color:gray;">JUnit</a></li> -->
+   </ul>
+
+</li>
+
+<li><h2>Publishing</h2>
+    <ul>
+      <li><a href="<?cs var:toroot ?>guide/publishing/app-signing.html">Signing Your Applications</a></li>
+      <li><a href="<?cs var:toroot ?>guide/publishing/versioning.html">Versioning Your Applications</a></li>
+      <li><a href="<?cs var:toroot ?>guide/publishing/preparing.html">Preparing to Publish</a></li>
+      <li><a href="<?cs var:toroot ?>guide/publishing/publishing.html">Publishing Your Applications</a></li>
+    </ul>
+</li>
+
+<li><h2>Best Practices</h2>
+    <ul>
+      <li><a href="<?cs var:toroot ?>guide/practices/design/performance.html">Designing for Performance</a></li>
+      <li><a href="<?cs var:toroot ?>guide/practices/design/responsiveness.html">Designing for Responsiveness</a></li>
+      <li><a href="<?cs var:toroot ?>guide/practices/design/seamlessness.html">Designing for Seamlessness</a></li>
+<!--  <li><a style="color:gray;">User Interface Guidelines</a></li> -->
+    </ul>
+</li>
+
+<li><h2>Tutorials and Sample Code</h2>
+    <ul>
+      <li><a href="<?cs var:toroot ?>guide/tutorials/hello-world.html">Hello World</a></li>
+      <li><a href="<?cs var:toroot ?>guide/tutorials/views/index.html">Hello Views</a></li>
+      <li><a href="<?cs var:toroot ?>guide/tutorials/notepad/index.html">Notepad Tutorial</a></li>
+    </ul>
+    <ul>
+    <?cs if:android.whichdoc != "online" ?>
+      <li><a href="<?cs var:toroot ?>../samples">Sample Code &raquo;</a></li>
+    <?cs else ?>
+      <li class="toggle-list">
+        <div><a href="<?cs var:toroot ?>guide/samples/index.html">Sample Code</a></div>
+	  <ul>
+            <li><a href="<?cs var:toroot ?>guide/samples/ApiDemos/index.html">API Demos</a></li>
+            <li><a href="<?cs var:toroot ?>guide/samples/LunarLander/index.html">Lunar Lander</a></li>
+            <li><a href="<?cs var:toroot ?>guide/samples/NotePad/index.html">NotePad</a></li>
+          </ul>
+      </li>
+    <?cs /if ?>
+    </ul>
+</li>
+
+
+
+<li><h2>Appendix</h2>
+    <ul>
+      <li><a href="<?cs var:toroot ?>guide/appendix/media-formats.html">Supported Media Formats</a></li>
+      <li><a href="<?cs var:toroot ?>guide/appendix/g-app-intents.html">Intents List: Google Apps</a></li>
+      <li><a href="<?cs var:toroot ?>guide/appendix/glossary.html">Glossary</a></li>
+      <li><a href="<?cs var:toroot ?>guide/appendix/faq/index.html">FAQ</a></li>
+    </ul>
+</li>
+
+</ul>
+
+<script type="text/javascript">
+<!--
+    buildToggleLists();
+//-->
+</script>
diff --git a/docs/html/guide/index.jd b/docs/html/guide/index.jd
new file mode 100644
index 0000000..ecbf97b
--- /dev/null
+++ b/docs/html/guide/index.jd
@@ -0,0 +1,84 @@
+page.title=The Developer's Guide
+@jd:body
+
+<p>
+Welcome to the <i>Android Dev Guide</i>! The Dev Guide is 
+a practical introduction to developing applications for Android.  
+It explores the concepts behind Android, the framework for 
+constructing an application, and the tools for developing, 
+testing, and publishing software for the platform.
+</p>
+
+<p>
+The Dev Guide holds most of the documentation for the Android
+platform, except for reference material on the framework API.  
+For API specifications, go to the 
+<a href="{@docRoot}reference/packages.html">Reference</a> tab above.
+</p>  
+
+<p>
+As you can see in the panel on the left, the Dev Guide is 
+divided into a handful of sections.  They are:
+<p>
+
+<dl>
+<dt><b>Android Basics</b></dt>
+<dd>An initial orientation to Android &mdash; what it is, 
+what it offers, and how your application fits in.</dd>
+
+<dt><b>Framework Topics</b></dt>
+<dd>Discussions of particular parts of the Android framework
+and API.  For an overview of the framework, begin with
+<a href="{@docRoot}guide/topics/fundamentals.html">Application
+Fundamentals</a>.  Then explore other topics &mdash; from 
+designing a user interface and setting up resources to storing 
+data and using permissions &mdash; as needed.</dd>
+
+<dt><b>Developing</b></dt>
+<dd>Directions for using Android's development and debugging tools, 
+and for testing the results.</dd>
+
+<dt><b>Publishing</b></dt>
+<dd>Instructions on how to prepare your application for deployment
+and how to publish it when it's ready.</dd>
+
+<dt><b>Best Practices</b></dt> 
+<dd>Recommendations on preferred techniques for writing  
+applications that perform efficiently and work well for the
+user.</dd>
+
+<dt><b>Tutorials and Samples</b></dt> 
+<dd>Step-by-step tutorials and sample code demonstrating how 
+an Android application is constructed.</dd>
+
+<dt><b>Appendix</b></dt>
+<dd>Reference information and specifications, as well as FAQs, 
+a glossary of terms, and other information.</dd>
+</dl>
+
+<p>
+The first step in programming for Android is downloading the SDK
+(software development kit).  For instructions and information about
+the kit, go to the <a href="{@docRoot}sdk/index.html">SDK</a> tab above.
+</p>
+
+<p>
+After you have the SDK, begin by looking over the Dev Guide.
+If you want to start by getting a quick look at the code, the short 
+<a href="{@docRoot}guide/tutorials/hello-world.html">Hello World</a>
+tutorial walks you through a standard "Hello, World" application as 
+it would be written for the Android platform.  The 
+<a href="{@docRoot}guide/topics/fundamentals.html">Application
+Fundamentals</a> document is a good place to start for an 
+understanding of the application framework.
+</p>
+
+
+<p>
+For additional help, consider joining one or more of the Android 
+discussion groups.  Go to the 
+<a href="{@docRoot}community/index.html">Community</a> tab above 
+for more information.
+</p>
+
+<p>To return to this page later, just click the "Dev Guide" tab while any Dev Guide page is loaded. </p>
\ No newline at end of file
diff --git a/docs/html/guide/practices/design/index.jd b/docs/html/guide/practices/design/index.jd
new file mode 100644
index 0000000..a818831
--- /dev/null
+++ b/docs/html/guide/practices/design/index.jd
@@ -0,0 +1,21 @@
+page.title=Application Design Goals
+@jd:body
+
+<p>When learning how to build applications on a new platform, you first learn what APIs are available and how to use them. Later, you learn the nuances of the platform. Put another way: first you learn how you <em>can</em> build applications; later, you learn how you <em>should</em> build them, to ensure that your applications offer outstanding performance and a great user experience. </p>
+
+<p>The documents below help you learn the nuances of Android and get started building great applications more quickly, They discuss important aspects of application design that directly influence the user experience of your application, when in the hands of a mobile device user. You should read and consider these design goals as you plan your application and throughout its development, especially if you are new to developing for mobile devices.</p>
+
+<p>Successful mobile applications offer an outstanding user experience, in addition to a compelling technical feature set. The user experience is more than just its visual design or UI flow. It is also influenced by how well the application responds to the user's keypresses and other actions, how it well it interacts with other applications, and how fully and efficiently it uses device and system capabilities.</p>
+
+<p>An outstanding user experience has three key characteristics: it is
+<em>fast</em>; it is <em>responsive</em>; and it is <em>seamless</em>. Of course
+every platform since the dawn of computing has probably cited those same three
+qualities at one time or another. However, each platform achieves them in
+different ways; the documents below explain how you can build Android
+applications that are fast, responsive, and seamless. </p>
+
+<ul>
+<li><a href="performance.html">Designing for Performance</a> (writing efficient Android code)</a></li>
+<li><a href="responsiveness.html">Designing for Responsiveness</a> (avoiding ANR)</a></li>
+<li><a href="seamlessness.html">Designing for Seamlessness</a> (coexisting with other applications)</a></li>
+</ul>
diff --git a/docs/html/guide/practices/design/performance.jd b/docs/html/guide/practices/design/performance.jd
new file mode 100644
index 0000000..1eef342
--- /dev/null
+++ b/docs/html/guide/practices/design/performance.jd
@@ -0,0 +1,549 @@
+page.title=Designing for Performance
+@jd:body
+
+<p>An Android application should be fast. Well, it's probably more accurate to
+say that it should be <em>efficient</em>. That is, it should execute as
+efficiently as possible in the mobile device environment, with its limited
+computing power and data storage, smaller screen, and constrained battery life. 
+
+<p>As you develop your application, keep in mind that, while the application may
+perform well enough in your emulator, running on your dual-core development
+computer, it will not perform that well when run a mobile device &mdash; even
+the most powerful mobile device can't match the capabilities of a typical
+desktop system. For that reason, you should strive to write efficient code, to
+ensure the best possible performance on a variety of mobile devices.</p>
+
+<p>Generally speaking, writing fast or efficient code means keeping memory
+allocations to a minimum, writing tight code, and avoiding certain language and
+programming idioms that can subtly cripple performance. In object-oriented
+terms, most of this work takes place at the <em>method</em> level, on the order of
+actual lines of code, loops, and so on.</p>
+
+<p>This document covers these topics: </p>
+<ul>
+    <li><a href="#intro">Introduction</a></li>
+    <li><a href="#object_creation">Avoid Creating Objects</a></li>
+    <li><a href="#native_methods">Use Native Methods</a></li>
+    <li><a href="#prefer_virtual">Prefer Virtual Over Interface</a></li>
+    <li><a href="#prefer_static">Prefer Static Over Virtual</a></li>
+    <li><a href="#internal_get_set">Avoid Internal Getters/Setters</a></li>
+    <li><a href="#cache_fields">Cache Field Lookups</a></li>
+    <li><a href="#use_final">Declare Constants Final</a></li>
+    <li><a href="#foreach">Use Enhanced For Loop Syntax With Caution</a></li>
+    <li><a href="#avoid_enums">Avoid Enums</a></li>
+    <li><a href="#package_inner">Use Package Scope with Inner Classes</a></li>
+    <li><a href="#avoidfloat">Avoid Float</a> </li>
+    <li><a href="#samples">Some Sample Performance Numbers</a> </li>
+    <li><a href="#closing_notes">Closing Notes</a></li>
+</ul>
+
+<a name="intro" id="intro"></a>
+<h2>Introduction</h2>
+
+<p>There are two basic rules for resource-constrained systems:</p>
+
+<ul>
+    <li>Don't do work that you don't need to do.</li>
+    <li>Don't allocate memory if you can avoid it.</li>
+</ul>
+
+<p>All the tips below follow from these two basic tenets.</p>
+
+<p>Some would argue that much of the advice on this page amounts to "premature
+optimization." While it's true that micro-optimizations sometimes make it
+harder to develop efficient data structures and algorithms, on embedded
+devices like handsets you often simply have no choice.  For instance, if you
+bring your assumptions about VM performance on desktop machines to Android,
+you're quite likely to write code that exhausts system memory.  This will bring
+your application to a crawl &mdash; let alone what it will do to other programs
+running on the system!</p>
+
+<p>That's why these guidelines are important.  Android's success depends on
+the user experience that your applications provide, and that user experience
+depends in part on whether your code is responsive and snappy, or slow and
+aggravating.  Since all our applications will run on the same devices, we're
+all in this together, in a way.  Think of this document as like the rules of
+the road you had to learn when you got your driver's license:  things run
+smoothly when everybody follows them, but when you don't, you get your car
+smashed up.</p>
+
+<p>Before we get down to brass tacks, a brief observation: nearly all issues
+described below are valid whether or not the VM features a JIT compiler. If I
+have two methods that accomplish the same thing, and the interpreted execution
+of foo() is faster than bar(), then the compiled version of foo() will
+probably be as fast or faster than compiled bar(). It is unwise to rely on a
+compiler to "save" you and make your code fast enough.</p>
+
+<a name="object_creation"></a>
+<h2>Avoid Creating Objects</h2>
+
+<p>Object creation is never free. A generational GC with per-thread allocation
+pools for temporary objects can make allocation cheaper, but allocating memory
+is always more expensive than not allocating memory.</p>
+
+<p>If you allocate objects in a user interface loop, you will force a periodic
+garbage collection, creating little "hiccups" in the user experience.</p>
+
+<p>Thus, you should avoid creating object instances you don't need to.  Some
+examples of things that can help:</p>
+
+<ul>
+    <li>When extracting strings from a set of input data, try 
+    to return a substring of the original data, instead of creating a copy.
+    You will create a new String object, but it will share the char[]
+    with the data.</li>
+    <li>If you have a method returning a string, and you know that its result
+    will always be appended to a StringBuffer anyway, change your signature
+    and implementation so that the function does the append directly,
+    instead of creating a short-lived temporary object.</li>
+</ul>
+
+<p>A somewhat more radical idea is to slice up multidimensional arrays into parallel
+single one-dimension arrays:</p>
+
+<ul>
+    <li>An array of ints is a much better than an array of Integers,
+    but this also generalizes to the fact that two parallel arrays of ints
+    are also a <strong>lot</strong> more efficient than an array of (int,int)
+    objects.  The same goes for any combination of primitive types.</li>
+    <li>If you need to implement a container that stores tuples of (Foo,Bar)
+    objects, try to remember that two parallel Foo[] and Bar[] arrays are
+    generally much better than a single array of custom (Foo,Bar) objects.
+    (The exception to this, of course, is when you're designing an API for
+    other code to access;  in those cases, it's usually better to trade
+    correct API design for a small hit in speed. But in your own internal 
+    code, you should try and be as efficient as possible.)</li>
+</ul>
+
+<p>Generally speaking, avoid creating short-term temporary objects if you
+can.  Fewer objects created mean less-frequent garbage collection, which has
+a direct impact on user experience.</p>
+
+<a name="native_methods" id="native_methods"></a>
+<h2>Use Native Methods</h2>
+
+<p>When processing strings, don't hesitate to use specialty methods like
+String.indexOf(), String.lastIndexOf(), and their cousins. These are typically
+implemented in C/C++ code that easily runs 10-100x faster than doing the same
+thing in a Java loop.</p>
+
+<p>The flip side of that advice is that punching through to a native
+method is more expensive than calling an interpreted method. Don't use native
+methods for trivial computation, if you can avoid it.</p>
+
+<a name="prefer_virtual" id="prefer_virtual"></a>
+<h2>Prefer Virtual Over Interface</h2>
+
+<p>Suppose you have a HashMap object.  You can declare it as a HashMap or as
+a generic Map:</p>
+
+<pre>Map myMap1 = new HashMap();
+HashMap myMap2 = new HashMap();</pre>
+
+<p>Which is better?</p>
+
+<p>Conventional wisdom says that you should prefer Map, because it
+allows you to change the underlying implementation to anything that
+implements the Map interface.  Conventional wisdom is correct for
+conventional programming, but isn't so great for embedded systems.  Calling
+through an interface reference can take 2x longer than a virtual
+method call through a concrete reference.</p>
+
+<p>If you have chosen a HashMap because it fits what you're doing, there
+is little value in calling it a Map.  Given the availability of
+IDEs that refactor your code for you, there's not much value in calling
+it a Map even if you're not sure where the code is headed. (Again, though,
+public APIs are an exception:  a good API usually trumps small performance
+concerns.)</p>
+
+<a name="prefer_static" id="prefer_static"></a>
+<h2>Prefer Static Over Virtual</h2>
+
+<p>If you don't need to access an object's fields, make your method static.  It can
+be called faster, because it doesn't require a virtual method table
+indirection.  It's also good practice, because you can tell from the method
+signature that calling the method can't alter the object's state.</p>
+
+<a name="internal_get_set" id="internal_get_set"></a>
+<h2>Avoid Internal Getters/Setters</h2>
+
+<p>In native languages like C++ it's common practice to use getters (e.g.
+<code>i = getCount()</code>) instead of accessing the field directly (<code>i
+= mCount</code>). This is an excellent habit for C++, because the compiler can
+usually inline the access, and if you need to restrict or debug field access
+you can add the code at any time.</p>
+
+<p>On Android, this is a bad idea.  Virtual method calls are expensive,
+much more so than instance field lookups.  It's reasonable to follow
+common object-oriented programming practices and have getters and setters
+in the public interface, but within a class you should always access
+fields directly.</p>
+
+<a name="cache_fields" id="cache_fields"></a>
+<h2>Cache Field Lookups</h2>
+
+<p>Accessing object fields is much slower than accessing local variables.
+Instead of writing:</p>
+<pre>for (int i = 0; i &lt; this.mCount; i++)
+      dumpItem(this.mItems[i]);</pre>
+
+<p>You should write:</p>
+<pre>  int count = this.mCount;
+  Item[] items = this.mItems;
+ 
+  for (int i = 0; i &lt; count; i++)
+      dumpItems(items[i]);
+</pre>
+
+<p>(We're using an explicit "this" to make it clear that these are
+member variables.)</p>
+
+<p>A similar guideline is never call a method in the second clause of a "for"
+statement.  For example, the following code will execute the getCount() method
+once per iteration, which is a huge waste when you could have simply cached
+the value as an int:</p>
+
+<pre>for (int i = 0; i &lt; this.getCount(); i++)
+    dumpItems(this.getItem(i));
+</pre>
+
+<p>It's also usually a good idea to create a local variable if you're going to be
+accessing an instance field more than once.  For example:</p>
+
+<pre>
+    protected void drawHorizontalScrollBar(Canvas canvas, int width, int height) {
+        if (isHorizontalScrollBarEnabled()) {
+            int size = <strong>mScrollBar</strong>.getSize(<em>false</em>);
+            if (size &lt;= 0) {
+                size = mScrollBarSize;
+            }
+            <strong>mScrollBar</strong>.setBounds(0, <em>height</em> - size, width, height);
+            <strong>mScrollBar</strong>.setParams(
+                    computeHorizontalScrollRange(),
+                    computeHorizontalScrollOffset(),
+                    computeHorizontalScrollExtent(), <em>false</em>);
+            <strong>mScrollBar</strong>.draw(canvas);
+        }
+    }</pre>
+
+<p>That's four separate lookups of the member field <code>mScrollBar</code>.
+By caching mScrollBar in a local stack variable, the four member field lookups
+become four stack variable references, which are much more efficient.</p>
+
+<p>Incidentally, method arguments have the same performance characteristics
+as local variables.</p>
+
+<a name="use_final" id="use_final"></a>
+<h2>Declare Constants Final</h2>
+
+<p>Consider the following declaration at the top of a class:</p>
+
+<pre>static int intVal = 42;
+static String strVal = "Hello, world!";</pre>
+
+<p>The compiler generates a class initializer method, called
+<code>&lt;clinit&gt;</code>, that is executed when the class is first used.
+The method stores the value 42 into <code>intVal</code>, and extracts a
+reference from the classfile string constant table for <code>strVal</code>.
+When these values are referenced later on, they are accessed with field
+lookups.</p>
+
+<p>We can improve matters with the "final" keyword:</p>
+
+<pre>static final int intVal = 42;
+static final String strVal = "Hello, world!";</pre>
+
+<p>The class no longer requires a <code>&lt;clinit&gt;</code> method,
+because the constants go into classfile static field initializers, which are
+handled directly by the VM.  Code accessing <code>intVal</code> will use
+the integer value 42 directly, and accesses to <code>strVal</code> will
+use a relatively inexpensive "string constant" instruction instead of a
+field lookup.</p>
+
+<p>Declaring a method or class "final" does not confer any immediate
+performance benefits, but it does allow certain optimizations. For example, if
+the compiler knows that a "getter" method can't be overridden by a sub-class,
+it can inline the method call.</p>
+
+<p>You can also declare local variables final. However, this has no definitive
+performance benefits. For local variables, only use "final" if it makes the
+code clearer (or you have to, e.g. for use in an anonymous inner class).</p>
+
+<a name="foreach" id="foreach"></a>
+<h2>Use Enhanced For Loop Syntax With Caution</h2>
+
+<p>The enhanced for loop (also sometimes known as "for-each" loop) can be used for collections that implement the Iterable interface.
+With these objects, an iterator is allocated to make interface calls
+to hasNext() and next(). With an ArrayList, you're better off walking through
+it directly, but for other collections the enhanced for loop syntax will be equivalent
+to explicit iterator usage.</p>
+
+<p>Nevertheless, the following code shows an acceptable use of the enhanced for loop:</p>
+
+<pre>public class Foo {
+    int mSplat;
+    static Foo mArray[] = new Foo[27];
+
+    public static void zero() {
+        int sum = 0;
+        for (int i = 0; i &lt; mArray.length; i++) {
+            sum += mArray[i].mSplat;
+        }
+    }
+
+    public static void one() {
+        int sum = 0;
+        Foo[] localArray = mArray;
+        int len = localArray.length;
+
+        for (int i = 0; i &lt; len; i++) {
+            sum += localArray[i].mSplat;
+        }
+    }
+
+    public static void two() {
+        int sum = 0;
+        for (Foo a: mArray) {
+            sum += a.mSplat;
+        }
+    }
+}</pre>
+
+<p><strong>zero()</strong> retrieves the static field twice and gets the array
+length once for every iteration through the loop.</p>
+
+<p><strong>one()</strong> pulls everything out into local variables, avoiding
+the lookups.</p>
+
+<p><strong>two()</strong> uses the enhanced for loop syntax introduced in version 1.5 of
+the Java programming language. The code generated by the compiler takes care
+of copying the array reference and the array length to local variables, making
+it a good choice for walking through all elements of an array. It does
+generate an extra local load/store in the main loop (apparently preserving
+"a"), making it a teensy bit slower and 4 bytes longer than one().</p>
+
+<p>To summarize all that a bit more clearly: enhanced for loop syntax performs well
+with arrays, but be cautious when using it with Iterable objects since there is
+additional object creation.</p>
+
+<a name="avoid_enums" id="avoid_enums"></a>
+<h2>Avoid Enums</h2>
+
+<p>Enums are very convenient, but unfortunately can be painful when size
+and speed matter.  For example, this:</p>
+
+<pre>public class Foo {
+   public enum Shrubbery { GROUND, CRAWLING, HANGING }
+}</pre>
+
+<p>turns into a 900 byte .class file (Foo$Shrubbery.class). On first use, the
+class initializer invokes the &lt;init&gt; method on objects representing each
+of the enumerated values. Each object gets its own static field, and the full
+set is stored in an array (a static field called "$VALUES"). That's a lot of
+code and data, just for three integers.</p>
+
+<p>This:</p>
+
+<pre>Shrubbery shrub = Shrubbery.GROUND;</pre>
+
+<p>causes a static field lookup.  If "GROUND" were a static final int,
+the compiler would treat it as a known constant and inline it.</p>
+
+<p>The flip side, of course, is that with enums you get nicer APIs and
+some compile-time value checking.  So, the usual trade-off applies: you should
+by all means use enums for public APIs, but try to avoid them when performance
+matters.</p>
+
+<p>In some circumstances it can be helpful to get enum integer values
+through the <code>ordinal()</code> method.  For example, replace:</p>
+
+<pre>for (int n = 0; n &lt; list.size(); n++) {
+    if (list.items[n].e == MyEnum.VAL_X)
+       // do stuff 1
+    else if (list.items[n].e == MyEnum.VAL_Y)
+       // do stuff 2
+}</pre>
+
+<p>with:</p>
+
+<pre>   int valX = MyEnum.VAL_X.ordinal();
+   int valY = MyEnum.VAL_Y.ordinal();
+   int count = list.size();
+   MyItem items = list.items();
+
+   for (int  n = 0; n &lt; count; n++)
+   {
+        int  valItem = items[n].e.ordinal();
+
+        if (valItem == valX)
+          // do stuff 1
+        else if (valItem == valY)
+          // do stuff 2
+   }</pre>
+
+<p>In some cases, this will be faster, though this is not guaranteed.</p>
+
+<a name="package_inner" id="package_inner"></a>
+<h2>Use Package Scope with Inner Classes</h2>
+
+<p>Consider the following class definition:</p>
+
+<pre>public class Foo {
+    private int mValue;
+
+    public void run() {
+        Inner in = new Inner();
+        mValue = 27;
+        in.stuff();
+    }
+
+    private void doStuff(int value) {
+        System.out.println("Value is " + value);
+    }
+
+    private class Inner {
+        void stuff() {
+            Foo.this.doStuff(Foo.this.mValue);
+        }
+    }
+}</pre>
+
+<p>The key things to note here are that we define an inner class (Foo$Inner)
+that directly accesses a private method and a private instance field
+in the outer class.  This is legal, and the code prints "Value is 27" as
+expected.</p>
+
+<p>The problem is that Foo$Inner is technically (behind the scenes) a totally
+separate class, which makes direct access to Foo's private
+members illegal.  To bridge that gap, the compiler generates a
+couple of synthetic methods:</p>
+
+<pre>/*package*/ static int Foo.access$100(Foo foo) {
+    return foo.mValue;
+}
+/*package*/ static void Foo.access$200(Foo foo, int value) {
+    foo.doStuff(value);
+}</pre>
+
+<p>The inner-class code calls these static methods whenever it needs to
+access the "mValue" field or invoke the "doStuff" method in the outer
+class. What this means is that the code above really boils down to a case
+where you're accessing member fields through accessor methods instead of
+directly.  Earlier we talked about how accessors are slower than direct field
+accesses, so this is an example of a certain language idiom resulting in an
+"invisible" performance hit.</p>
+
+<p>We can avoid this problem by declaring fields and methods accessed
+by inner classes to have package scope, rather than private scope.
+This runs faster and removes the overhead of the generated methods.
+(Unfortunately it also means the fields could be accessed directly by other
+classes in the same package, which runs counter to the standard OO
+practice of making all fields private. Once again, if you're
+designing a public API you might want to carefully consider using this
+optimization.)</p>
+
+<a name="avoidfloat" id="avoidfloat"></a>
+<h2>Avoid Float</h2>
+
+<p>Before the release of the Pentium CPU, it was common for game authors to do
+as much as possible with integer math. With the Pentium, the floating point
+math co-processor became a built-in feature, and by interleaving integer and
+floating-point operations your game would actually go faster than it would
+with purely integer math. The common practice on desktop systems is to use
+floating point freely.</p>
+
+<p>Unfortunately, embedded processors frequently do not have hardware floating
+point support, so all operations on "float" and "double" are performed in
+software. Some basic floating point operations can take on the order of a
+millisecond to complete.</p>
+
+<p>Also, even for integers, some chips have hardware multiply but lack
+hardware divide. In such cases, integer division and modulus operations are
+performed in software &mdash; something to think about if you're designing a
+hash table or doing lots of math.</p>
+
+<a name="samples" id="samples"></a>
+<h2>Some Sample Performance Numbers</h2>
+
+<p>To illustrate some of our ideas, here is a table listing the approximate
+run times for a few basic actions. Note that these values should NOT be taken
+as absolute numbers: they are a combination of CPU and wall clock time, and
+will change as improvements are made to the system. However, it is worth
+noting how these values apply relative to each other &mdash; for example,
+adding a member variable currently takes about four times as long as adding a
+local variable.</p>
+
+<table>
+    <tr>
+        <th>Action</th>
+        <th>Time</th>
+    </tr>
+    <tr>
+        <td>Add a local variable </td>
+        <td>1</td>
+    </tr>
+    <tr class="alt">
+        <td>Add a member variable </td>
+        <td>4</td>
+    </tr>
+    <tr>
+        <td>Call String.length()</td>
+        <td>5</td>
+    </tr>
+    <tr class="alt">
+        <td>Call empty static native method</td>
+        <td>5</td>
+    </tr>
+    <tr>
+        <td>Call empty static method </td>
+        <td>12</td>
+    </tr>
+    <tr class="alt">
+        <td>Call empty virtual method </td>
+        <td>12.5</td>
+    </tr>
+    <tr>
+        <td>Call empty interface method </td>
+        <td>15</td>
+    </tr>
+    <tr class="alt">
+        <td>Call Iterator:next() on a HashMap </td>
+        <td>165</td>
+    </tr>
+    <tr>
+        <td>Call put() on a HashMap</td>
+        <td>600</td>
+    </tr>
+    <tr class="alt">
+        <td>Inflate 1 View from XML </td>
+        <td>22,000</td>
+    </tr>
+    <tr>
+        <td>Inflate 1 LinearLayout containing 1 TextView </td>
+        <td>25,000</td>
+    </tr>
+    <tr class="alt">
+        <td>Inflate 1 LinearLayout containing 6 View objects </td>
+        <td>100,000</td>
+    </tr>
+    <tr>
+        <td>Inflate 1 LinearLayout containing 6 TextView objects </td>
+        <td>135,000</td>
+    </tr>
+    <tr class="alt">
+        <td>Launch an empty activity </td>
+        <td>3,000,000</td>
+    </tr>
+</table>
+
+<a name="closing_notes" id="closing_notes"></a>
+<h2>Closing Notes</h2>
+
+<p>The best way to write good, efficient code for embedded systems is to
+understand what the code you write really does. If you really want to allocate
+an iterator, by all means use enhanced for loop syntax on a List; just make it a
+deliberate choice, not an inadvertent side effect.</p>
+
+<p>Forewarned is forearmed!  Know what you're getting into!  Insert your
+favorite maxim here, but always think carefully about what your code is doing,
+and be on the lookout for ways to speed it up.</p>
diff --git a/docs/html/guide/practices/design/responsiveness.jd b/docs/html/guide/practices/design/responsiveness.jd
new file mode 100644
index 0000000..ecd743d
--- /dev/null
+++ b/docs/html/guide/practices/design/responsiveness.jd
@@ -0,0 +1,117 @@
+page.title=Designing for Responsiveness
+@jd:body
+
+<p>It's possible to write code that wins every performance test in the world, but still sends users in a fiery rage when they try to use the application. These are the applications that aren't <em>responsive</em> enough &mdash; the ones that feel
+sluggish, hang or freeze for significant periods, or take too long to process
+input. </p>
+
+<p>In Android, the system guards against applications that are insufficiently responsive for a period of time by displaying a dialog to the user, called the Application Not Responding (ANR) dialog. The user can choose to let the application continue, but the user won't appreciate having to act on this dialog every time he or she uses your application. So it's important to design responsiveness into your application, so that the system never has cause to display an ANR to the user. </p>
+
+<p>Generally, the system displays an ANR if an application cannot respond to user input. For example, if an  application blocks on some I/O operation (frequently a network access), then the main application thread won't be able to process incoming user input events. After a time, the system concludes that the application has hung, and displays the ANR to give the user the option to kill it. 
+
+<p>Similarly, if your application spends too much time building an elaborate in-memory
+structure, or perhaps computing the next move in a game, the system will 
+conclude that your application has hung. It's always important to make
+sure these computations are efficient using the techniques above, but even the
+most efficient code still takes time to run.</p>
+
+<p>In both of these cases, the fix is usually to create a child thread, and do
+most of your work there. This keeps the main thread (which drives the user
+interface event loop) running, and prevents the system from concluding your code
+has frozen. Since such threading usually is accomplished at the class
+level, you can think of responsiveness as a <em>class</em> problem. (Compare
+this with basic performance, which was described above as a <em>method</em>-level
+concern.)</p>
+
+<div class="sidebox" style="margin-top:1em;border:0;">
+<div style="border:0;background-color:#fff;padding:15px;padding-right:2em;margin:0;">
+<img src="{@docRoot}images/anr.png" width="240" height="320" alt="Screenshot of ANR dialog box">
+<p style="margin-top:.5em;padding:.5em;">An ANR dialog displayed to the user.</p>
+</div>
+</div>
+
+<p>This document discusses how the Android system determines whether an application is
+not responding and provides guidelines for
+ensuring that your application is responsive. </p>
+
+<p>This document covers these topics: </p>
+<ul>
+    <li><a href="#anr">What Triggers ANR?</a></li>
+    <li><a href="#avoiding">How to Avoid ANR</a></li>
+    <li><a href="#reinforcing">Reinforcing Responsiveness</a></li>
+</ul>
+
+<h2 id="anr">What Triggers ANR?</h2>
+
+<p>In Android, application responsiveness is monitored by the Activity Manager
+and Window Manager system services. Android will display the ANR dialog
+for a particular application when it detects one of the following
+conditions:</p>
+<ul>  
+    <li>No response to an input event (e.g. key press, screen touch) within 5 seconds</li>
+    <li>A {@link android.content.BroadcastReceiver BroadcastReceiver} hasn't finished executing within 10 seconds</li>
+</ul>
+
+<h2 id="avoiding">How to Avoid ANR</h2>
+
+<p>Given the above definition for ANR, let's examine why this can occur in
+Android applications and how best to structure your application to avoid ANR.</p>
+
+<p>Android applications normally run entirely on a single (i.e. main) thread.
+This means that anything your application is doing in the main thread that
+takes a long time to complete can trigger the ANR dialog because your
+application is not giving itself a chance to handle the input event or Intent
+broadcast.</p>
+
+<p>Therefore any method that runs in the main thread should do as little work
+as possible. In particular, Activities should do as little as possible to set
+up in key life-cycle methods such as <code>onCreate()</code> and
+<code>onResume()</code>. Potentially long running operations such as network
+or database operations, or computationally expensive calculations such as
+resizing bitmaps should be done in a child thread (or in the case of databases
+operations, via an asynchronous request). However, this does not mean that
+your main thread should block while waiting for the child thread to
+complete &mdash; nor should you call <code>Thread.wait()</code> or
+<code>Thread.sleep()</code>. Instead of blocking while waiting for a child
+thread to complete, your main thread should provide a {@link
+android.os.Handler Handler} for child threads to post back to upon completion.
+Designing your application in this way will allow your main thread to remain
+responsive to input and thus avoid ANR dialogs caused by the 5 second input
+event timeout. These same practices should be followed for any other threads
+that display UI, as they are also subject to the same timeouts.</p>
+
+<p>The specific constraint on IntentReciever execution time emphasizes what
+they were meant to do: small, discrete amounts of work in the background such
+as saving a setting or registering a Notification. So as with other methods
+called in the main thread, applications should avoid potentially long-running
+operations or calculations in BroadcastReceivers. But instead of doing intensive
+tasks via child threads (as the life of a BroadcastReceiver is short), your
+application should start a {@link android.app.Service Service} if a
+potentially long running action needs to be taken in response to an Intent
+broadcast. As a side note, you should also avoid starting an Activity from an
+Intent Receiver, as it will spawn a new screen that will steal focus from
+whatever application the user is currently has running. If your application
+has something to show the user in response to an Intent broadcast, it should
+do so using the {@link android.app.NotificationManager Notification
+Manager}.</p>
+
+<h2 id="reinforcing">Reinforcing Responsiveness</h2>
+
+<p>Generally, 100 to 200ms is the threshold beyond which users will perceive
+lag (or lack of "snappiness," if you will) in an application. As such, here
+are some additional tips beyond what you should do to avoid ANR that will help
+make your application seem responsive to users.</p>
+
+<ul>
+    <li>If your application is doing work in the background in response to
+    user input, show that progress is being made ({@link
+    android.widget.ProgressBar ProgressBar} and {@link
+    android.app.ProgressDialog ProgressDialog} are useful for this).</li>
+    <li>For games specifically, do calculations for moves in a child
+    thread.</li>
+    <li>If your application has a time-consuming initial setup phase, consider
+    showing a splash screen or rendering the main view as quickly as possible
+    and filling in the information asynchronously. In either case, you should
+    indicate somehow that progress is being made, lest the user perceive that
+    the application is frozen.</li>
+</ul>
diff --git a/docs/html/guide/practices/design/seamlessness.jd b/docs/html/guide/practices/design/seamlessness.jd
new file mode 100644
index 0000000..a6c1641
--- /dev/null
+++ b/docs/html/guide/practices/design/seamlessness.jd
@@ -0,0 +1,242 @@
+page.title=Designing for Seamlessness
+@jd:body
+
+<p>Even if your application is fast and responsive, certain design decisions can
+still cause problems for users &mdash; because of unplanned interactions with
+other applications or dialogs, inadvertent loss of data, unintended blocking,
+and so on. To avoid these problems, it helps to understand the context in which
+your applications run and the system interactions that can affect your
+application. In short, you should strive to develop an application that
+interacts seamlessly with the system and with other applications. </p>
+
+<p>A common seamlessness problem is when an application's background process
+&mdash; for example, a service or broadcast receiver &mdash; pops up a dialog in
+response to some event. This may seem like harmless behavior, especially when
+you are building and testing your application in isolation, on the emulator.
+However, when your application is run on an actual device, your application may
+not have user focus at the time your background process displays the dialog. So
+it could end up that your application would display it's dialog behind the
+active application, or it could take focus from the current application and
+display the dialog in front of whatever the user was doing (such as dialing a
+phone call, for example). That behavior would not work for your application or
+for the user. </p>
+
+<p>To avoid these problems, your application should use the proper system 
+facility for notifying the user &mdash; the 
+{@link android.app.Notification Notification} classes. Using
+notifications, your application can signal the user that an event has 
+taken place, by displaying an icon in the status bar rather than taking
+focus and interrupting the user.</p>
+
+<p>Another example of a seamlessness problem is when an activity inadvertently
+loses state or user data because it doesn't correctly implement the onPause()
+and other lifecycle methods. Or, if your application exposes data intended to be
+used by other applications, you should expose it via a ContentProvider, rather
+than (for example) doing so through a world-readable raw file or database.</p>
+
+<p>What those examples have in common is that they involve cooperating nicely
+with the system and other applications. The Android system is designed to treat
+applications as a sort of federation of loosely-coupled components, rather than
+chunks of black-box code. This allows you as the developer to view the entire
+system as just an even-larger federation of these components. This benefits you
+by allowing you to integrate cleanly and seamlessly with other applications, and
+so you should design your own code to return the favor.</p>
+
+<p>This document discusses common seamlessness problems and how to avoid them.
+It covers these topics: </p>
+<ul>
+    <li><a href="#drop">Don't Drop Data</a></li>
+    <li><a href="#expose">Don't Expose Raw Data</a></li>
+    <li><a href="#interrupt">Don't Interrupt the User</a></li>
+    <li><a href="#threads">Got a Lot to Do? Do it in a Thread</a></li>
+    <li><a href="#multiple-activities">Don't Overload a Single Activity Screen</a></li>
+    <li><a href="#themes">Extend System Themes</a></li>
+    <li><a href="#flexui">Design Your UI to Work with Multiple Screen Resolutions</a></li>
+    <li><a href="#network">Assume the Network is Slow</a></li>
+    <li><a href="#keyboard">Don't Assume Touchscreen or Keyboard</a></li>
+    <li><a href="#battery">Do Conserve the Device Battery</a></li>
+</ul>
+
+<h2 id="drop">Don't Drop Data</h2>
+
+<p>Always keep in mind that Android is a mobile platform. It may seem obvious to
+say it, but it's important to remember that another Activity (such as the
+"Incoming Phone Call" app) can pop up over your own Activity at any moment.
+This will fire the onSaveInstanceState() and onPause() methods, and will likely result in
+your application being killed.</p>
+
+<p>If the user was editing data in your application when the other Activity
+appeared, your application will likely lose that data when your application is
+killed. Unless, of course, you save the work in progress first. The "Android
+Way" is to do just that: Android applications that accept or edit input should
+override the onSaveInstanceState() method and save their state in some appropriate
+fashion. When the user revisits the application, she should be able to
+retrieve her data.</p>
+
+<p>A classic example of a good use of this behavior is a mail application. If the
+user was composing an email when another Activity started up, the application
+should save the in-process email as a draft.</p>
+
+<h2 id="expose">Don't Expose Raw Data</h2>
+
+<p>If you wouldn't walk down the street in your underwear, neither should your
+data. While it's possible to expose certain kinds of application to the world
+to read, this is usually not the best idea. Exposing raw data requires other
+applications to understand your data format; if you change that format, you'll
+break any other applications that aren't similarly updated.</p>
+
+<p>The "Android Way" is to create a ContentProvider to expose your data to other
+applications via a clean, well-thought-out, and maintainable API. Using a
+ContentProvider is much like inserting a Java language interface to split up and
+componentize two tightly-coupled pieces of code. This means you'll be able to
+modify the internal format of your data without changing the interface exposed
+by the ContentProvider, and this without affecting other applications.</p>
+
+<h2 id="interrupt">Don't Interrupt the User</h2>
+
+<p>If the user is running an application (such as the Phone application during a
+call) it's a pretty safe bet he did it on purpose. That's why you should avoid
+spawning activities except in direct response to user input from the current
+Activity.</p>
+
+<p>That is, don't call startActivity() from BroadcastReceivers or Services running in
+the background. Doing so will interrupt whatever application is currently
+running, and result in an annoyed user. Perhaps even worse, your Activity may
+become a "keystroke bandit" and receive some of the input the user was in the
+middle of providing to the previous Activity. Depending on what your
+application does, this could be bad news.</p>
+
+<p>Instead of spawning Activity UIs directly from the background, you should
+instead use the NotificationManager to set Notifications. These will appear in
+the status bar, and the user can then click on them at his leisure, to see
+what your application has to show him.</p>
+
+<p>(Note that all this doesn't apply to cases where your own Activity is already
+in the foreground: in that case, the user expects to see your next Activity in
+response to input.)</p>
+
+<h2 id="threads">Got a Lot to Do? Do it in a Thread</h2>
+
+<p>If your application needs to perform some expensive or long-running
+computation, you should probably move it to a thread. This will prevent the
+dreaded "Application Not Responding" dialog from being displayed to the user,
+with the ultimate result being the fiery demise of your application.</p>
+
+<p>By default, all code in an Activity as well as all its Views run in the same
+thread. This is the same thread that also handles UI events. For example, when
+the user presses a key, a key-down event is added to the Activity's main
+thread's queue. The event handler system needs to dequeue and handle that
+event quickly; if it doesn't, the system concludes after a few seconds that
+the application is hung and offers to kill it for the user.</p>
+
+<p>If you have long-running code, running it inline in your Activity will run it
+on the event handler thread, effectively blocking the event handler. This will
+delay input processing, and result in the ANR dialogs. To avoid this, move
+your computations to a thread. This <a
+href="responsiveness.html">Design for Responsiveness</a> document 
+discusses how to do that..</p>
+
+<h2 id="multiple-activities">Don't Overload a Single Activity Screen</h2>
+
+<p>Any application worth using will probably have several different screens.
+When designing the screens of your UI, be sure to make use of multiple Activity
+object instances.</p>
+
+<p>Depending on your development background, you may interpret an Activity as
+similar to something like a Java Applet, in that it is the entry point for
+your application. However, that's not quite accurate: where an Applet subclass
+is the single entry point for a Java Applet, an Activity should be thought of
+as one of potentially several entry points to your application. The only
+difference between your "main" Activity and any others you might have is that
+the "main" one just happens to be the only one that expressed an interest in
+the "android.intent.action.MAIN" action in your AndroidManifest..xml file.</p>
+
+<p>So, when designing your application, think of your application as a federation
+of Activity objects. This will make your code a lot more maintainable in the long
+run, and as a nice side effect also plays nicely with Android's application
+history and "backstack" model.</p>
+
+<h2 id="themes">Extend System Themes</h2>
+
+<p>When it comes to the look-and-feel of the user interface, it's important to
+blend in nicely. Users are jarred by applications which contrast with the user
+interface they've come to expect. When designing your UIs, you should try and
+avoid rolling your own as much as possible. Instead, use a Theme. You
+can override or extend those parts of the theme that you need to, but at least
+you're starting from the same UI base as all the other applications. For all
+the details, read <a href="{@docRoot}guide/topics/ui/themes.html">Applying Styles and Themes</a>.</p>
+
+<h2 id="flexui">Design Your UI to Work with Multiple Screen Resolutions</h2>
+
+<p>Different Android-powered devices will support different screen resolutions. 
+Some will even be able to change resolutions on the fly, such as by switching 
+to landscape mode. It's important to make sure your layouts and drawables 
+are flexible enough to display properly on a variety of device screens.</p>
+
+<p>Fortunately, this is very easy to do. In brief, what you must do is 
+provide different versions of your artwork (if you use any) for the key 
+resolutions, and then design your layout to accommodate various dimensions. 
+(For example, avoid using hard-coded positions and instead use relative 
+layouts.) If you do that much, the system handles the rest, and your 
+application looks great on any device.</p>
+
+<h2 id="network">Assume the Network is Slow</h2>
+
+<p>Android devices will come with a variety of network-connectivity options. All
+will have some data-access provision, though some will be faster than others.
+The lowest common denominator, however, is GPRS, the non-3G data service for
+GSM networks. Even 3G-capable devices will spend lots of time on non-3G
+networks, so slow networks will remain a reality for quite a long time to
+come.</p>
+
+<p>That's why you should always code your applications to minimize network
+accesses and bandwidth. You can't assume the network is fast, so you should
+always plan for it to be slow. If your users happen to be on faster networks,
+then that's great &mdash; their experience will only improve. You want to avoid the
+inverse case though: applications that are usable some of the time, but
+frustratingly slow the rest based on where the user is at any given moment are
+likely to be unpopular.</p>
+
+<p>One potential gotcha here is that it's very easy to fall into this trap if
+you're using the emulator, since the emulator uses your desktop computer's
+network connection. That's almost guaranteed to be much faster than a cell
+network, so you'll want to change the settings on the emulator that simulate
+slower network speeds. You can do this in Eclipse, in the "Emulator Settings"
+tab of your launch configuration or via a <a
+href="{@docRoot}guide/developing/tools/emulator.html#netspeed">command-line 
+option</a> when starting the emulator.</p>
+
+<h2 id="keyboard">Don't Assume Touchscreen or Keyboard</h2>
+
+<p>
+Android will support a variety of handset form-factors.  That's a fancy way of
+saying that some Android devices will have full "QWERTY" keyboards, while
+others will have 40-key, 12-key, or even other key configurations.  Similarly,
+some devices will have touch-screens, but many won't.
+</p><p>
+When building your applications, keep that in mind.  Don't make assumptions
+about specific keyboard layouts -- unless, of course, you're really interested
+in restricting your application so that it can only be used on those devices.
+</p>
+
+<h2 id="battery">Do Conserve the Device Battery</h2>
+<p>
+A mobile device isn't very mobile if it's constantly plugged into the
+wall.  Mobile devices are battery-powered, and the longer we can make that
+battery last on a charge, the happier everyone is &mdash; especially the user.
+Two of the biggest consumers of battery power are the processor, and the
+radio;  that's why it's important to write your applications to do as little
+work as possible, and use the network as infrequently as possible.
+</p><p>
+Minimizing the amount of processor time your application uses really comes
+down to <a href="performance.html">writing efficient
+code</a>.  To minimize the power drain from using the radio, be sure to handle
+error conditions gracefully, and only fetch what you need.  For example, don't
+constantly retry a network operation if one failed.  If it failed once, it's
+likely because the user has no reception, so it's probably going to fail again
+if you try right away; all you'll do is waste battery power.
+</p><p>
+Users are pretty smart:  if your program is power-hungry, you can count on
+them noticing.  The only thing you can be sure of at that point is that your
+program won't stay installed very long.
+</p>
diff --git a/docs/html/guide/practices/index.html b/docs/html/guide/practices/index.html
new file mode 100644
index 0000000..4881acf
--- /dev/null
+++ b/docs/html/guide/practices/index.html
@@ -0,0 +1,8 @@
+<html>
+<head>
+<meta http-equiv="refresh" content="0;url=../index.html">
+</head>
+<body>
+<a href="../index.html">click here</a> if you are not redirected.
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/html/guide/publishing/app-signing.jd b/docs/html/guide/publishing/app-signing.jd
new file mode 100644
index 0000000..28c927a
--- /dev/null
+++ b/docs/html/guide/publishing/app-signing.jd
@@ -0,0 +1,489 @@
+page.title=Signing Your Applications
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+
+<h2>Signing quickview</h2>
+
+<ul>
+<li>All Android apps <em>must</em> be signed</a></li>
+<li>You can sign with a self-signed key</li>
+<li>How you sign your apps is critical &mdash; read this document carefully</li>
+<li>Determine your signing strategy early in the development process</li>
+</ul>
+
+<h2>In this document</h2>
+
+<ol>
+<li><a href="#overview">Overview</a></li>
+<li><a href="#strategies">Signing Strategies</a></li>
+<li><a href="#setup">Basic Setup for Signing</a></li>
+<li><a href="#debugmode">Signing in Debug Mode</a></li>
+<li><a href="#releasemode">Signing for Public Release</a>
+    <ol>
+    <li><a href="#releasecompile">Compiling for Release</a></li>
+    <li><a href="#cert">Obtaining a Suitable Private Key</a></li>
+    <li><a href="#signapp">Signing Your Application</a></li>
+    </ol>
+</li>
+<li><a href="#secure-key">Securing Your Private Key</a></li>
+
+</ol>
+
+<h2>See also</h2>
+
+<ol>
+<li><a href="{@docRoot}guide/publishing/versioning.html">Versioning Your Applications</a></li>
+<li><a href="{@docRoot}guide/publishing/preparing.html">Preparing to Publish</a></li>
+</ol>
+
+</div>
+</div>
+
+<p>This document provides information about signing your Android applications prior to publishing them for mobile device users.</p>
+
+<h2 id="overview">Overview</h2>
+
+<p>The Android system requires that all installed applications be digitally
+signed with a certificate whose private key is held by the application's
+developer. The system uses the certificate as a means of identifying the author of
+an application and establishing trust relationships between applications, rather
+than for controlling which applications the user can install. The certificate
+does not need to be signed by a certificate authority: it is perfectly
+allowable, and typical, for Android applications to use self-signed
+certificates.</p>
+
+<p>The important points to understand about signing Android applications are:</p>
+
+<ul>
+  <li>All applications <em>must</em> be signed. The system will not install an application 
+that is not signed.</li>
+  <li>You can use self-signed certificates to sign your applications. No certificate authority 
+is needed.</li>
+  <li>When you are ready to publish your application, you must sign it with a suitable private 
+key. You can not publish an application that is signed with the default key generated 
+by the SDK tools. 
+  </li>
+  <li>The system tests a signer certificate's expiration date only at install time. If an 
+application's signer certificate expires after the application is installed, the application 
+will continue to function normally.</li>
+  <li>You can use standard tools &mdash; Keytool and Jarsigner &mdash; to generate keys and 
+sign your application .apk files.</li>
+</ul>
+
+<p>The Android system will not install or run an application that is not signed appropriately. This 
+applies wherever the Android system is run, whether on an actual device or on the emulator. 
+For this reason, you must set up signing for your application before you will be able to 
+run or debug it on an emulator or device.</p>
+
+<p>The Android SDK tools assist you in signing your applications when debugging. Both the ADT Plugin 
+for Eclipse and the Ant build tool offer two signing modes &mdash; debug mode and release mode. 
+
+<ul>
+<li>In debug mode, the build tools use the Keytool utility, included in the JDK, to create 
+a keystore and key with a known alias and password. At each compilation, the tools then use 
+the debug key to sign the application .apk file. Because the password is known, the tools 
+don't need to prompt you for the keystore/key password each time you compile.</li>
+
+<li>When your application is ready for release, you compile it in release signing mode. 
+In this mode, the tools compile your .apk <em>without</em> signing it. You must then sign
+the .apk manually &mdash; <span style="color:red">with your private key</span> &mdash; 
+using Jarsigner (or similar tool). If you do not have a suitable private key already, 
+you can run Keytool manually to generate your own keystore/key and then sign your 
+application with Jarsigner.</li>
+</ul>
+
+<h2 id="strategies">Signing Strategies</h2>
+
+<p>Some aspects of application signing may affect how you approach the development
+of your application, especially if you are planning to release multiple
+applications. </p>
+
+<p>In general, the recommended strategy for all developers is to sign
+all of your applications with the same certificate, throughout the expected
+lifespan of your applications. There are several reasons why you should do so: </p>
+
+<ul>
+<li>Application upgrade &mdash; As you release upgrades to your
+application, you will want to sign the upgrades with the same certificate, if you
+want users to upgrade seamlessly to the new version. When the system is 
+installing an update to an application, if any of the certificates in the 
+new version match any of the certificates in the old version, then the 
+system allows the update. If you sign the version without using a matching
+certificate, you will also need to assign a different package name to the 
+application &mdash; in this case, the user installs the new version as a 
+completely new application. </li>
+
+<li>Application modularity &mdash; The Android system allows applications that
+are signed by the same certificate to run in the same process, if the
+applications so request, so that the system treats them as a single application.
+In this way you can deploy your application in modules, and users can update
+each of the modules independently if needed.</li>
+
+<li>Code/data sharing through permissions &mdash; The Android system provides
+signature-based permissions enforcement, so that an application can expose
+functionality to another application that is signed with a specified
+certificate. By signing multiple applications with the same certificate and
+using signature-based permissions checks, your applications can share code and
+data in a secure manner. </li>
+
+</ul>
+
+<p>Another important consideration in determining your signing strategy is 
+how to set the validity period of the key that you will use to sign your 
+applications.</p>
+
+<ul>
+<li>If you plan to support upgrades for a single application, you should ensure 
+that your key has a validity period that exceeds the expected lifespan of
+that application. A validity period of 25 years or more is recommended. 
+When your key's validity period expires, users will no longer be
+able to seamlessly upgrade to new versions of your application.</li>
+
+<li>If you will sign multiple distinct applications with the same key, 
+you should ensure that your key's validity period exceeds the expected 
+lifespan of <em>all versions of all of the applications</em>, including 
+dependent applications that may be added to the suite in the future. </li>
+
+<li>If you plan to publish your application(s) on Android Market, the
+key you use to sign the application(s) must have a validity period 
+ending after 22 October 2033. The Market server enforces this requirement
+to ensure that users can seamlessly upgrade Market applications when
+new versions are available. </li>
+</ul>
+
+<p>As you design your application, keep these points in mind and make sure to
+use a <a href="#cert">suitable certificate</a> to sign your applications. </p>
+
+<h2 id="setup">Basic Setup for Signing</h2>
+
+<p>To support the generation of a keystore and debug key, you should first make sure that 
+Keytool is available to the SDK build 
+tools. In most cases, you can tell the SDK build tools how to find Keytool by making sure 
+that your JAVA_HOME environment variable is set and that it references a suitable JDK. 
+Alternatively, you can add the JDK version of Keytool to your PATH variable.</p>
+
+<p>If you are developing on a version of Linux that originally came with GNU Compiler for 
+Java, make sure that the system is using the JDK version of Keytool, rather than the gcj 
+version. If Keytool is already in your PATH, it might be pointing to a symlink at 
+/usr/bin/keytool. In this case, check the symlink target to make sure that it points 
+to the Keytool in the JDK.</p>
+
+<p>If you will release your application to the public, you will also need to have
+the Jarsigner tool available on your machine. Both Jarsigner and Keytool are included
+in the JDK. </p>
+
+<h2 id="debugmode">Signing in Debug Mode</h2>
+
+<p>The Android build tools provide a debug signing mode that makes it easier for you 
+to develop and debug your application, while still meeting the Android system
+requirement for signing your .apk when it is installed in the emulator or a device. 
+When you use debug mode, the SDK tools invoke Keytool to create a debug 
+keystore and key. </p>
+
+<p>The SDK tools create the debug keystore/key with predetermined names/passwords;</p>
+<ul>
+<li>Keystore name &mdash; "debug.keystore"</li>
+<li>Keystore password &mdash; "android"</li>
+<li>Key alias &mdash; "androiddebugkey"</li>
+<li>Key password &mdash; "android"</li>
+<li>CN &mdash; "CN=Android Debug,O=Android,C=US"</li>
+</ul></p>
+
+<p>If you are developing in Eclipse/ADT and have set up Keytool as described
+above, signing in debug mode is enabled by default. When you run or debug your
+application, ADT signs the .apk with the debug certificate and installs it on 
+the emulator. No specific action on your part is needed, provided ADT has 
+access to Keytool.</p>
+
+<p>If you use Ant to build your .apk files, debug signing mode 
+is enabled by default, assuming that you are using a build.xml file generated by the 
+activitycreator tool included in the latest SDK. When you run Ant against build.xml to 
+compile your app, the build script generates a keystore/key and signs the .apk for you. 
+No specific action on your part is needed.</p>
+
+<p>If necessary, you can change the location/name of the debug keystore/key or
+supply a custom debug keystore/key to use. In Eclipse/ADT, you can use
+<strong>Windows</strong> &gt; <strong>Prefs</strong> &gt;
+<strong>Android</strong> &gt; <strong>Build</strong>. However, any custom debug
+keystore/key must use the same keystore/key names and passwords as the default
+debug key (as described above). </p>
+
+<p>Note that you <em>cannot</em> release your application to the public if it 
+is signed with the debug certificate. </p>
+
+<h3 id="debugexpiry">Expiry of the Debug Certificate</h3>
+
+<p>The self-signed certificate used to sign your application in debug mode (the default on 
+Eclipse/ADT and Ant builds) will have an expiration date of 365 days from its creation date.</p>
+
+<p>When the certificate expires, you will get a build error. On Ant builds, the error 
+looks like this:</p>
+
+<pre>debug:
+[echo] Packaging bin/samples-debug.apk, and signing it with a debug key...
+[exec] Debug Certificate expired on 8/4/08 3:43 PM</pre>
+
+<p>In Eclipse/ADT, you will see a similar error in the Android console.</p>
+
+<p>To fix this problem, simply delete the <code>debug.keystore</code> file. On Linux/Mac OSX, 
+the file is stored in <code>~/.android</code>. On Windows XP, the file is stored in <code>
+C:\Documents and Settings\&lt;user&gt;\Local Settings\Application Data\Android</code>. 
+On Windows Vista, the file is stored in <code>
+C:\Users\&lt;user&gt;\AppData\Local\Android</code>.</p>
+
+<p>The next time you build, the build tools will regenerate a new keystore and debug key.</p>
+
+<p>Note that, if your development machine is using a non-Gregorian locale, the build 
+tools may erroneously generate an already-expired debug certificate, so that you get an 
+error when trying to compile your application. For workaround information, see the 
+troubleshooting topic <a href="{@docRoot}guide/appendix/faq/troubleshooting.html#signingcalendar">
+I&nbsp;can't&nbsp;compile my app because the build tools generated an expired debug 
+certificate</a>. </p>
+
+<h2 id="releasemode">Signing for Public Release</h2>
+
+<p>When your application is ready for release to other users, you must:</p>
+<ol>
+<li>Compile the application in release mode</li>
+<li>Obtain a suitable private key, and then</li>
+<li>Sign the application with your private key</li>
+<li>Secure your private key</li>
+</ol>
+
+<p>The sections below provide information about these steps. </p>
+
+<h3 id="releasecompile">Compiling for Release</h3>
+
+<p>To prepare your application for release, you must first compile it in release mode. 
+In release mode, the Android build tools compile your application as usual, 
+but without signing it with the debug key.  </p>
+
+<p>If you are developing in Eclipse/ADT, right-click the project in the Package 
+pane and select <strong>Android Tools</strong> > <strong>Export Application 
+Package</strong>. You can then specify the file location for the unsigned .apk. 
+Alternatively, you can follow the "Exporting the unsigned .apk" 
+link in the Manifest Editor overview page. </p>
+
+<p>If you are using Ant, all you need to do is specify the build target 
+"release" in the Ant command. For example, if you are running Ant from the 
+directory containing your build.xml file, the command would look like this:</p>
+
+<pre>$ ant release</pre>
+
+<p>The build script compiles the application .apk without signing it. 
+
+<p>Note that you can not release your application unsigned, or signed with the debug key.</p>
+
+<h3 id="cert">Obtaining a Suitable Private Key</h3>
+
+<p>In preparation for signing your application, you must first ensure that 
+you have a suitable private key with which to sign. A suitable private 
+key is one that:</p>
+
+<ul>
+<li>Is in your possession</li>
+<li>Represents the personal, corporate, or organizational entity to be identified 
+with the application</li>
+<li>Has a validity period that exceeds the expected lifespan of the application
+or application suite. A validity period of more than 25 years is recommended. 
+<p>If you plan to publish your application(s) on Android Market, note that a 
+validity period ending after 22 October 2033 is a requirement. You can not upload an
+application if it is signed with a key whose validity expires before that date. 
+</p></li>
+<li>Is not the debug key generated by the Android SDK tools. </li>
+</ul>
+
+<p>The key may be self-signed. If you do not have a suitable key, you must 
+generate one using Keytool. Make sure that you have Keytool available, as described
+in <a href="#setup">Basic Setup</a>.</p>
+
+<p>To generate a self-signed key with Keytool, use the <code>keytool</code>
+command and pass any of the options listed below (and any others, as
+needed). </p>
+
+<p class="warning">Before you run Keytool, make sure to read 
+<a href="#secure-key">Securing Your Private Key</a> for a discussion of how to keep
+your key secure and why doing so is critically important to you and to users. In
+particular, when you are generating your key, you should select strong passwords
+for both the keystore and key.</p>
+
+<table>
+<tr>
+<th>Keytool Option</th>
+<th>Description</th>
+</tr>
+<tr>
+<td><code>-genkey</code></td><td>Generate a key pair (public and private
+keys)</td>
+</tr>
+<tr>
+<td><code>-v</code></td><td>Enable verbose output.</td>
+</tr>
+<tr>
+<td><code>-keystore&nbsp;&lt;keystore-name&gt;.keystore</code></td><td>A name
+for the keystore containing the private key.</td>
+</tr>
+<tr>
+<td><code>-storepass &lt;password&gt;</code></td><td><p>A password for the
+keystore.</p><p>As a security precaution, do not include this option 
+in your command line unless you are working at a secure computer.
+If not supplied, Keytool prompts you to enter the password. In this 
+way, your password is not stored in your shell history.</p></td>
+</tr>
+<tr>
+<td><code>-alias &lt;alias_name&gt;</code></td><td>An alias for the key.</td>
+</tr>
+<tr>
+<td><code>-keyalg &lt;alg&gt;</code></td><td>The encryption algorithm to use 
+when generating the key. Both DSA and RSA are supported.</td>
+</tr>
+<tr>
+<td><code>-dname &lt;name&gt;</code></td><td><p>A Distinguished Name that describes
+who created the key. The value is used as the issuer and subject fields in the
+self-signed certificate. </p><p>Note that you do not need to specify this option
+in the command line. If not supplied, Jarsigner prompts you to enter each 
+of the Distinguished Name fields (CN, OU, and so on).</p></td>
+</tr>
+<tr>
+<td><code>-validity &lt;valdays&gt;</code></td><td><p>The validity period for the
+key, in days. </p><p><strong>Note:</strong> A value of 10000 or greater is recommended.</p></td>
+</tr>
+<tr>
+<td><code>-keypass &lt;password&gt;</code></td><td><p>The password for the key.</p>
+<p>As a security precaution, do not include this option 
+in your command line unless you are working at a secure computer.
+If not supplied, Keytool prompts you to enter the password. In this 
+way, your password is not stored in your shell history.</p></td>
+</tr>
+</table>
+
+
+<p>Here's an example of a Keytool command that generates a private key:</p>
+
+<pre>$ keytool -genkey -v -keystore my-release-key.keystore 
+-alias alias_name -keyalg RSA -validity 10000</pre>
+
+<p>Running the example command above, Keytool prompts you to provide
+passwords for the keystore and key, and to provide the Distinguished
+Name fields for your key. It then generates the keystore as a file called
+<code>my-release-key.keystore</code>. The keystore and key are 
+protected by the passwords you entered. The keystore contains 
+a single key, valid for 10000 days. The alias is a name that you &mdash;
+will use later, to refer to this keystore when signing your application. </p>
+
+<p>For more information about Keytool, see the documentation at
+<a
+href="http://java.sun.com/j2se/1.5.0/docs/tooldocs/#security">
+http://java.sun.com/j2se/1.5.0/docs/tooldocs/#security</a></p>
+
+<h3 id="signapp">Signing Your Application</h3>
+
+<p>When you are ready to actually sign your .apk for release, you can do so
+using the Jarsigner tool. Make sure that you have Jarsigner available on your
+machine, as described in <a href="#setup">Basic Setup</a>. Also, make sure that
+the keystore containing your private key is  available.</p>
+
+<p>To sign your application, you run Jarsigner, referencing both the
+application's .apk and the keystore containing the private key with which to
+sign the .apk. The table below shows the options you could use. <p>
+
+<table>
+<tr>
+<th>Jarsigner Option</th>
+<th>Description</th>
+</tr>
+<tr>
+<td><code>-keystore&nbsp;&lt;keystore-name&gt;.keystore</code></td><td>The name of
+the keystore containing your private key.</td>
+</tr>
+<tr>
+<td><code>-verbose</code></td><td>Enable verbose output.</td>
+</tr>
+<tr>
+<td><code>-storepass &lt;password&gt;</code></td><td><p>The password for the
+keystore. </p><p>As a security precaution, do not include this option 
+in your command line unless you are working at a secure computer.
+If not supplied, Jarsigner prompts you to enter the password. In this 
+way, your password is not stored in your shell history.</p></td>
+</tr>
+<tr>
+<td><code>-keypass &lt;password&gt;</code></td><td><p>The password for the private
+key. </p><p>As a security precaution, do not include this option 
+in your command line unless you are working at a secure computer.
+If not supplied, Jarsigner prompts you to enter the password. In this 
+way, your password is not stored in your shell history.</p></td>
+</tr>
+</table>
+
+<p>Here's how you would use Jarsigner to sign an application package called
+<code>my_application.apk</code>, using the example keystore created above. 
+</p>
+
+<pre>$ jarsigner -verbose -keystore my-release-key.keystore 
+my_application.apk alias_name</pre>
+
+<p>Running the example command above, Jarsigner prompts you to provide
+passwords for the keystore and key. It then modifies the APK 
+in-place, meaning the .apk is now signed. Note that you can sign an 
+APK multiple times with different keys.</p>
+
+<p>To verify that your .apk is signed, you can use a command like this:</p>
+
+<pre>$ jarsigner -verify my_signed.apk</pre>
+
+<p>If the .apk is signed properly, Jarsigner prints "jar verified". 
+If you want more details, you can try one of these commands:</p>
+
+<pre>$ jarsigner -verify -verbose my_application.apk</pre>
+
+<p>or</p>
+
+<pre>$ jarsigner -verify -verbose -certs my_application.apk</pre>
+
+<p>The command above, with the <code>-certs</code> option added, will show you the 
+"CN=" line that describes who created the key.</p>
+
+<p class="note">Note: if you see "CN=Android Debug", this means the .apk was
+signed with the debug key generated by the Android SDK. If you intend to release
+your application, you must sign it with your private key instead of the debug
+key.</p>
+
+<p>For more information about Jarsigner, see the documentation at
+<a href="http://java.sun.com/j2se/1.5.0/docs/tooldocs/#security">
+http://java.sun.com/j2se/1.5.0/docs/tooldocs/#security</a></p>
+
+<h2 id="secure-key">Securing Your Private Key</h2>
+
+<p>Maintaining the security of your private key is of critical importance, both
+to you and to the user. If you allow someone to use your key, or if you leave
+your keystore and passwords in an unsecured location such that a third-party
+could find and use them, your authoring identity and the trust of the user
+are compromised. </p>
+
+<p>If a third party should manage to take your key without your knowledge or 
+permission, that person could sign and distribute applications that maliciously
+replace your authentic applications or corrupt them. Such a person could also
+sign and distribute applications under your identity that attack other 
+applications or the system itself, or corrupt or steal user data. </p>
+
+<p>Your reputation as a developer entity depends on your securing your private
+key properly, at all times, until the key is expired. Here are some tips for
+keeping your key secure: </p>
+
+<ul>
+<li>Select strong passwords for the keystore and key.</li>
+<li>When you generate your key with Keytool, <em>do not</em> supply the 
+<code>-storepass</code> and <code>-keypass</code> options at the command line. 
+If you do so, your passwords will be available in your shell history, 
+which any user on your computer could access.</li>
+<li>Similarly, when signing your applications with Jarsigner, 
+<em>do not</em> supply the <code>-storepass</code> and <code>-keypass</code> 
+options at the command line. </li>
+<li>Do not give or lend anyone your private key, and do not let unauthorized
+persons know your keystore and key passwords.</li>
+</ul>
+
+<p>In general, if you follow common-sense precautions when generating, using,
+and storing your key, it will remain secure. </p>
\ No newline at end of file
diff --git a/docs/html/guide/publishing/preparing.jd b/docs/html/guide/publishing/preparing.jd
new file mode 100644
index 0000000..d355265
--- /dev/null
+++ b/docs/html/guide/publishing/preparing.jd
@@ -0,0 +1,254 @@
+page.title=Preparing to Publish: A Checklist
+@jd:body
+
+<!--
+<div id="qv-wrapper">
+<div id="qv">
+
+<h2>In this document</h2>
+
+<ol>
+<li><a href=""></a></li>
+</ol>
+
+</div>
+</div>
+-->
+
+<p>Publishing an application means testing it, packaging it appropriately, and 
+making it available to users of Android-powered mobile devices.</p>
+
+<p>If you plan to publish your application for installation on
+Android-powered devices, there are several things you need to do, to get
+your application ready. This document highlights the significant
+checkpoints for preparing your application for a successful release.
+</p>
+
+<p>If you will publish your application on Android Market, please also see <a
+href="{@docRoot}guide/publishing/publishing.html#market">Publishing on Android Market</a> 
+for specific preparation requirements for your application. </p>
+
+<p>For general information about the ways that you can publish an applications, 
+see the <a href="{@docRoot}guide/publishing/publishing.html">Publishing Your 
+Applications</a> document. </p>
+
+<div class="special">
+
+<p>Before you consider your application ready for release:</p>
+
+<ol>
+<li>Test your application extensively on an actual device </li>
+<li>Consider adding an End User License Agreement in your application</li>
+<li>Specify an icon and label in the application's manifest</li>
+<li>Turn off logging and debugging and clean up data/files</li>
+</ol>
+
+<p>Before you do the final compile of your application:</p>
+
+<ol start="5">
+<li>Version your application</li>
+<li>Obtain a suitable cryptographic key</li>
+<li>Register for a Maps API Key, if your application is using MapView elements</li>
+</ol>
+
+<p><em>Compile your application...</em></p>
+<p>After compiling your application:</p>
+<ol start="8">
+<li>Sign your application</li>
+<li>Test your compiled application</li>
+</ol>
+</div>
+
+<h2 id="releaseready">Before you consider your application ready for release</h2>
+
+<h3 id="test">1. Test your application extensively on an actual device</h3>
+
+<p>It's important to test your application as extensively as possible, in as
+many areas as possible. To help you do that, Android provides a variety of
+testing classes and tools. You can use 
+{@link android.app.Instrumentation Instrumentation} to run JUnit and other 
+test cases, and you can use testing
+tools such as the <a href="{@docRoot}guide/developing/tools/monkey.html">UI/Application
+Exerciser Monkey</a>.  </p>
+
+<ul>
+<li>To ensure that your application will run properly for users, you should make
+every effort to obtain one or more physical mobile device(s) of the type on
+which you expect the application to run. You should then test your application
+on the actual device, under realistic network conditions. Testing  your
+application on a physical device is very important, because it enables you to
+verify that your user interface elements are sized correctly (especially for
+touch-screen UI) and that your application's performance and battery efficiency
+are acceptable.</li>
+
+<li>If you can not obtain a mobile device of the type you are targeting for your
+application, you can use emulator options such as <code>-dpi</code>,
+<code>-device</code>, <code>-scale</code>, <code>-netspeed</code>,
+<code>-netdelay</code>, <code>-cpu-delay</code> and others to model the
+emulator's screen, network performance, and other attributes to match the target
+device to the greatest extent possible. You can then test your application's UI
+and performance. However, we strongly recommend that you test your application
+on an actual target device before publishing it. </li>
+
+<li>If you are targeting the <a href="http://www.t-mobileg1.com/">T-Mobile
+G1</a> device for your application, make sure that your UI handles screen
+orientation changes. </li>
+</ul>
+
+<h3 id="eula">2. Consider adding an End User License Agreement in your 
+application</h3>
+
+<p>To protect your person, organization, and intellectual property, you may want
+to provide an End User License Agreement (EULA) with your application. 
+
+<h3 id="iconlabel">3. Specify an icon and label in the application's manifest</h3>
+
+<p>The icon and label that you specify in an application's manifest are
+important because they are displayed to users as your application's icon and
+name. They are displayed on the device's Home screen, as well as in Manage
+Applications, My Downloads, and elsewhere. Additionally, publishing services may
+display the icon and label to users. </p>
+
+<p>To specify an icon and label, you define the attributes
+<code>android:icon</code> and <code>android:label</code> in the 
+<code>&lt;application&gt;</code> element of the manifest. </p>
+
+<p>As regards the design of your icon, you should try to make it match as much
+as possible the style used by the built-in Android applications.</p>
+
+<h3 id="logging">4. Turn off logging and debugging and clean up data/files</h3>
+
+<p>For release, you should make sure that debug facilities are turned off and
+that debug and other unnecessary data/files are removed from your application
+project.</p>
+<ul>
+<li>Remove the <code>android:debuggable="true"</code> attribute from the
+<code>&lt;application&gt;</code> element of the manifest.</li>
+<li>Remove log files, backup files, and other unnecessary files from the
+application project.</li>
+<li>Check for private or proprietary data and remove it as necessary.</li>
+<li>Deactivate any calls to {@link android.util.Log} methods in the source
+code.</li>
+</ul>
+
+<h2 id="finalcompile">Before you do the final compile of your application</h2>
+
+<h3 id="versionapp">5. Version your application</h3>
+
+<p>Before you compile your application, you must make sure that you have defined
+a version number for your application, specifying an appropriate value for both
+the <code>android:versionCode</code> and <code>android:versionName</code>
+attributes of the <code>&lt;manifest&gt;</code> element in the application's
+manifest file. Carefully consider your version numbering plans in the context of
+your overall application upgrade strategy. </p>
+
+<p>If you have previously released a version of your application, you must make
+sure to increment the version number of the current application. You must
+increment both the <code>android:versionCode</code> and
+<code>android:versionName</code> attributes of the <code>&lt;manifest&gt;</code>
+element in the application's manifest file, using appropriate values. </p>
+
+<p>For detailed information about how to define version information for your
+application, see <a href="{@docRoot}guide/publishing/versioning.html">Versioning 
+Your Applications</a>.</p>
+
+<h3 id="cryptokey">6. Obtain a suitable cryptographic key</h3>
+
+<p>If you have read and followed all of the preparation steps up to this point,
+your application is compiled and ready for signing. Inside the .apk, the
+application is properly versioned, and you've cleaned out extra files and
+private data, as described above. </p>
+
+<p>Before you sign your application, you need to make sure that you have a
+suitable private key. For complete information about how to obtain (or generate)
+a private key, see <a href="{@docRoot}guide/publishing/app-signing.html#cert">
+Obtaining a Suitable Private Key</a>.</p>
+
+<p>Once you have obtained (or generated) a suitable private key, you will use it
+to:</p>
+
+<ul>
+<li>Register for a Maps API Key (see below), if your application uses MapView
+elements.</li>
+<li>Sign your application for release, later in the preparation process</li>
+</ul>
+
+<h3 id="mapsApiKey">7. Register for a Maps API Key, if your application is using
+MapView elements</h3>
+
+<div class="sidebox" style="margin-bottom:.5em;padding:1em;"><p>
+For complete information about getting a Maps API Key, see <a
+href="{@docRoot}guide/topics/location/geo/mapkey.html">Obtaining a Maps API
+Key</a>.<br></p></div>
+
+<p>If your application uses one or more Mapview elements, you will need to 
+register your application with the Google
+Maps service and obtain a Maps API Key, before your MapView(s) will be able to
+retrieve data from Google Maps. To do so, you supply an MD5 fingerprint of your
+signer certificate to the Maps service. </p>
+
+<p>During development, you can get a temporary Maps API Key by registering the
+debug key generated by the SDK tools. However, before publishing your
+application, you must register for a new Maps API Key that is based on your
+private key. </p>
+
+<p>If your application uses MapView elements, the important points to understand
+are:</p>
+
+<ol>
+<li>You <em>must</em> obtain the Maps API Key before you compile your
+application for release, because you must add the Key to a special attribute in
+each MapView element &mdash; <code>android:apiKey</code> &mdash; in your
+application's layout files. If you are instantiating MapView objects directly
+from code, you must pass the Maps API Key as a parameter in the constructor.
+</li>
+<li>The Maps API Key referenced by your application's MapView elements must be
+registered (in Google Maps) to the certificate used to sign the application.
+This is particularly important when publishing your application &mdash; your
+MapView elements must reference a Key that is registered to the release
+certificate that you will use to sign your application.  </li>
+<li>If you previously got a temporary Maps API Key by registering the debug
+certificate generated by the SDK tools, you <em>must</em> remember to obtain a
+new Maps API Key by registering your release certificate. You must then remember
+to change the MapView elements to reference the new Key, rather than the Key
+associated with the debug certificate. If you do not do so, your MapView
+elements will not have permission to download Maps data. </li>
+<li>If you change the private key that you will use to sign your application,
+you <em>must</em> remember to obtain a new Maps API Key from the Google Maps
+service. If you do not get a new Maps API Key and apply it to all MapView
+elements, any MapView elements referencing the old Key will not have permission
+to download Maps data. </li>
+</ol>
+
+<p>For more information about signing and your private key, see <a
+href="#signing">Signing Your Applications</a>.</p>
+
+
+<h2 id="compile">Compile your application</h2>
+
+<p>When you've prepared your application as described in the previous sections,
+you can compile your application for release. </p>
+
+<h2 id="post-compile">After compiling your application</h2>
+
+<h3 id="signapp">8. Sign your application</h3>
+
+<p>Sign your application using your private key. Signing your application
+correctly is critically important. Please see <a href="#signing">Signing Your
+Applications</a> for complete information. </p>
+
+<h3 id="testapp">9. Test your compiled and signed application</h3>
+
+<p>Before you release your compiled application, you should thoroughly test it
+on the target mobile device (and target network, if possible). In particular,
+you should make sure that any MapView elements in your UI are receiving maps
+data properly. If they are not, go back to <a href="#mapsApiKey">Register for a
+Maps API Key</a> and correct the problem. You should also ensure that the
+application works correctly with any server-side services and data that you are
+providing or are relying on and that the application handles any authentication
+requirements correctly.  </p>
+
+<p>After testing, you are now ready to publish your application to mobile device
+users.</p>
+
+
diff --git a/docs/html/guide/publishing/publishing.jd b/docs/html/guide/publishing/publishing.jd
new file mode 100644
index 0000000..3aea3cf
--- /dev/null
+++ b/docs/html/guide/publishing/publishing.jd
@@ -0,0 +1,250 @@
+page.title=Publishing Your Applications
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+
+<h2>Publishing quickview</h2>
+
+<ul>
+<li>You can publish your application using a hosted service such as Android Market or through a web server.</li>
+<li>Before you publish, make sure you have prepared your application properly.</li>
+<li>Android Market makes it easy for users of Android-powered devices to see and download your application.</li>
+</ul>
+
+
+<h2>In this document</h2>
+
+<ol>
+<li><a href="#overview">Publishing on Android Market</a>
+    <ol>
+    <li><a href="#marketupgrade">Publishing Upgrades on Android Market</a>
+    <li><a href="#marketintent">Using Intents to Launch the Market Application</a></li>
+    </ol></li>
+<!--
+<li><span style="color:ccc">Publishing on Other Hosted Services</a></li>
+<li><span style="color:ccc">Publishing through a Web Server</a></li>
+-->
+</ol>
+
+<h2>See also</h2>
+
+<ol>
+<li><a href="{@docRoot}guide/publishing/preparing.html">Preparing to Publish</a></li>
+</ol>
+
+<div id="qv-extra">
+  <img id="rule" src="{@docRoot}assets/images/grad-rule-qv.png">
+  <div id="qv-sub-rule">
+    <img src="{@docRoot}assets/images/icon_market.jpg" style="float:left;margin:0;padding:0;">
+    <p style="color:#669999;">Interested in publishing your app on Android Market?</p>
+    <a id="publish-link" href="http://market.android.com/publish">Go to Android Market &raquo;</a>
+  </div>
+</div>
+
+</div>
+</div>
+
+<p>Publishing an application means testing it, packaging it appropriately, and making 
+it available to users of Android-powered mobile devices for download or sideload.</p>
+
+<p>If you've followed the steps outlined in 
+<a href="{@docRoot}guide/publishing/preparing.html">Preparing to
+Publish Your Applications</a>, the result of the process is a compiled .apk that
+is signed with your release private key. Inside the .apk, the application is
+properly versioned and any MapView elements reference a Maps API Key that you
+obtained by registering the MD5 fingerprint of the same certificate used to sign
+the .apk. Your application is now ready for publishing. </p>
+
+<p>The sections below provide information about publishing your Android
+application to mobile device users.</p>
+
+<h2 id="market">Publishing on Android Market</h2>
+
+<p>Android Market is a hosted service that makes it easy for users to find and
+download Android applications to their Android-powered devices, and makes it 
+easy for developers to publish their applications to Android users.</p>
+
+<p>To publish your application on Android Market, you first need to register
+with the service using your Google account and agree to the terms of service.
+Once you are registered, you can upload your application to the service whenever
+you want, as many times as you want, and then publish it when you are ready.
+Once published, users can see your application, download it, and rate it using
+the Market application installed on their Android-powered devices. </p>
+
+<p>To register as an Android Market developer and get started with publishing,
+visit the Android Market: </p>
+
+<p style="margin-left:3em;"><a
+href="http://market.android.com/publish">http://market.android.com/publish</a>
+</p>
+
+<p>If you plan to publish your application on Android Market, you must make sure
+that it meets the requirements listed below, which are enforced by the Market
+server when you upload the application.</p>
+
+<div class="special">
+<p>Requirements enforced by the Android Market server:</p>
+<ol>
+<li>Your application must be signed with a cryptographic private key whose
+validity period ends after <span style="color:red">22 October 2033</span>. </li>
+<li>Your application must define both an <code>android:versionCode</code> and an
+<code>android:versionName</code> attribute in the <code>&lt;manifest&gt;</code>
+element of its manifest. The server uses the <code>android:versionCode</code> as
+the basis for identifying the application internally and handling upgrades, and
+it displays the <code>android:versionName</code> to users as the application's
+version.</li>
+<li>Your application must define both an <code>android:icon</code> and an
+<code>android:label</code> attribute in the <code>&lt;application&gt;</code>
+element of its manifest.</li>
+</ol>
+</div>
+
+<h3 id="marketupgrade">Publishing Upgrades on Android Market</h3>
+
+<p>The beta version of Android Market does not support notifying your users when
+you publish a new version of your application. This capability will be
+added soon, but currently the user must independently initiate download of an
+upgraded application. When you publish an upgrade, you can assist users by
+notifying them that the upgrade is available and giving them a way to download
+the upgraded application from Android Market.</p>
+
+<p>Here is a suggested way of tracking installed application versions and
+notifying users that an upgrade is available:</p>
+
+<ol>
+<li>Have your app occasionally check in with a web-service that you're
+running. This web service should return two values: the latest available
+version number for the application (corresponding to
+<code>android:versionCode</code>) and a URI string that your application
+can later send in an Intent, to launch Market and search for the
+upgraded application for the user. 
+
+<p>The URI that your web service returns should be properly formatted to 
+search Android Market for your upgraded application. See 
+<a href="#marketintent">Using Intents to Launch the Market Application</a> 
+for more information. The URI should specify the upgraded 
+application's package name as the query parameter, since the package name
+is guaranteed to be unique on Android Market. The URI format for the 
+package name search is: </p>
+
+<p><code>http://market.android.com/search?q=pname:&lt;package&gt;</code> or 
+<br><code>market://search?q=pname:&lt;package&gt;</code></p>
+
+</li>
+<li>Your application can then compare its own version number against
+that retrieved.  If the retrieved value is greater, your application can
+show a dialog informing the user that a new version is available. The
+dialog can offer buttons to begin the download or cancel. </li> <li>If
+the user clicks the button to begin the download, your application can
+call startActivity() using the ACTION_VIEW Intent, passing the URI
+received from your web service. The Intent launches the Market
+application on the device and initiates an immediate search on the
+Android Market site, based on the query parameters in the URI. When the
+result is displayed, the user can view the details of the upgraded
+application and begin the download. 
+
+<p>Note that, because the URI string is received from your web 
+service and not hard-coded into your application, you can easily change
+the Market launch behaviors whenever needed, without 
+having to change your application. </p></li></ol>
+
+<p>For more information about URIs you can pass to the Market application at
+launch, see <a href="#marketintent">Using Intents to Launch the Market
+Application</a>, below.</p>
+
+<h3 id="marketintent">Using Intents to Launch the Market Application on 
+a Device</h3>
+
+<p>Android-powered devices include a preinstalled Market application that gives
+users access to the Android Market site. From Market, users can
+browse or search available applications, read ratings and reviews, and
+download/install applications.</p>
+
+<p>You can launch the Market application from another Android
+application by sending an Intent to the system. You might want to do
+this, for example, to help the user locate and download an upgrade to an
+installed application, or to let the user know about related
+applications that are available for download. </p>
+
+<p>To launch Market, you send an ACTION_VIEW Intent, passing a Market-handled
+URI string as the Intent data. In most cases, your application would call
+startActivity() to send the ACTION_VIEW Intent with the Market-handled URI.</p>
+
+<p>The URI that you supply with the Intent lets the system route the intent
+properly and also expresses the type of action that you want Market to perform
+after launch. Currently, you can have Market initiate a search for applications
+on Android Market, based on query parameters that you provide. For example, you
+can specify URIs to search for applications by:</p>
+
+<ul>
+<li>Package name</li>
+<li>Developer name</li>
+<li>String match across application name, developer name, and
+description, or </li>
+<li>Any combination of the above</li>
+</ul>
+
+<p>Note that the URI queries return results from the public metadata supplied by
+developers in their Android Market profiles or application publishing
+information, but not from the developer's private account or from the
+certificate used to sign the application. </p>
+
+<p>The table below provides a list of URIs and actions currently
+supported by the Market application.</p>
+
+<table>
+<tr>
+<th>For this Result</th>
+<th>Pass this URI with the ACTION_VIEW Intent</th>
+<th>Comments</th>
+</tr>
+
+<!--
+<tr>
+<td>Display the details screen for a specific application, as identified 
+by its Market appID string.</td>
+<td><code>http://market.android.com/details?id=&lt;appMarketAppIdString&gt;</code> 
+or<br>
+<code>market://details?id=&lt;appMarketUidString&gt;</code></td>
+<td>Note that Market appID is specific to an application 
+<em>and</em> its version. That is, an appID query loads the details page 
+for a specific version of an application.</td>
+</tr>
+-->
+<tr>
+<td>Search for an application by its fully qualified Java package name and
+display the result.</td>
+<td><code>http://market.android.com/search?q=pname:&lt;package&gt;</code> or<br>
+<code>market://search?q=pname:&lt;package&gt;</code></td>
+<td>Searches only the Java package name of applications. Returns only exact
+matches.</td>
+</tr>
+
+<tr>
+<td>Search for applications by developer name and display the results.</td>
+<td><code>http://market.android.com/search?q=pub:"&lt;Developer&nbsp;Name&gt;"</code>
+or<br> <code>market://search?q=pub:"&lt;Developer Name&gt;"</code></td>
+<td>Searches only the "Developer Name" fields of Market public profiles. 
+Returns exact matches only. </td>
+</tr>
+
+<tr>
+<td>Search for applications by substring and display the results.</td>
+<td><code>http://market.android.com/search?q=&lt;substring&gt;</code> or
+<br><code>market://search?q=&lt;substring&gt;</code></td>
+<td>Searches all public fields (application title, developer name, and
+application description) for all applications. Returns exact and partial 
+matches.</td>
+</tr>
+
+<tr>
+<td>Search using multiple query parameters and display the results.</td>
+<td>Example:<p><code>http://market.android.com/search?q=world pname:com.android.hello pub:Android</code></p></td>
+<td>Returns a list of applications meeting all the supplied parameters. </td>
+</tr>
+</table>
+
+<p>Note that these URIs work only when passed as intent data &mdash; you 
+can't currently load the URIs in a web browser, either on a desktop machine or 
+on the device. </p>
\ No newline at end of file
diff --git a/docs/html/guide/publishing/versioning.jd b/docs/html/guide/publishing/versioning.jd
new file mode 100644
index 0000000..d0eafcd
--- /dev/null
+++ b/docs/html/guide/publishing/versioning.jd
@@ -0,0 +1,155 @@
+page.title=Versioning Your Applications
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+
+<h2>Versioning quickview</h2>
+
+<ul>
+<li>Your application <em>must</em> be versioned</a></li>
+<li>You set the version in the application's manifest file</li>
+<li>How you version your applications affects how users upgrade </li>
+<li>Determine your versioning strategy early in the development process, including considerations for future releases.</li>
+</ul>
+
+<h2>In this document</h2>
+
+<ol>
+<li><a href="#appversion">Setting Application Version</a></li>
+<li><a href="#minsdkversion">Specifying Minimum System API Version</a>
+</ol>
+
+
+<h2>See also</h2>
+
+<ol>
+<li><a href="{@docRoot}guide/publishing/preparing.html">Preparing to Publish Your Application</a></li>
+<li><a href="{@docRoot}guide/publishing/publishing.html#market">Publishing On Android Market</a></li>
+<li><a href="{@docRoot}guide/topics/manifest/manifest-intro.html">The AndroidManifest.xml File</a></li>
+</ol>
+
+</div>
+</div>
+
+<p>Versioning is a critical component of your application upgrade/maintenance
+strategy. </p>
+
+<ul>
+<li>Users need to have specific information about the application version that
+is installed on their devices and the upgrade versions available for
+installation. </li>
+<li>Other applications &mdash; including other applications that you publish as
+a suite &mdash; need to query the system for your application's version, to
+determine compatibility and identify dependencies.</li>
+<li>Services through which you will publish your application(s) may also need to
+query your application for its version, so that they can display the version to
+users. A publishing service may also need to check the application version to
+determine compatibility and establish upgrade/downgrade relationships.</li>
+</ul>
+
+<p>The Android system itself <em>does not ever</em> check the application version
+information for an application, such as to enforce restrictions on upgrades,
+compatibility, and so on. Instead, only users or applications themselves are
+responsible for enforcing any version restrictions for applications themselves. </p>
+
+<p>The Android system <em>does</em> check any system version compatibility expressed 
+by an application in its manifest, in the <code>minSdkVersion</code> attribute. This
+allows an application to specify the minimum system API with which is compatible. 
+For more information see <a href="#minsdkversion">Specifying Minimum System API Version</a>.
+
+<h2 id="appversioning">Setting Application Version</h2>
+<p>To define the version information for your application, you set attributes in
+the application's manifest file. Two attributes are available, and you should
+always define values for both of them: </p>
+
+<ul>
+<li><code>android:versionCode</code> &mdash; An integer value that represents
+the version of the application code, relative to other versions. 
+
+<p>The value is an integer so that other applications can programatically
+evaluate it, for example to check an upgrade or downgrade relationship. You can
+set the value to any integer you want, however you should make sure that each
+successive release of your application uses a greater value. The system does not
+enforce this behavior, but increasing the value with successive releases is
+normative. </p>
+
+<p>Typically, you would release the first version of your application with
+versionCode set to 1, then monotonically increase the value with each release,
+regardless whether the release constitutes a major or minor release. This means
+that the <code>android:versionCode</code> value does not necessarily have a
+strong resemblence to the application release version that is visible to the
+user (see <code>android:versionName</code>, below). Applications and publishing
+services should not display this version value to users.</p>
+</li>
+<li><code>android:versionName</code> &mdash; A string value that represents the
+release version of the application code, as it should be shown to users. 
+<p>The value is a string so that you can describe the application version as a
+&lt;major&gt;.&lt;minor&gt;.&lt;point&gt; string, or as any other type of
+absolute or relative version identifier. </p>
+
+<p>As with <code>android:versionCode</code>, the system does not use this value
+for any internal purpose, other than to enable applications to display it to
+users. Publishing services may also extract the <code>android:versionName</code>
+value for display to users.</p>
+</li>
+</ul>
+
+<p>You define both of these version attributes in the
+<code>&lt;manifest&gt;</code> element of the manifest file. </p>
+
+<p>Here's an example manifest that shows the <code>android:versionCode</code>
+and <code>android:versionName</code> attributes in the
+<code>&lt;manifest&gt;</code> element. </p>
+
+<pre>
+&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="com.example.package.name"
+      android:versionCode="2"
+      android:versionName="1.1"&gt;
+    &lt;application android:icon="@drawable/icon" android:label="@string/app_name"&gt;
+        ...
+    &lt;/application&gt;
+&lt;/manifest&gt;
+</pre>
+
+<p>In this example, note that <code>android:versionCode</code> value indicates
+that the current .apk contains the second release of the application code, which
+corresponds to a minor follow-on release, as shown by the
+<code>android:codeName</code> string. </p>
+
+<p>The Android framework provides an API to let applications query the system
+for version information about your application. To obtain version information,
+applications use the 
+{@link android.content.pm.PackageManager#getPackageInfo(java.lang.String, int)} 
+method of {@link android.content.pm.PackageManager PackageManager}. </p>
+
+<h2 id="minsdkversion">Specifying Minimum System API Version</h2>
+
+<p>If your application requires a specific minimum version of the Android
+platform, you can specify that version as an API Level identifier 
+in the application's manifest file. Doing so ensures that your 
+application can only be installed on devices that
+are running a compatible version of the Android system. </p>
+
+<p>To specify the minimum system version in the manifest, use this attribute: </p>
+
+<ul>
+<li><code>android:minSdkVersion</code> &mdash; An integer value corresponding to
+the code version of the Android platform. 
+<p>When preparing to install an application, the system checks the value of this
+attribute and compares it to the system version. If the
+<code>android:minSdkVersion</code> value is greater than the system version, the
+system aborts the installation of the application. </p>
+
+<p>If you do not specify this attribute in your manifest, the system assumes
+that your application is compatible with all platform versions.</p></li>
+</ul>
+
+<p>To specify a minimum platform version for your application, add a
+<code>&lt;uses-sdk&gt;</code> element as a child of
+<code>&lt;manifest&gt;</code>, then define the
+<code>android:minSdkVersion</code> as an attribute. </p>
+
+<p>For more information, also see the <a href="{@docRoot}sdk/android-1.1.html">Android System Image 1.1 Version Notes</a>.</p>
diff --git a/docs/html/guide/samples/index.jd b/docs/html/guide/samples/index.jd
new file mode 100644
index 0000000..4e665fa
--- /dev/null
+++ b/docs/html/guide/samples/index.jd
@@ -0,0 +1,23 @@
+guide=true
+page.title=Sample Code
+@jd:body
+
+
+<p>Sometimes, the best way to learn how things are done is to just look at some code. So here
+ we've provided links to let you browse the source of some some simple Android applications. </p>
+
+<p>The source code for these applications is included in the Android SDK, in this location:</p>
+
+<p style="margin-left:2em"><code>&lt;sdk&gt;/samples/</code></p>
+
+<p>You can easily add these applications as projects in your development environment, so that you 
+can modify them and watch them execute. </p>
+<dl>
+ <dt><a href="ApiDemos/index.html">API Demos</a></dt>
+  <dd>A variety of small applications that demonstrate simple views and widgets.</dd>
+ <dt><a href="LunarLander/index.html">Lunar Lander</a></dt>
+  <dd>A classic Lunar Lander game.</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}guide/tutorials/notepad/index.html">Notepad tutorial</a>.</dd>
+</dl>
diff --git a/docs/html/guide/topics/data/data-storage.jd b/docs/html/guide/topics/data/data-storage.jd
new file mode 100644
index 0000000..0a1ee02
--- /dev/null
+++ b/docs/html/guide/topics/data/data-storage.jd
@@ -0,0 +1,199 @@
+page.title=Data Storage
+@jd:body
+
+
+<div id="qv-wrapper">
+<div id="qv">
+
+  <h2>Storage quickview</h2>
+  <ul>
+    <li>Fast, lightweight storage through system preferences</li>
+    <li>File storage to device internal or removable flash</li>
+    <li>Arbitrary and structured storage in databases</li>
+    <li>Support for network-based storage</li>
+  </ul>
+
+  <h2>In this document</h2>
+  <ol>
+    <li><a href="#pref">Preferences</a></li>
+    <li><a href="#files">Files</a></li>
+    <li><a href="#db">Databases</a></li>
+    <li><a href="#netw">Network</a></li>
+  </ol>
+
+  <h2>See also</h2>
+  <ol>
+    <li><a href="#pref">Content Providers and Content Resolvers</a></li>
+  </ol>
+
+</div>
+</div>
+
+<p>
+A typical desktop operating system provides a common file system that any
+application can use to store files that can be read by other
+applications (perhaps with some access control settings).  Android uses a
+different system:  On Android, all application data (including files) are
+private to that application.  
+</p>
+
+<p>
+However, Android also provides a standard way for an application to expose 
+its private data to other applications &mdash; through content providers.
+A content provider is an 
+optional component of an application that exposes read/write access to the 
+application's data, subject to whatever restrictions it might impose.  
+Content providers implement a standard syntax for requesting and modifying
+data, and a standard mechanism for reading the returned data.  Android supplies 
+a number of content providers for standard data types, such as image, audio, 
+and video files and personal contact information.  For more information on 
+using content providers, see a separate document,
+<a href="{@docRoot}guide/topics/providers/content-providers.html">Content Providers</a>.
+</p>
+ 
+<p>
+Whether or not you want to export your application's data to others,
+you need a way to store it.  Android provides the following four mechanisms
+for storing and retrieving data: <a href="#pref">Preferences</a>,
+<a href="#files">Files</a>, <a href="#db">Databases</a>, and <a href="#netw">Network</a>.
+</p>
+
+
+<h2 id="pref">Preferences</h2>
+<p>Preferences is a lightweight mechanism to store and retrieve key-value pairs of primitive 
+data types.  It is typically used to store application preferences, such as a 
+default greeting or a text font to be loaded whenever the application is started. Call 
+<code>{@link android.content.Context#getSharedPreferences(java.lang.String,int)
+Context.getSharedPreferences()}</code> to read and write values.  Assign a name to 
+your set of preferences if you want to share them with other components in the same 
+application, or use <code>{@link android.app.Activity#getPreferences(int) 
+Activity.getPreferences()}</code> with no name to keep them private to the calling
+activity.  You cannot share preferences across applications (except by using a 
+content provider).
+</p>
+
+<p>
+Here is an example of setting user preferences for silent keypress mode for a 
+calculator:
+</p>
+
+<pre>
+import android.app.Activity;
+import android.content.SharedPreferences;
+
+public class Calc extends Activity {
+public static final String PREFS_NAME = "MyPrefsFile";
+    . . .      
+
+    &#64;Override
+    protected void onCreate(Bundle state){         
+       super.onCreate(state);
+    
+    . . .
+    
+       // Restore preferences
+       SharedPreferences settings = getSharedPreferences(PREFS_NAME, 0);
+       boolean silent = settings.getBoolean("silentMode", false);
+       setSilent(silent);
+    }
+    
+    &#64;Override
+    protected void onStop(){
+       super.onStop();
+    
+      // Save user preferences. We need an Editor object to
+      // make changes. All objects are from android.context.Context
+      SharedPreferences settings = getSharedPreferences(PREFS_NAME, 0);
+      SharedPreferences.Editor editor = settings.edit();
+      editor.putBoolean("silentMode", mSilentMode);
+
+      // Don't forget to commit your edits!!!
+      editor.commit();
+    }
+}
+</pre>
+
+
+<h2 id="files">Files</h2>
+<p>You can store files directly on the mobile device or on a removable 
+storage medium.  By default, other applications cannot access these files.
+</p>
+
+<p>
+To read data from a file, call {@link android.content.Context#openFileInput 
+Context.openFileInput()} and pass it the local name and path of the file.  
+It returns a standard Java {@link java.io.FileInputStream} object.  To write 
+to a file, call {@link android.content.Context#openFileOutput 
+Context.openFileOutput()} with the name and path.  It returns a {@link 
+java.io.FileOutputStream} object.  Calling these methods with name and path 
+strings from another application will not work; you can only access local 
+files.
+</p>
+
+<p>
+If you have a static file to package with your application at compile time, 
+you can save the file in your project in <code>res/raw/<em>myDataFile</em></code>, 
+and then open it with {@link
+android.content.res.Resources#openRawResource(int) Resources.openRawResource
+(R.raw.<em>myDataFile</em>)}.  It returns an {@link java.io.InputStream}
+object that you can use to read from the file.
+</p>
+
+<h2 id="db">Databases</h2>
+<p>The Android API contains support for creating and using SQLite databases. 
+Each database is private to the application that creates it.
+</p>
+
+<p>
+The {@link android.database.sqlite.SQLiteDatabase} object represents a database
+and has methods for interacting with it &mdash; making queries and managing the
+data.  To create the database, call <code>{@link 
+android.database.sqlite.SQLiteDatabase#create SQLiteDatabase.create()}</code> 
+and also subclass {@link android.database.sqlite.SQLiteOpenHelper}.  
+</p>
+
+<p>
+As part of its support for the SQLite database system, Android exposes 
+database management functions that let you store complex collections of data 
+wrapped into useful objects.  For example, Android defines a data type 
+for contact information; it consists of many fields including a first and last 
+name (strings), an address and phone numbers (also strings), a photo (bitmap
+image), and much other information describing a person. 
+</p>
+
+<p>
+Android ships with the sqlite3 database tool, which enables you to browse
+table contents, run SQL commands, and perform other useful functions on SQLite
+databases.  See <a href="{@docRoot}guide/developing/tools/adb.html#sqlite">Examine databases 
+(sqlite3)</a> to learn how to run this program.
+</p>
+
+<p>
+All databases, SQLite and others, are stored on the device in 
+<code>/data/data/<em>package_name</em>/databases</code>.
+</p>
+
+<p>
+Discussion of how many tables to create, what fields they contain, and how
+they are linked, is beyond the scope of this note, but Android does not
+impose any limitations beyond the standard SQLite concepts.  We do recommend
+including an autoincrement value key field that can be used as a unique ID to
+quickly find a record.  This is not required for private data, but if you
+implement a content provider, you must include such a unique ID field.  See the
+<a href="{@docRoot}guide/topics/providers/content-providers.html">Content Providers</a>
+document for more information on this field and the NotePadProvider class 
+in the NotePad sample code for an example of creating and populating a 
+new database.  Any databases you create will be accessible by name to any other 
+class in the application, but not outside the application.
+</p>
+
+
+<h2 id="netw">Network</h2>
+<p>You can also use the network to store and retrieve data (when it's available).
+To do network operations, use the classes in the following packages:</p>
+
+<ul class="no-style">
+  <li><code>{@link java.net java.net.*}</code></li>
+  <li><code>{@link android.net android.net.*}</code></li>
+</ul>
+
diff --git a/docs/html/guide/topics/data/index.html b/docs/html/guide/topics/data/index.html
new file mode 100644
index 0000000..a94f8c0
--- /dev/null
+++ b/docs/html/guide/topics/data/index.html
@@ -0,0 +1,9 @@
+<html>
+<head>
+<meta http-equiv="refresh" content="0;url=data-storage.html">
+<title>Redirecting...</title>
+</head>
+<body>
+<a href="data-storage.html">click here</a> if you are not redirected.
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/html/guide/topics/drawing/index.html b/docs/html/guide/topics/drawing/index.html
new file mode 100644
index 0000000..43c1499
--- /dev/null
+++ b/docs/html/guide/topics/drawing/index.html
@@ -0,0 +1,9 @@
+<html>
+<head>
+<meta http-equiv="refresh" content="0;url=opengl.html">
+<title>Redirecting...</title>
+</head>
+<body>
+<a href="opengl.html">click here</a> if you are not redirected.
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/html/guide/topics/drawing/opengl.jd b/docs/html/guide/topics/drawing/opengl.jd
new file mode 100644
index 0000000..e22a251
--- /dev/null
+++ b/docs/html/guide/topics/drawing/opengl.jd
@@ -0,0 +1,53 @@
+page.title=OpenGL
+@jd:body
+
+<p>Android includes support for 3D hardware acceleration. This functionality is
+accessed via the OpenGL API &mdash; specifically, the OpenGL ES API.</p>
+
+<p>OpenGL ES is a flavor of the OpenGL specification intended for embedded
+devices. Versions of OpenGL ES are loosely peered to versions of the primary
+OpenGL standard. Android currently supports OpenGL ES 1.0, which corresponds
+to OpenGL 1.3. So, if the application you have in mind is possible with OpenGL
+1.3 on a desktop system, it should be possible on Android.</p>
+
+<p>The specific API provided by Android is similar to the J2ME JSR239 OpenGL
+ES API. However, it may not be identical, so watch out for deviations.</p>
+
+<h2>Using the API</h2>
+
+<p>Here's how to use the API at an extremely high level:</p>
+
+<ol>
+<li>Write a custom View subclass.</li>
+<li>Obtain a handle to an OpenGLContext, which provides access to the OpenGL functionality.</li>
+<li>In your View's onDraw() method, get a handle to a GL object, and use its methods to perform GL operations.</li>
+</ol>
+
+<p>For an example of this usage model (based on the classic GL ColorCube),
+see
+<a href="{@docRoot}samples/ApiDemos/src/com/example/android/apis/graphics/GLView1.html">com.android.samples.graphics.GLView1.java</a>
+in the ApiDemos sample code project. A slightly more sophisticated version showing how to use
+it with threads can be found in 
+<a href="{@docRoot}samples/ApiDemos/src/com/example/android/apis/graphics/GLSurfaceViewActivity.html">com.android.samples.graphics.GLSurfaceViewActivity.java</a>.
+</p>
+
+<p>Writing a summary of how to actually write 3D applications using OpenGL is
+beyond the scope of this text and is left as an exercise for the reader.</p>
+
+<h2>Links to Additional Information</h2>
+
+<p>Information about OpenGL ES can be
+found at <a title="http://www.khronos.org/opengles/"
+href="http://www.khronos.org/opengles/">http://www.khronos.org/opengles/</a>.</p> 
+
+<p>Information specifically
+about OpenGL ES 1.0 (including a detailed specification) can be found
+at <a title="http://www.khronos.org/opengles/1_X/"
+href="http://www.khronos.org/opengles/1_X/">http://www.khronos.org/opengles/1_X/</a>.</p>
+
+<p>The documentation for the Android {@link javax.microedition.khronos.opengles.GL
+OpenGL ES implementations} are also available.</p>
+
+<p>Finally, note that though Android does include some basic support for
+OpenGL ES 1.1, the support is <strong>not complete</strong>, and should not be relied
+upon at this time.</p>
diff --git a/docs/html/guide/topics/fundamentals.jd b/docs/html/guide/topics/fundamentals.jd
new file mode 100644
index 0000000..3c7f419
--- /dev/null
+++ b/docs/html/guide/topics/fundamentals.jd
@@ -0,0 +1,1726 @@
+page.title=Application Fundamentals
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+<h2>Key classes</h2>
+<ol>
+<li>{@link android.app.Activity}</li>
+<li>{@link android.app.Service}</li>
+<li>{@link android.content.BroadcastReceiver}</li>
+<li>{@link android.content.ContentProvider}</li>
+<li>{@link android.content.Intent}</li>
+</ol>
+
+<h2>In this document</h2>
+<ol>
+<li><a href="#appcomp">Application Components</a>
+  <ol>
+    <li><a href="#actcomp">Activating components: intents</a></li>
+    <li><a href="#endcomp">Shutting down components</a></li>
+    <li><a href="#manfile">The manifest file</a></li>
+    <li><a href="#ifilters">Intent filters</a></li>
+  </ol></li>
+<li><a href="#acttask">Activities and Tasks</a>
+  <ol>
+    <li><a href="#afftask">Affinities and new tasks</a></li>
+    <li><a href="#lmodes">Launch modes</a></li>
+    <li><a href="#clearstack">Clearing the stack</a></li>
+    <li><a href="#starttask">Starting tasks</a></li>
+  </ol></li>
+<li><a href="#procthread">Processes and Threads</a>
+  <ol>
+    <li><a href="#procs">Processes</a></li>
+    <li><a href="#threads">Threads</a></li>
+    <li><a href="#rpc">Remote procedure calls</a></li>
+    <li><a href="#tsafe">Thread-safe methods</a></li>
+  </ol></li>
+<li><a href="#lcycles">Component Lifecycles</a>
+  <ol>
+    <li><a href="#actlife">Activity lifecycle</a></li>
+    <li><a href="#servlife">Service lifecycle</a></li>
+    <li><a href="#broadlife">Broadcast receiver lifecycle</a></li>
+    <li><a href="#proclife">Processes and lifecycles</a></li>
+  </ol></li>
+</ol>
+</div>
+</div>
+
+<p>
+Android applications are written in the Java programming language. 
+The compiled Java code &mdash; along with any data and resource 
+files required by the application &mdash; is bundled by the 
+<a href="{@docRoot}guide/developing/tools/aapt.html"><code>aapt</code> 
+tool</a> into an <i>Android package</i>, an archive file 
+marked by an {@code .apk} suffix.  This file is the vehicle 
+for distributing the application and installing it on mobile devices; 
+it's the file users download to their devices.  All the code in a 
+single {@code .apk} file is considered to be one <i>application</i>.
+</p>
+
+<p>
+In many ways, each Android application lives in its own world:
+</p>
+
+<ul>
+<li>By default, every application runs in its own Linux process.  
+Android starts the process when any of the application's code needs to be 
+executed, and shuts down the process when it's no longer needed and system 
+resources are required by other applications.</li>
+
+<li>Each process has its own Java virtual machine (VM), so application code 
+runs in isolation from the code of all other applications.</li>
+
+<li>By default, each application is assigned a unique Linux user ID.  
+Permissions are set so that the application's files are visible only 
+that user, only to the application itself &mdash; although there are ways 
+to export them to other applications as well.</li>
+</ul>
+
+<p>
+It's possible to arrange for two applications to share the same user ID, 
+in which case they will be able to see each other's files.  To conserve 
+system resources, applications with the same ID can also arrange to run 
+in the same Linux process, sharing the same VM.
+</p>
+
+
+<h2 id="appcomp">Application Components</h2>
+
+<p>
+A central feature of Android is that one application can make use of elements 
+of other applications (provided those applications permit it).  For example, 
+if your application needs to display a scrolling list of images and another 
+application has developed a suitable scroller and made it available to others, 
+you can call upon that scroller to do the work, rather than develop your own.  
+Your application doesn't incorporate the code of the other application or 
+link to it.  Rather, it simply starts up that piece of the other application 
+when the need arises.
+</p>
+
+<p>
+For this to work, the system must be able to start an application process 
+when any part of it is needed, and instantiate the Java objects for that part.  
+Therefore, unlike applications on most other systems, Android applications don't 
+have a single entry point for everything in the application (no {@code main()} 
+function, for example).  Rather, they have essential <i>components</i> that 
+the system can instantiate and run as needed.  There are four types of components:
+</p>
+
+<dl>
+
+<dt><b>Activities</b></dt>
+<dd>An <i>activity</i> presents a visual user interface for one focused endeavor 
+the user can undertake.  For example, an activity might present a list of 
+menu items users can choose from or it might display photographs along
+with their captions.  A text messaging application might have one activity 
+that shows a list of contacts to send messages to, a second activity to write 
+the message to the chosen contact, and other activities to review old messages 
+or change settings.  Though they work together to form a cohesive user interface, 
+each activity is independent of the others.  
+Each one is implemented as a subclass of the {@link android.app.Activity} base class.  
+
+<p>
+An application might consist of just one activity or, like the text messaging
+application just mentioned, it may contain several.  
+What the activities are, and how many there are depends, of course, on the 
+application and its design.  Typically, one of the activities is marked
+as the first one that should be presented to the user when the application is 
+launched.  Moving from one activity to another is accomplished by having the 
+current activity start the next one.  
+</p>
+
+<p>
+Each activity is given a default window to draw in.  Typically, the window 
+fills the screen, but it might be smaller than the screen and float on top 
+of other windows.  An activity can also make use of additional windows &mdash; 
+for example, a pop-up dialog that calls for a user response in the midst of 
+the activity, or a window that presents users with vital information when they 
+select a particular item on-screen.
+</p>
+
+<p>
+The visual content of the window is provided by a hierarchy of views &mdash; 
+objects derived from the base {@link android.view.View} class.  Each view 
+controls a particular rectangular space within the window.  Parent views 
+contain and organize the layout of their children.  Leaf views (those at the 
+bottom of the hierarchy) draw in the rectangles they control and respond to 
+user actions directed at that space.  Thus, views are where the activity's 
+interaction with the user takes place.  For example, a view might display 
+a small image and initiate an action when the user taps that image.  Android 
+has a number of ready-made views that you can use &mdash; including buttons, 
+text fields, scroll bars, menu items, check boxes, and more.
+</p>
+
+<p>
+A view hierarchy is placed within an activity's window by the 
+<code>{@link android.app.Activity#setContentView Activity.setContentView()}</code> 
+method.  The <i>content view</i> is the View object at the root of the hierarchy.  
+(See the separate <a href="{@docRoot}guide/topics/ui/index.html">User Interface</a> 
+document for more information on views and the hierarchy.)
+</p>
+
+<p><dt><b>Services</b></dt>
+<dd>A <i>service</i> doesn't have a visual user interface, but rather runs in 
+the background for an indefinite period of time.  For example, a service might 
+play background music as the user attends to other matters, or it might fetch 
+data over the network or calculate something and provide the result to activities 
+that need it.  Each service extends the {@link android.app.Service} base class.
+
+<p>
+A prime example is a media player playing songs from a play list.  The player 
+application would probably have one or more activities that allow the user to 
+choose songs and start playing them.  However, the music playback itself would 
+not be handled by an activity because users will expect the music to keep 
+playing even after they leave the player and begin something different.  
+To keep the music going, the media player activity could start a service to run 
+in the background.  The system would then keep the music playback service running 
+even after the activity that started it leaves the screen.
+</p>
+
+<p> 
+It's possible to connect to (bind to) an ongoing service (and start the service 
+if it's not already running).  While connected, you can communicate with the 
+service through an interface that the service exposes.  For the music service, 
+this interface might allow users to pause, rewind, stop, and restart the playback.
+</p>
+
+<p>
+Like activities and the other components, services run in the main thread of 
+the application process.  So that they won't block other components or the 
+user interface, they often spawn another thread for time-consuming tasks 
+(like music playback).  See <a href="#procthread">Processes and Threads</a>, later.
+</p></dd>
+
+<dt><b>Broadcast receivers</b></dt>
+<dd>A <i>broadcast receiver</i> is a component that does nothing but 
+receive and react to broadcast announcements.  Many broadcasts originate in 
+system code &mdash; for example, announcements that the timezone has changed, 
+that the battery is low, that a picture has been taken, or that the user 
+changed a language preference.  Applications can also initiate broadcasts
+&mdash; for example, to let other applications know that some data has been
+downloaded to the device and is available for them to use.
+
+<p>
+An application can have any number of broadcast receivers to respond to any 
+announcements it considers important.  All receivers extend the {@link 
+android.content.BroadcastReceiver} base class.
+</p>
+
+<p>
+Broadcast receivers do not display a user interface.  However, they may start
+an activity in response to the information they receive, or they may use 
+the {@link android.app.NotificationManager} to alert the user.  Notifications 
+can get the user's attention in various ways &mdash; flashing 
+the backlight, vibrating the device, playing a sound, and so on.  They 
+typically place a persistent icon in the status bar, which users can open to 
+get the message. 
+</p></dd>
+
+<dt><b>Content providers</b></dt>
+<dd>A <i>content provider</i> makes a specific set of the application's data 
+available to other applications. The data can be stored in the file system, 
+in an SQLite database, or in any other manner that makes sense.  
+The content provider extends the {@link android.content.ContentProvider} base 
+class to implement a standard set of methods that enable other applications 
+to retrieve and store data of the type it controls.  However, applications 
+do not call these methods directly.  Rather they use a {@link 
+android.content.ContentResolver} object and call its methods instead.  
+A ContentResolver can talk to any content provider; it cooperates with the
+provider to manage any interprocess communication that's involved. 
+
+<p>
+See the separate 
+<a href="{@docRoot}guide/topics/providers/content-providers.html">Content 
+Providers</a> document for more information on using content providers.
+</p></dd>
+
+</dl>
+
+<p>
+Whenever there's a request that should be handled by a particular component, 
+Android makes sure that the application process of the component is running, 
+starting it if necessary, and that an appropriate instance of the component 
+is available, creating the instance if necessary.  
+</p>
+
+
+<h3 id="actcomp">Activating components: intents</h3> 
+
+<p>
+Content providers are activated when they're targeted by a request from a 
+ContentResolver.  The other three components &mdash; activities, services, 
+and broadcast receivers &mdash; are activated by asynchronous messages 
+called <i>intents</i>.  An intent is an {@link android.content.Intent} 
+object that holds the content of the message.  For activities and services,
+it names the action being requested and specifies the URI of the data to 
+act on, among other things. For example, it might convey a request for 
+an activity to present an image to the user or let the user edit some
+text.  For broadcast receivers, the Intent object names the action being 
+announced.  For example, it might announce to interested parties that the 
+camera button has been pressed.
+</p>
+
+<p>
+There are separate methods for activiating each type of component: 
+</p>
+
+<ul>
+
+<li>An activity is launched (or given something new to do) by passing an 
+Intent object to <code>{@link android.content.Context#startActivity 
+Context.startActivity()}</code> or <code>{@link 
+android.app.Activity#startActivityForResult 
+Activity.startActivityForResult()}</code>.  The responding activity can 
+look at the initial intent that caused it to be launched by calling its 
+<code>{@link android.app.Activity#getIntent getIntent()}</code> method.  
+Android calls the activity's <code>{@link 
+android.app.Activity#onNewIntent onNewIntent()}</code> method to pass 
+it any subsequent intents.
+
+<p>
+One activity often starts the next one.  If it expects a result back from 
+the activity it's starting, it calls {@code startActivityForResult()} 
+instead of {@code startActivity()}.  For example, if it starts an activity 
+that lets the user pick a photo, it might expect to be returned the chosen 
+photo.  The result is returned in an Intent object that's passed to the 
+calling activity's <code>{@link android.app.Activity#onActivityResult 
+onActivityResult()}</code> method.
+</p>
+</li>
+
+<li><p>A service is started (or new instructions are given to an ongoing 
+service) by passing an Intent object to <code>{@link 
+android.content.Context#startService Context.startService()}</code>.  
+Android calls the service's <code>{@link android.app.Service#onStart 
+onStart()}</code> method and passes it the Intent object.</p>
+
+<p>
+Similarly, an intent can be passed to <code>{@link 
+android.content.Context#bindService Context.bindService()}</code> to 
+establish an ongoing connection between the calling component and a 
+target service.  The service receives the Intent object in
+an <code>{@link android.app.Service#onBind onBind()}</code> call.
+(If the service is not already running, {@code bindService()} can
+optionally start it.)  For example, an activity might establish a connection 
+with the music playback service mentioned earlier so that it can provide 
+the user with the means (a user interface) for controlling the playback.  
+The activity would call {@code bindService()} to set up that connection, 
+and then call methods defined by the service to affect the playback.
+</p>
+
+<p>
+A later section, <a href="#rpc">Remote procedure calls</a>, has more details 
+about binding to a service.
+</p>
+</li>
+
+<li><p>An application can initiate a broadcast by passing an Intent object to 
+methods like <code>{@link 
+android.content.Context#sendBroadcast(Intent) Context.sendBroadcast()}</code>, 
+<code>{@link android.content.Context#sendOrderedBroadcast(Intent, String) 
+Context.sendOrderedBroadcast()}</code>, and <code>{@link 
+android.content.Context#sendStickyBroadcast Context.sendStickyBroadcast()}</code>
+in any of their variations.  Android delivers the intent to all interested 
+broadcast receivers by calling their <code>{@link 
+android.content.BroadcastReceiver#onReceive onReceive()}</code> methods.</p></li>
+
+</ul>
+
+<p>
+For more on intent messages, see the separate article, 
+<a href="{@docRoot}guide/topics/intents/intents-filters.html">Intents 
+and Intent Filters</a>.
+</p>
+
+
+<h3 id="endcomp">Shutting down components</h3>
+
+<p>
+A content provider is active only while it's responding to a request from 
+a ContentResolver.  And a broadcast receiver is active only while it's 
+responding to a broadcast message.  So there's no need to explicitly shut 
+down these components.
+</p>
+
+<p>
+Activities, on the other hand, provide the user interface.  They're 
+in a long-running conversation with the user and may remain active, 
+even when idle, as long as the conversation continues.  Similarly, services 
+may also remain running for a long time.  So Android has methods to shut 
+down activities and services in an orderly way:
+</p>
+
+<ul>
+<li>An activity can be shut down by calling its
+<code>{@link android.app.Activity#finish finish()}</code> method.  One activity can
+shut down another activity (one it started with {@code startActivityForResult()}) by 
+calling <code>{@link android.app.Activity#finishActivity finishActivity()}</code>.</li>
+
+<li>A service can be stopped by calling its
+<code>{@link android.app.Service#stopSelf stopSelf()}</code> method, or by calling 
+<code>{@link android.content.Context#stopService Context.stopService()}</code>.</li>
+</ul>
+
+<p>
+Components might also be shut down by the system when they are no longer being
+used or when Android must reclaim memory for more active components.  A later
+section, <a href="#lcycles">Component Lifecycles</a>, discusses this
+possibility and its ramifications in more detail.
+</p>
+
+
+<h3 id="manfile">The manifest file</h3>
+
+<p>
+Before Android can start an application component, it must learn that 
+the component exists.  Therefore, applications declare their components 
+in a manifest file that's bundled into the Android package, the {@code .apk} 
+file that also holds the application's code, files, and resources.  
+</p>
+
+<p>
+The manifest is a structured XML file and is always named AndroidManifest.xml 
+for all applications.  It does a number of things in addition to declaring the 
+application's components, such as naming any libraries the application needs 
+to be linked against (besides the default Android library) and identifying 
+any permissions the application expects to be granted.
+</p>
+
+<p>
+But the principal task of the manifest is to inform Android about the application's 
+components.  For example, an activity might be declared as follows:
+</p>
+
+<pre>&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;manifest . . . &gt;
+    &lt;application . . . &gt;
+        &lt;activity android:name="com.example.project.FreneticActivity"
+                  android:icon="@drawable/small_pic.png"
+                  android:label="@string/freneticLabel" 
+                  . . .  &gt;
+        &lt;/activity&gt;
+        . . .
+    &lt;/application&gt;
+&lt;/manifest&gt;</pre>
+
+<p>
+The {@code name} attribute of the 
+<code><a href="{@docRoot}guide/topics/manifest/activity-element.html">&lt;activity&gt;</a></code>
+element names the {@link android.app.Activity} subclass that implements the 
+activity.  The {@code icon} and {@code label} attributes point to 
+resource files containing an icon and label that can be displayed 
+to users to represent the activity.
+</p>
+
+<p>
+The other components are declared in a similar way &mdash; 
+<code><a href="{@docRoot}guide/topics/manifest/service-element.html">&lt;service&gt;</a></code>
+elements for services,
+<code><a href="{@docRoot}guide/topics/manifest/receiver-element.html">&lt;receiver&gt;</a></code>
+elements for broadcast receivers, and 
+<code><a href="{@docRoot}guide/topics/manifest/provider-element.html">&lt;provider&gt;</a></code>
+elements for content providers.  Activities, services, and content providers 
+that are not declared in the manifest are not visible to the system and are 
+consequently never run.  However, broadcast receivers can either be 
+declared in the manifest, or they can be created dynamically in code 
+(as {@link android.content.BroadcastReceiver} objects) 
+and registered with the system by calling 
+<code>{@link android.content.Context#registerReceiver Context.registerReceiver()}</code>.
+</p>
+
+<p>
+For more on how to structure a manifest file for your application, see 
+<a href="{@docRoot}guide/topics/manifest/manifest-intro.html">The 
+AndroidManifest.xml File</a>.
+</p>
+
+
+<h3 id="ifilters">Intent filters</h3>
+
+<p>
+An Intent object can explicitly name a target component.  If it does,
+Android finds that component (based on the declarations in the manifest 
+file) and activates it.  But if a target is not explicitly named, 
+Android must locate the best component to respond to the intent.  
+It does so by comparing the Intent object to the <i>intent filters</i> 
+of potential targets.  A component's intent filters inform Android of 
+the kinds of intents the component is able to handle.  Like other 
+essential information about the component, they're declared in the 
+manifest file.  Here's an extension of the previous example that adds 
+two intent filters to the activity:
+</p>
+
+<pre>&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;manifest . . . &gt;
+    &lt;application . . . &gt;
+        &lt;activity android:name="com.example.project.FreneticActivity"
+                  android:icon="@drawable/small_pic.png"
+                  android:label="@string/freneticLabel" 
+                  . . .  &gt;
+            &lt;intent-filter . . . &gt;
+                &lt;action android:name="android.intent.action.MAIN" /&gt;
+                &lt;category android:name="android.intent.category.LAUNCHER" /&gt;
+            &lt;/intent-filter&gt;
+            &lt;intent-filter . . . &gt;
+                &lt;action android:name="com.example.project.BOUNCE" /&gt;
+                &lt;data android:type="image/jpeg" /&gt;
+                &lt;category android:name="android.intent.category.DEFAULT" /&gt;
+            &lt;/intent-filter&gt;
+        &lt;/activity&gt;
+        . . .
+    &lt;/application&gt;
+&lt;/manifest&gt;</pre>
+
+<p>
+The first filter in the example &mdash; the combination of the action
+"{@code android.intent.action.MAIN}" and the category
+"{@code android.intent.category.LAUNCHER}" &mdash; is a common one.
+It marks the activity as one that should be represented in the
+application launcher, the screen listing applications users can launch 
+on the device.  In other words, the activity is the entry point for 
+the application, the initial one users would see when they choose 
+the application in the launcher.
+</p>
+
+<p>
+The second filter declares an action that the activity can perform on 
+a particular type of data.
+</p>
+
+<p>
+A component can have any number of intent filters, each one declaring a 
+different set of capabilities.  If it doesn't have any filters, it can 
+be activated only by intents that explicitly name the component as the 
+target.
+</p>
+
+<p>
+For a broadcast receiver that's created and registered in code, the
+intent filter is instantiated directly as an {@link android.content.IntentFilter}
+object.  All other filters are set up in the manifest.
+</p>
+
+<p>
+For more on intent filters, see a separate document, 
+<a href="{@docRoot}guide/topics/intents/intents-filters.html">Intents 
+and Intent Filters</a>.
+</p>
+
+
+<h2 id="acttask">Activities and Tasks</h2>
+
+<p>
+As noted earlier,  one activity can start another, including one defined 
+in a different application.  Suppose, for example, that you'd like 
+to let users display a street map of some location.  There's already an 
+activity that can do that, so all your activity needs to do is put together 
+an Intent object with the required information and pass it to 
+{@code startActivity()}.  The map viewer will display the map.  When the user 
+hits the BACK key, your activity will reappear on screen.
+</p>
+
+<p>
+To the user, it will seem as if the map viewer is part of the same application 
+as your activity, even though it's defined in another application and runs in 
+that application's process.  Android maintains this user experience by keeping 
+both activities in the same <i>task</i>.  Simply put, a task is what the user 
+experiences as an "application."  It's a group of related activities, arranged 
+in a stack.  The root activity in the stack is the one that began the task 
+&mdash; typically, it's an activity the user selected in the application launcher.  
+The activity at the top of the stack is one that's currently running &mdash; 
+the one that is the focus for user actions.  When one activity starts another, 
+the new activity is pushed on the stack; it becomes the running activity.  
+The previous activity remains in the stack.  When the user presses the BACK key, 
+the current activity is popped from the stack, and the previous one resumes as 
+the running activity.  
+</p>
+
+<p>
+The stack contains objects, so if a task has more than one instance of the same 
+Activity subclass open &mdash; multiple map viewers, for example &mdash; the 
+stack has a separate entry for each instance.  Activities in the stack are never 
+rearranged, only pushed and popped.
+</p>
+
+<p>
+A task is a stack of activities, not a class or an element in the manifest file. 
+So there's no way to set values for a task independently of its activities.  
+Values for the task as a whole are set in the root activity.  For example, the 
+next section will talk about the "affinity of a task"; that value is read from 
+the affinity set for the task's root activity.
+</p>
+
+<p>
+All the activities in a task move together as a unit.  The entire task (the entire 
+activity stack) can be brought to the foreground or sent to the background.  
+Suppose, for instance, that the current task has four activities in its stack 
+&mdash; three under the current activity.  The user presses the HOME key, goes 
+to the application launcher, and selects a new application (actually, a new <i>task</i>).  
+The current task goes into the background and the root activity for the new task is displayed.  
+Then, after a short period, the user goes back to the home screen and again selects 
+the previous application (the previous task).  That task, with all four 
+activities in the stack, comes forward.  When the user presses the BACK 
+key, the screen does not display the activity the user just left (the root
+activity of the previous task).  Rather, the activity on the top of the stack 
+is removed and the previous activity in the same task is displayed. 
+</p>
+
+<p>
+The behavior just described is the default behavior for activities and tasks.  
+But there are ways to modify almost all aspects of it.  The association of 
+activities with tasks, and the behavior of an activity within a task, is 
+controlled by the interaction between flags set in the Intent object that
+started the activity and attributes set in the activity's 
+<code><a href="{@docRoot}guide/topics/manifest/activity-element.html">&lt;activity&gt;</a></code>
+element in the manifest.  Both requester and respondent have a say in what happens.
+</p>
+
+<p>
+In this regard, the principal Intent flags are:
+
+<p style="margin-left: 2em">{@code FLAG_ACTIVITY_NEW_TASK}
+<br/>{@code FLAG_ACTIVITY_CLEAR_TOP}
+<br/>{@code FLAG_ACTIVITY_RESET_TASK_IF_NEEDED}
+<br/>{@code FLAG_ACTIVITY_SINGLE_TOP}</p>
+
+<p>
+The principal {@code &lt;activity&gt;} attributes are:
+  
+<p style="margin-left: 2em">{@code taskAffinity}
+<br/>{@code launchMode}
+<br/>{@code allowTaskReparenting}
+<br/>{@code clearTaskOnLaunch}
+<br/>{@code alwaysRetainTaskState}
+<br/>{@code finishOnTaskLaunch}</p>
+
+<p>
+The following sections describe what some of these flags and attributes do,
+how they interact, and what considerations should govern their use.
+</p>
+
+
+<h3 id="afftask">Affinities and new tasks</h3>
+
+<p>
+By default, all the activities in an application have an <i>affinity</i> for each 
+other &mdash; that is, there's a preference for them all to belong to the 
+same task.  However, an individual affinity can be set for each activity 
+with the {@code taskAffinity} attribute of the {@code &lt;activity&gt;} element. 
+Activities defined in different applications can share an affinity, or activities 
+defined in the same application can be assigned different affinities.  
+The affinity comes into play in two circumstances:  When the Intent object 
+that launches an activity contains the {@code FLAG_ACTIVITY_NEW_TASK} flag, 
+and when an activity has its {@code allowTaskReparenting} attribute set 
+to "{@code true}". 
+</p>
+
+<dl>
+<dt>The <code>{@link android.content.Intent#FLAG_ACTIVITY_NEW_TASK}</code> flag</dt>
+<dd>As described earlier, a new activity is, by default, launched into 
+the task of the activity that called {@code startActivity()}.  It's pushed
+ onto the same stack as the caller.  However, if the Intent object passed 
+to {@code startActivity()} contains the {@code FLAG_ACTIVITY_NEW_TASK} 
+flag, the system looks for a different task to house the new activity.  
+Often, as the name of the flag implies, it's a new task.  However, it 
+doesn't have to be.  If there's already an existing task with the same 
+affinity as the new activity, the activity is launched into that task.  If 
+not, it begins a new task.</dd>
+
+<dt>The <code><a 
+href="{@docRoot}guide/topics/manifest/activity-element.html#reparent">allowTaskReparenting</a></code>
+attribute</dt>
+<dd>If an activity has its {@code allowTaskReparenting} attribute set 
+to "{@code true}", it can move from the task it starts in to the task 
+it has an affinity for when that task comes to the fore.  For example, 
+suppose that an activity that reports weather conditions in selected 
+cities is defined as part of a travel application.  It has the same
+affinity as other activities in the same application (the default 
+affinity) and it allows reparenting.  One of your activities 
+starts the weather reporter, so it initially belongs to the same task as 
+your activity.  However, when the travel application next comes forward, 
+the weather reporter will be reassigned to and displayed with that task.</dd>
+</dl>
+
+<p>
+If an {@code .apk} file contains more than one "application"
+from the user's point of view, you will probably want to assign different 
+affinities to the activities associated with each of them.
+</p>
+
+
+<h3 id="lmodes">Launch modes</h3>
+
+<p>
+There are four different launch modes that can be assigned to an {@code
+&lt;activity&gt;} element's 
+<code><a href="{@docRoot}guide/topics/manifest/activity-element.html#lmode">launchMode</a></code> 
+attribute:
+</p>
+
+<p style="margin-left: 2em">"{@code standard}" (the default mode)
+<br>"{@code singleTop}"
+<br>"{@code singleTask}"
+<br>"{@code singleInstance}"</p>
+
+<p>
+The modes differ from each other on these four points:
+</p>
+
+<ul>
+
+<li><b>Which task will hold the activity that responds to the intent</b>.  
+For the "{@code standard}" and "{@code singleTop}" modes, it's the task that 
+originated the intent (and called 
+<code>{@link android.content.Context#startActivity startActivity()}</code>) 
+&mdash; unless the Intent object contains the 
+<code>{@link android.content.Intent#FLAG_ACTIVITY_NEW_TASK}</code> flag.  
+In that case, a different task is chosen as described in the previous 
+section, <a href="#afftask">Affinities and new tasks</a>.  
+
+<p>
+In contrast, the "{@code singleTask}" and "{@code singleInstance}" modes mark 
+activities that are always at the root of a task.  They define a task; they're
+never launched into another task.
+</p>  
+
+<li><p><b>Whether there can be multiple instances of the activity</b>.  
+A "{@code standard}" or "{@code singleTop}" activity can be instantiated
+many times.  They can belong to multiple tasks, and a given task can have 
+multiple instances of the same activity.
+</p> 
+
+<p>
+In contrast, "{@code singleTask}" and "{@code singleInstance}" activities 
+are limited to just one instance.  Since these activities are at the root
+of a task, this limitation means that there is never more than a single
+instance of the task on the device at one time.
+</p>    
+
+<li><p><b>Whether the instance can have other activities in its task</b>.  
+A "{@code singleInstance}" activity stands alone as the only activity in its 
+task.  If it starts another activity, that activity will be launched into a 
+different task regardless of its launch mode &mdash; as if {@code
+FLAG_ACTIVITY_NEW_TASK} was in the intent.  In all other respects, the 
+"{@code singleInstance}" mode is identical to "{@code singleTask}".</p>
+
+<p>
+The other three modes permit multiple activities to belong to the task.
+A "{@code singleTask}" activity will always be the root activity of the task, 
+but it can start other activities that will be assigned to its
+task.  Instances of "{@code standard}" and "{@code singleTop}"
+activities can appear anywhere in a stack.  
+</p></li>
+
+<li><b>Whether a new instance of the class will be launched 
+to handle a new intent</b>.  For the default "{@code standard}" mode, a 
+new instance is created to respond to every new intent.  Each instance 
+handles just one intent.  For the "{@code singleTop}" mode, an existing 
+instance of the class is re-used to handle a new intent if it resides 
+at the top of the activity stack of the target task.  If it does not 
+reside at the top, it is not re-used.  Instead, a new instance 
+is created for the new intent and pushed on the stack.
+
+<p>
+For example, suppose a task's activity stack consists of root activity A with 
+activities B, C, and D on top in that order, so the stack is A-B-C-D.  An intent 
+arrives for an activity of type D.  If D has the default "{@code standard}" launch 
+mode, a new instance of the class is launched and the stack becomes A-B-C-D-D.  
+However, if D's launch mode is "{@code singleTop}", the existing instance is 
+expected to handle the new intent (since it's at the top of the stack) and the 
+stack remains A-B-C-D.  
+</p>
+
+<p>
+If, on the other hand, the arriving intent is for an activity of type B, a new 
+instance of B would be launched no matter whether B's mode is "{@code standard}" 
+or "{@code singleTop}" (since B is not at the top of the stack), so the resulting 
+stack would be A-B-C-D-B.
+</p>
+
+<p>
+As noted above, there's never more than one instance of a "{@code singleTask}" 
+or "{@code singleInstance}" activity, so that instance is expected to handle
+all new intents.  A "{@code singleInstance}" activity is always at the top of 
+the stack (since it is the only activity in the task), so it is always in 
+position to handle the intent.  However, a "{@code singleTask}" activity may 
+or may not have other activities above it in the stack.  If it does, it is not 
+in position to handle the intent, and the intent is dropped.  (Even though the 
+intent is dropped, its arrival would have caused the task to come to the 
+foreground, where it would remain.)
+</p>
+</li>
+
+</ul>
+
+<p>
+When an existing activity is asked to handle a new intent, the Intent
+object is passed to the activity in an 
+<code>{@link android.app.Activity#onNewIntent onNewIntent()}</code> call.  
+(The intent object that originally started the activity can be retrieved by 
+calling <code>{@link android.app.Activity#getIntent getIntent()}</code>.)
+</p>
+
+<p>
+Note that when a new instance of an Activity is created to handle a new
+intent, the user can always press the BACK key to return to the previous state
+(to the previous activity).  But when an existing instance of an 
+Activity handles a new intent, the user cannot press the BACK key to 
+return to what that instance was doing before the new intent arrived.
+</p>
+
+<p>
+For more on launch modes, see the description of the 
+<code><a href="{@docRoot}guide/topics/manifest/activity-element.html">&lt;activity&gt;</a></code>
+element. 
+</p>
+
+
+<h3 id="clearstack">Clearing the stack</h3>
+
+<p>
+If the user leaves a task for a long time, the system clears the task of all
+activities except the root activity.  When the user returns to the task again, 
+it's as the user left it, except that only the initial activity is present. 
+The idea is that, after
+a time, users will likely have abandoned what they were doing before and are
+returning to the task to begin something new.
+</p>
+
+<p>
+That's the default.  There are some activity attributes that can be used to 
+control this behavior and modify it:
+</p>
+
+<dl>
+<dt>The <code><a 
+href="{@docRoot}guide/topics/manifest/activity-element.html#always">alwaysRetainTaskState</a></code>
+attribute</dt>
+<dd>If this attribute is set to "{@code true}" in the root activity of a task, 
+the default behavior just described does not happen.  
+The task retains all activities in its stack even after a long period.</dd>
+
+<dt>The <code><a 
+href="{@docRoot}guide/topics/manifest/activity-element.html#clear">clearTaskOnLaunch</a></code>
+attribute</dt>
+<dd>If this attribute is set to "{@code true}" in the root activity of a task, 
+the stack is cleared down to the root activity whenever the user leaves the task 
+and returns to it.  In other words, it's the polar opposite of 
+{@code alwaysRetainTaskState}.  The user always returns to the task in its
+initial state, even after a momentary absence.</dd>
+
+<dt>The <code><a 
+href="{@docRoot}guide/topics/manifest/activity-element.html#finish">finishOnTaskLaunch</a></code>
+attribute</dt>
+<dd>This attribute is like {@code clearTaskOnLaunch}, but it operates on a 
+single activity, not an entire task.  And it can cause any activity to go
+away, including the root activity.  When it's set to "{@code true}", the 
+activity remains part of the task only for the current session.  If the user 
+leaves and then returns to the task, it no longer is present.</dd>
+</dl>
+
+<p>
+There's another way to force activities to be removed from the stack.  
+If an Intent object includes the <code>{@link 
+android.content.Intent#FLAG_ACTIVITY_CLEAR_TOP FLAG_ACTIVITY_CLEAR_TOP}</code> 
+flag, and the target task already has an instance of the type of activity that 
+should handle the intent in its stack, all activities above that instance 
+are cleared away so that it stands at the top of the stack and can respond 
+to the intent. 
+If the launch mode of the designated activity is "{@code standard}", it too 
+will be removed from the stack, and a new instance will be launched to handle 
+the incoming intent.  That's because a new instance is always created for 
+a new intent when the launch mode is "{@code standard}".
+</p>
+
+<p>
+{@code FLAG_ACTIVITY_CLEAR_TOP} is most often used in conjunction
+with {@code FLAG_ACTIVITY_NEW_TASK}.  When used together, these flags are
+a way of locating an existing activity in another task and putting it in
+a position where it can respond to the intent.  
+</p>
+
+
+<h3 id="starttask">Starting tasks</h3>
+
+<p>
+An activity is set up as the entry point for a task by giving it 
+an intent filter with "{@code android.intent.action.MAIN}" as the 
+specified action and "{@code android.intent.category.LAUNCHER}" as 
+the specified category.  (There's an example of this type of filter 
+in the earlier <a href="#ifilters">Intent Filters</a> section.)  
+A filter of this kind causes an icon and label for the activity to be 
+displayed in the application launcher, giving users a way both to 
+launch the task and to return to it at any time after it has been 
+launched.
+</p>
+
+<p>
+This second ability is important:  Users must be able to leave a task
+and then come back to it later.  For this reason, the two launch modes
+that mark activities as always initiating a task, "{@code singleTask}" 
+and "{@code singleInstance}", should be used only when the activity has 
+a {@code MAIN} and {@code LAUNCHER} filter.  
+Imagine, for example, what could happen if the filter is missing:
+An intent launches a "{@code singleTask}" activity, initiating a new task, 
+and the user spends some time working in that task.  The user then presses 
+the HOME key.  The task is now ordered behind and obscured by the home 
+screen.  And, because it is not represented in the application launcher, 
+the user has no way to return to it.
+</p>
+
+<p>
+A similar difficulty attends the {@code FLAG_ACTIVITY_NEW_TASK} flag.
+If this flag causes an activity to
+begin a new task and the user presses the HOME key to leave it, there
+must be some way for the user to navigate back to it again.  Some 
+entities (such as the notification manager) always start activities 
+in an external task, never as part of their own, so they always put 
+{@code FLAG_ACTIVITY_NEW_TASK} in the intents they pass to 
+{@code startActivity()}.  If you have an activity that can be invoked 
+by an external entity that might use this flag, take care that the user 
+has a independent way to get back to the task that's started.
+</p> 
+
+<p>
+For those cases where you don't want the user to be able to return
+to an activity, set the {@code &lt;activity&gt;} element's {@code
+finishOnTaskLaunch} to "{@code true}".  
+See <a href="#clearstack">Clearing the stack</a>, earlier.
+</p>
+
+
+<h2 id="procthread">Processes and Threads</h2>
+
+<p>
+When the first of an application's components needs to be run, Android 
+starts a Linux process for it with a single thread of execution.  By default, 
+all components of the application run in that process and thread.
+</p>
+
+<p>
+However, you can arrange for components to run in other processes, and you 
+can spawn additional threads for any process.
+</p>
+
+
+<h3 id="procs">Processes</h3>
+
+<p>
+The process where a component runs is controlled by the manifest file.  
+The component elements &mdash; {@code &lt;activity&gt;}, 
+{@code &lt;service&gt;}, {@code &lt;receiver&gt;}, and {@code &lt;provider&gt;} 
+&mdash; each have a {@code process} attribute that can specify a process
+where that component should run.  These attributes can be set so that each 
+component runs in its own process, or so that some components share a process 
+while others do not.  They can also be set so that components of 
+different applications run in the same process &mdash; provided that the 
+applications share the same Linux user ID and are signed by the same authorities.
+The {@code &lt;application&gt;} element also has a {@code process} attribute,
+for setting a default value that applies to all components.
+</p>
+
+<p>
+All components are instantiated in the main thread of the specified
+process, and system calls to the component are dispatched from that
+thread.  Separate threads are not created for each instance.  Consequently,
+methods that respond to those calls &mdash; methods like 
+<code>{@link android.view.View#onKeyDown View.onKeyDown()}</code> that report
+user actions and the lifecycle notifications discussed later in the 
+<a href="#lcycles">Component Lifecycles</a> section &mdash; always run in the
+main thread of the process.  This means
+that no component should perform long or blocking operations (such as networking 
+operations or computation loops) when called by the system, since this will block
+any other components also in the process.  You can spawn separate threads for 
+long operations, as discussed under <a href="#threads">Threads</a>, next.
+</p>
+
+<p>
+Android may decide to shut down a process at some point, when memory is 
+low and required by other processes that are more immediately serving 
+the user.  Application components running in the process are consequently 
+destroyed.  A process is restarted for those components when there's again
+work for them to do.
+</p>  
+
+<p>
+When deciding which processes to terminate, Android weighs their relative
+importance to the user.  For example, it more readily shuts down a process 
+with activities that are no longer visible on screen than a process with
+visible activities.
+The decision whether to terminate a process, therefore, depends on the state 
+of the components running in that process.  Those states are the subject of
+a later section, <a href="#lcycles">Component Lifecycles</a>.
+</p>
+
+
+<h3 id="threads">Threads</h3>
+
+<p>
+Even though you may confine your application to a single process, there will
+likely be times when you will need to spawn a thread to do some background 
+work.  Since the user interface must always be quick to respond to user actions, 
+the thread that hosts an activity should not also host time-consuming operations 
+like network downloads.  Anything that may not be completed quickly should be
+assigned to a different thread. 
+</p>
+
+<p>
+Threads are created in code using standard Java {@link java.lang.Thread}
+objects.  Android provides a number of convenience classes for managing 
+threads &mdash; {@link android.os.Looper} for running a message loop within 
+a thread, {@link android.os.Handler} for processing messages, and 
+{@link android.os.HandlerThread} for setting up a thread with a message loop.
+</p>
+
+
+<h3 id="rpc">Remote procedure calls</h3>
+
+<p>
+Android has a lightweight mechanism for remote procedure calls (RPCs) 
+&mdash; where a method is called locally, but executed remotely (in another
+process), with any result returned back to the caller.
+This entails decomposing the method call and all its attendant data to a 
+level the operating system can understand, transmitting it from the local 
+process and address space to the remote process and address space, and 
+reassembling and reenacting the call there.  Return values have to be 
+transmitted in the opposite direction.  Android provides all the code 
+to do that work, so that you can concentrate on defining and implementing 
+the RPC interface itself.
+</p>
+
+<p>
+An RPC interface can include only methods.
+All methods are executed synchronously (the local method blocks until the 
+remote method finishes), even if there is no return value.
+</p>
+
+<p>
+In brief, the mechanism works as follows:  You'd begin by declaring the
+RPC interface you want to implement using a simple IDL (interface definition 
+language).  From that declaration, the 
+<code><a href="{@docRoot}guide/developing/tools/aidl.html">aidl</a></code> 
+tool generates a Java interface definition that must be made available to 
+both the local and the remote process.  It contains two inner class, as shown 
+in the following diagram:
+</p>
+
+<p style="margin-left: 2em">
+<img src="{@docRoot}images/binder_rpc.png" alt="RPC mechanism." />
+</p>
+
+<p>
+The inner classes have all the code needed to administer remote procedure
+calls for the interface you declared with the IDL. 
+Both inner classes implement the {@link android.os.IBinder}
+interface.  One of them is used locally and internally by the system;
+the code you write can ignore it.
+The other, called Stub, extends the {@link android.os.Binder}
+class.  In addition to internal code for effectuating the IPC calls, it 
+contains declarations for the methods in the RPC interface you declared.
+You would subclass Stub to implement those methods, as indicated in the 
+diagram.  
+</p>
+
+<p>
+Typically, the remote process would be managed by a service (because a 
+service can inform the system about the process and its connections to 
+other processes).  It would have both the interface file generated by 
+the {@code aidl} tool and the Stub subclass implementing the 
+RPC methods.  Clients of the service would have only the interface file
+generated by the {@code aidl} tool.
+</p>
+
+<p>
+Here's how a connection between a service and its clients is set up:
+</p>
+
+<ul>
+<li>Clients of the service (on the local side) would implement 
+<code>{@link android.content.ServiceConnection#onServiceConnected
+onServiceConnected()}</code> and 
+<code>{@link android.content.ServiceConnection#onServiceDisconnected
+onServiceDisconnected()}</code> methods so they can be notified 
+when a successful connection to the remote service is established, and 
+when it goes away.  They would then call
+<code>{@link android.content.Context#bindService bindService()}</code>
+to set up the connection.
+</li>  
+
+<li> 
+The service's <code>{@link android.app.Service#onBind onBind()}</code> 
+method would be implemented to either accept or reject the connection, 
+depending on the intent it receives (the intent passed to
+{@code bindService()}).  If the connection is accepted, it returns 
+an instance of the Stub subclass.
+</li>
+
+<li>If the service accepts the connection, Android calls the 
+client's {@code onServiceConnected()} method and passes it an IBinder 
+object, a proxy for the Stub subclass managed by the service.  Through
+the proxy, the client can make calls on the remote service.  
+</li>
+</ul>
+
+<p>
+This brief description omits some details of the RPC mechanism.  For more 
+information, see 
+<a href="{@docRoot}guide/developing/tools/aidl.html">Designing a Remote 
+Interface Using AIDL</a> and the {@link android.os.IBinder IBinder} class 
+description.
+</p>  
+
+
+<h3 id="tsafe">Thread-safe methods</h3>
+
+<p>
+In a few contexts, the methods you implement may be called from more 
+than one thread, and therefore must be written to be thread-safe.
+</p>
+
+<p>
+This is primarily true for methods that can be called remotely &mdash;
+as in the RPC mechanism discussed in the previous section.
+When a call on a method implemented in an IBinder object originates
+in the same process as the IBinder, the method is executed in the
+caller's thread.  However, when the call originates in another process, 
+the method is executed in a thread chosen from a pool of threads that 
+Android maintains in the same process as the IBinder; it's not executed 
+in the main thread of the process.  For example, whereas a service's 
+{@code onBind()} method would be called from the main thread of the 
+service's process, methods implemented in the object that {@code onBind()} 
+returns (for example, a Stub subclass that implements RPC methods) would 
+be called from threads in the pool. 
+Since services can have more than one client, more than one pool thread
+can engage the same IBinder method at the same time.  IBinder methods
+must, therefore, be implemented to be thread-safe.
+</p>  
+
+<p>
+Similarly, a content provider can receive data requests that originate in 
+other processes.  Although the ContentResolver and ContentProvider classes 
+hide the details of how the interprocess communication is managed, 
+ContentProvider methods that respond to those requests &mdash; the methods
+<code>{@link android.content.ContentProvider#query query()}</code>, 
+<code>{@link android.content.ContentProvider#insert insert()}</code>, 
+<code>{@link android.content.ContentProvider#delete delete()}</code>, 
+<code>{@link android.content.ContentProvider#update update()}</code>, and
+<code>{@link android.content.ContentProvider#getType getType()}</code>
+&mdash; are called from a pool of threads in the content provider's
+process, not the main thread of the process.  Since these methods
+may be called from any number of threads at the same time, they too must
+be implemented to be thread-safe.
+</p> 
+
+
+<h2 id="lcycles">Component Lifecycles</h2>
+
+<p>
+Application components have a lifecycle &mdash; a beginning when 
+Android instantiates them to respond to intents through to an end when 
+the instances are destroyed.  In between, they may sometimes be active 
+or inactive,or, in the case of activities, visible to the user or
+invisible.  This section discusses the lifecycles of activities,
+services, and broadcast receivers &mdash; including the states that they 
+can be in during their lifetimes, the methods that notify you of transitions
+between states, and the effect of those states on the possibility that
+the process hosting them might be terminated and the instances destroyed.
+</p> 
+
+
+<h3 id="actlife">Activity lifecycle</h3>
+
+<p>An activity has essentially three states:</p>
+
+<ul>
+<li> It is <em>active</em> or <em>running</em> when it is in the foreground of the 
+screen (at the top of the activity stack for the current task).  This is the
+activity that is the focus for the user's actions.</li>
+
+<li><p>It is <em>paused</em> if it has lost focus but is still visible to the user.
+That is, another activity lies on top of it and that activity either is transparent
+or doesn't cover the full screen, so some of the paused activity can show through. 
+A paused activity is completely alive (it maintains all state and member information 
+and remains attached to the window manager), but can be killed by the system in 
+extreme low memory situations.</p></li>
+
+<li><p>It is <em>stopped</em> if it is completely obscured by another activity.
+It still retains all state and member information.  However, it is no longer 
+visible to the user so its window is hidden and it will often be killed by the 
+system when memory is needed elsewhere.</p></li>
+</ul>
+
+<p>
+If an activity is paused or stopped, the system can drop it from memory either 
+by asking it to finish (calling its {@link android.app.Activity#finish finish()}
+method), or simply killing its process.  When it is displayed again 
+to the user, it must be completely restarted and restored to its previous state.
+</p>
+
+<p>
+As an activity transitions from state to state, it is notified of the change 
+by calls to the following protected methods:
+</p>
+
+<p style="margin-left: 2em">{@code void onCreate(Bundle <i>savedInstanceState</i>)}
+<br/>{@code void onStart()}
+<br/>{@code void onRestart()}
+<br/>{@code void onResume()}
+<br/>{@code void onPause()}
+<br/>{@code void onStop()}
+<br/>{@code void onDestroy()}</p>
+
+<p>
+All of these methods are hooks that you can override to do appropriate work 
+when the state changes.  All activities must implement 
+<code>{@link android.app.Activity#onCreate onCreate()}</code> to do the 
+initial setup when the object is first instantiated.  
+Many will also implement <code>{@link android.app.Activity#onPause onPause()}</code> 
+to commit data changes and otherwise prepare to stop interacting with the user.
+</p>
+
+<div class="sidebox-wrapper">
+<div class="sidebox-inner">
+<h2>Calling into the superclass</h2>
+<p>
+An implementation of any activity lifecycle method should always first 
+call the superclass version.  For example:
+</p>
+
+<pre>protected void onPause() {
+    super.onPause();
+    . . .
+}</pre>
+</div>
+</div> 
+
+
+<p>
+Taken together, these seven methods define the entire lifecycle of an 
+activity.  There are three nested loops that you can monitor by
+implementing them: 
+</p> 
+
+<ul>
+<li>The <b>entire lifetime</b> of an activity happens between the first call
+to <code>{@link android.app.Activity#onCreate onCreate()}</code> through to a 
+single final call to <code>{@link android.app.Activity#onDestroy}</code>.  
+An activity does all its initial setup of "global" state in {@code onCreate()}, 
+and releases all remaining resources in {@code onDestroy()}.  For example, 
+if it has a thread running in the background to download data from the network, 
+it may create that thread in {@code onCreate()} and then stop the thread in 
+{@code onDestroy()}.</li>
+
+<li><p>The <b>visible lifetime</b> of an activity happens between a call to
+<code>{@link android.app.Activity#onStart onStart()}</code> until a 
+corresponding call to <code>{@link android.app.Activity#onStop onStop()}</code>.  
+During this time, the user can see the activity on-screen, though it may not 
+be in the foreground and interacting with the user.  Between these two methods, 
+you can maintain resources that are needed to show the activity to the user.  
+For example, you can register a {@link android.content.BroadcastReceiver} in 
+{@code onStart()} to monitor for changes that impact your UI, and unregister 
+it in {@code onStop()} when the user can no longer see what you are displaying.  
+The {@code onStart()} and {@code onStop()} methods can be called multiple times, 
+as the activity alternates between being visible and hidden to the user.</p></li>
+
+<li><p>The <b>foreground lifetime</b> of an activity happens between a call 
+to <code>{@link android.app.Activity#onResume onResume()}</code> until a 
+corresponding call to <code>{@link android.app.Activity#onPause onPause()}</code>.  
+During this time, the activity is in front of all other activities on screen and 
+is interacting with the user.  An activity can frequently transition between the 
+resumed and paused states &mdash; for example, {@code onPause()} is called when 
+the device goes to sleep or when a new activity is started, {@code onResume()} 
+is called when an activity result or a new intent is delivered.  Therefore, the 
+code in these two methods should be fairly lightweight.</p></li>
+</ul>
+
+<p>
+The following diagram illustrates these loops and the paths an activity
+may take between states.  The colored ovals are major states the activity 
+can be in.  The square rectangles represent the callback methods you can implement 
+to perform operations when the activity transitions between states.
+<p>
+
+<p style="margin-left: 2em"><img src="{@docRoot}images/activity_lifecycle.png"
+alt="State diagram for an Android activity lifecycle." /></p>  
+  
+<p>
+The following table describes each of these methods in more detail and 
+locates it within the activity's overall lifecycle:
+</p>
+
+<table border="2" width="85%" frame="hsides" rules="rows">
+<colgroup align="left" span="3"></colgroup>
+<colgroup align="left"></colgroup>
+<colgroup align="center"></colgroup>
+<colgroup align="center"></colgroup>
+
+<thead>
+<tr><th colspan="3">Method</th> <th>Description</th> <th>Killable?</th> <th>Next</th></tr>
+</thead>
+
+<tbody>
+<tr>
+  <td colspan="3" align="left"><code>{@link android.app.Activity#onCreate onCreate()}</code></td>
+  <td>Called when the activity is first created.
+      This is where you should do all of your normal static set up &mdash;
+      create views, bind data to lists, and so on.  This method is passed
+      a Bundle object containing the activity's previous state, if that 
+      state was captured (see <a href="#actstate">Saving Activity State</a>, 
+      later).
+      <p>Always followed by {@code onStart()}.</p></td>
+  <td align="center">No</td>
+      <td align="center">{@code onStart()}</td>
+</tr>
+
+<tr>
+   <td rowspan="5" style="border-left: none; border-right: none;">&nbsp;&nbsp;&nbsp;&nbsp;</td>
+   <td colspan="2" align="left"><code>{@link android.app.Activity#onRestart 
+onRestart()}</code></td>
+   <td>Called after the activity has been stopped, just prior to it being
+       started again.
+       <p>Always followed by {@code onStart()}</p></td>
+   <td align="center">No</td>
+   <td align="center">{@code onStart()}</td>
+</tr>
+
+<tr>
+   <td colspan="2" align="left"><code>{@link android.app.Activity#onStart onStart()}</code></td>
+   <td>Called just before the activity becomes visible to the user.
+       <p>Followed by {@code onResume()} if the activity comes
+       to the foreground, or {@code onStop()} if it becomes hidden.</p></td>
+    <td align="center">No</td>
+    <td align="center">{@code onResume()} <br/>or<br/> {@code onStop()}</td>
+</tr>
+
+<tr>
+   <td rowspan="2" style="border-left: none;">&nbsp;&nbsp;&nbsp;&nbsp;</td>
+   <td align="left"><code>{@link android.app.Activity#onResume onResume()}</code></td>
+   <td>Called just before the activity starts
+       interacting with the user.  At this point the activity is at
+       the top of the activity stack, with user input going to it.
+       <p>Always followed by {@code onPause()}.</p></td>
+   <td align="center">No</td>
+   <td align="center">{@code onPause()}</td>
+</tr>
+
+<tr>
+   <td align="left"><code>{@link android.app.Activity#onPause onPause()}</code></td>
+   <td>Called when the system is about to start resuming another
+       activity.  This method is typically used to commit unsaved changes to
+       persistent data, stop animations and other things that may be consuming
+       CPU, and so on.  It should do whatever it does very quickly, because
+       the next activity will not be resumed until it returns.
+       <p>Followed either by {@code onResume()} if the activity
+       returns back to the front, or by {@code onStop()} if it becomes
+       invisible to the user.</td>
+   <td align="center"><strong style="color:#800000">Yes</strong></td>
+   <td align="center">{@code onResume()} <br/>or<br/> {@code onStop()}</td>
+</tr>
+
+<tr>
+   <td colspan="2" align="left"><code>{@link android.app.Activity#onStop onStop()}</code></td>
+   <td>Called when the activity is no longer visible to the user.  This
+       may happen because it is being destroyed, or because another activity 
+       (either an existing one or a new one) has been resumed and is covering it. 
+       <p>Followed either by {@code onRestart()} if
+       the activity is coming back to interact with the user, or by
+       {@code onDestroy()} if this activity is going away.</p></td>
+   <td align="center"><strong style="color:#800000">Yes</strong></td>
+   <td align="center">{@code onRestart()} <br/>or<br/> {@code onDestroy()}</td>
+</tr>
+
+<tr>
+   <td colspan="3" align="left"><code>{@link android.app.Activity#onDestroy 
+onDestroy()}</code></td>
+   <td>Called before the activity is destroyed.  This is the final call 
+       that the activity will receive.  It could be called either because the
+       activity is finishing (someone called <code>{@link android.app.Activity#finish 
+       finish()}</code> on it), or because the system is temporarily destroying this
+       instance of the activity to save space.  You can distinguish
+       between these two scenarios with the <code>{@link
+       android.app.Activity#isFinishing isFinishing()}</code> method.</td>
+   <td align="center"><strong style="color:#800000">Yes</strong></td>
+   <td align="center"><em>nothing</em></td>
+</tr>
+</tbody>
+</table>
+
+<p>
+Note the <b>Killable</b> column in the table above.  It indicates
+whether or not the system can kill the process hosting the activity 
+<em>at any time after the method returns, without executing another
+line of the activity's code</em>.  Three methods ({@code onPause()},
+{@code onStop()}, and {@code onDestroy()}) are marked "Yes."  Because
+{@code onPause()} is the first of the three, it's the only one that's
+guaranteed to be called before the process is killed &mdash; 
+{@code onStop()} and {@code onDestroy()} may not be.  Therefore, you 
+should use {@code onPause()} to write any persistent data (such as user 
+edits) to storage.
+</p>
+
+<p>
+Methods that are marked "No" in the <b>Killable</b> column protect the
+process hosting the activity from being killed from the moment they are 
+called.  Thus an activity is in a killable state, for example, from the 
+time {@code onPause()} returns to the time {@code onResume()} is called.
+It will not again be killable until {@code onPause()} again returns.
+</p>
+
+<p>
+As noted in a later section, <a href="#proclife">Processes and lifecycle</a>,
+an activity that's not technically "killable" by this definition might
+still be killed by the system &mdash; but that would happen only in
+extreme and dire circumstances when there is no other recourse.
+</p>
+
+
+<h4 id="actstate">Saving activity state</h4>
+
+<p>
+When the system, rather than the user, shuts down an activity to conserve 
+memory, the user may expect to return to the activity and find it in its 
+previous state.
+</p>
+
+<p>
+To capture that state before the activity is killed, you can implement
+an <code>{@link android.app.Activity#onSaveInstanceState 
+onSaveInstanceState()}</code> method for the activity.  Android calls this 
+method before making the activity vulnerable to being destroyed &mdash;
+that is, before {@code onPause()} is called.  It
+passes the method a {@link android.os.Bundle} object where you can record 
+the dynamic state of the activity as name-value pairs.  When the activity is 
+again started, the Bundle is passed both to {@code onCreate()} and to a
+method that's called after {@code onStart()}, <code>{@link 
+android.app.Activity#onRestoreInstanceState onRestoreInstanceState()}</code>, 
+so that either or both of them can recreate the captured state.
+</p>
+
+<p>
+Unlike {@code onPause()} and the other methods discussed earlier,
+{@code onSaveInstanceState()} and {@code onRestoreInstanceState()} are
+not lifecycle methods.  They are not always called.  For example, Android
+calls {@code onSaveInstanceState()} before the activity becomes 
+vulnerable to being destroyed by the system, but does not bother
+calling it when the instance is actually being destroyed by a user action
+(such as pressing the BACK key).  In that case, the user won't expect to
+return to the activity, so there's no reason to save its state.
+</p>
+
+<p>
+Because {@code onSaveInstanceState()} is not always called, you should 
+use it only to record the transient state of the activity, not to store 
+persistent data.  Use {@code onPause()} for that purpose instead.
+</p>
+
+
+<h4 id="coordact">Coordinating activities</h4>
+
+<p>
+When one activity starts another, they both experience lifecycle
+transitions.  One pauses and may stop, while the other starts up.
+On occasion, you may need to coordinate these activities, one with
+the other.
+</p>
+
+<p>
+The order of lifecycle callbacks is well defined,
+particularly when the two activities are in the same process:
+</p>
+
+<ol>
+<li>The current activity's {@code onPause()} method is called.</li>
+
+<li>Next, the starting activity's {@code onCreate()}, {@code onStart()},
+and {@code onResume()} methods are called in sequence.</li>
+
+<li>Then, if the starting activity is no longer visible
+on screen, its {@code onStop()} method is called.</li>
+</ol>
+
+
+<h3 id="servlife">Service lifecycle</h3>
+
+<p>
+A service can be used in two ways:
+</p>
+
+<ul>
+<li>It can be started and allowed to run until someone stops it or
+it stops itself.  In this mode, it's started by calling 
+<code>{@link android.content.Context#startService Context.startService()}</code>
+and stopped by calling 
+<code>{@link android.content.Context#stopService Context.stopService()}</code>.
+It can stop itself by calling 
+<code>{@link android.app.Service#stopSelf() Service.stopSelf()}</code> or
+<code>{@link android.app.Service#stopSelfResult Service.stopSelfResult()}</code>.  
+Only one {@code stopService()} call is needed to stop the service, no matter how 
+many times {@code startService()} was called.</li>
+
+<li><p>It can be operated programmatically using an interface that
+it defines and exports.  Clients establish a connection to the Service 
+object and use that connection to call into the service.  The connection is 
+established by calling  
+<code>{@link android.content.Context#bindService Context.bindService()}</code>,
+and is closed by calling
+<code>{@link android.content.Context#unbindService Context.unbindService()}</code>.
+Multiple clients can bind to the same service.
+If the service has not already been launched, {@code bindService()} can optionally
+launch it.
+</p></li>
+</ul>
+
+<p>
+The two modes are not entirely separate.  You can bind to a service that 
+was started with {@code startService()}.  For example, a background music
+service could be started by calling {@code startService()} with an Intent
+object that identifies the music to play.  Only later, possibly when the 
+user wants to exercise some control over the player or get information 
+about the current song, would an activity
+establish a connection to the service by calling {@code bindService()}.  
+In cases like this, {@code stopService()} 
+will not actually stop the service until the last binding is closed.
+</p>
+
+<p>
+Like an activity, a service has lifecycle methods that you can implement
+to monitor changes in its state.  But they are fewer than the activity 
+methods &mdash; only three &mdash; and they are public, not protected:
+</p>
+
+<p style="margin-left: 2em">{@code void onCreate()}
+<br/>{@code void onStart(Intent <i>intent</i>)}
+<br/>{@code void onDestroy()}</p>
+
+<p>
+By implementing these methods, you can monitor two nested loops of the
+service's lifecycle:
+</p>
+
+<ul>
+<li>The <b>entire lifetime</b> of a service happens between the time
+<code>{@link android.app.Service#onCreate onCreate()}</code> is called and
+the time <code>{@link android.app.Service#onDestroy}</code> returns.  
+Like an activity, a service does its initial setup in {@code onCreate()}, 
+and releases all remaining resources in {@code onDestroy()}.  For example, 
+a music playback service could create the thread where the music will be played  
+in {@code onCreate()}, and then stop the thread in {@code onDestroy()}.</li>
+
+<li><p>The <b>active lifetime</b> of a service begins with a call to 
+<code>{@link android.app.Service#onStart onStart()}</code>.  This method 
+is handed the Intent object that was passed to {@code startService()}.
+The music service would open the Intent to discover which music to 
+play, and begin the playback.</p>
+
+<p>
+There's no equivalent callback for when the service stops &mdash; no
+{@code onStop()} method.
+</p></li>
+</ul>
+
+<p>
+The {@code onCreate()} and {@code onDestroy()} methods are called for all
+services, whether they're started by 
+<code>{@link android.content.Context#startService Context.startService()}</code>
+or 
+<code>{@link android.content.Context#bindService Context.bindService()}</code>.
+However, {@code onStart()} is called only for services started by {@code
+startService()}.
+</p>
+
+<p>
+If a service permits others to
+bind to it, there are additional callback methods for it to implement:
+</p>
+
+<p style="margin-left: 2em">{@code IBinder onBind(Intent <i>intent</i>)}
+<br/>{@code boolean onUnbind(Intent <i>intent</i>)}
+<br/>{@code void onRebind(Intent <i>intent</i>)}</p>
+
+<p>
+The <code>{@link android.app.Service#onBind onBind()}</code> callback is passed 
+the Intent object that was passed to {@code bindService} and 
+<code>{@link android.app.Service#onUnbind onUnbind()}</code> is handed
+the intent that was passed to {@code unbindService()}.   
+If the service permits the binding, {@code onBind()} 
+returns the communications channel that clients use to interact with the service. 
+The {@code onUnbind()} method can ask for 
+<code>{@link android.app.Service#onRebind onRebind()}</code>
+to be called if a new client connects to the service.
+</p>
+
+<p>
+The following diagram illustrates the callback methods for a service.  
+Although, it separates services that are created via {@code startService}
+from those created by {@code bindService()}, keep in mind that any service,
+no matter how it's started, can potentially allow clients to bind to it,
+so any service may receive {@code onBind()} and {@code onUnbind()} calls.
+</p>
+
+<p style="margin-left: 2em"><img src="{@docRoot}images/service_lifecycle.png"
+alt="State diagram for Service callbacks." /></p>
+
+
+<h3 id="broadlife">Broadcast receiver lifecycle</h3>
+
+<p>
+A broadcast receiver has single callback method:
+</p>
+
+<p style="margin-left: 2em">{@code void onReceive(Context <i>curContext</i>, Intent <i>broadcastMsg</i>)}</p>
+
+<p>
+When a broadcast message arrives for the receiver, Android calls its 
+<code>{@link android.content.BroadcastReceiver#onReceive onReceive()}</code> 
+method and passes it the Intent object containing the message.  The broadcast 
+receiver is considered to be active only while it is executing this method.  
+When {@code onReceive()} returns, it is inactive.
+</p>
+
+<p>
+A process with an active broadcast receiver is protected from being killed. 
+But a process with only inactive components can be killed by the system at 
+any time, when the memory it consumes is needed by other processes.
+</p>
+
+<p>
+This presents a problem when the response to a broadcast message is time 
+consuming and, therefore, something that should be done in a separate thread, 
+away from the main thread where other components of the user interface run.
+If {@code onReceive()} spawns the thread and then returns, the entire process,
+including the new thread, is judged to be inactive (unless other application 
+components are active in the process), putting it in jeopardy of being killed.  
+The solution to this problem is for {@code onReceive()} to start a service 
+and let the service do the job, so the
+system knows that there is still active work being done in the process.
+</p>
+
+<p>
+The next section has more on the vulnerability of processes to being killed.
+</p>
+
+
+<h3 id="proclife">Processes and lifecycles</h3>
+
+<p>The Android system tries to maintain an application process for as
+long as possible, but eventually it will need to remove old processes when
+memory runs low.  To determine which processes to keep and which to kill, 
+Android places each process into an "importance hierarchy" based on the 
+components running in it and the state of those components.  Processes 
+with the lowest importance are eliminated first, then those with the next
+lowest, and so on.  There are five levels in the hierarchy.  The following 
+list presents them in order of importance:
+</p>
+
+<ol>
+
+<li>A <b>foreground process</b> is one that is required for
+what the user is currently doing.  A process is considered to be 
+in the foreground if any of the following conditions hold:
+
+<ul>
+<li>It is running an activity that the user is interacting with 
+(the Activity object's <code>{@link android.app.Activity#onResume 
+onResume()}</code> method has been called).</li>
+
+<li><p>It hosts a service that's bound 
+to the activity that the user is interacting with.</p></li>
+
+<li><p>It has a {@link android.app.Service} object that's executing
+one of its lifecycle callbacks (<code>{@link android.app.Service#onCreate 
+onCreate()}</code>, <code>{@link android.app.Service#onStart onStart()}</code>, 
+or <code>{@link android.app.Service#onDestroy onDestroy()}</code>).</p></li>
+
+<li><p>It has a {@link android.content.BroadcastReceiver} object that's 
+executing its <code>{@link android.content.BroadcastReceiver#onReceive 
+onReceive()}</code> method.</p></li>
+</ul>
+
+<p>
+Only a few foreground processes will exist at any given time.  They 
+are killed only as a last resort &mdash; if memory is so low that 
+they cannot all continue to run.  Generally, at that point, the device has
+reached a memory paging state, so killing some foreground processes is 
+required to keep the user interface responsive.
+</p></li>
+
+<li><p>A <b>visible process</b> is one that doesn't have any foreground
+components, but still can affect what the user sees on screen.  
+A process is considered to be visible if either of the following conditions 
+holds:</p>
+
+<ul>
+<li>It hosts an activity that is not in the foreground, but is still visible 
+to the user (its <code>{@link android.app.Activity#onPause onPause()}</code> 
+method has been called).  This may occur, for example, if the foreground 
+activity is a dialog that allows the previous activity to be seen behind it.</li>
+
+<li><p>It hosts a service that's bound to a visible activity.</p></li>
+</ul>
+
+<p>
+A visible process is considered extremely important and will not be killed 
+unless doing so is required to keep all foreground processes running.
+</p></li>
+
+<li><p>A <b>service process</b> is one that is running a service that 
+has been started with the 
+<code>{@link android.content.Context#startService startService()}</code>
+method and that does not fall into either of the two higher categories.  
+Although service processes are not directly tied to anything the 
+user sees, they are generally doing things that the user cares about (such 
+as playing an mp3 in the background or downloading  data on the network), 
+so the system keeps them running unless there's not enough 
+memory to retain them along with all foreground and visible processes.  
+</p></li>
+
+<li><p>A <b>background process</b> is one holding an activity
+that's not currently visible to the user  (the Activity object's
+<code>{@link android.app.Activity#onStop onStop()}</code> method has been called).  
+These processes have no direct impact on the user experience, and can be killed 
+at any time to reclaim memory for a foreground, visible, or service process.  
+Usually there are many background processes running, so they are kept in an 
+LRU (least recently used) list to ensure that the process with the activity that 
+was most recently seen by the user is the last to be killed.
+If an activity implements its lifecycle methods correctly, and captures its current 
+state, killing its process will not have a deleterious effect on the user experience. 
+</p></li>
+
+<li><p>An <b>empty process</b> is one that doesn't hold any active application
+components.  The only reason to keep such a process around is as a cache to
+improve startup time the next time a component needs to run in it.  The system 
+often kills these processes in order to balance overall system resources between 
+process caches and the underlying kernel caches.</p></li>
+
+</ol>
+
+<p>
+Android ranks a process at the highest level it can, based upon the
+importance of the components currently active in the process.  For example, 
+if a process hosts a service and a visible activity, the process will be 
+ranked as a visible process, not a service process.
+</p>
+
+<p>
+In addition, a process's ranking may be increased because other processes are
+dependent on it.  A process that is serving another process can never be 
+ranked lower than the process it is serving.  For example, if a content 
+provider in process A is serving a client in process B, or if a service in 
+process A is bound to a component in process B, process A will always be 
+considered at least as important as process B.
+</p> 
+
+<p>
+Because a process running a service is ranked higher than one with background
+activities, an activity that initiates a long-running operation might do
+well to start a service for that operation, rather than simply spawn a thread
+&mdash; particularly if the operation will likely outlast the activity.  
+Examples of this are playing music in the background 
+and uploading a picture taken by the camera to a web site.  Using a service
+guarantees that the operation will have at least "service process" priority,
+regardless of what happens to the activity.  As noted in the 
+<a href="#broadlife">Broadcast receiver lifecycle</a> section earlier, this
+is the same reason that broadcast receivers should employ services rather
+than simply put time-consuming operations in a thread.
+</p>
diff --git a/docs/html/guide/topics/geo/lbs.jd b/docs/html/guide/topics/geo/lbs.jd
new file mode 100644
index 0000000..981f6fe
--- /dev/null
+++ b/docs/html/guide/topics/geo/lbs.jd
@@ -0,0 +1,73 @@
+page.title=Location-based Service APIs
+@jd:body
+
+<p>The Android SDK includes two packages that provide Android's primary support
+for building location-based services:
+{@link android.location} and com.google.android.maps. 
+Please read on below for a brief introduction to each package.</p>
+
+<h2>android.location</h2>
+
+<p>This package contains several classes related to
+location services in the Android platform. Most importantly, it introduces the 
+{@link android.location.LocationManager}
+service, which provides an API to determine location and bearing if the
+underlying device (if it supports the service). The LocationManager 
+should <strong>not</strong> be
+instantiated directly; rather, a handle to it should be retrieved via
+{@link android.content.Context#getSystemService(String)
+getSystemService(Context.LOCATION_SERVICE)}.</p>
+
+<p>Once your application has a handle to the LocationManager, your application
+will be able to do three things:</p>
+
+<ul>
+    <li>Query for the list of all LocationProviders known to the
+    LocationManager for its last known location.</li>
+    <li>Register/unregister for periodic updates of current location from a
+    LocationProvider (specified either by Criteria or name).</li>
+    <li>Register/unregister for a given Intent to be fired if the device comes
+    within a given proximity (specified by radius in meters) of a given
+    lat/long.</li>
+</ul>
+
+<p>However, during initial development, you may not have access to real 
+data from a real location provider (Network or GPS). So it may be necessary to
+spoof some data for your application, with some mock location data.</p>
+
+<p class="note"><strong>Note:</strong> If you've used mock LocationProviders in
+previous versions of the SDK (m3/m5), you can no longer provide canned LocationProviders
+in the /system/etc/location directory. These directories will be wiped during boot-up.
+Please follow the new procedures below.</p>
+
+
+<h3>Providing Mock Location Data</h3>
+
+<p>When testing your application on the Android emulator, there are a couple different
+ways to send it some spoof location data: with the DDMS tool or the "geo" command.</p>
+
+<h4 id="ddms">Using DDMS</h4>
+<p>With the DDMS tool, you can simulate location data a few different ways:</p>
+<ul>
+    <li>Manually send individual longitude/latitude coordinates to the device.</li>
+    <li>Use a GPX file describing a route for playback to the device.</li>
+    <li>Use a KML file describing individual placemarks for sequenced playback to the device.</li>
+</ul>
+<p>For more information on using DDMS to spoof location data, see the 
+<a href="{@docRoot}reference/ddms.html#emulator-control">Using DDMS guide</a>.
+
+<h4 id="geo">Using the "geo" command</h4>
+<p>Launch your application in the Android emulator and open a terminal/console in
+your SDK's <code>/tools</code> directory. Now you can use:</p>
+<ul><li><code>geo fix</code> to send a fixed geo-location.
+	<p>This command accepts a longitude and latitude in decimal degrees, and
+	an optional altitude in meters. For example:</p>
+	<pre>geo fix -121.45356 46.51119 4392</pre>
+    </li>
+    <li><code>geo nmea</code> to send an NMEA 0183 sentence.
+	<p>This command accepts a single NMEA sentence of type '$GPGGA' (fix data) or '$GPRMC' (transit data).
+	For example:</p>
+	<pre>geo nmea $GPRMC,081836,A,3751.65,S,14507.36,E,000.0,360.0,130998,011.3,E*62</pre>
+    </li>
+</ul>
+
diff --git a/docs/html/guide/topics/geo/mapkey.jd b/docs/html/guide/topics/geo/mapkey.jd
new file mode 100644
index 0000000..6442940
--- /dev/null
+++ b/docs/html/guide/topics/geo/mapkey.jd
@@ -0,0 +1,28 @@
+page.title=Obtaining a MapView API Key
+@jd:body
+
+<p>MapView is a very useful class that lets you easily integrate Google Maps into your application. It provides built-in map downloading, rendering, and caching, as well as a variety of display options and controls. It provides a wrapper around the Google Maps API that lets your application request and manipulate Google Maps data through class methods, and it lets you work with Maps data as you would other types of Views. </p>
+
+<p>Because MapView gives you access to Google Maps data, you need to register your application with the Google Maps service and agree to the applicable Terms of Service, before your MapView will be able to obtain data from Google Maps. This will apply whether you are developing your application on the emulator or preparing your application for deployment to mobile devices. </p>
+
+<p>Registering your application is simple, and has two parts: </p>
+
+<ol>
+<li>Registering a public key fingerprint from the certificate that you will use to sign the .apk. The registration service then provides you a Maps API Key that is associated with your application's signer certificate. </li>
+<li>Adding the Maps API Key to a special attribute of the MapView element &mdash; <code>android:apiKey</code>. You can use the same Maps API Key for any MapView in any application, provided that the application's .apk is signed with the certificate whose fingerprint you registered with the service. </li>
+</ol>
+
+<p>Once you have registered your application as described above, your MapView will be able to retrieve data from the Google Maps servers. </p>
+
+<div class="special">
+<p>The MapView registration service is not yet active and Google Maps is not yet enforcing the Maps API Key requirement. The registration service will be activated soon, so that MapViews in any application deployed to a mobile device will require registration and a valid Maps API Key.</p>
+
+<p>As soon as the registration service becomes available, this page (<a href="http://code.google.com/android/toolbox/apis/mapkey.html">http://code.google.com/android/toolbox/apis/mapkey.html</a>) will be updated with details about how and where to register and how to add your Maps API Key to your application. </p>
+
+<p>In the meantime, you can continue developing your MapView without registration, provided that you:</p>
+<ol type="a">
+<li>Add the attribute "android:apiKey" to the MapView element in your layout XML, with any value. Or</li>
+<li>Include an arbitrary string in the <code>apikey</code> parameter of the MapView constructor, if creating the MapView programmatically. </li>
+</ol>
+
+<p>When the Maps API Key checking is activated in the service, any MapViews that do not have a properly registered apiKey will stop working.  The map data (tile images) of the MapView will never load (even if the device is on the network). In this case, go to the page linked above and read about how to register your certificate fingerprint and obtain a Maps API Key. </p>
diff --git a/docs/html/guide/topics/graphics/2d-graphics.jd b/docs/html/guide/topics/graphics/2d-graphics.jd
new file mode 100644
index 0000000..a72962e
--- /dev/null
+++ b/docs/html/guide/topics/graphics/2d-graphics.jd
@@ -0,0 +1,480 @@
+page.title=2D Graphics
+parent.title=2D and 3D Graphics
+parent.link=index.html
+@jd:body
+
+
+<div id="qv-wrapper">
+  <div id="qv">
+    <h2>In this document</h2>
+    <ol>
+      <li><a href="#drawables">Drawables</a>
+        <ol>
+          <li><a href="#drawable-images">Creating from resource images</a></li>
+          <li><a href="#drawable-xml">Creating from resource XML</a></li>
+        </ol>
+      </li>
+      <li><a href="#shape-drawable">ShapeDrawable</a></li>
+   <!--   <li><a href="#state-list">StateListDrawable</a></li> -->
+      <li><a href="#nine-patch">NinePatchDrawable</a></li>
+      <li><a href="#tween-animation">Tween Animation</a></li>
+      <li><a href="#frame-animation">Frame Animation</a></li>
+    </ol>
+  </div>
+</div>
+
+<p>Android offers a custom 2D graphics library for drawing and animating shapes and images.
+The {@link android.graphics.drawable} and {@link android.view.animation}
+packages are where you'll find the common classes used for drawing and animating in two-dimensions.
+</p>
+
+<p>This document offers an introduction to drawing graphics in your Android application.
+We'll discuss the basics of using Drawable objects to draw
+graphics, how to use a couple subclasses of the Drawable class, and how to
+create animations that either tween (move, stretch, rotate) a single graphic
+or animate a series of graphics (like a roll of film).</p>
+
+
+<h2 id="drawables">Drawables</h2>
+
+<p>A {@link android.graphics.drawable.Drawable} is a general abstraction for "something that can be drawn."
+You'll discover that the Drawable class extends to define a variety of specific kinds of drawable graphics,
+including {@link android.graphics.drawable.BitmapDrawable}, {@link android.graphics.drawable.ShapeDrawable},
+{@link android.graphics.drawable.PictureDrawable}, {@link android.graphics.drawable.LayerDrawable}, and several more.
+Of course, you can also extend these to define your own custom Drawable objects that behave in unique ways.</p>
+
+<p>There are three ways to define and instantiate a Drawable: using an image saved in your project resouces;
+using an XML file that defines the Drawable properties; or using the normal class constructors. Below, we'll discuss
+each the first two techniques (using constructors is nothing new for an experienced developer).</p>
+
+
+<h3 id="drawables-from-images">Creating from resource images</h3>
+
+<p>A simple way to add graphics to your application is by referencing an image file from your project resources. 
+Supported file types are PNG (preferred), JPG (acceptable) and GIF (discouraged). This technique would 
+obviously be preferred for application icons, logos, or other graphics such as those used in a game.</p>
+
+<p>To use an image resource, just add your file to the <code>res/drawable/</code> directory of your project.
+From there, you can reference it from your code or your XML layout. 
+Either way, it is referred using a resource ID, which is the file name without the file type
+extension (E.g., <code>my_image.png</code> is referenced as <var>my_image</var>).</p>
+
+<h4>Example code</h4>
+<p>The following code snippet demonstrates how to build an {@link android.widget.ImageView} that uses an image
+from drawable resources and add it to the layout.</p>
+<pre>
+LinearLayout mLinearLayout;
+
+protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+
+    // Create a LinearLayout in which to add the ImageView
+    mLinearLayout = new LinearLayout(this);
+
+    // Instantiate an ImageView and define its properties
+    ImageView i = new ImageView(this);
+    i.setImageResource(R.drawable.my_image);
+    i.setAdjustViewBounds(true); // set the ImageView bounds to match the Drawable's dimensions
+    i.setLayoutParams(new Gallery.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
+
+    // Add the ImageView to the layout and set the layout as the content view
+    mLinearLayout.addView(i);
+    setContentView(mLinearLayout);
+}
+</pre>
+<p>In other cases, you may want to handle your image resource as a 
+{@link android.graphics.drawable.Drawable} object.
+To do so, create a Drawable from the resource like so:
+<pre>Drawable myImage = Resources.getDrawable(R.drawable.my_image);</pre>
+
+<p class="caution"><strong>Caution:</strong> Each unique resource in your project can maintain only one
+state, no matter how many different objects you may instantiate for it. For example, if you instantiate two
+Drawable objects from the same image resource, then change a property (such as the alpha) for one of the 
+Drawables, then it will also affect the other. So when dealing with multiple instances of an image resource, 
+instead of directly transforming the Drawable, you should perform a <a href="#tween-animation">tween animation</a>.</p>
+
+
+<h4>Example XML</h4>
+<p>The XML snippet below shows how to add a resource Drawable to an 
+{@link android.widget.ImageView} in the XML layout (with some red tint just for fun).
+<pre>
+&lt;ImageView   
+  android:layout_width="wrap_content"
+  android:layout_height="wrap_content"
+  android:tint="#55ff0000"
+  android:src="@drawable/my_image"/>
+</pre>
+<p>For more information on using project resources, read about
+  <a href="{@docRoot}guide/topics/resources/index.html">Resources and Assets</a>.</p>
+
+
+<h3 id="drawables-from-xml">Creating from resource XML</h3>
+
+<p>By now, you should be familiar with Android's principles of developing a
+<a href="{@docRoot}guide/topics/ui/index.html">User Interface</a>. Hence, you understand the power
+and flexibility inherent in defining objects in XML. This philosophy caries over from Views to Drawables.
+If there is a Drawable object that you'd like to create, which is not initially dependent on variables defined by
+your applicaton code or user interaction, then defining the Drawable in XML is a good option.
+Even if you expect your Drawable to change its properties during the user's experience with your application, 
+you should consider defining the object in XML, as you can always modify properties once it is instantiated.</p>
+
+<p>Once you've defined your Drawable in XML, save the file in the <code>res/drawable/</code> directory of
+your project. Then, retrieve and instantiate the object by calling
+{@link android.content.res.Resources#getDrawable(int) Resources.getDrawable()}, passing it the resource ID 
+of your XML file. (See the <a href="#drawable-xml-example">example below</a>.)</p>
+
+<p>Any Drawable subclass that supports the <code>inflate()</code> method can be defined in 
+XML and instantiated by your application. 
+Each Drawable that supports XML inflation utilizes specific XML attributes that help define the object
+properties (see the class reference to see what these are). See the class documentation for each
+Drawable subclass for information on how to define it in XML.
+
+<h4 id="drawable-xml-example">Example</h4>
+<p>Here's some XML that defines a TransitionDrawable:</p>
+<pre>
+&lt;transition xmlns:android="http://schemas.android.com/apk/res/android">
+  &lt;item android:drawable="&#64;drawable/image_expand">
+  &lt;item android:drawable="&#64;drawable/image_collapse">
+&lt;/transition>
+</pre>
+
+<p>With this XML saved in the file <code>res/drawable/expand_collapse.xml</code>, 
+the following code will instantiate the TransitionDrawable and set it as the content of an ImageView:</p>
+<pre>
+Resources res = mContext.getResources();
+TransitionDrawable transition = (TransitionDrawable) res.getDrawable(R.drawable.expand_collapse);
+ImageView image = (ImageView) findViewById(R.id.toggle_image);
+image.setImageDrawable(transition);
+</pre>
+<p>Then this transition can be run forward (for 1 second) with:</p>
+<pre>transition.startTransition(1000);</pre>
+
+<p>Refer to the Drawable classes listed above for more information on the XML attributes supported by each.</p>
+
+
+
+<h2 id="shape-drawable">ShapeDrawable</h2>
+
+<p>When you want to dynamically draw some two-dimensional graphics, a {@link android.graphics.drawable.ShapeDrawable}
+object will probably suit your needs. With a ShapeDrawable, you can programmatically draw
+primitive shapes and style them in any way imaginable.</p>
+
+<p>A ShapeDrawable is an extension of {@link android.graphics.drawable.Drawable}, so you can use one where ever
+a Drawable is expected &mdash; perhaps for the background of a View, set with 
+{@link android.view.View#setBackgroundDrawable(android.graphics.drawable.Drawable) setBackgroundDrawable()}. 
+Of course, you can also draw your shape as its own custom {@link android.view.View}, 
+to be added to your layout however you please.
+Because the ShapeDrawable has its own <code>draw()</code> method, you can create a subclass of View that 
+draws the ShapeDrawable during the <code>View.onDraw()</code> method.
+Here's a basic extension of the View class that does just this, to draw a ShapeDrawable as a View:</p>
+<pre>
+public class CustomDrawableView extends View {
+    private ShapeDrawable mDrawable;
+
+    public CustomDrawableView(Context context) {
+        super(context);
+
+        int x = 10;
+        int y = 10;
+        int width = 300;
+        int height = 50;
+
+        mDrawable = new ShapeDrawable(new OvalShape());
+        mDrawable.getPaint().setColor(0xff74AC23);
+        mDrawable.setBounds(x, y, x + width, y + height);
+    }
+
+    protected void onDraw(Canvas canvas) {
+        mDrawable.draw(canvas);
+    }
+}
+</pre>
+
+<p>In the constructor, a ShapeDrawable is defines as an {@link android.graphics.drawable.shapes.OvalShape}.
+It's then given a color and the bounds of the shape are set. If you do not set the bounds, then the
+shape will not be drawn, whereas if you don't set the color, it will default to black.</p>
+<p>With the custom View defined, it can be drawn any way you like. With the sample above, we can
+draw the shape progammatically in an Activity:</p>
+<pre>
+CustomDrawableView mCustomDrawableView;
+
+protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    mCustomDrawableView = new CustomDrawableView(this);
+    
+    setContentView(mCustomDrawableView);
+}
+</pre>
+
+<p>If you'd like to draw this custom drawable from the XML layout instead of from the Activity, 
+then the CustomDrawable class must override the {@link android.view.View#View(android.content.Context, android.util.AttributeSet) View(Context, AttributeSet)} constructor, which is called when 
+instantiating a View via inflation from XML. Then add a CustomDrawable element to the XML, 
+like so:</p>
+<pre>
+&lt;com.example.shapedrawable.CustomDrawableView
+    android:layout_width="fill_parent" 
+    android:layout_height="wrap_content" 
+    />
+</pre>
+
+<p>The ShapeDrawable class (like many other Drawable types in the {@link android.graphics.drawable} package)
+allows you to define various properties of the drawable with public methods. 
+Some properties you might want to adjust include
+alpha transparency, color filter, dither, opacity and color.</p>
+
+<!-- TODO
+<h2 id="state-list">StateListDrawable</h2>
+
+<p>A StateListDrawable is an extension of the DrawableContainer class, making it  little different. 
+The primary distinction is that the 
+StateListDrawable manages a collection of images for the Drawable, instead of just one. 
+This means that it can switch the image when you want, without switching objects. However, the 
+intention of the StateListDrawable is to automatically change the image used based on the state
+of the object it's attached to.
+-->
+
+<h2 id="nine-patch">NinePatchDrawable</h2>
+
+<p>A {@link android.graphics.drawable.NinePatchDrawable} graphic is a stretchable bitmap image, which Android
+will automatically resize to accomodate the contents of the View in which you have placed it as the background. 
+An example use of a NinePatch is the backgrounds used by standard Android buttons &mdash;
+buttons must stretch to accommodate strings of various lengths. A NinePatch drawable is a standard PNG 
+image that includes an extra 1-pixel-wide border. It must be saved with the extension <code>.9.png</code>,
+and saved into the <code>res/drawable/</code> directory of your project.
+</p>
+<p>
+    The border is used to define the stretchable and static areas of 
+    the image. You indicate a stretchable section by drawing one (or more) 1-pixel-wide 
+    black line(s) in the left and top part of the border. (You can have as 
+    many stretchable sections as you want.) The relative size of the stretchable 
+    sections stays the same, so the largest sections always remain the largest.
+</p>
+<p>
+    You can also define an optional drawable section of the image (effectively, 
+    the padding lines) by drawing a line on the right and bottom lines. 
+    If a View object sets the NinePatch as its background and then specifies the 
+    View's text, it will stretch itself so that all the text fits inside only
+    the area designated by the right and bottom lines (if included). If the 
+    padding lines are not included, Android uses the left and top lines to 
+    define this drawable area.
+</p>
+<p>To clarify the difference between the different lines, the left and top lines define 
+which pixels of the image are allowed to be replicated in order to strech the image.
+The bottom and right lines define the relative area within the image that the contents
+of the View are allowed to lie within.</p>
+<p>
+    Here is a sample NinePatch file used to define a button:
+</p>
+    <img src="{@docRoot}images/ninepatch_raw.png" alt="" />
+
+<p>This NinePatch defines one stretchable area with the left and top lines
+and the drawable area with the bottom and right lines. In the top image, the dotted grey
+lines identify the regions of the image that will be replicated in order to strech the image. The pink
+rectangle in the bottom image identifies the region in which the contents of the View are allowed.
+If the contents don't fit in this region, then the image will be stretched so that they do.
+</p>
+
+<p>The <a href="{@docRoot}guide/developing/tools/draw9patch.html">Draw 9-patch</a> tool offers 
+   an extremely handy way to create your NinePatch images, using a WYSIWYG graphics editor. It 
+even raises warnings if the region you've defined for the stretchable area is at risk of
+producing drawing artifacts as a result of the pixel replication.
+</p>
+
+<h3>Example XML</h3>
+
+<p>Here's some sample layout XML that demonstrates how to add a NinePatch image to a
+couple of buttons. (The NinePatch image is saved as <code>res/drawable/my_button_background.9.png</code>
+<pre>
+&lt;Button id="@+id/tiny"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_centerInParent="true"
+        android:text="Tiny"
+        android:textSize="8sp"
+        android:background="@drawable/my_button_background"/&gt;
+
+&lt;Button id="@+id/big"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerInParent="true"
+        android:text="Biiiiiiig text!"
+        android:textSize="30sp"
+        android:background="@drawable/my_button_background"/&gt;
+</pre>
+<p>Note that the width and height are set to "wrap_content" to make the button fit neatly around the text.
+</p>
+
+<p>Below are the two buttons rendered from the XML and NinePatch image shown above. 
+Notice how the width and height of the button varies with the text, and the background image 
+stretches to accommodate it.
+</p>
+
+<img src="{@docRoot}images/ninepatch_examples.png" alt=""/>
+
+
+<h2 id="tween-animation">Tween Animation</h2>
+
+<p>A tween animation can perform a series of simple transformations (position, size, rotation, and transparency) on
+the contents of a View object. So, if you have a TextView object, you can move, rotate, grow, or shrink the text. 
+If it has a background image, the background image will be transformed along with the text.
+The {@link android.view.animation animation package} provides all the classes used in a tween animation.</p>
+
+<p>A sequence of animation instructions defines the twen animation, defined by either XML or Android code.
+Like defining a layout, an XML file is recommended because it's more readable, reusable, and swappable 
+than hard-coding the animation. In the example below, we use XML. (To learn more about defining an animation 
+in your application code, instead of XML, refer to the 
+{@link android.view.animation.AnimationSet} class and other {@link android.view.animation.Animation} subclasses.)</p>
+
+<p>The animation instructions define the transformations that you want to occur, when they will occur, 
+and how long they should take to apply. Transformations can be sequential or simultaneous &mdash;
+for example, you can have the contents of a TextView move from left to right, and then 
+rotate 180 degrees, or you can have the text move and rotate simultaneously. Each transformation 
+takes a set of parameters specific for that transformation (starting size and ending size
+for size change, starting angle and ending angle for rotation, and so on), and
+also a set of common parameters (for instance, start time and duration). To make
+several transformations happen simultaneously, give them the same start time;
+to make them sequential, calculate the start time plus the duration of the preceding transformation.
+</p>
+
+<p>The animation XML file belongs in the <code>res/anim/</code> directory of your Android project.
+The file must have a single root element: this will be either a single <code>&lt;alpha&gt;</code>,
+<code>&lt;scale&gt;</code>, <code>&lt;translate&gt;</code>, <code>&lt;rotate&gt;</code>, interpolator element, 
+or <code>&lt;set&gt;</code> element that holds groups of these elements (which may include another
+<code>&lt;set&gt;</code>). By default, all animation instructions are applied simultaneously. 
+To make them occur sequentially, you must specify the <code>startOffset</code> attribute, as shown in the example below.
+</p>
+
+<p>The following XML from one of the ApiDemos is used to stretch, 
+then simultaneously spin and rotate a View object.
+</p>
+<pre>
+&lt;set android:shareInterpolator="false"&gt;
+   &lt;scale
+          android:interpolator="&#64;android:anim/accelerate_decelerate_interpolator"
+          android:fromXScale="1.0"
+          android:toXScale="1.4"
+          android:fromYScale="1.0"
+          android:toYScale="0.6"
+          android:pivotX="50%"
+          android:pivotY="50%"
+          android:fillAfter="false"
+          android:duration="700" /&gt;
+   &lt;set android:interpolator="&#64;android:anim/decelerate_interpolator"&gt;
+      &lt;scale
+             android:fromXScale="1.4" 
+             android:toXScale="0.0"
+             android:fromYScale="0.6"
+             android:toYScale="0.0" 
+             android:pivotX="50%" 
+             android:pivotY="50%" 
+             android:startOffset="700"
+             android:duration="400" 
+             android:fillBefore="false" /&gt;
+      &lt;rotate 
+             android:fromDegrees="0" 
+             android:toDegrees="-45"
+             android:toYScale="0.0" 
+             android:pivotX="50%" 
+             android:pivotY="50%"
+             android:startOffset="700"
+             android:duration="400" /&gt;
+   &lt;/set&gt;
+&lt;/set&gt;
+</pre>
+<p>Screen coordinates (not used in this example) are (0,0) at the upper left hand corner, 
+and increase as you go down and to the right.</p>
+
+<p>Some values, such as pivotX, can be specified relative to the object itself or relative to the parent. 
+Be sure to use the proper format for what you want ("50" for 50% relative to the parent, or "50%" for 50% 
+relative to itself).</p>
+
+<p>You can determine how a transformation is applied over time by assigning an 
+{@link android.view.animation.Interpolator}. Android includes 
+several Interpolator subclasses that specify various speed curves: for instance, 
+{@link android.view.animation.AccelerateInterpolator} tells 
+a transformation to start slow and speed up. Each one has an attribute value that can be applied in the XML.</p>
+
+<p>With this XML saved as <code>hyperspace_jump.xml</code> in the <code>res/anim/</code> directory of the
+project, the following Java code will reference it and apply it to an {@link android.widget.ImageView} object
+from the layout.
+</p>
+<pre>
+ImageView spaceshipImage = (ImageView) findViewById(R.id.spaceshipImage);
+Animation hyperspaceJumpAnimation = AnimationUtils.loadAnimation(this, R.anim.hyperspace_jump);
+spaceshipImage.startAnimation(hyperspaceJumpAnimation);
+</pre>
+
+<p>As an alternative to <code>startAnimation()</code>, you can define a starting time for the animation with
+<code>{@link android.view.animation.Animation#setStartTime(long) Animation.setStartTime()}</code>, 
+then assign the animation to the View with
+<code>{@link android.view.View#setAnimation(android.view.animation.Animation) View.setAnimation()}</code>.
+</p>
+
+<p>For more information on the XML syntax, available tags and attributes, see the discussion on animation 
+in the <a href="{@docRoot}guide/topics/resources/available-resources.html#animation">Available Resources</a>.</p>
+
+<p class="note"><strong>Note:</strong> Regardless of how your animation may move or resize, the bounds of the 
+View that holds your animation will not automatically adjust to accomodate it. Even so, the animation will still
+be drawn beyond the bounds of its View and will not be clipped. However, clipping <em>will occur</em>
+if the animation exceeds the bounds of the parent View.</p>
+
+
+<h2 id="frame-animation">Frame Animation</h2>
+
+<p>This is a traditional animation in the sense that it is created with a sequence of different
+images, played in order, like a roll of film. The {@link android.graphics.drawable.AnimationDrawable}
+class is the basis for frame animations.</p>
+
+<p>While you can define the frames of an animation in your code, using the 
+{@link android.graphics.drawable.AnimationDrawable} class API, it's more simply accomplished with a single XML 
+file that lists the frames that compose the animation. Like the tween animation above, the XML file for this kind 
+of animation belongs in the <code>res/anim/</code> directory of your Android project. In this case, 
+the instructions are the order and duration for each frame of the animation.</p>
+
+<p>The XML file consists of an <code>&lt;animation-list></code> element as the root node and a series
+of child <code>&lt;item></code> nodes that each define a frame: a drawable resource for the frame and the frame duration.
+Here's an example XML file for a frame-by-frame animation:</p>
+<pre>
+&lt;animation-list xmlns:android="http://schemas.android.com/apk/res/android"
+    android:oneshot="true">
+    &lt;item android:drawable="&#64;drawable/rocket_thrust1" android:duration="200" />
+    &lt;item android:drawable="&#64;drawable/rocket_thrust2" android:duration="200" />
+    &lt;item android:drawable="&#64;drawable/rocket_thrust3" android:duration="200" />
+&lt;/animation-list>
+</pre>
+
+<p>This animation runs for just three frames. By setting the <code>android:oneshot</code> attribute of the 
+list to <var>true</var>, it will cycle just once then stop and hold on the last frame. If it is set <var>false</var> then
+the animation will loop. With this XML saved as <code>rocket_thrust.xml</p> in the <code>res/anim/</code> directory
+of the project, it can be added as the background image to a View and then called to play. Here's an example Activity,
+in which the animation is added to an {@link android.widget.ImageView} and then animated when the screen is touched:</p>
+<pre>
+AnimationDrawable rocketAnimation;
+
+public void onCreate(Bundle savedInstanceState) {
+  super.onCreate(savedInstanceState);
+  setContentView(R.layout.main);
+
+  ImageView rocketImage = (ImageView) findViewById(R.id.rocket_image);
+  rocketImage.setBackgroundResource(R.anim.rocket_thrust);
+  rocketAnimation = (AnimationDrawable) rocketImage.getBackground();
+}
+
+public boolean onTouchEvent(MotionEvent event) {
+  if (event.getAction() == MotionEvent.ACTION_DOWN) {
+    rocketAnimation.start();
+    return true;
+  }
+  return super.onTouchEvent(event);
+}
+</pre>
+<p>It's important to note that the <code>start()</code> method called on the AnimationDrawable cannot be
+called during the <code>onCreate()</code> method of your Activity, because the AnimationDrawable is not yet fully attached
+to the window. If you want to play the animation immediately, without
+requiring interaction, then you might want to call it from the 
+<code>{@link android.app.Activity#onWindowFocusChanged(boolean) onWindowFocusChanged()}</code> method in 
+your Activity, which will get called when Android brings your window into focus.</p> 
+
+
diff --git a/docs/html/guide/topics/graphics/index.jd b/docs/html/guide/topics/graphics/index.jd
new file mode 100644
index 0000000..bc2a8bf
--- /dev/null
+++ b/docs/html/guide/topics/graphics/index.jd
@@ -0,0 +1,203 @@
+page.title=Graphics
+@jd:body
+
+<div id="qv-wrapper">
+  <div id="qv">
+  <h2>In this document</h2>
+  <ol>
+    <li><a href="#options">Consider your Options</a></li>
+    <li><a href="#draw-to-view">Simple Graphics Inside a View</a></li>
+    <li><a href="#draw-with-canvas">Draw with a Canvas</a>
+    <ol>
+      <li><a href="#on-view">On a View</a></li>
+      <li><a href="#on-surfaceview">On a SurfaceView</a></li>
+    </ol>
+    </li>
+  </ol>
+  </div>
+</div>
+<p>Android graphics are powered by a custom 2D graphics library and OpenGL ES 1.0
+for high performance 3D graphics. The most common 2D graphics APIs can be found in the 
+{@link android.graphics.drawable drawable package}. OpenGL APIs are available
+from the Khronos {@link javax.microedition.khronos.opengles OpenGL ES package},
+plus some Android {@link android.opengl OpenGL utilities}.</p>
+
+<p>When starting a project, it's important to consider exactly what your graphical demands will be. 
+Varying graphical tasks are best accomplished with varying techniques. For example, graphics and animations
+for a rather static application should be implemented much differently than graphics and animations
+for an interactive game or 3D rendering.</p>
+
+<p>Here, we'll discuss a few of the options you have for drawing graphics on Android, 
+and which tasks they're best suited for.</p>
+
+<p>If you're specifically looking for information on drawing 3D graphics, this page won't
+help a lot. However, the information below, on <a href="#drawing-with-canvas">Drawing with a Canvas</a>
+(and the section on SurfaceView), 
+will give you a quick idea of how you should draw to the View hierarchy. For more information
+on Android's 3D graphic utilities (provided by the OpenGL ES API), 
+read <a href="opengl.html">3D with OpenGL</a> and refer to other OpenGL documentation.</p>
+
+
+<h2 id="options">Consider your Options</h2>
+
+<p>When drawing 2D graphics, you'll typically do so in one of two ways:</p>
+<ol type="a">
+  <li>Draw your graphics or animations into a View object from your layout. In this manner, 
+  the drawing (and any animation) of your graphics is handled by the system's 
+  normal View hierarchy drawing process &mdash; you simply define the graphics to go inside the View.</li>
+  <li>Draw your graphics directly to a Canvas. This way, you personally call the appropriate class's 
+  <code>draw()</code> method (passing it your Canvas), or one of the Canvas <code>draw...()</code> methods (like 
+  <code>{@link android.graphics.Canvas#drawPicture(Picture,Rect) drawPicture()}</code>). In doing so, you are also in
+  control of any animation.</li>
+</ol>
+
+<p>Option "a," drawing to a View, is your best choice when you want to draw simple graphics that do not
+need to change dynamically and are not part of a performance-intensive game. For example, you should
+draw your graphics into a View when you want to display a static graphic or predefined animation, within 
+an otherwise static application. Read <a href="#draw-to-view">Simple Graphics Inside a View</a>.</li>
+
+<p>Option "b," drawing to a Canvas, is better when you're application needs to regularly re-draw itself.
+Basically, any video game should be drawing to the Canvas on its own. However, there's more than 
+one way to do this: </p>
+<ul>
+  <li>In the same thread as your UI Activity, wherein you create a custom View component in
+  your layout, call <code>{@link android.view.View#invalidate()}</code> and then handle the 
+  <code>{@link android.view.View#onDraw(Canvas) onDraw()}</code> callback..</li>
+  <li>Or, in a separate thread, wherein you manage a {@link android.view.SurfaceView} and 
+  perform draws to the Canvas as fast as your thread is capable 
+  (you do not need to request <code>invalidate()</code>).</li>
+</ul>
+<p>...Begin by reading <a href="#draw-with-canvas">Draw with a Canvas</a>.</p>
+
+<h2 id="draw-to-view">Simple Graphics Inside a View</h2>
+
+<p>If you'll be drawing some simple graphics (images, shapes, colors, pre-defined animations, etc.),
+then you should probably just draw to the background of a View or
+to the content of an {@link android.widget.ImageView} in your layout.
+In this case, you can skip the rest of this document and learn how to
+draw graphics and animations in the <a href="2d-graphics.html">2D Graphics</a> document.
+</p>
+
+
+<h2 id="draw-with-canvas">Draw with a Canvas</h2>
+
+<p>When you're writing an application in which you would like to perform specialized drawing
+and/or control the animation of graphics,
+you should do so by drawing through a {@link android.graphics.Canvas}. A Canvas works for you as
+a pretense, or interface, to the actual surface upon which your graphics will be drawn &mdash; it
+holds all of your "draw" calls. Via the Canvas, your drawing is actually performed upon an 
+underlying {@link android.graphics.Bitmap}, which is placed into the window.</p>
+
+<p>In the event that you're drawing within the <code>{@link android.view.View#onDraw(Canvas) onDraw()}</code>
+callback method, the Canvas is provided for you and you need only place your drawing calls upon it.
+You can also acquire a Canvas from <code>{@link android.view.SurfaceHolder#lockCanvas() SurfaceHolder.lockCanvas()}</code>,
+when dealing with a SurfaceView object. (Both of these scenarios are discussed in the following sections.)
+However, if you need to create a new Canvas, then you must define the {@link android.graphics.Bitmap} 
+upon which drawing will actually be performed. The Bitmap is always required for a Canvas. You can set up
+a new Canvas like this:</p>
+<pre>
+Bitmap b = Bitmap.createBitmap(100, 100, Bitmap.Config.ARGB_8888);
+Canvas c = new Canvas(b);
+</pre>
+
+<p>Now your Canvas will draw onto the defined Bitmap. After drawing upon it with the Canvas, you can then carry your 
+Bitmap to another Canvas with one of the <code>{@link android.graphics.Canvas#drawBitmap(Bitmap,Matrix,Paint)
+Canvas.drawBitmap(Bitmap,...)}</code> methods. It's recommended that you ultimately draw your final
+graphics through a Canvas offered to you
+by <code>{@link android.view.View#onDraw(Canvas) View.onDraw()}</code> or 
+<code>{@link android.view.SurfaceHolder#lockCanvas() SurfaceHolder.lockCanvas()}</code> (see the following sections).</p>
+
+<p>The {@link android.graphics.Canvas} class has its own set of drawing methods that you can use, 
+like <code>drawBitmap(...)</code>, <code>drawRect(...)</code>, <code>drawText(...)</code>, and many more.
+Other classes that you might use also have <code>draw()</code> methods. For example, you'll probably
+have some {@link android.graphics.drawable.Drawable} objects that you want to put on the Canvas. Drawable
+has its own <code>{@link android.graphics.drawable.Drawable#draw(Canvas) draw()}</code> method 
+that takes your Canvas as an arguement.</p>
+
+
+<h3 id="on-view">On a View</h3>
+
+<p>If you're application does not require a significant amount of processing or 
+frame-rate speed (perhaps for a chess game, a snake game, 
+or another slowly-animated application), then you should consider creating a custom View component
+and drawing with a Canvas in <code>{@link android.view.View#onDraw(Canvas) View.onDraw()}</code>. 
+The most convenient aspect of doing so is that the Android framework will
+provide you with a pre-defined Canvas to which you will place your drawing calls.</p>
+
+<p>To start, extend the {@link android.view.View} class (or descendent thereof) and define
+the <code>{@link android.view.View#onDraw(Canvas) onDraw()}</code> callback method. This method will be called by the Android 
+framework to request that your View draw itself. This is where you will perform all your calls
+to draw through the {@link android.graphics.Canvas}, which is passed to you through the <code>onDraw()</code> callback.</p>
+
+<p>The Android framework will only call <code>onDraw()</code> as necessary. Each time that 
+your application is prepared to be drawn, you must request your View be invalidated by calling
+<code>{@link android.view.View#invalidate()}</code>. This indicates that you'd like your View to be drawn and
+Android will then call your <code>onDraw()</code> method (though is not guaranteed that the callback will
+be instantaneous). </p>
+
+<p>Inside your View component's <code>onDraw()</code>, use the Canvas given to you for all your drawing,
+using various <code>Canvas.draw...()</code> methods, or other class <code>draw()</code> methods that
+take your Canvas as an argument. Once your <code>onDraw()</code> is complete, the Android framework will 
+use your Canvas to draw a Bitmap handled by the system.</p>
+
+<p class="note"><strong>Note: </strong> In order to request an invalidate from a thread other than your main
+Activity's thread, you must call <code>{@link android.view.View#postInvalidate()}</code>.</p>
+
+<p>Also read <a href="{@docRoot}guide/topics/ui/custom-components.html">Building Custom Components</a>
+for a guide to extending a View class, and <a href="2d-graphics.html">2D Graphics: Drawables</a> for
+information on using Drawable objects like images from your resources and other primitive shapes.</p>
+
+<p>For a sample application, see the Snake game, in the SDK samples folder:
+<code>&lt;your-sdk-directory>/samples/Snake/</code>.</p>
+
+<h3 id="on-surfaceview">On a SurfaceView</h3>
+
+<p>The {@link android.view.SurfaceView} is a special subclass of View that offers a dedicated
+drawing surface within the View hierarchy. The aim is to offer this drawing surface to
+an application's secondary thread, so that the application isn't required
+to wait until the system's View hierarchy is ready to draw. Instead, a secondary thread
+that has reference to a SurfaceView can draw to its own Canvas at its own pace.</p>
+
+<p>To begin, you need to create a new class that extends {@link android.view.SurfaceView}. The class should also 
+implement {@link android.view.SurfaceHolder.Callback}. This subclass is an interface that will notify you
+with information about the underlying {@link android.view.Surface}, such as when it is created, changed, or destroyed. 
+These events  are important so that you know when you can start drawing, whether you need 
+to make adjustments based on new surface properties, and when to stop drawing and potentially 
+kill some tasks. Inside your SurfaceView class is also a good place to define your secondary Thread class, which will
+perform all the drawing procedures to your Canvas.</p>
+
+<p>Instead of handling the Surface object directly, you should handle it via
+a {@link android.view.SurfaceHolder}. So, when your SurfaceView is initialized, get the SurfaceHolder by calling 
+<code>{@link android.view.SurfaceView#getHolder()}</code>. You should then notify the SurfaceHolder that you'd
+like to receive SurfaceHolder callbacks (from {@link android.view.SurfaceHolder.Callback}) by calling 
+{@link android.view.SurfaceHolder#addCallback(SurfaceHolder.Callback) addCallback()} 
+(pass it <var>this</var>). Then override each of the 
+{@link android.view.SurfaceHolder.Callback} methods inside your SurfaceView class.</p>
+
+<p>In order to draw to the Surface Canvas from within your second thread, you must pass the thread your SurfaceHandler
+and retrieve the Canvas with <code>{@link android.view.SurfaceHolder#lockCanvas() lockCanvas()}</code>. 
+You can now take the Canvas given to you by the SurfaceHolder and do your necessary drawing upon it. 
+Once you're done drawing with the Canvas, call 
+<code>{@link android.view.SurfaceHolder#unlockCanvasAndPost(Canvas) unlockCanvasAndPost()}</code>, passing it
+your Canvas object. The Surface will now draw the Canvas as you left it. Perform this sequence of locking and 
+unlocking the canvas each time you want to redraw.</p>
+
+<p class="note"><strong>Note:</strong> On each pass you retrieve the Canvas from the SurfaceHolder, 
+the previous state of the Canvas will be retained. In order to properly animate your graphics, you must re-paint the 
+entire surface. For example, you can clear the previous state of the Canvas by filling in a color
+with <code>{@link android.graphics.Canvas#drawColor(int) drawColor()}</code> or setting a background image
+with <code>{@link android.graphics.Canvas#drawBitmap(Bitmap,Rect,RectF,Paint) drawBitmap()}</code>. Otherwise,
+you will see traces of the drawings you previously performed.</p>
+
+
+<p>For a sample application, see the Lunar Landar game, in the SDK samples folder:
+<code>&lt;your-sdk-directory>/samples/LunarLander/</code>. Or,
+browse the source in the <a href="{@docRoot}guide/samples/index.html">Sample Code</a> section.</p>
+
+
+
+
+
+
+
+
diff --git a/docs/html/guide/topics/graphics/opengl.jd b/docs/html/guide/topics/graphics/opengl.jd
new file mode 100644
index 0000000..eb2932d
--- /dev/null
+++ b/docs/html/guide/topics/graphics/opengl.jd
@@ -0,0 +1,56 @@
+page.title=3D with OpenGL
+parent.title=2D and 3D Graphics
+parent.link=index.html
+@jd:body
+
+
+<p>Android includes support for high performance 3D graphics 
+via the OpenGL API &mdash; specifically, the OpenGL ES API.</p>
+
+<p>OpenGL ES is a flavor of the OpenGL specification intended for embedded
+devices. Versions of <a href="http://www.khronos.org/opengles/">OpenGL ES</a> are loosely peered to versions of the primary
+OpenGL standard. Android currently supports OpenGL ES 1.0, which corresponds
+to OpenGL 1.3. So, if the application you have in mind is possible with OpenGL
+1.3 on a desktop system, it should be possible on Android.</p>
+
+<p>The specific API provided by Android is similar to the J2ME JSR239 OpenGL
+ES API. However, it may not be identical, so watch out for deviations.</p>
+
+<h2>Using the API</h2>
+
+<p>Here's how to use the API at an extremely high level:</p>
+
+<ol>
+<li>Write a custom View subclass.</li>
+<li>Obtain a handle to an OpenGLContext, which provides access to the OpenGL functionality.</li>
+<li>In your View's onDraw() method, get a handle to a GL object, and use its methods to perform GL operations.</li>
+</ol>
+
+<p>For an example of this usage model (based on the classic GL ColorCube),
+see
+<a href="{@docRoot}guide/samples/ApiDemos/src/com/example/android/apis/graphics/GLSurfaceView.html">com.android.samples.graphics.GLSurfaceView.java</a>
+in the ApiDemos sample code project. A slightly more sophisticated version showing how to use
+it with threads can be found in 
+<a href="{@docRoot}guide/samples/ApiDemos/src/com/example/android/apis/graphics/GLSurfaceViewActivity.html">com.android.samples.graphics.GLSurfaceViewActivity.java</a>.
+</p>
+
+<p>Writing a summary of how to actually write 3D applications using OpenGL is
+beyond the scope of this text and is left as an exercise for the reader.</p>
+
+<h2>Links to Additional Information</h2>
+
+<p>Information about OpenGL ES can be
+found at <a title="http://www.khronos.org/opengles/"
+href="http://www.khronos.org/opengles/">http://www.khronos.org/opengles/</a>.</p> 
+
+<p>Information specifically
+about OpenGL ES 1.0 (including a detailed specification) can be found
+at <a title="http://www.khronos.org/opengles/1_X/"
+href="http://www.khronos.org/opengles/1_X/">http://www.khronos.org/opengles/1_X/</a>.</p>
+
+<p>The documentation for the Android {@link javax.microedition.khronos.opengles
+OpenGL ES implementations} are also available.</p>
+
+<p>Finally, note that though Android does include some basic support for
+OpenGL ES 1.1, the support is <strong>not complete</strong>, and should not be relied
+upon at this time.</p>
diff --git a/docs/html/guide/topics/index.html b/docs/html/guide/topics/index.html
new file mode 100644
index 0000000..4881acf
--- /dev/null
+++ b/docs/html/guide/topics/index.html
@@ -0,0 +1,8 @@
+<html>
+<head>
+<meta http-equiv="refresh" content="0;url=../index.html">
+</head>
+<body>
+<a href="../index.html">click here</a> if you are not redirected.
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/html/guide/topics/intents/index.html b/docs/html/guide/topics/intents/index.html
new file mode 100644
index 0000000..b831246
--- /dev/null
+++ b/docs/html/guide/topics/intents/index.html
@@ -0,0 +1,9 @@
+<html>
+<head>
+<meta http-equiv="refresh" content="0;url=intents-filters.html">
+<title>Redirecting...</title>
+</head>
+<body>
+<a href="intents-filters.html">click here</a> if you are not redirected.
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/html/guide/topics/intents/intents-filters.jd b/docs/html/guide/topics/intents/intents-filters.jd
new file mode 100644
index 0000000..fd20ca17
--- /dev/null
+++ b/docs/html/guide/topics/intents/intents-filters.jd
@@ -0,0 +1,693 @@
+page.title=Intents and Intent Filters
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+<h2>Key classes</h2>
+<ol>
+<li>{@link android.content.Intent}</li>
+<li>{@link android.content.IntentFilter}</li>
+<li>{@link android.app.Activity}</li>
+<li>{@link android.app.Service}</li>
+<li>{@link android.content.BroadcastReceiver}</li>
+<li>{@link android.content.pm.PackageManager}</li>
+</ol>
+
+<h2>In this document</h2>
+<ol>
+<li><a href="#iobjs">Intent Objects</a></li>
+<li><a href="#ires">Intent Resolution</a>, including:</li>
+<li style="margin-left: 2em"><a href="#ifs">Intent filters</a></li>
+<li style="margin-left: 2em"><a href="#ccases">Common cases</a></li>
+<li style="margin-left: 2em"><a href="#imatch">Using intent matching</a></li>
+</ol>
+</div>
+</div>
+
+
+<p>
+Three of the core components of an application &mdash; activities, services, and 
+broadcast receivers &mdash; are activated through messages, called <i>intents</i>.   
+Intent messaging is a facility for late run-time binding between components in the same 
+or different applications.  The intent itself, an {@link android.content.Intent} 
+object, is a passive data structure holding an abstract description of an operation 
+to be performed &mdash; or, in the case of broadcasts, a description of something 
+that has happened and is being announced.  There are separate mechanisms for 
+delivering intents to each type of component: 
+</p>
+
+<ul>
+<li>An Intent object is passed to <code>{@link android.content.Context#startActivity 
+Context.startActivity()}</code> or <code>{@link android.app.Activity#startActivityForResult 
+Activity.startActivityForResult()}</code> to launch an activity or get an existing 
+activity to do something new.</li>
+
+<li><p>An Intent object is passed to <code>{@link android.content.Context#startService 
+Context.startService()}</code> to initiate a service or deliver new instructions to an 
+ongoing service.  Similarly, an intent can be passed to <code>{@link 
+android.content.Context#bindService Context.bindService()}</code> to establish a 
+connection between the calling component and a target service.  It can optionally
+initiate the service if it's not already running.</p></li>
+
+<li><p>Intent objects passed to any of the broadcast methods (such as <code>{@link 
+android.content.Context#sendBroadcast(Intent) Context.sendBroadcast()}</code>, 
+<code>{@link android.content.Context#sendOrderedBroadcast(Intent, String) 
+Context.sendOrderedBroadcast()}</code>, or <code>{@link 
+android.content.Context#sendStickyBroadcast Context.sendStickyBroadcast()}</code>) 
+are delivered to all interested broadcast receivers.  Many kinds of broadcasts 
+originate in system code.</p></li>
+</ul>
+
+<p>
+In each case, the Android system finds the appropriate activity, service, or set 
+of broadcast receivers to respond to the intent, instantiating them if necessary. 
+There is no overlap within these messaging systems:  Broadcast intents are delivered 
+only to broadcast receivers, never to activities or services.  An intent passed to 
+{@code startActivity()} is delivered only to an activity, never to a service or 
+broadcast receiver, and so on.
+</p>
+
+<p>
+This document begins with a description of Intent objects.  It then describes the 
+rules Android uses to map intents to components &mdash; how it resolves which 
+component should receive an intent message.  For intents that don't explicitly 
+name a target component, this process involves testing the Intent object against 
+<i>intent filters</i> associated with potential targets. 
+</p>
+
+
+<h2><a name="iobjs"></a>Intent Objects</h2>
+
+<p>
+An {@link android.content.Intent} object is a bundle of information.  It 
+contains information of interest to the component that receives the intent 
+(such as the action to be taken and the data to act on) plus information 
+of interest to the Android system (such as the category of component that 
+should handle the intent and instructions on how to launch a target activity).  
+Principally, it can contain the following:
+</p>
+
+<dl>
+
+<dt><b>Component name</b><a name="cname"></a></dt> 
+<dd>The name of the component that should handle the intent.  This field is 
+a {@link android.content.ComponentName} object &mdash; a combination of the 
+fully qualified class name of the target component (for example "{@code 
+com.example.project.app.FreneticActivity}") and the package name set
+in the manifest file of the application where the component resides (for 
+example, "{@code com.example.project}").  The package part of the component 
+name and the package name set in the manifest do not necessarily have to match.
+
+<p>  
+The component name is optional.  If it is set, the Intent object is 
+delivered to an instance of the designated class.  If it is not set, 
+Android uses other information in the Intent object to locate a suitable 
+target &mdash; see <a href="#ires">Intent Resolution</a>, later in this 
+document.
+</p>
+
+<p>
+The component name is set by <code>{@link android.content.Intent#setComponent 
+setComponent()}</code>,  <code>{@link android.content.Intent#setClass 
+setClass()}</code>, or <code>{@link android.content.Intent#setClassName(String, String) 
+setClassName()}</code> and read by <code>{@link android.content.Intent#getComponent 
+getComponent()}</code>. 
+</p>
+</dd>
+
+<p><dt><b>Action</b></dt>
+<dd>A string naming the action to be performed &mdash; or, in the case of broadcast 
+intents, the action that took place and is being reported.  The Intent class defines 
+a number of action constants, including these:
+</p>
+
+<table>
+<tr>
+   <th>Constant</th>
+   <th>Target component</th>
+   <th>Action</th>
+</tr><tr>
+   <td>{@code ACTION_CALL}
+   <td>activity
+   <td>Initiate a phone call.
+</tr><tr>
+   <td>{@code ACTION_EDIT}
+   <td>activity
+   <td>Display data for the user to edit.
+</tr><tr>
+   <td>{@code ACTION_MAIN}
+   <td>activity
+   <td>Start up as the initial activity of a task, with no data input and no returned output.
+</tr><tr>
+   <td>{@code ACTION_SYNC}
+   <td>activity
+   <td>Synchronize data on a server with data on the mobile device.
+</tr><tr>
+   <td>{@code ACTION_BATTERY_LOW}
+   <td>broadcast receiver
+   <td>A warning that the battery is low.
+</tr><tr>
+   <td>{@code ACTION_HEADSET_PLUG}
+   <td>broadcast receiver
+   <td>A headset has been plugged into the device, or unplugged from it.
+</tr><tr>
+   <td>{@code ACTION_SCREEN_ON}
+   <td>broadcast receiver
+   <td>The screen has been turned on.
+</tr><tr>
+   <td>{@code ACTION_TIMEZONE_CHANGED}
+   <td>broadcast receiver
+   <td>The setting for the time zone has changed.
+</tr>
+</table>
+
+<p>
+See the {@link android.content.Intent} class description for a list of 
+pre-defined constants for generic actions.  Other actions are defined 
+elsewhere in the Android API.
+You can also define your own action strings for activating the components 
+in your application.  Those you invent should include the application 
+package as a prefix &mdash; for example: 
+"<code>com.example.project.SHOW_COLOR</code>". 
+</p>
+
+<p>
+The action largely determines how the rest of the intent is structured
+&mdash; particularly the <a href="#data">data</a> and 
+<a href="#extras">extras</a> fields &mdash; 
+much as a method name determines a set of arguments and a return value.
+For this reason, it's a good idea to use action names that are
+as specific as possible, and to couple them tightly to the other fields of
+the intent.  In other words, instead of defining an action in isolation,
+define an entire protocol for the Intent objects your components can handle.
+</p>
+
+<p>
+The action in an Intent object is set by the 
+<code>{@link android.content.Intent#setAction setAction()}</code> 
+method and read by 
+<code>{@link android.content.Intent#getAction getAction()}</code>.
+</p>
+</dd>
+
+<p><dt><b>Data</b><a name="data"></a></dt>
+<dd>The URI of the data to be acted on and the MIME type of that data.  Different 
+actions are paired with different kinds of data specifications.  For example, if 
+the action field is {@code ACTION_EDIT}, 
+the data field would contain the URI of the document to be displayed for editing.  
+If the action is {@code ACTION_CALL}, the data field would be a {@code tel:} URI 
+with the number to call.  Similarly, if the action is {@code ACTION_VIEW} and the 
+data field is an {@code http:} URI, the receiving activity would be called upon 
+to download and display whatever data the URI refers to.
+
+<p>
+When matching an intent to a component that is capable of handling the data, 
+it's often important to know the type of data (its MIME type) in addition to its URI.  
+For example, a component able to display image data should not be called
+upon to play an audio file.
+</p>
+
+<p>
+In many cases, the data type can be inferred from the URI &mdash; particularly 
+{@code content:} URIs, which indicate that the data is located on the device and
+controlled by a content provider (see the  
+<a href="{@docRoot}guide/topics/providers/content-providers.html">separate 
+discussion on content providers</a>).  But the type can also be explicitly set 
+in the Intent object.  
+The <code>{@link android.content.Intent#setData setData()}</code> method specifies 
+data only as a URI, <code>{@link android.content.Intent#setType setType()}</code> 
+specifies it only as a MIME type, and <code>{@link 
+android.content.Intent#setDataAndType setDataAndType()}</code> specifies it as both 
+a URI and a MIME type.  The URI is read by <code>{@link 
+android.content.Intent#getData getData()}</code> and the type by <code>{@link 
+android.content.Intent#getType getType()}</code>.
+</p>
+</dd>
+
+<p><dt><b>Category</b></dt>
+<dd>A string containing additional information about the kind of component 
+that should handle the intent.  Any number of category descriptions can be 
+placed in an Intent object.  As it does for actions, the Intent class defines
+several category constants, including these: 
+
+<table>
+<tr>
+   <th>Constant</th>
+   <th>Meaning</th>
+</tr><tr>
+   <td>{@code CATEGORY_BROWSABLE}
+   <td>The target activity can be safely invoked by the browser to display data 
+       referenced by a link &mdash; for example, an image or an e-mail message.
+</tr><tr>
+   <td>{@code CATEGORY_GADGET}
+   <td>The activity can be embedded inside of another activity that hosts gadgets.
+</tr><tr>
+   <td>{@code CATEGORY_HOME}
+   <td>The activity displays the home screen, the first screen the user sees when 
+       the device is turned on or when the HOME key is pressed.
+</tr><tr>
+   <td>{@code CATEGORY_LAUNCHER}
+   <td>The activity can be the initial activity of a task and is listed in 
+       the top-level application launcher.
+</tr><tr>
+   <td>{@code CATEGORY_PREFERENCE}
+   <td>The target activity is a preference panel.
+</tr>
+</table> 
+
+<p>
+See the {@link android.content.Intent} class description for the full list of 
+categories.
+</p>
+
+<p>
+The <code>{@link android.content.Intent#addCategory addCategory()}</code> method 
+places a category in an Intent object, <code>{@link android.content.Intent#removeCategory 
+removeCategory()}</code> deletes a category previously added, and <code>{@link android.content.Intent#getCategories getCategories()}</code> gets the set of all 
+categories currently in the object. 
+</p>
+</dd>
+
+<p><dt><b>Extras</b><a name="extras"></a></dt>
+<dd>Key-value pairs for additional information that should be delivered to the 
+component handling the intent.  Just as some actions are paired with particular 
+kinds of data URIs, some are paired with particular extras.  For example, an 
+{@code ACTION_TIMEZONE_CHANGED} intent has a "{@code time-zone}" extra that 
+identifies the new time zone, and {@code ACTION_HEADSET_PLUG} has a 
+"{@code state}" extra indicating whether the headset is now plugged in or 
+unplugged, as well as a "{@code name}" extra for the type of headset. 
+If you were to invent a {@code SHOW_COLOR} action, the color value would
+be set in an extra key-value pair.
+
+<p>
+The Intent object has a series of {@code put...()} methods for inserting various 
+types of extra data and a similar  set of {@code get...()} methods for reading 
+the data.  These methods parallel those for {@link android.os.Bundle} objects.  
+In fact, the extras can be installed and read as a Bundle using the <code>{@link 
+android.content.Intent#putExtras putExtras()}</code> and <code>{@link 
+android.content.Intent#getExtras getExtras()}</code> methods.
+</p>
+</dd>
+
+<p><dt><b>Flags</b></dt>
+<dd>Flags of various sorts.  Many instruct the Android system how to launch an 
+activity (for example, which task the activity should belong to) and how to treat 
+it after it's launched (for example, whether it belongs in the list of recent 
+activities).  All these flags are defined in the Intent class.   
+</dd>
+
+</dl>
+
+<p>
+The Android system and the applications that come with the platform employ 
+Intent objects both to send out system-originated broadcasts and to activate 
+system-defined components.  To see how to structure an intent to activate a 
+system component, consult the 
+<a href="{@docRoot}guide/appendix/g-app-intents.html">list of intents</a> 
+in the reference.  
+</p>
+
+
+<h2><a name="ires"></a>Intent Resolution</h2>
+
+<p>
+Intents can be divided into two groups:
+</p>
+
+<ul>
+<li><i>Explicit intents</i> designate the target component by its 
+name (the <a href="#cname">component name field</a>, mentioned earlier, 
+has a value set).  Since component names would generally not be known to 
+developers of other applications, explicit intents are typically used 
+for application-internal messages &mdash; such as an activity starting 
+a subordinate service or launching a sister activity.</li>
+
+<li><p><i>Implicit intents</i> do not name a target (the field for 
+the component name is blank).  Implicit intents are often used to 
+activate components in other applications.</p></li>   
+</ul>
+
+<p>
+Android delivers an explicit intent to an instance of the designated 
+target class.  Nothing in the Intent object other than the component 
+name matters for determining which component should get the intent.  
+</p>
+
+<p>
+A different strategy is needed for implicit intents.  In the absence of a 
+designated target, the Android system must find the best component (or 
+components) to handle the intent &mdash; a single activity or service to 
+perform the requested action or the set of broadcast receivers to respond 
+to the broadcast announcement.  It does so by comparing the contents of 
+the Intent object to <i>intent filters</i>, structures associated with 
+components that can potentially receive intents.  Filters advertise the 
+capabilities of a component and delimit the intents it can handle.  They 
+open the component to the possibility of receiving implicit intents of 
+the advertised type.  If a component does not have any intent filters, 
+it can receive only explicit intents.  A component with filters can 
+receive both explicit and implicit intents.
+</p>
+
+<p>
+Only three aspects of an Intent object are consulted when the object
+is tested against an intent filter:
+</p>
+
+<p style="margin-left: 2em">action
+<br/>data (both URI and data type)
+<br/>category</p>
+
+<p>
+The extras and flags play no part in resolving which component receives
+an intent.
+</p>
+
+
+<h3><a name="ifs"></a>Intent filters</h3>
+
+<p>
+To inform the system which implicit intents they can handle, activities, 
+services, and broadcast receivers can have one or more intent filters.  
+Each filter describes a capability of the component, a set of intents that 
+the component is willing to receive.  It, in effect, filters in 
+intents of a desired type, while filtering out unwanted 
+intents &mdash; but only unwanted implicit intents (those that don't name
+a target class).  An explicit intent is always delivered to its target, 
+no matter what it contains; the filter is not consulted.  But an implicit 
+intent is delivered to a component only if it can pass through one of the 
+component's filters.
+</p>
+
+<p>
+A component has separate filters for each job it can do, each face it can 
+present to the user.  For example, the principal activity of the sample
+NotePad application has three filters &mdash; one for starting up with a
+blank slate, another for starting with an assigned directory of notes 
+that the user can view, edit, or select from, and a third for finding a 
+particular note without an initial specification of its directory.
+</p>
+
+<p>
+An intent filter is an instance of the {@link android.content.IntentFilter} class.  
+However, since the Android system must know about the capabilities of a component 
+before it can launch that component, intent filters are generally not set up in 
+Java code, but in the application's manifest file (AndroidManifest.xml) as 
+{@code &lt;intent-filter&gt;} elements.  (The one exception would be filters for 
+broadcast receivers that are registered dynamically by calling <code>{@link android.content.Context#registerReceiver(BroadcastReceiver, IntentFilter, String, 
+Handler) Context.registerReceiver()}</code>; they are directly created as 
+IntentFilter objects.)
+</p>
+
+<div class="sidebox-wrapper">
+<div class="sidebox-inner">
+<h2>Filters and security</h2>
+<p>An intent filter cannot be relied on for security.  While it opens a
+component to receiving only certain kinds of implicit intents, it does 
+nothing to prevent explicit intents from targeting the component.  Even 
+though a filter restricts the intents a component will be asked to handle
+to certain actions and data sources, someone could always put 
+together an explicit intent with a different action and data source, and 
+name the component as the target.
+</p>
+</div>
+</div> 
+
+<p>
+A filter has fields that parallel the action, data, and category fields of an 
+Intent object.  An implicit intent is tested against the filter in all three areas.  
+To be delivered to the component that owns the filter, it must pass all three tests.  
+If it fails even one of them, the Android system won't deliver it to the 
+component &mdash; at least not on the basis of that filter.  However, since a 
+component can have multiple intent filters, an intent that does not pass 
+through one of a component's filters might make it through on another.
+</p>
+
+<p>
+Each of the three tests is described in detail below:
+</p>
+
+<dl>
+
+<dt><b>Action test</b></dt>
+<dd>An {@code &lt;intent-filter&gt;} element in the manifest file lists actions 
+as {@code &lt;action&gt;} subelements.  For example:
+
+<pre>&lt;intent-filter . . . &gt;
+    &lt;action android:name="com.example.project.SHOW_CURRENT" /&gt;
+    &lt;action android:name="com.example.project.SHOW_RECENT" /&gt;
+    &lt;action android:name="com.example.project.SHOW_PENDING" /&gt;
+    . . .
+&lt;/intent-filter&gt;</pre>
+
+<p>
+As the example shows, while an Intent object names just a single action, 
+a filter may list more than one.  The list cannot be empty; a filter must 
+contain at least one {@code &lt;action&gt;} element, or it
+will block all intents.
+</p>
+
+<p>
+To pass this test, the action specified in the Intent object must match 
+one of the actions listed in the filter.  If the object or the filter 
+does not specify an action, the results are as follows: 
+</p>
+
+<ul>
+<li>If the filter fails to list any actions, there is nothing for an 
+intent to match, so all intents fail the test.  No intents can get 
+through the filter.</li>
+
+<li><p>On the other hand, an Intent object that doesn't specify an 
+action automatically passes the test &mdash; as long as the filter 
+contains at least one action.</p></li>
+</ul
+</dd>
+
+<dt><b>Category test</b></dt>
+<dd>An {@code &lt;intent-filter&gt;} element also lists categories as subelements.  
+For example:
+
+<pre>&lt;intent-filter . . . &gt;
+    &lt;category android:name="android.intent.category.DEFAULT" /&gt;
+    &lt;category android:name="android.intent.category.BROWSABLE" /&gt;
+    . . .
+&lt;/intent-filter&gt;</pre>
+
+<p>
+Note that the constants described earlier for actions and categories are not
+used in the manifest file.  The full string values are used instead.  For 
+instance, the "{@code android.intent.category.BROWSABLE}" string in the example 
+above corresponds to the {@code CATEGORY_BROWSABLE} constant mentioned earlier 
+in this document.  Similarly, the string "{@code android.intent.action.EDIT}" 
+corresponds to the {@code ACTION_EDIT} constant.
+</p>
+
+<p>
+For an intent to pass the category test, every category in the Intent object 
+must match a category in the filter.  The filter can list additional categories, 
+but it cannot omit any that are in the intent.
+</p>
+
+<p>
+In principle, therefore, an Intent object with no categories should always pass 
+this test, regardless of what's in the filter.  That's mostly true.  However, 
+with one exception, Android treats all implicit intents passed to {@link 
+android.content.Context#startActivity startActivity()} as if they contained 
+at least one category:  "{@code android.intent.category.DEFAULT}" (the
+{@code CATEGORY_DEFAULT} constant).  
+Therefore, activities that are willing to receive implicit intents must 
+include "{@code android.intent.category.DEFAULT}" in their intent filters. 
+(Filters with "{@code android.intent.action.MAIN}" and 
+"{@code android.intent.category.LAUNCHER}" settings are the exception.  
+They mark activities that begin new tasks and that are represented on the 
+launcher screen.  They can include "{@code android.intent.category.DEFAULT}" 
+in the list of categories, but don't need to.)  See <a href="#imatch">Using
+intent matching</a>, later, for more on these filters.)
+</p>
+<dd>
+
+<dt><b>Data test</b></dt>
+<dd>Like the action and categories, the data specification for an intent filter 
+is contained in a subelement.  And, as in those cases, the subelement can appear 
+multiple times, or not at all.  For example:
+
+<pre>&lt;intent-filter . . . &gt;
+    &lt;data android:type="video/mpeg" android:scheme="http" . . . /&gt; 
+    &lt;data android:type="audio/mpeg" android:scheme="http" . . . /&gt;
+    . . .
+&lt;/intent-filter&gt;</pre>
+
+<p>
+Each {@code &lt;data&gt;} element can specify a URI and a data type (MIME media type).  
+There are separate attributes &mdash; {@code scheme}, {@code host}, {@code port}, 
+and {@code path} &mdash; for each part of the URI:  
+</p>
+
+<p style="margin-left: 2em">{@code scheme://host:port/path}</p>
+
+<p>
+For example, in the following URI,
+</p>
+
+<p style="margin-left: 2em">{@code content://com.example.project:200/folder/subfolder/etc}</p>
+
+<p> the scheme is "{@code content}", the host is "{@code com.example.project}", 
+the port is "{@code 200}", and the path is "{@code folder/subfolder/etc}".  
+The host and port together constitute the URI <i>authority</i>; if a host is 
+not specified, the port is ignored.
+</p>
+
+<p>
+Each of these attributes is optional, but they are not independent of each other:  
+For an authority to be meaningful, a scheme must also be specified.  
+For a path to be meaningful, both a scheme and an authority must be specified.  
+</p>
+
+<p>
+When the URI in an Intent object is compared to a URI specification in a filter, 
+it's compared only to the parts of the URI actually mentioned in the filter.  
+For example, if a filter specifies only a scheme, all URIs with that scheme match 
+the filter.  If a filter specifies a scheme and an authority but no path, all URIs 
+with the same scheme and authority match, regardless of their paths.  If a filter 
+specifies a scheme, an authority, and a path, only URIs with the same scheme, 
+authority, and path match.  However, a path specification in the filter can 
+contain wildcards to require only a partial match of the path.
+</p>
+
+<p>
+The {@code type} attribute of a {@code &lt;data&gt;} element specifies the MIME type 
+of the data.  It's more common in filters than a URI.  Both the Intent object and 
+the filter can use a "*" wildcard for the subtype field &mdash; for example, 
+"{@code text/*}" or "{@code audio/*}" &mdash; indicating any subtype matches.
+</p>
+
+<p>
+The data test compares both the URI and the data type in the Intent object to a URI 
+and data type specified in the filter.  The rules are as follows:
+</p>
+
+<ol type="a">
+<li>An Intent object that contains neither a URI nor a data type passes the 
+test only if the filter likewise does not specify any URIs or data types.</li>
+
+<li><p>An Intent object that contains a URI but no data type (and a type cannot 
+be inferred from the URI) passes the test only if its URI matches a URI in the 
+filter and the filter likewise does not specify a type.  This will be the case 
+only for URIs like {@code mailto:} and {@code tel:} that do not refer to actual data.</p></li>
+
+<li><p>An Intent object that contains a data type but not a URI passes the test 
+only if the filter lists the same data type and similarly does not specify a URI.</p></li>
+
+<li><p>An Intent object that contains both a URI and a data type (or a data type 
+can be inferred from the URI) passes the data type part of the test only if its 
+type matches a type listed in the filter.  It passes the URI part of the test 
+either if its URI matches a URI in the filter or if it has a {@code content:} 
+or {@code file:} URI and the filter does not specify a URI.  In other words, 
+a component is presumed to support {@code content:} and {@code file:} data if
+its filter lists only a data type.</p></li>
+</ol>
+</dl>
+
+<p>
+If an intent can pass through the filters of more than one activity or service, 
+the user may be asked which component to activate.  An exception is raised if
+no target can be found.
+</p>
+
+
+<h3><a name="ccases"></a>Common cases</h3>
+
+<p>
+The last rule shown above for the data test, rule (d), reflects the expectation 
+that components are able to get local data from a file or content provider.
+Therefore, their filters can list just a data type and do not need to explicitly
+name the {@code content:} and {@code file:} schemes.
+This is a typical case.  A {@code &lt;data&gt;} element like the following, 
+for example, tells Android that the component can get image data from a content 
+provider and display it:
+</p>
+
+<pre>&lt;data android:type="image/*" /&gt;</pre>
+
+<p>
+Since most available data is dispensed by content providers, filters that 
+specify a data type but not a URI are perhaps the most common.
+</p>
+
+<p>
+Another common configuration is filters with a scheme and a data type.  For
+example, a {@code &lt;data&gt;} element like the following tells Android that
+the component can get video data from the network and display it:
+</p>
+
+<pre>&lt;data android:scheme="http" android:type="video/*" /&gt;</pre>
+
+<p>
+Consider, for example, what the browser application does when
+the user follows a link on a web page.   It first tries to display the data 
+(as it could if the link was to an HTML page).  If it can't display the data, 
+it puts together an implicit intent with the scheme and data type and tries
+to start an activity that can do the job.  If there are no takers, it asks the
+download manager to download the data.  That puts it under the control
+of a content provider, so a potentially larger pool of activities
+(those with filters that just name a data type) can respond.
+</p>
+
+<p>
+Most applications also have a way to start fresh, without a reference
+to any particular data.  Activities that can initiate applications 
+have filters with "{@code android.intent.action.MAIN}" specified as
+the action.  If they are to be represented in the application launcher,
+they also specify the "{@code android.intent.category.LAUNCHER}" 
+category:
+</p>
+
+<pre>&lt;intent-filter . . . &gt;
+    &lt;action android:name="code android.intent.action.MAIN" /&gt;
+    &lt;category android:name="code android.intent.category.LAUNCHER" /&gt;
+&lt;/intent-filter&gt;</pre>
+
+
+<h3><a name="imatch"></a>Using intent matching</h3>
+
+<p>
+Intents are matched against intent filters not only to discover a target
+component to activate, but also to discover something about the set of
+components on the device.  For example, the Android system populates the 
+application launcher, the top-level screen that shows the applications 
+that are available for the user to launch, by finding all the  activities
+ with intent filters that specify the "{@code android.intent.action.MAIN}" 
+action and "{@code android.intent.category.LAUNCHER}" category 
+(as illustrated in the previous section).  It then displays the icons and 
+labels of those activities in the launcher.  Similarly, it discovers the 
+home screen by looking for the activity with 
+"{@code android.intent.category.HOME}" in its filter.
+</p>
+
+<p>
+Your application can use intent matching is a similar way.
+The {@link android.content.pm.PackageManager} has a set of {@code query...()}
+methods that return all components that can accept a particular intent, and 
+a similar series of {@code resolve...()} methods that determine the best
+component to respond to an intent.  For example, 
+{@link android.content.pm.PackageManager#queryIntentActivities 
+queryIntentActivities()} returns a list of all activities that can perform
+the intent passed as an argument, and {@link 
+android.content.pm.PackageManager#queryIntentServices 
+queryIntentServices()} returns a similar list of services.  
+Neither method activates the components; they just list the ones that
+can respond.  There's a similar method, 
+{@link android.content.pm.PackageManager#queryBroadcastReceivers 
+queryBroadcastReceivers()}, for broadcast receivers.
+</p>
+
+
+
+
+
+
+  
+
+
+
+
diff --git a/docs/html/guide/topics/location/geo/mapkey.jd b/docs/html/guide/topics/location/geo/mapkey.jd
new file mode 100644
index 0000000..9aa824c
--- /dev/null
+++ b/docs/html/guide/topics/location/geo/mapkey.jd
@@ -0,0 +1,210 @@
+page.title=Obtaining a Maps API Key
+@jd:body
+
+<div class="sidebox"><p>To register for a Maps API Key, read this document and then go to the <a href="http://code.google.com/android/maps-api-signup.html">Android Maps API Key Signup</a> page.</p>
+
+</div>
+
+<p>com.google.android.maps.MapView is a very useful class that lets you easily integrate Google Maps into your application. It provides built-in map downloading, rendering, and caching of Maps tiles, as well as a variety of display options and controls. It provides a wrapper around the Google Maps API that lets your application request and manipulate Google Maps data through class methods, and it lets you work with Maps data as you would other types of Views. </p>
+
+<p>Because MapView gives you access to Google Maps data, you need to register with the Google Maps service and agree to the applicable Terms of Service before your MapView will be able to obtain data from Google Maps. This will apply whether you are developing your application on the emulator or preparing your application for deployment to mobile devices. </p>
+
+<p>Registering for a Maps API Key is simple, free, and has two parts: </p>
+
+<ol>
+<li>Registering the MD5 fingerprint of the certificate that you will use to sign your application. The Maps registration service then provides you a Maps API Key that is associated with your application's signer certificate. </li>
+<li>Adding a reference to the Maps API Key in each MapView, whether declared in XML or instantiated directly from code. You can use the same Maps API Key for any MapView in any Android application, provided that the application is signed with the certificate whose fingerprint you registered with the service. </li>
+</ol>
+
+<p>During registration, you also need to agree to the Maps API Terms of Service, which describe how your application can use the Maps data. In general, the terms of service are permissive and place few restrictions on how you can use the data. For example, the terms allow you to build "friend finder" type applications. </p>
+
+<p>The sections below describe how to obtain your Maps API Key and how to reference it from your MapView elements. </p>
+
+<ul>
+<li><a href="#overview">Overview</a></li>
+<li><a href="#getfingerprint">Getting the MD5 Fingerprint of Your Signing Certificate</a></li>
+<li><a href="#getdebugfingerprint">Getting the MD5 Fingerprint of the SDK Debug Certificate</a></li>
+<li><a href="#registering">Registering the Certificate Fingerprint with the Google Maps Service</a></li>
+<li><a href="#addingkey">Adding the Maps API Key to your Application</a></li>
+<li><a href="#finalsteps">Final Steps to Enable MapView Elements</a></li>
+</ul>
+
+<h2 id="overview">Overview</h2>
+
+<p>MapView objects are views that display Maps tiles downloaded from the Google Maps service. To ensure that applications use Maps data in an appropriate manner, the Google Maps service requires application developers to register with the service, agreeing to the Terms of Service and supplying an MD5 fingerprint of the certificate(s) that they will use to sign applications. For each registered certificate fingerprint, the service then provides the developer with a Maps API Key &mdash; an alphanumeric string that uniquely identifies the certificate and developer registered with the service.  </p>
+
+<p>The Google Maps service also requires that each MapView identify itself to the service using a Maps API Key. Before providing Maps tiles to a MapView, the service checks the Maps API Key supplied by the MapView to ensure that it:</p>
+<ul>
+<li>References a certificate/developer registered with the service, and </li>
+<li>References a certificate that matches the certificate with which the application (containing the MapView) was signed. </li>
+</ul>
+
+<p>Unless both conditions are met, the service does not provide Maps tiles to the MapView. </p>
+
+<p>Each MapView object in your application must reference a Maps API Key. Since the Key is associated with a certificate, all Mapview elements in an application should reference the same Key. Going a step further, all MapView elements in all applications that you sign with the same certificate should reference the same Key. </p>
+
+<p>On the other hand, you can register for multiple Maps API Keys, each being associated with a specific certificate. You would want to do this if, for example, you were developing several independent applications that you will sign using different certificates. In this case, note that all MapView elements in a given application can reference the same Maps API Key, but <em>must</em> reference the Key that is associated with the certificate used to sign the application. </p>
+
+<p>Because MapView elements must refer to a Maps API Key, you need to register your certificate and receive a Key before you can make use of MapView elements in your application. To make it easier for you to get started using MapView elements, you are welcome to register the debug certificate generated by the SDK tools and receive a temporary Maps API Key. The details of how to do that are given below. </p>
+
+<p>When you are preparing to release your application, however, note that you <em>must</em> sign your application with a suitable cryptographic key, rather than the SDK debug key. That means that you will also need to register your application's release certificate with the Google Maps service. After you've done so, you will receive a new Maps API Key that is uniquely associated with your release certificate. To enable the MapView elements in your application to work after release, you must remember to change the Maps API Key for all MapViews in your application so that they refer to the Key associated with your release certificate (rather than your debug certificate). </p>
+
+<p>To summarize, the important points to understand about MapViews and the Maps API Key are: </p>
+
+<ul>
+<li>To display Maps data in a MapView, you need to register for a Maps API Key</li>
+<li>Each Maps API Key is uniquely associated with a specific certificate, based on an MD5 fingerprint of the certificate </li>
+<li>Each MapView must reference a Maps API Key, and the Key referenced must be registered to the certificate used to sign the application</li>
+<li>All MapView elements in an application can reference the same Maps API Key</li>
+<li>You can register multiple certificates under your developer identity</li>
+<li>You can get a temporary Maps API Key based on your debug certificate, but before you publish your application, you must register for a new Key based on your release certificate and update references in your MapViews accordingly</li>
+</ul>
+
+<h2 id="getfingerprint">Getting the MD5 Fingerprint of Your Signing Certificate</h2>
+
+<div class="sidebox">
+For more information about using Keytool and Jarsigner to sign your application, see <a href="{@docRoot}guide/publishing/app-signing.html">Signing Your Applications</a>.
+</div>
+
+<p>To register for a Maps API Key, you need to provide an MD5 fingerprint of the certificate that you will use to sign your application. </p>
+
+<p>Before you visit the registration page, use Keytool to generate the fingerprint of the appropriate certificate. 
+
+<p>First, determine which key you will use to sign your application at release and make sure of the path to the keystore that contains it.</p>
+
+<p>Next, run Keytool with the <code>-list</code> option, against the target keystore and key alias. The table below lists the options you should use.</p>
+
+<table>
+<tr>
+<th>Keytool Option</th>
+<th>Description</th>
+</tr>
+<tr>
+<td><code>-list</code></td><td>Print an MD5 fingerprint of a certificate.</td>
+</tr>
+<tr>
+<td><code>-keystore&nbsp;&lt;keystore-name&gt;.keystore</code></td><td>The name of the keystore containing the target key.</td>
+</tr>
+<tr>
+<td><code>-storepass &lt;password&gt;</code></td><td><p>A password for the
+keystore.</p><p>As a security precaution, do not include this option 
+in your command line unless you are working at a secure computer.
+If not supplied, Keytool prompts you to enter the password. In this 
+way, your password is not stored in your shell history.</p></td>
+</tr>
+<tr>
+<td><code>-alias &lt;alias_name&gt;</code></td><td>The alias for the key for which to generate the MD5 certificate fingerprint.</td>
+</tr>
+<tr>
+<td><code>-keypass &lt;password&gt;</code></td><td><p>The password for the key.</p>
+<p>As a security precaution, do not include this option 
+in your command line unless you are working at a secure computer.
+If not supplied, Keytool prompts you to enter the password. In this 
+way, your password is not stored in your shell history.</p></td>
+</tr>
+</table>
+
+<p>Here's an example of a Keytool command that generates an MD5 certificate fingerprint for the key <code>alias_name</code> in the keystore <code>my-release-key.keystore</code>:</p>
+
+<pre>$ keytool -list -alias alias_name -keystore my-release-key.keystore</pre>
+
+<p>Keytool will prompt you to enter passwords for the keystore and key. As output of the command, Keytool prints the fingerprint to the shell. For example:</p>
+
+<pre>Certificate fingerprint (MD5): 94:1E:43:49:87:73:BB:E6:A6:88:D7:20:F1:8E:B5:98</pre>
+
+<p>Note that, if you happen to forget your Maps API Key, you can repeat the process described above and register the fingerprint again. The server will give you the same key for the specified certificate fingerprint.</p>
+
+<p>Once you have the fingerprint, you can go to the Maps API registration site, described next.</p>
+
+<h2 id="getdebugfingerprint">Getting the MD5 Fingerprint of the SDK Debug Certificate</h2>
+
+<p>While you are developing and debugging your application, you will likely be
+sigining your application in debug mode &mdash; that is, the SDK build tools
+will automatically sign your application using the debug certificate. To let
+your MapView elements properly display Maps data during this period, you should
+obtain a temporary Maps API Key registered to the debug certificate. To do so,
+you first need to get the MD5 fingerprint of the debug certificate. When
+you are ready to release your application, you must register your release
+certificate with the Google Maps service and obtain a new Maps API Key. You must
+then change the MapView elements in your application to reference the new API
+key. </p>
+
+<p>To generate an MD5 fingerprint of the debug certificate, first locate the debug keystore. The location at which the SDK tools create the default debug keystore varies by platform: </p>
+
+<ul>
+<li>Windows Vista: <code>C:\Users\&lt;user&gt;\AppData\Local\Android\debug.keystore</code></li>
+<li>Windows XP: <code>C:\Documents and Settings\&lt;user&gt;\Local Settings\Application&nbsp;Data\Android\debug.keystore</code></li>
+<li>OS X and Linux: <code>~/.android/debug.keystore</code></li>
+</ul>
+
+<p>If you are using Eclipse/ADT and are unsure where the debug keystore is located, you can select <strong>Windows</strong> &gt; <strong>Prefs</strong> &gt; <strong>Android</strong> &gt; <strong>Build</strong> to check the full path, which you can then paste into a file explorer to locate the directory containing the keystore.</p>
+
+<p>Once you have located the keystore, use this Keytool command to get the MD5 fingerprint of the debug certificate:</p>
+
+<pre>$ keytool -list -alias androiddebugkey \
+-keystore &lt;path_to_debug_keystore&gt;.keystore \
+-storepass android -keypass android</pre>
+
+<h2 id="registering">Registering the Certificate Fingerprint with the Google Maps Service</h2>
+
+<p>When you are ready to register for a Maps API Key, load this page in a browser: </p>
+
+<p><a href="http://code.google.com/android/maps-api-signup.html">http://code.google.com/android/maps-api-signup.html</a></p>
+
+<p>To register for a Maps API Key, follow these steps:</p>
+
+<ol>
+<li>If you don't have a Google account, use the link on the page to set one up. </li>
+<li>Read the Android Maps API Terms of Service carefully. If you agree to the terms, indicate so using the checkbox on the screen. </li>
+<li>Paste the MD5 certificate fingerprint of the certificate that you are registering into the appropriate form field.</li>
+<li>Click "Generate API Key"</li>
+</ol>
+
+<p>The server will handle your request, associating the fingerprint with your developer identity and generating a unique Maps API Key, then returning a results page that gives you your Key string. </p>
+
+<p>To use the Maps API Key string, copy and paste it into your code as described in the next section.</p>
+
+<h2 id="addingkey">Adding the Maps API Key to your Application</h2>
+
+<p>Once you've registered with the Google Maps service and have obtained a Maps API Key, you must add it to your application's MapView objects, so that the Maps server will allow them to download Maps tiles. </p>
+
+<p>For <code>&lt;MapView&gt;</code> elements declared in XML layout files, add the Maps API Key as the value of a special attribute &mdash; <code>android:apiKey</code>. For example: </li>
+
+<pre>&lt;com.google.android.maps.MapView
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:enabled="true"
+ android:clickable="true"
+ android:apiKey="example_Maps_ApiKey_String"
+ /&gt;</pre>
+</li>
+
+<p>For MapView objects instantiated directly from code, pass the Maps API Key string as a parameter in the constructor. For example: </p>
+
+<pre>mMapView = new MapView(this, "example_Maps_ApiKey_String");</pre> 
+
+<p>For more information about MapView, see the MapView class Documentation. </p>
+
+<h2 id="finalsteps">Final Steps to Enable MapView Elements</h2>
+
+<p>If you've added the Maps API Key to the MapViews in your application, here are the final steps to enable the MapView elements to run properly:</p>
+
+<ul>
+<li>Make sure that you added a <code>&lt;uses-library&gt;</code> element referencing the external <code>com.google.android.maps</code> library. The element must be a child of the <code>&lt;application&gt;</code> element in the application's manifest. For example: 
+
+<p><pre>&lt;manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.example.package.name"&gt;
+ ...
+ &lt;application android:name="MyApplication" &gt;
+   &lt;uses-library android:name="com.google.android.maps" /&gt;
+ ...
+ &lt;/application&gt;</pre></p></li>
+
+<li>Sign your application with the certificate that corresponds to the Maps API Key referenced in your MapView elements. </li>
+
+</ul>
+
+<div class="special"><p>Note that, when you are ready to publish your application, you must get a Maps API Key that is based on the certificate that you will use to sign the application for release. You must then change the Maps API Key string referenced by all of your MapView elements, so that they reference the new Key. </p></div>
+
+
+
diff --git a/docs/html/guide/topics/location/index.jd b/docs/html/guide/topics/location/index.jd
new file mode 100644
index 0000000..53f1d29
--- /dev/null
+++ b/docs/html/guide/topics/location/index.jd
@@ -0,0 +1,109 @@
+page.title=Location
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+
+  <h2>In this document</h2>
+  <ol>
+    <li><a href="#location">android.location</a></li>
+    <li><a href="#maps">com.google.android.maps</a></li>
+  </ol>
+</div>
+</div>
+
+<p>The Android SDK includes two packages that provide Android's primary support
+for building location-based services:
+{@link android.location} and {@link-fixme com.google.android.maps}. 
+Please read on below for a brief introduction to each package.</p>
+
+<h2 id="location">android.location</h2>
+
+<p>This package contains several classes related to
+location services in the Android platform. Most importantly, it introduces the 
+{@link android.location.LocationManager}
+service, which provides an API to determine location and bearing if the
+underlying device (if it supports the service). The LocationManager 
+should <strong>not</strong> be
+instantiated directly; rather, a handle to it should be retrieved via
+{@link android.content.Context#getSystemService(String)
+getSystemService(Context.LOCATION_SERVICE)}.</p>
+
+<p>Once your application has a handle to the LocationManager, your application
+will be able to do three things:</p>
+
+<ul>
+    <li>Query for the list of all LocationProviders known to the
+    LocationManager for its last known location.</li>
+    <li>Register/unregister for periodic updates of current location from a
+    LocationProvider (specified either by Criteria or name).</li>
+    <li>Register/unregister for a given Intent to be fired if the device comes
+    within a given proximity (specified by radius in meters) of a given
+    lat/long.</li>
+</ul>
+
+<p>However, during initial development, you may not have access to real 
+data from a real location provider (Network or GPS). So it may be necessary to
+spoof some data for your application, with some mock location data.</p>
+
+<p class="note"><strong>Note:</strong> If you've used mock LocationProviders in
+previous versions of the SDK (m3/m5), you can no longer provide canned LocationProviders
+in the /system/etc/location directory. These directories will be wiped during boot-up.
+Please follow the new procedures below.</p>
+
+
+<h3>Providing Mock Location Data</h3>
+
+<p>When testing your application on the Android emulator, there are a couple different
+ways to send it some spoof location data: with the DDMS tool or the "geo" command.</p>
+
+<h4 id="ddms">Using DDMS</h4>
+<p>With the DDMS tool, you can simulate location data a few different ways:</p>
+<ul>
+    <li>Manually send individual longitude/latitude coordinates to the device.</li>
+    <li>Use a GPX file describing a route for playback to the device.</li>
+    <li>Use a KML file describing individual placemarks for sequenced playback to the device.</li>
+</ul>
+<p>For more information on using DDMS to spoof location data, see the 
+<a href="{@docRoot}guide/developing/tools/ddms.html#emulator-control">Using DDMS guide</a>.
+
+<h4 id="geo">Using the "geo" command</h4>
+<p>Launch your application in the Android emulator and open a terminal/console in
+your SDK's <code>/tools</code> directory. Now you can use:</p>
+<ul><li><code>geo fix</code> to send a fixed geo-location.
+	<p>This command accepts a longitude and latitude in decimal degrees, and
+	an optional altitude in meters. For example:</p>
+	<pre>geo fix -121.45356 46.51119 4392</pre>
+    </li>
+    <li><code>geo nmea</code> to send an NMEA 0183 sentence.
+	<p>This command accepts a single NMEA sentence of type '$GPGGA' (fix data) or '$GPRMC' (transit data).
+	For example:</p>
+	<pre>geo nmea $GPRMC,081836,A,3751.65,S,14507.36,E,000.0,360.0,130998,011.3,E*62</pre>
+    </li>
+</ul>
+
+
+<h2 id="maps">com.google.android.maps</h2>
+
+<p>This package introduces a number of classes related to
+rendering, controlling, and overlaying customized information on your own
+Google Mapified Activity. The most important of which is the 
+{@link-fixme com.google.android.maps.MapView} class, which automagically draws you a 
+basic Google Map when you add a MapView to your layout. Note that, if you 
+want to do so, then your Activity that handles the 
+MapView must extend {@link-fixme com.google.android.maps.MapActivity}. </p>
+
+<p>Also note that you must obtain a MapView API Key from the Google Maps
+service, before your MapView can load maps data. For more information, see 
+<a href="{@docRoot}guide/topics/location/geo/mapkey.html">Obtaining a MapView API Key</a>.</p>
+
+<p>Once you've created a MapView, you'll probably want to use 
+{@link-fixme com.google.android.maps.MapView#getController()} to 
+retrieve a {@link-fixme com.google.android.maps.MapController}, for controlling and 
+animating the map, and {@link-fixme com.google.android.maps.ItemizedOverlay} to
+draw {@link-fixme com.google.android.maps.Overlay}s and other information on the Map.</p>
+
+<p>This is not a standard package in the Android library. In order to use it, you must add the following node to your Android Manifest file, as a child of the 
+<code>&lt;application></code> element:</p>
+<pre>&lt;uses-library android:name="com.google.android.maps" /></pre>
+
diff --git a/docs/html/guide/topics/manifest/action-element.jd b/docs/html/guide/topics/manifest/action-element.jd
new file mode 100644
index 0000000..bc2e1d3
--- /dev/null
+++ b/docs/html/guide/topics/manifest/action-element.jd
@@ -0,0 +1,46 @@
+page.title=&lt;action&gt;
+@jd:body
+
+<dl class="xml">
+<dt>syntax:</dt>
+<dd><pre class="stx">&lt;action android:<a href="#nm">name</a>="<i>string</i>" /&gt;</pre></dd>
+
+<dt>contained in:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">&lt;intent-filter&gt;</a></code></dd>
+
+<p>
+<dt>description:</dt>
+<dd>Adds an action to an intent filter. 
+An <code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">&lt;intent-filter&gt;</a></code> element must contain 
+one or more {@code &lt;action&gt;} elements.  If it doesn't contain any, no
+Intent objects will get through the filter.  See 
+<a href="{@docRoot}guide/topics/intents/intents-filters.html">Intents and 
+Intent Filters</a> for details on intent filters and the role of action
+specifications within a filter.
+</dd>
+
+<dt>attributes:</dt>
+<dd><dl class="attr">
+<dt><a name="nm"></a>{@code android:name}</dt>
+<dd>The name of the action.  Some standard actions are defined in the
+{@link android.content.Intent#ACTION_CHOOSER Intent} class as 
+{@code ACTION_<i>string</i>} constants.  To assign one of these actions to 
+this attribute, prepend "{@code android.intent.action.}" to the 
+{@code <i>string</i>} that follows {@code ACTION_}.
+For example, for {@code ACTION_MAIN}, use "{@code android.intent.action.MAIN}"
+and for {@code ACTION_WEB_SEARCH}, use "{@code android.intent.action.WEB_SEARCH}".
+
+<p>
+For actions you define, it's best to use the package name as a prefix to
+ensure uniqueness.  For example, a {@code TRANSMOGRIFY} action might be specified 
+as follows:
+</p>
+
+<pre>&lt;action android:name="com.example.project.TRANSMOGRIFY" /&gt;</pre>
+</dd>
+</dl></dd>
+
+<dt>see also:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">&lt;intent-filter&gt;</a></code></dd>
+
+</dl>
\ No newline at end of file
diff --git a/docs/html/guide/topics/manifest/activity-alias-element.jd b/docs/html/guide/topics/manifest/activity-alias-element.jd
new file mode 100644
index 0000000..9d81d50
--- /dev/null
+++ b/docs/html/guide/topics/manifest/activity-alias-element.jd
@@ -0,0 +1,129 @@
+page.title=&lt;activity-alias&gt;
+@jd:body
+
+<dl class="xml">
+<dt>syntax:</dt>
+<dd><pre class="stx">&lt;activity-alias android:<a href="#enabled">enabled</a>=["true" | "false"]
+                android:<a href="#exported">exported</a>=["true" | "false"]
+                android:<a href="#icon">icon</a>="<i>drawable resource</i>"
+                android:<a href="#label">label</a>="<i>string resource</i>"
+                android:<a href="#nm">name</a>="<i>string</i>"
+                android:<a href="#prmsn">permission</a>="<i>string</i>"
+                android:<a href="#trgt">targetActivity</a>="<i>string</i>" &gt;
+    . . .
+&lt;/activity-alias&gt;</pre></dd>
+
+<dt>contained in:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code></dd>
+
+<dt>can contain:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">&lt;intent-filter&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html">&lt;meta-data&gt;</a></code></dd>
+
+<dt>description:</dt>
+<dd>An alias for an activity, named by the {@code targetActivity} 
+attribute.  The target must be in the same application as the
+alias and it must be declared before the alias in the manifest.
+
+<p>
+The alias presents the target activity as a independent entity.
+It can have its own set of intent filters, and they, rather than the 
+intent filters on the target activity itself, determine which intents 
+can activate the target through the alias and how the system
+treats the alias.  For example, the intent filters on the alias may 
+specify the "<code>{@link android.content.Intent#ACTION_MAIN 
+android.intent.action.MAIN}</code>" 
+and "<code>{@link android.content.Intent#CATEGORY_LAUNCHER 
+android.intent.category.LAUNCHER}</code>" flags, causing it to be 
+represented in the application launcher, even though none of the 
+filters on the target activity itself set these flags.
+</p>
+
+<p>
+With the exception of {@code targetActivity}, {@code &lt;activity-alias&gt;} 
+attributes are a subset of <code><a href="{@docRoot}guide/topics/manifest/activity-element.html">&lt;activity&gt;</a></code> attributes.  
+For attributes in the subset, none of the values set for the target carry over
+to the alias.  However, for attributes not in the subset, the values set for 
+the target activity also apply to the alias.
+</p></dd>
+
+<dt>attributes:</dt>
+<dd><dl class="attr">
+<dt><a name="enabled"></a>{@code android:enabled}</dt>
+<dd>Whether or not the target activity can be instantiated by the system through 
+this alias &mdash; "{@code true}" if it can be, and "{@code false}" if not.  
+The default value is "{@code true}".
+
+<p>
+The <code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> element has its own 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html#enabled">enabled</a></code> attribute that applies to all 
+application components, including activity aliases.  The 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> and {@code &lt;activity-alias&gt;} 
+attributes must both be "{@code true}" for the system to be able to instantiate 
+the target activity through the alias.  If either is "{@code false}", the alias 
+does not work.
+</p></dd>
+
+<dt><a name="exported"></a>{@code android:exported}</dt>
+<dd>Whether or not components of other applications can launch the target activity 
+through this alias &mdash; "{@code true}" if they can, and "{@code false}" if not.  
+If "{@code false}", the target activity can be launched through the alias only by 
+components of the same application as the alias or applications with the same user ID.  
+
+<p>
+The default value depends on whether the alias contains intent filters.  The 
+absence of any filters means that the activity can be invoked through the alias
+only by specifying the exact name of the alias.  This implies that the alias 
+is intended only for application-internal use (since others would not know its name)  
+&mdash; so the default value is "{@code false}".
+On the other hand, the presence of at least one filter implies that the alias 
+is intended for external use &mdash; so the default value is "{@code true}".
+</p></dd>
+
+<dt><a name="icon"></a>{@code android:icon}</dt>
+<dd>An icon for the target activity when presented to users through the alias.  
+See the <code><a href="{@docRoot}guide/topics/manifest/activity-element.html">&lt;activity&gt;</a></code> element's 
+<code><a href="{@docRoot}guide/topics/manifest/activity-element.html#icon">icon</a></code> attribute for more information.
+
+<dt><a name="label"></a>{@code android:label}</dt>
+<dd>A user-readable label for the alias when presented to users through the alias.
+See the the <code><a href="{@docRoot}guide/topics/manifest/activity-element.html">&lt;activity&gt;</a></code> element's 
+<code><a href="{@docRoot}guide/topics/manifest/activity-element.html#label">label</a></code> attribute for more information.
+</p></dd>
+
+<dt><a name="nm">{@code android:name}</dt>
+<dd>A unique name for the alias.  The name should resemble a fully
+qualified class name.  But, unlike the name of the target activity, 
+the alias name is arbitrary; it does not refer to an actual class.  
+</p></dd>
+
+<dt><a name="prmsn"></a>{@code android:permission}</dt>
+<dd>The name of a permission that clients must have to launch the target activity 
+or get it to do something via the alias.  If a caller of 
+<code>{@link android.content.Context#startActivity startActivity()}</code> or
+<code>{@link android.app.Activity#startActivityForResult startActivityForResult()}</code>
+has not been granted the specified permission, the target activity will not be
+activated. 
+
+<p>This attribute supplants any permission set for the target activity itself.  If
+it is not set, a permission is not needed to activate the target through the alias.
+</p>
+
+<p>
+For more information on permissions, see the 
+<a href="{@docRoot}guide/topics/manifest/manifest-intro.html#perms">Permissions</a> 
+section in the introduction.
+</p></dd>
+
+<dt><a name="trgt"></a>{@code android:targetActivity}</dt>
+<dd>The name of the activity that can be activated through the alias.
+This name must match the {@code name} attribute of an 
+<code><a href="{@docRoot}guide/topics/manifest/activity-element.html">&lt;activity&gt;</a></code> element that precedes
+the alias in the manifest.
+</p></dd>
+</dl></dd>
+
+<dt>see also:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/activity-element.html">&lt;activity&gt;</a></code></dd>
+
+</dl>
\ No newline at end of file
diff --git a/docs/html/guide/topics/manifest/activity-element.jd b/docs/html/guide/topics/manifest/activity-element.jd
new file mode 100644
index 0000000..aba89d7
--- /dev/null
+++ b/docs/html/guide/topics/manifest/activity-element.jd
@@ -0,0 +1,565 @@
+page.title=&lt;activity&gt;
+@jd:body
+
+<dl class="xml">
+<dt>syntax:</dt>
+<dd><pre class="stx">&lt;activity android:<a href="#reparent">allowTaskReparenting</a>=["true" | "false"]
+          android:<a href="#always">alwaysRetainTaskState</a>=["true" | "false"]
+          android:<a href="#clear">clearTaskOnLaunch</a>=["true"" | "false"]
+          android:<a href="#config">configChanges</a>=[<i>one or more of</i>: "mcc" "mnc" "locale" 
+                                 "touchscreen" "keyboard" "keyboardHidden" 
+                                 "navigation" "orientation" "fontScale"]
+          android:<a href="#enabled">enabled</a>=["true" | "false"]
+          android:<a href="#exclude">excludeFromRecents</a>=["true" | "false"]
+          android:<a href="#exported">exported</a>=["true" | "false"]
+          android:<a href="#finish">finishOnTaskLaunch</a>=["true" | "false"]
+          android:<a href="#icon">icon</a>="<i>drawable resource</i>"
+          android:<a href="#label">label</a>="<i>string resource</i>"
+          android:<a href="#lmode">launchMode</a>=["multiple" | "singleTop" | 
+                              "singleTask" | "singleInstance"]
+          android:<a href="#multi">multiprocess</a>=["true" | "false"]
+          android:<a href="#nm">name</a>="<i>string</i>"
+          android:<a href="#prmsn">permission</a>="<i>string</i>"
+          android:<a href="#proc">process</a>="<i>string</i>"
+          android:<a href="#screen">screenOrientation</a>=["unspecified" | "user" | "behind" |
+                                     "landscape" | "portrait" | 
+                                     "sensor" | "nonsensor"]
+          android:<a href="#state">stateNotNeeded</a>=["true" | "false"]
+          android:<a href="#aff">taskAffinity</a>="<i>string</i>"
+          android:<a href="#theme">theme</a>="<i>resource or theme</i>" &gt;
+    . . .
+&lt;/activity&gt;</pre></dd>
+
+<dt>contained in:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code></dd>
+
+<dt>can contain:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">&lt;intent-filter&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html">&lt;meta-data&gt;</a></code></dd>
+
+<dt>description:</dt>
+<dd>Declares an activity (an {@link android.app.Activity} subclass) that 
+implements part of the application's visual user interface.  All activities 
+must be represented by {@code &lt;activity&gt;} 
+elements in the manifest file.  Any that are not declared there will not be seen 
+by the system and will never be run.
+
+<dt>attributes:</dt>
+<dd><dl class="attr">
+<dt><a href name="reparent"></a>{@code android:allowTaskReparenting}</dt>
+<dd>Whether or not the activity can move from the task that started it to 
+the task it has an affinity for when that task is next brought to the 
+front &mdash; "{@code true}" if it can move, and "{@code false}" if it 
+must remain with the task where it started.  
+
+<p>
+If this attribute is not set, the value set by the corresponding 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html#reparent">allowTaskReparenting</a></code>
+attribute of the <code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> element 
+applies to the activity.  The default value is "{@code false}".
+</p>
+
+<p>
+Normally when an activity is started, it's associated with the task of 
+the activity that started it and it stays there for its entire lifetime.  
+You can use this attribute to force it to be re-parented to the task it 
+has an affinity for when its current task is no longer displayed.  
+Typically, it's used to cause the activities of an application to move 
+to the main task associated with that application.
+</p>
+
+<p>
+For example, if an e-mail message contains a link to a web page, clicking 
+the link brings up an activity that can display the page.  That activity 
+is defined by the browser application, but is launched as part of the e-mail 
+task.  If it's reparented to the browser task, it will be shown when the 
+browser next comes to the front, and will be absent when the e-mail task 
+again comes forward.
+</p>
+
+<p>
+The affinity of an activity is defined by the 
+<code><a href="#aff">taskAffinity</a></code> attribute.  The affinity 
+of a task is determined by reading the affinity of its root activity.
+Therefore, by definition, a root activity is always in a task with the
+same affinity.  Since activities with "{@code singleTask}" or 
+"{@code singleInstance}" launch modes can only be at the root of a task,
+re-parenting is limited to the "{@code standard}" and "{@code singleTop}" 
+modes.  (See also the <code><a href="#lmode">launchMode</a></code> 
+attribute.)
+</p></dd>
+
+<dt><a name="always"></a>{@code android:alwaysRetainTaskState}</dt>
+<dd>Whether or not the state of the task that the activity is in will always 
+be maintained by the system &mdash; "{@code true}" if it will be, and 
+"{@code false}" if the system is allowed to reset the task to its initial 
+state in certain situations.  The default value is "{@code false}".  This 
+attribute is meaningful only for the root activity of a task; it's ignored 
+for all other activities.
+
+<p>
+Normally, the system clears a task (removes all activities from the stack 
+above the root activity) in certain situations when the user re-selects that 
+task from the home screen.  Typically, this is done if the user hasn't visited 
+the task for a certain amount of time, such as 30 minutes.
+</p>
+
+<p>
+However, when this attribute is "{@code true}", users will always return 
+to the task in its last state, regardless of how they get there.  This is 
+useful, for example, in an application like the web browser where there is 
+a lot of state (such as multiple open tabs) that users would not like to lose.
+</p></dd>
+
+<dt><a name="clear"></a>{@code android:clearTaskOnLaunch}</dt>
+<dd>Whether or not all activities will be removed from the task, except for 
+the root activity, whenever it is re-launched from the home screen &mdash; 
+"{@code true}" if the task is always stripped down to its root activity, and 
+"{@code false}" if not.  The default value is "{@code false}".  This attribute 
+is meaningful only for activities that start a new task (the root activity); 
+it's ignored for all other activities in the task.
+
+<p>
+When the value is "{@code true}", every time users start the task again, they 
+are brought to its root activity, regardless of what they were last doing in 
+the task and regardless of whether they used BACK or HOME to last leave it.  
+When the value is "{@code false}", the task may be cleared of activities in 
+some situations (see the 
+<code><a href="#always">alwaysRetainTaskState</a></code> attribute), but not always.  
+</p>
+
+<p>
+Suppose, for example, that someone launches activity P from the home screen, 
+and from there goes to activity Q.  The user next presses HOME, and then returns 
+to activity P.  Normally, the user would see activity Q, since that is what they 
+were last doing in P's task.  However, if P set this flag to "{@code true}", all 
+of the activities on top of it (Q in this case) were removed when the user pressed 
+HOME and the task went to the background.  So the user sees only P when returning 
+to the task.
+</p>
+
+<p>
+If this attribute and <code><a href="#reparent">allowTaskReparenting</a></code> 
+are both "{@code true}", any activities that can be re-parented are moved to 
+the task they share an affinity with; the remaining activities are then dropped, 
+as described above.
+</p></dd>
+
+<dt><a name="config"></a>{@code android:configChanges}</dt>
+<dd>Lists configuration changes that the activity will handle itself.  When 
+changes that are not listed occur, the activity is shut down and restarted.  
+When a listed change occurs, the activity remains running and its <code>{@link android.app.Activity#onConfigurationChanged onConfigurationChanged()}</code> 
+method is called.
+
+<p>
+Any or all of the following strings can be used to set this attribute.  Values are 
+separated by '{@code |}' &mdash; for example, "{@code locale|navigation|orientation}".
+</p>
+
+<table>
+<tr>
+   <td><b>Value</b></td>
+   <td><b>Description</b></td>
+</tr><tr>
+   <td>"{@code mcc}"</td>
+   <td>The IMSI mobile country code (MCC) has changed &mdash; 
+       that is, a SIM has been detected and updated the MCC.</td>
+</tr><tr>
+   <td>"{@code mnc}"</td>
+   <td>The IMSI mobile network code (MNC) has changed &mdash; 
+       that is, a SIM has been detected and updated the MNC.</td>
+</tr><tr>
+   <td>"{@code locale}"</td>
+   <td>The locale has changed &mdash; for example, the user has selected a new 
+       language that text should be displayed in.</td>
+</tr><tr>
+   <td>"{@code touchscreen}"</td>
+   <td>The touchscreen has changed.  (This should never normally happen.)</td>
+</tr><tr>
+   <td>"{@code keyboard}"</td>
+   <td>The keyboard type has changed &mdash; for example, the user has 
+       plugged in an external keyboard.</td>
+</tr><tr>
+   <td>"{@code keyboardHidden}"</td>
+   <td>The keyboard accessibility has changed &mdash; for example, the 
+       user has slid the keyboard out to expose it.</td>
+</tr><tr>
+   <td>"{@code navigation}"</td>
+   <td>The navigation type has changed.  (This should never normally happen.)</td>
+</tr><tr>
+   <td>"{@code orientation}"</td> 
+   <td>The screen orientation has changed &mdash; that is, the user has rotated 
+       the device.</td>
+ </tr><tr>
+  <td>"{@code fontScale}"</td>
+   <td>The font scaling factor has changed &mdash; that is, the user has selected 
+       a new global font size.</td>
+</tr>
+</table>
+
+<p>
+All of these configuration changes can impact the resource values seen by the 
+application.  Therefore, when <code>{@link android.app.Activity#onConfigurationChanged 
+onConfigurationChanged()}</code> is called, it will generally be necessary to again 
+retrieve all resources (including view layouts, drawables, and so on) to correctly 
+handle the change. 
+</p></dd>
+
+<dt><a name="enabled"></a>{@code android:enabled}</dt>
+<dd>Whether or not the activity can be instantiated by the system &mdash; 
+"{@code true}" if it can be, and "{@code false}" if not.  The default value 
+is "{@code true}".
+
+<p>
+The <code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> element has its own 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html#enabled">enabled</a></code> attribute that applies to all 
+application components, including activities.  The 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> and {@code &lt;activity&gt;} 
+attributes must both be "{@code true}" (as they both are by default) for 
+the system to be able to instantiate the activity.  If either is 
+"{@code false}", it cannot be instantiated.
+</p></dd>
+
+<dt><a name="exclude"></a>{@code android:excludeFromRecents}</dt>
+<dd>Whether or not the activity should be excluded from the list of recently 
+launched activities that can be displayed to users &mdash; "{@code true}" if 
+it should be excluded, and "{@code false}" if it should be included.  
+The default value is "{@code false}".
+</p></dd>
+
+<dt><a name="exported"></a>{@code android:exported}</dt>
+<dd>Whether or not the activity can be launched by components of other 
+applications &mdash; "{@code true}" if it can be, and "{@code false}" if not.  
+If "{@code false}", the activity can be launched only by components of the 
+same application or applications with the same user ID.  
+
+<p>
+The default value depends on whether the activity contains intent filters.  The 
+absence of any filters means that the activity can be invoked only by specifying 
+its exact class name.  This implies that the activity is intended only for 
+application-internal use (since others would not know the class name).  So in 
+this case, the default value is "{@code false}".
+On the other hand, the presence of at least one filter implies that the activity 
+is intended for external use, so the default value is "{@code true}".
+</p>
+
+<p>
+This attribute is not the only way to limit an activity's exposure to other
+applications.  You can also use a permission to limit the external entities that 
+can invoke the activity  (see the <code><a href="{@docRoot}guide/topics/manifest/activity-element.html#prmsn">permission</a></code> 
+attribute).
+</p></dd>
+
+<dt><a name="finish"></a>{@code android:finishOnTaskLaunch}</dt>
+<dd>Whether or not an existing instance of the activity should be shut down 
+(finished) whenever the user again launches its task (chooses the task on the 
+home screen) &mdash; "{@code true}" if it should be shut down, and "{@code false}" 
+if not.  The default value is "{@code false}". 
+
+<p>
+If this attribute and <code><a href="{@docRoot}guide/topics/manifest/activity-element.html#reparent">allowTaskReparenting</a></code> 
+are both "{@code true}", this attribute trumps the other.  The affinity of the 
+activity is ignored.  The activity is not re-parented, but destroyed.
+</p>
+
+<dt><a name="icon"></a>{@code android:icon}</dt>
+<dd>An icon representing the activity. The icon is displayed to users when 
+a representation of the activity is required on-screen.  For example, icons 
+for activities that initiate tasks are displayed in the launcher window.  
+The icon is often accompanied by a label (see the {@code label} attribute).
+</p>
+
+<p>
+This attribute must be set as a reference to a drawable resource containing 
+the image definition.  If it is not set, the icon specified for the application 
+as a whole is used instead (see the <code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> 
+element's <code><a href="{@docRoot}guide/topics/manifest/application-element.html#icon">icon</a></code> attribute).
+</p>
+
+<p>
+The activity's icon &mdash; whether set here or by the 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> element &mdash; is also the 
+default icon for all the activity's intent filters (see the 
+<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">&lt;intent-filter&gt;</a></code> element's 
+<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html#icon">icon</a></code> attribute). 
+</p></dd>
+
+<dt><a name="label"></a>{@code android:label}</dt>
+<dd>A user-readable label for the activity.  The label is displayed on-screen 
+when the activity must be represented to the user. It's often displayed along 
+with the activity icon.
+
+<p>
+If this attribute is not set, the label set for the application as a whole is 
+used instead (see the <code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> element's 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html#label">label</a></code> attribute).
+</p>
+
+<p>
+The activity's label &mdash; whether set here or by the 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> element &mdash; is also the 
+default label for all the activity's intent filters (see the 
+<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">&lt;intent-filter&gt;</a></code> element's 
+<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html#label">label</a></code> attribute). 
+</p>
+
+<p>
+The label should be set as a reference to a string resource, so that
+it can be localized like other strings in the user interface.  
+However, as a convenience while you're developing the application, 
+it can also be set as a raw string.
+</p></dd>
+
+<dt><a name="lmode"></a>{@code android:launchMode}</dt>
+<dd>An instruction on how the activity should be launched.  There are four modes 
+that work in conjunction with activity flags ({@code FLAG_ACTIVITY_*} constants) 
+in {@link android.content.Intent} objects to determine what should happen when 
+the activity is called upon to handle an intent.  They are:
+
+<p style="margin-left: 2em">"{@code standard}"
+<br>"{@code singleTop}"
+<br>"{@code singleTask}"
+<br>"{@code singleInstance}"</p>
+
+<p>
+The default mode is "{@code standard}".
+</p>
+
+<p>
+The modes fall into two main groups, with "{@code standard}" and 
+"{@code singleTop}" activities on one side, and "{@code singleTask}" and 
+"{@code singleInstance}" activities on the other.  An activity with the 
+"{@code standard}" or "{@code singleTop}" launch mode can be instantiated 
+multiple times.  The instances can belong to any task and can be located 
+anywhere in the activity stack.  Typically, they're launched into the task 
+that called 
+<code>{@link android.content.Context#startActivity startActivity()}</code>
+(unless the Intent object contains a 
+<code>{@link android.content.Intent#FLAG_ACTIVITY_NEW_TASK}</code> 
+instruction, in which case a different task is chosen &mdash; see the 
+<a href="#aff">taskAffinity</a> attribute).
+</p>
+
+<p>
+In contrast, "{@code singleTask}" and "{@code singleInstance}" activities 
+can only begin a task.  They are always at the root of the activity stack. 
+Moreover, the device can hold only one instance of the activity at a time 
+&mdash; only one such task.
+</p>
+
+<p>
+The "{@code standard}" and "{@code singleTop}" modes differ from each other 
+in just one respect:  Every time there's new intent for a "{@code standard}" 
+activity, a new instance of the class is created to respond to that intent.  
+Each instance handles a single intent.
+Similarly, a new instance of a "{@code singleTop}" activity may also be 
+created to handle a new intent.  However, if the target task already has an 
+existing instance of the activity at the top of its stack, that instance 
+will receive the new intent (in an 
+<code>{@link android.app.Activity#onNewIntent onNewIntent()}</code> call);
+a new instance is not created.
+In other circumstances &mdash; for example, if an existing instance of the 
+"{@code singleTop}" activity is in the target task, but not at the top of 
+the stack, or if it's at the top of a stack, but not in the target task 
+&mdash; a new instance would be created and pushed on the stack.
+</p>  
+
+<p>
+The "{@code singleTask}" and "{@code singleInstance}" modes also differ from 
+each other in only one respect:  A "{@code singleTask}" activity allows other 
+activities to be part of its task.  It's at the root of the activity stack, 
+but other activities (necessarily "{@code standard}" and "{@code singleTop}" 
+activities) can be launched into the same task.  A "{@code singleInstance}" 
+activity, on the other hand, permits no other activities to be part of its 
+task.  It's the only activity in the task.  If it starts another activity, 
+that activity is assigned to a different task &mdash; as if {@code
+FLAG_ACTIVITY_NEW_TASK} was in the intent.
+</p>
+
+<p>For more information on launch modes and their interaction with Intent
+flags, see the 
+<a href="{@docRoot}guide/topics/fundamentals.html#acttask">Activities and 
+Tasks</a> section of the 
+<a href="{@docRoot}guide/topics/fundamentals.html">Application Fundamentals</a>
+document.
+</p>
+</dd>
+
+<dt><a name="multi"></a>{@code android:multiprocess}</dt>
+<dd>Whether an instance of the activity can be launched into the process of the component 
+that started it &mdash; "{@code true}" if it can be, and "{@code false}" if not.  
+The default value is "{@code false}".
+
+<p>
+Normally, a new instance of an activity is launched into the process of the 
+application that defined it, so all instances of the activity run in the same 
+process.  However, if this flag is set to "{@code true}", instances of the 
+activity can run in multiple processes, allowing the system to create instances 
+wherever they are used (provided permissions allow it), something that is almost 
+never necessary or desirable.
+</p></dd>
+
+<dt><a name="nm"></a>{@code android:name}</dt>
+<dd>The name of the class that implements the activity, a subclass of 
+{@link android.app.Activity}.  The attribute value should be a fully qualified 
+class name (such as, "{@code com.example.project.ExtracurricularActivity}").  
+However, as a shorthand, if the first character of the name is a period 
+(for example, "{@code .ExtracurricularActivity}"), it is appended to the 
+package name specified in the 
+<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html">&lt;manifest&gt;</a></code> 
+element.
+
+<p>
+There is no default.  The name must be specified.
+</p></dd>
+
+<dt><a name="prmsn"></a>{@code android:permission}</dt>
+<dd>The name of a permission that clients must have to launch the activity 
+or otherwise get it to respond to an intent.  If a caller of 
+<code>{@link android.content.Context#startActivity startActivity()}</code> or
+<code>{@link android.app.Activity#startActivityForResult startActivityForResult()}</code>
+has not been granted the specified permission, its intent will not be 
+delivered to the activity.
+
+<p>
+If this attribute is not set, the permission set by the 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> element's
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html#prmsn">permission</a></code> attribute applies 
+to the activity.  If neither attribute is set, the activity is
+not protected by a permission.
+</p>
+
+<p>
+For more information on permissions, see the 
+<a href="{@docRoot}guide/topics/manifest/manifest-intro.html#sectperm">Permissions</a> 
+section in the introduction and another document, 
+<a href="{@docRoot}guide/topics/security/security.html">Security and
+Permissions</a>.
+</p></dd>
+
+<dt><a name="proc"></a>{@code android:process}</dt>
+<dd>The name of the process in which the activity should run.  Normally, 
+all components of an application run in the default process created for the 
+application.  It has the same name as the application package.  The <code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> element's 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html#proc">process</a></code> attribute can set a different 
+default for all components.  But each component can override the default,
+allowing you to spread your application across multiple processes.
+
+<p>
+If the name assigned to this attribute begins with a colon (':'), a new 
+process, private to the application, is created when it's needed and 
+the activity runs in that process.
+If the process name begins with a lowercase character, the activity will run 
+in a global process of that name, provided that it has permission to do so.
+This allows components in different applications to share a process, reducing 
+resource usage.
+</p></dd>
+
+<dt><a name="screen"></a>{@code android:screenOrientation}</dt>
+<dd>The orientation of the activity's display on the device.
+The value can be any one of the following strings:
+
+<table>
+<tr>
+   <td>"{@code unspecified}"</td>
+   <td>The default value.  The system chooses the orientation.  The policy it
+       uses, and therefore the choices made in specific contexts, may differ 
+       from device to device.</td>
+</tr><tr>
+   <td>"{@code landscape}"</td>
+   <td>Landscape orientation (the display is wider than it is tall).</td>
+</tr><tr>
+   <td>"{@code portrait}"</td>
+   <td>Portrait orientation (the display is taller than it is wide).</td>
+</tr><tr>
+   <td>"{@code user}"</td>
+   <td>The user's current preferred orientation.</td>
+</tr><tr>
+   <td>"{@code behind}"</td>
+   <td>The same orientation as the activity that's immediately beneath it in 
+       the activity stack.</td>
+</tr><tr>
+   <td>"{@code sensor}"</td>
+   <td>The orientation determined by a physical orientation sensor.  The 
+       orientation of the display depends on how the user is holding the device; 
+       it changes when the user rotates the device.</td>
+</tr><tr>
+   <td>"{@code nosensor}"</td>
+   <td>An orientation determined without reference to a physical orientation sensor.  
+       The sensor is ignored, so the display will not rotate based on how the user 
+       moves the device.  Except for this distinction, the system chooses the 
+       orientation using the same policy as for the "{@code unspecified}" setting.</td>
+</tr>
+</table></dd>
+
+<dt><a name="state"></a>{@code android:stateNotNeeded}</dt>
+<dd>Whether or not the activity can be killed and successfully restarted 
+without having saved its state &mdash; "{@code true}" if it can be restarted 
+without reference to its previous state, and "{@code false}" if its previous 
+state is required.  The default value is "{@code false}".
+
+<p>
+Normally, before an activity is temporarily shut down to save resources, its 
+<code>{@link android.app.Activity#onSaveInstanceState onSaveInstanceState()}</code> 
+method is called.  This method stores the current state of the activity in a 
+{@link android.os.Bundle} object, which is then passed to 
+<code>{@link android.app.Activity#onCreate onCreate()}</code> when the activity 
+is restarted.  If this attribute is set to "{@code true}", 
+{@code onSaveInstanceState()} may not be called and {@code onCreate()} will 
+be passed {@code null} instead of the Bundle &mdash; just as it was when the 
+activity started for the first time.
+</p>
+
+<p>
+A "{@code true}" setting ensures that the activity can be restarted in the 
+absence of retained state.  For example, the activity that displays the 
+home screen uses this setting to make sure that it does not get removed if it 
+crashes for some reason. 
+</p></dd>
+
+<dt><a name="aff"></a>{@code android:taskAffinity}</dt>
+<dd>The task that the activity has an affinity for.  Activities with 
+the same affinity conceptually belong to the same task (to the same
+"application" from the user's perspective).  The affinity of a task 
+is determined by the affinity of its root activity. 
+
+<p>
+The affinity determines two things &mdash; the task that the activity is re-parented 
+to (see the <code><a href="{@docRoot}guide/topics/manifest/activity-element.html#reparent">allowTaskReparenting</a></code> 
+attribute) and the task that will house the activity when it is launched 
+with the <code>{@link android.content.Intent#FLAG_ACTIVITY_NEW_TASK}</code> 
+flag.
+</p>
+
+<p>
+By default, all activities in an application have the same affinity.  You
+can set this attribute to group them differently, and even place
+activities defined in different applications within the same task.  To 
+specify that the activity does not have an affinity for any task, set
+it to an empty string.
+
+<p>
+If this attribute is not set, the activity inherits the affinity set 
+for the application (see the <code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> 
+element's <code><a href="{@docRoot}guide/topics/manifest/application-element.html#aff">taskAffinity</a></code> attribute).  
+The name of the default affinity for an application is the package name set 
+by the <code><a href="{@docRoot}guide/topics/manifest/manifest-element.html">&lt;manifest&gt;</a></code> element.
+</p>
+
+<dt><a name="theme"></a>{@code android:theme}</dt>
+<dd>A reference to a style resource defining an overall theme for the activity.  
+This automatically sets the activity's context to use this theme (see
+<code>{@link android.content.Context#setTheme setTheme()}</code>, and may also 
+cause "starting" animations prior to the activity being launched (to better 
+match what the activity actually looks like).
+
+<p>
+If this attribute is not set, the activity inherits the theme set for the 
+application as a whole &mdash; see the <code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> 
+element's <code><a href="{@docRoot}guide/topics/manifest/application-element.html#theme">theme</a></code> attribute.  If that attribute is 
+also not set, the default system theme is used.
+</p>
+<dd> 
+</dl></dd>
+
+</dl>
\ No newline at end of file
diff --git a/docs/html/guide/topics/manifest/application-element.jd b/docs/html/guide/topics/manifest/application-element.jd
new file mode 100644
index 0000000..362c205
--- /dev/null
+++ b/docs/html/guide/topics/manifest/application-element.jd
@@ -0,0 +1,226 @@
+page.title=&lt;application&gt;
+@jd:body
+
+<dl class="xml">
+<dt>syntax:</dt>
+<dd><pre class="stx">&lt;application android:<a href="#clear">allowClearUserData</a>=["true" | "false"]
+             android:<a href="#reparent">allowTaskReparenting</a>=["true" | "false"]
+             android:<a href="#debug">debuggable</a>=["true" | "false"]
+             android:<a href="#desc">description</a>="<i>string resource</i>"
+             android:<a href="#enabled">enabled</a>=["true" | "false"]
+             android:<a href="#code">hasCode</a>=["true" | "false"]
+             android:<a href="#icon">icon</a>="<i>drawable resource</i>"
+             android:<a href="#label">label</a>="<i>string resource</i>"
+             android:<a href="#space">manageSpaceActivity</a>="<i>string</i>"
+             android:<a href="#nm">name</a>="<i>string</i>"
+             android:<a href="#prmsn">permission</a>="<i>string</i>"
+             android:<a href="#persistent">persistent</a>=["true" | "false"]
+             android:<a href="#proc">process</a>="<i>string</i>"
+             android:<a href="#aff">taskAffinity</a>="<i>string</i>"
+             android:<a href="#theme">theme</a>="<i>resource or theme</i>" &gt;
+    . . .
+&lt;/application&gt;</pre></dd>
+
+<dt>contained in:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/manifest-element.html">&lt;manifest&gt;</a></code></dd>
+
+<dt>can contain:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/activity-element.html">&lt;activity&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/activity-alias-element.html">&lt;activity-alias&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/service-element.html">&lt;service&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/receiver-element.html">&lt;receiver&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/provider-element.html">&lt;provider&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/uses-library-element.html">&lt;uses-library&gt;</a></code></dd>
+
+<dt>description:</dt>
+<dd>The declaration of the application.  This element contains subelements 
+that declare each of the application's components and has attributes 
+that can affect all the components.  Many of these attributes (such as 
+{@code icon}, {@code label}, {@code permission}, {@code process}, 
+{@code taskAffinity}, and {@code allowTaskReparenting}) set default values 
+for corresponding attributes of the component elements.  Others (such as
+{@code debuggable}, {@code enabled}, {@code description}, and 
+{@code allowClearUserData})  set values for the application as a whole and 
+cannot be overridden by the components.</dd>
+
+<dt>attributes</dt>
+<dd><dl class="attr">
+<dt><a name="clear"></a>{@code android:allowClearUserData}</dt>
+<dd>Whether or not users are given the option to remove user data &mdash; 
+"{@code true}" if they are, and "{@code false}" if not.  If the value is 
+"{@code true}", as it is by default, the application manager includes an 
+option that allows users to clear the data.</dd>
+
+<dt><a name="reparent"></a>{@code android:allowTaskReparenting}</dt>
+<dd>Whether or not activities that the application defines can move from 
+the task that started them to the task they have an affinity for when that task 
+is next brought to the front &mdash; "{@code true}" if they can move, and 
+"{@code false}" if they must remain with the task where they started.  
+The default value is "{@code false}".
+
+<p>
+The 
+<code><a href="{@docRoot}guide/topics/manifest/activity-element.html">&lt;activity&gt;</a></code> 
+element has its own 
+<code><a href="{@docRoot}guide/topics/manifest/activity-element.html#reparent">allowTaskReparenting</a></code>
+attribute that can override the value set here.  See that attribute for more 
+information.
+</p></dd>
+
+<dt><a name="debug"></a>{@code android:debuggable}</dt>
+<dd>Whether or not the application can be debugged, even when running 
+on a device in user mode &mdash; "{@code true}" if it can be, and "{@code false}"
+if not.  The default value is "{@code false}".</dd> 
+
+<dt><a name="desc"></a>{@code android:description}</dt>
+<dd>User-readable text about the application, longer and more descriptive than the application label.  The value must be set as a reference to a string resource.  Unlike the label, it cannot be a raw string.  There is no default value.</dd>
+
+<dt><a name="enabled"></a>{@code android:enabled}</dt>
+<dd>Whether or not the Android system can instantiate components of 
+the application &mdash; "{@code true}" if it can, and "{@code false}" 
+if not.  If the value is "{@code true}", each component's 
+{@code enabled} attribute determines whether that component is enabled 
+or not.  If the value is "{@code false}", it overrides the 
+component-specific values; all components are disabled.
+
+<p>
+The default value is "{@code true}".
+</p></dd>  
+
+<dt><a name="code"></a>{@code android:hasCode}</dt>
+<dd>Whether or not the application contains any code &mdash; "{@code true}" 
+if it does, and "{@code false}" if not.  When the value is "{@code false}", 
+the system does not try to load any application code when launching components.  
+The default value is "{@code true}".
+
+<p>
+An application would not have any code of its own only if it's using nothing
+but built-in component classes, such as an activity that uses the {@link 
+android.app.AliasActivity} class, a rare occurrence.
+
+<dt><a name="icon"></a>{@code android:icon}</dt>
+<dd>An icon for the application as whole, and the default icon for 
+each of the application's components.  See the individual 
+{@code icon} attributes for 
+<code><a href="{@docRoot}guide/topics/manifest/activity-element.html">&lt;activity&gt;</a></code>, 
+<code><a href="{@docRoot}guide/topics/manifest/activity-alias-element.html">&lt;activity-alias&gt;</a></code>,
+<code><a href="{@docRoot}guide/topics/manifest/service-element.html">&lt;service&gt;</a></code>, 
+<code><a href="{@docRoot}guide/topics/manifest/receiver-element.html">&lt;receiver&gt;</a></code>, and
+<code><a href="{@docRoot}guide/topics/manifest/provider-element.html">&lt;provider&gt;</a></code> elements.
+
+<p>
+This attribute must be set as a reference to a drawable resource containing
+the image definition.   There is no default icon.
+</p></dd>
+
+<dt><a name="label"></a>{@code android:label}</dt>
+<dd>A user-readable label for the application as a whole, and a default 
+label for each of the application's components.  See the individual 
+{@code label} attributes for 
+<code><a href="{@docRoot}guide/topics/manifest/activity-element.html">&lt;activity&gt;</a></code>, 
+<code><a href="{@docRoot}guide/topics/manifest/activity-alias-element.html">&lt;activity-alias&gt;</a></code>,
+<code><a href="{@docRoot}guide/topics/manifest/service-element.html">&lt;service&gt;</a></code>, 
+<code><a href="{@docRoot}guide/topics/manifest/receiver-element.html">&lt;receiver&gt;</a></code>, and
+<code><a href="{@docRoot}guide/topics/manifest/provider-element.html">&lt;provider&gt;</a></code> elements.
+
+<p>
+The label should be set as a reference to a string resource, so that
+it can be localized like other strings in the user interface.  
+However, as a convenience while you're developing the application, 
+it can also be set as a raw string.
+</p></dd>
+
+<dt><a name="space"></a>{@code android:manageSpaceActivity}</dt>
+<dd>The fully qualified name of an Activity subclass that the system 
+can launch to let users manage the memory occupied by the application 
+on the device.  The activity should also be declared with an 
+<code><a href="{@docRoot}guide/topics/manifest/activity-element.html">&lt;activity&gt;</a></code> element.
+</dd>
+
+<dt><a name="nm"></a>{@code android:name}</dt>
+<dd>The fully qualified name of an {@link android.app.Application} 
+subclass implemented for the application.  When the application process 
+is started, this class is instantiated before any of the application's 
+components.  
+
+<p>
+The subclass is optional; most applications won't need one.
+In the absence of a subclass, Android uses an instance of the base 
+Application class.
+</p></dd>
+
+<dt><a name="prmsn"></a>{@code android:permission}</dt>
+<dd>The name of a permission that clients must have in order to interact 
+with the application.  This attribute is a convenient way to set a 
+permission that applies to all of the application's components.  It can 
+be overwritten by setting the {@code permission} attributes of individual 
+components.
+
+<p>
+For more information on permissions, see the 
+<a href="{@docRoot}guide/topics/manifest/manifest-intro.html#sectperm">Permissions</a> 
+section in the introduction and another document, 
+<a href="{@docRoot}guide/topics/security/security.html">Security and
+Permissions</a>.
+</p></dd>
+
+<dt><a name="persistent"></a>{@code android:persistent}</dt>
+<dd>Whether or not the application should remain running at all times &mdash; 
+"{@code true}" if it should, and "{@code false}" if not.  The default value 
+is "{@code false}".  Applications should not normally set this flag; 
+persistence mode is intended only for certain system applications.</dd>
+
+<dt><a name="proc"></a>{@code android:process}</dt>
+<dd>The name of a process where all components of the application should run.
+Each component can override this default by setting its own {@code process}
+attribute.
+
+<p>
+By default, Android creates a process for an application when the first
+of its components needs to run.  All components then run in that process.
+The name of the default process matches the package name set by the
+<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html">&lt;manifest&gt;</a></code> element.
+</p>
+
+<p>By setting this attribute to a process name that's shared with another
+application, you can arrange for components of both applications to run in
+the same process &mdash; but only if the two applications also share a
+user ID and be signed with the same certificate.
+</p>
+
+<p>
+If the name assigned to this attribute begins with a colon (':'), a new 
+process, private to the application, is created when it's needed.
+If the process name begins with a lowercase character, a global process 
+of that name is created.  A global process can be shared with other
+applications, reducing resource usage.
+</p></dd>
+
+<dt><a href name="aff"></a>{@code android:taskAffinity}</dt>
+<dd>An affinity name that applies to all activities within the application,
+except for those that set a different affinity with their own
+<code><a href="{@docRoot}guide/topics/manifest/activity-element.html#aff">taskAffinity</a></code> 
+attributes.  See that attribute for more information.
+
+<p>
+By default, all activities within an application share the same 
+affinity.  The name of that affinity is the same as the package name 
+set by the 
+<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html">&lt;manifest&gt;</a></code> element.
+</p></dd>
+
+<dt><a name="theme"></a>{@code android:theme}</dt>
+<dd>A reference to a style resource defining a default theme for all
+activities in the application.  Individual activities can override
+the default by setting their own <code><a href="{@docRoot}guide/topics/manifest/activity-element.html#theme">theme</a></code> 
+attributes; see that attribute for more information.</dd>
+
+</dl></dd>
+
+<dt>see also:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/activity-element.html">&lt;activity&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/service-element.html">&lt;service&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/receiver-element.html">&lt;receiver&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/provider-element.html">&lt;provider&gt;</a></code></dd>
+
+</dl>
diff --git a/docs/html/guide/topics/manifest/category-element.jd b/docs/html/guide/topics/manifest/category-element.jd
new file mode 100644
index 0000000..50ea576
--- /dev/null
+++ b/docs/html/guide/topics/manifest/category-element.jd
@@ -0,0 +1,38 @@
+page.title=&lt;category&gt;
+@jd:body
+
+<dl class="xml">
+<dt>syntax:</dt>
+<dd><pre class="stx">&lt;category android:<a href="#nm">name</a>="<i>string</i>" /&gt;</pre></dd>
+
+<dt>contained in:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">&lt;intent-filter&gt;</a></code></dd>
+
+<dt>description:</dt>
+<dd>Adds a category name to an intent filter.  See 
+<a href="{@docRoot}guide/topics/intents/intents-filters.html">Intents and 
+Intent Filters</a> for details on intent filters and the role of category
+specifications within a filter.</dd>
+
+<dt>attributes:</dt>
+<dd><dl class="attr">
+<dt><a name="nm"></a>{@code android:name}</dt>
+<dd>The name of the category.  Standard categories are defined in the 
+{@link android.content.Intent} class as {@code CATEGORY_<i>name</i>} 
+constants.  The name assigned here can be derived from those constants 
+by prefixing "{@code android.intent.category.}" to the 
+{@code <i>name</i>} that follows {@code CATEGORY_}.  For example,
+the string value for {@code CATEGORY_LAUNCHER} is 
+"{@code android.intent.category.LAUNCHER}".
+
+<p>
+Custom categories should use the package name as a prefix, to ensure
+that they are unique.
+</p></dd>
+</dl></dd>
+
+<dt>see also:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/action-element.html">&lt;action&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/data-element.html">&lt;data&gt;</a></code></dd>
+
+</dl>
diff --git a/docs/html/guide/topics/manifest/data-element.jd b/docs/html/guide/topics/manifest/data-element.jd
new file mode 100644
index 0000000..5d8fde2
--- /dev/null
+++ b/docs/html/guide/topics/manifest/data-element.jd
@@ -0,0 +1,148 @@
+page.title=&lt;data&gt;
+@jd:body
+
+<dl class="xml">
+<dt>syntax:</dt>
+<dd><pre class="stx">&lt;data android:<a href="#host">host</a>="<i>string</i>"
+      android:<a href="#mime">mimeType</a>="<i>string</i>"
+      android:<a href="#path">path</a>="<i>string</i>"
+      android:<a href="#path">pathPattern</a>="<i>string</i>"
+      android:<a href="#path">pathPrefix</a>="<i>string</i>"
+      android:<a href="#port">port</a>="<i>string</i>"
+      android:<a href="#scheme">scheme</a>="<i>string</i>" /&gt;</pre></dd>
+
+
+<dt>contained in:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">&lt;intent-filter&gt;</a></code></dd>
+
+<dt>description:</dt>
+<dd>Adds a data specification to an intent filter.  The specification can 
+be just a data type (the <code><a href="{@docRoot}guide/topics/manifest/data-element.html#mime">mimeType</a></code> attribute), 
+just a URI, or both a data type and a URI.  A URI is specified by separate 
+attributes for each of its parts:
+
+<p style="margin-left: 2em">{@code scheme://host:port/path} <i>or</i> 
+{@code pathPrefix} <i>or</i> {@code pathPattern}</p>
+
+<p>
+These attributes are optional, but also mutually dependent: 
+If a <code><a href="{@docRoot}guide/topics/manifest/data-element.html#scheme">scheme</a></code> is not specified for the 
+intent filter, all the other URI attributes are ignored.  If a 
+<code><a href="{@docRoot}guide/topics/manifest/data-element.html#host">host</a></code> is not specified for the filer, 
+the {@code port} attribute and all the path attributes are ignored.
+</p>
+
+<p>
+All the {@code &lt;data&gt;} elements contained within the same
+<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">&lt;intent-filter&gt;</a></code> element contribute to
+the same filter.  So, for example, the following filter specification,
+</p>
+
+<pre>&lt;intent-filter . . . &gt;
+    &lt;data android:scheme="something" android:host="project.example.com" /&gt;
+    . . .
+&lt;/intent-filter&gt;</pre>
+
+<p>is equivalent to this one:</p>
+
+<pre>&lt;intent-filter . . . &gt;
+    &lt;data android:scheme="something" /&gt
+    &lt;data android:host="project.example.com" /&gt;
+    . . .
+&lt;/intent-filter&gt;</pre>
+
+<p>
+You can place any number of &lt;data&gt; elements inside an
+<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">&lt;intent-filter&gt;</a></code> to give it multiple data 
+options.  None of its attributes have default values.  
+</p>
+
+<p>
+Information on how intent filters work, including the rules for how Intent objects
+are matched against filters, can be found in another document,
+<a href="{@docRoot}guide/topics/intents/intents-filters.html">Intents and
+Intent Filters</a>.  See also the 
+<a href="{@docRoot}guide/topics/manifest/manifest-intro.html#ifs">Intent Filters</a> 
+section in the introduction.
+</p></dd>
+
+<dt>attributes:</dt>
+<dd><dl class="attr">
+<dt><a name="host"></a>{@code android:host}</dt>
+<dd>The host part of a URI authority.  This attribute is meaningless
+unless a <code><a href="{@docRoot}guide/topics/manifest/data-element.html#scheme">scheme</a></code> attribute is also 
+specified for the filter.
+</dd>
+
+<dt><a name="mime"></a>{@code android:mimeType}</dt>
+<dd>A MIME media type, such as {@code image/jpeg} or {@code audio/mpeg4-generic}.  
+The subtype can be the asterisk wildcard ({@code *}) to indicate that any 
+subtype matches.</dd>
+
+<dt><a name="path"></a>{@code android:path}
+<br/>{@code android:pathPrefix}
+<br/>{@code android:pathPattern}</dt>
+<dd>The path part of a URI.  The {@code path} attribute specifies a complete 
+path that is matched against the complete path in an Intent object.  The 
+{@code pathPrefix} attribute specifies a partial path that is matched against 
+only the initial part of the path in the Intent object.  The {@code pathPattern} 
+attribute specifies a complete path that is matched against the complete path 
+in the Intent object, but it can contain the following wildcards: 
+
+<ul>
+<li>An asterisk ('{@code *}') matches a sequence of 0 to many occurrences of
+the immediately preceding character.</li>
+
+<li>A period followed by an asterisk ("{@code .*}") matches any sequence of 
+0 to many characters.</li>
+</ul>
+
+<p>
+Because '{@code \}' is used as an escape character when the string is read 
+from XML (before it is parsed as a pattern), you will need to double-escape:  
+For example, a literal '{@code *}' would be written as "{@code \\*}" and a 
+literal '{@code \}' would be written as "{@code \\\\}".  This is basically 
+the same as what you would need to write if constructing the string in Java code.
+</p>
+
+<p>
+For more information on these three types of patterns, see the descriptions of 
+{@link android.os.PatternMatcher#PATTERN_LITERAL},
+{@link android.os.PatternMatcher#PATTERN_PREFIX}, and
+{@link android.os.PatternMatcher#PATTERN_SIMPLE_GLOB} in the
+{@link android.os.PatternMatcher} class.
+</p>
+
+<p>These attributes are meaningful only if the 
+<code><a href="#scheme">scheme</a></code> and <code><a href="#host">host</a></code> 
+attributes are also specified for the filter.
+</p></dd>
+
+<dt><a name="port"></a>{@code android:port}</dt>
+<dd>The port part of a URI authority.  This attribute is meaningful only 
+if the <code><a href="#scheme">scheme</a></code> and 
+<code><a href="#host">host</a></code> attributes are also specified for 
+the filter.</dd>
+
+<dt><a name="scheme"></a>{@code android:scheme}</dt>
+<dd>The scheme part of a URI.  This is the minimal essential attribute for 
+specifying a URI; at least one {@code scheme} attribute must be set 
+for the filter, or none of the other URI attributes are meaningful.
+
+<p>
+A scheme is specified without the trailing colon (for example,
+{@code http}, rather than {@code http:}).
+</p>
+
+<p>
+If the filter has a data type set (the <code><a href="{@docRoot}guide/topics/manifest/data-element.html#mime">mimeType</a></code> 
+attribute) but no scheme, the {@code content:} and {@code file:} schemes are
+assumed.
+</p></dd>
+</dl></dd>  
+
+<dt>see also:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/action-element.html">&lt;action&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/category-element.html">&lt;category&gt;</a></code></dd>
+
+</dl>
diff --git a/docs/html/guide/topics/manifest/grant-uri-permission-element.jd b/docs/html/guide/topics/manifest/grant-uri-permission-element.jd
new file mode 100644
index 0000000..f5b37b5
--- /dev/null
+++ b/docs/html/guide/topics/manifest/grant-uri-permission-element.jd
@@ -0,0 +1,85 @@
+page.title=&lt;grant-uri-permission&gt;
+@jd:body
+
+<dl class="xml">
+<dt>syntax:</dt>
+<dd><pre class="stx">&lt;grant-uri-permission android:<a href="#path">path</a>="<i>string</i>"
+                      android:<a href="#path">pathPattern</a>="<i>string</i>"
+                      android:<a href="#path">pathPrefix</a>="<i>string</i>" /&gt;</pre></dd>
+
+<dt>contained in:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/provider-element.html">&lt;provider&gt;</a></code></dd>
+
+<dt>description:</dt>
+<dd>Specifies which data subsets of the parent content provider permission
+can be granted for.  Data subsets are indicated by the path part of a 
+{@code content:} URI.  (The authority part of the URI identifies the
+content provider.)  
+Granting permission is a way of enabling clients of the provider that don't 
+normally have permission to access its data to overcome that restriction on 
+a one-time basis.
+
+<p> 
+If a content provider's <code><a href="{@docRoot}guide/topics/manifest/provider-element.html#gprmns">grantUriPermissions</a></code> 
+attribute is "{@code true}", permission can be granted for any the data under 
+the provider's purview.  However, if that attribute is "{@code false}", permission 
+can be granted only to data subsets that are specified by this element.  
+A provider can contain any number of {@code &lt;grant-uri-permission&gt;} elements.  
+Each one can specify only one path (only one of the three possible attributes).
+</p>
+
+<p>
+For information on how permission is granted, see the 
+<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">&lt;intent-filter&gt;</a></code> element's
+<code><a href="{@docRoot}guide/topics/manifest/provider-element.html#gprmsn">grantUriPermissions</a></code> attribute.
+</p></dd>
+
+<dt>attributes:</dt>
+<dd><dl class="attr">
+<dt><a name="path"></a>{@code android:path}
+<br/>{@code android:pathPrefix}
+<br/>{@code android:pathPattern}</dt>
+<dd>A path identifying the data subset or subsets that permission can be 
+granted for.  The {@code path} attribute specifies a complete path; 
+permission can be granted only to the particular data subset identified 
+by that path.  
+The {@code pathPrefix} attribute specifies the initial part of a path; 
+permission can be granted to all data subsets with paths that share that 
+initial part.   
+The {@code pathPattern} attribute specifies a complete path, but one 
+that can contain the following wildcards:
+
+<ul>
+<li>An asterisk ('{@code *}') matches a sequence of 0 to many occurrences of
+the immediately preceding character.</li>
+
+<li><p>A period followed by an asterisk ("{@code .*}") matches any sequence of 
+0 to many characters.</p></li>
+</ul>
+
+<p>
+Because '{@code \}' is used as an escape character when the string is read 
+from XML (before it is parsed as a pattern), you will need to double-escape:  
+For example, a literal '{@code *}' would be written as "{@code \\*}" and a 
+literal '{@code \}' would be written as "{@code \\\\}".  This is basically 
+the same as what you would need to write if constructing the string in Java code.
+</p>
+
+<p>
+For more information on these types of patterns, see the descriptions of 
+{@link android.os.PatternMatcher#PATTERN_LITERAL},
+{@link android.os.PatternMatcher#PATTERN_PREFIX}, and
+{@link android.os.PatternMatcher#PATTERN_SIMPLE_GLOB} in the
+{@link android.os.PatternMatcher} class.
+</p></dd>
+</dl></dd>
+
+<dt>see also:</dt>
+<dd>the 
+<code><a href="{@docRoot}guide/topics/manifest/provider-element.html#gprmns">grantUriPermissions</a></code>
+attribute of the 
+<code><a href="{@docRoot}guide/topics/manifest/provider-element.html">&lt;provider&gt;</a></code> 
+element</dd>
+
+
+</dl>
diff --git a/docs/html/guide/topics/manifest/instrumentation-element.jd b/docs/html/guide/topics/manifest/instrumentation-element.jd
new file mode 100644
index 0000000..fdec949
--- /dev/null
+++ b/docs/html/guide/topics/manifest/instrumentation-element.jd
@@ -0,0 +1,61 @@
+page.title=&lt;instrumentation&gt;
+@jd:body
+
+<dl class="xml">
+<dt>syntax:</dt>
+<dd><pre class="stx">&lt;instrumentation android:<a href="#ftest">functionalTest</a>=["true" | "false"]
+                 android:<a href="#hprof">handleProfiling</a>=["true" | "false"]
+                 android:<a href="#icon">icon</a>="<i>drawable resource</i>"
+                 android:<a href="#label">label</a>="<i>string resource</i>"
+                 android:<a href="#nm">name</a>="<i>string</i>"
+                 android:<a href="#trgt">targetPackage</a>="<i>string</i>" /&gt;</pre></dd>
+
+<dt>contained in:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/manifest-element.html">&lt;manifest&gt;</a></code></dd>
+
+<dt>description:</dt>
+<dd>Declares an {@link android.app.Instrumentation} class that enables you
+to monitor an application's interaction with the system.  The Instrumentation
+object is instantiated before any of the application's components.</dd>
+
+<dt>attributes:</dt>
+<dd><dl class="attr">
+<dt><a name="ftest"></a>{@code android:functionalTest}</dt>
+<dd>Whether or not the Instrumentation class should run as a functional test 
+&mdash; "{@code true}" if it should, and "{@code false}" if not.  The
+default value is "{@code false}".</dd>
+
+<dt><a name="hprof"></a>{@code android:handleProfiling}</dt>
+<dd>Whether or not the Instrumentation object will turn profiling on and 
+off &mdash; "{@code true}" if it determines when profiling starts and 
+stops, and "{@code false}" if profiling continues the entire time it is 
+running.  A value of "{@code true}" enables the object to target profiling 
+at a specific set of operations.  The default value is "{@code false}".</dd>
+
+<dt><a name="icon"></a>{@code android:icon}</dt>
+<dd>An icon that represents the Instrumentation class.  This attribute must
+be set as a reference to a drawable resource.</dd>
+
+<dt><a name="label"></a>{@code android:label}</dt>
+<dd>A user-readable label for the Instrumentation class.  The label can
+be set as a raw string or a reference to a string resource.</dd>
+
+<dt><a name="nm"></a>{@code android:name}</dt>
+<dd>The name of the {@link android.app.Instrumentation} subclass.  
+This should be a fully qualified class name (such as, 
+"{@code com.example.project.StringInstrumentation}").  However, as a shorthand, 
+if the first character of the name is a period, it is appended to the package 
+name specified in the <code><a href="{@docRoot}guide/topics/manifest/manifest-element.html">&lt;manifest&gt;</a></code> element.  
+
+<p>
+There is no default.  The name must be specified.
+</p></dd>
+
+<dt><a name="trgt"></a>{@code android:targetPackage}</dt>
+<dd>The application that the Instrumentation object will run against.
+An application is identified by the package name assigned in its manifest
+file by the <code><a href="{@docRoot}guide/topics/manifest/manifest-element.html">&lt;manifest&gt;</a></code> element.</dd>
+
+</dl></dd>
+
+</dl>
diff --git a/docs/html/guide/topics/manifest/intent-filter-element.jd b/docs/html/guide/topics/manifest/intent-filter-element.jd
new file mode 100644
index 0000000..58d1f91
--- /dev/null
+++ b/docs/html/guide/topics/manifest/intent-filter-element.jd
@@ -0,0 +1,130 @@
+page.title=&lt;intent-filter&gt;
+@jd:body
+
+<dl class="xml">
+<dt>syntax:</dt>
+<dd><pre class="stx">&lt;intent-filter android:<a href="#icon">icon</a>="<i>drawable resource</i>"
+               android:<a href="#label">label</a>="<i>string resource</i>"
+               android:<a href="#priority">priority</a>="<i>integer</i>" &gt;
+    . . .
+&lt;/intent-filter&gt;</pre></dd>
+
+<dt>contained in:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/activity-element.html">&lt;activity&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/activity-alias-element.html">&lt;activity-alias&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/service-element.html">&lt;service&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/receiver-element.html">&lt;receiver&gt;</a></code></dd>
+
+<dt>must contain:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/action-element.html">&lt;action&gt;</a></code></dd>
+
+<dt>can contain:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/category-element.html">&lt;category&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/data-element.html">&lt;data&gt;</a></code></dd>
+
+<dt>description:</dt>
+<dd>Specifies the types of intents that an activity, service, or broadcast 
+receiver can respond to.  An intent filter declares the capabilities of its
+parent component &mdash; what an activity or service can do and what types 
+of broadcasts a receiver can handle.  It opens the component to receiving 
+intents of the advertised type, while filtering out those that are not 
+meaningful for the component.
+
+<p>
+Most of the contents of the filter are described by its 
+<code><a href="{@docRoot}guide/topics/manifest/action-element.html">&lt;action&gt;</a></code>, 
+<code><a href="{@docRoot}guide/topics/manifest/category-element.html">&lt;category&gt;</a></code>, and
+<code><a href="{@docRoot}guide/topics/manifest/data-element.html">&lt;data&gt;</a></code> subelements.
+</p>
+
+<p>
+For a more detailed discussion of filters, see the separate  
+<a href="{@docRoot}guide/topics/intents/intents-filters.html">Intents 
+and Intent Filters</a> document, as well as the 
+<a href="{@docRoot}guide/topics/manifest/manifest-intro.html#ifs">Intents Filters</a> 
+section in the introduction.
+</p></dd>
+
+<dt>attributes:</dt>
+<dd><dl class="attr">
+<dt><a name="icon"></a>{@code android:icon}</dt>
+<dd>An icon that represents the parent activity, service, or broadcast
+receiver when that component is presented to the user as having the 
+capability described by the filter.
+
+<p>
+This attribute must be set as a reference to a drawable resource 
+containing the image definition.  The default value is the icon set 
+by the parent component's {@code icon} attribute.  If the parent 
+does not specify an icon, the default is the icon set by the
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> element.
+</p>
+
+<p>
+For more on intent filter icons, see 
+<a href="{@docRoot}guide/topics/manifest/manifest-intro.html#iconlabel">Icons and Labels</a>
+in the introduction.
+</p></dd>
+
+<dt><a name="label"></a>{@code android:label}</dt>
+<dd>A user-readable label for the parent component.  This label, rather than
+the one set by the parent component, is used when the component is presented
+to the user as having the capability described by the filter.
+
+<p>
+The label should be set as a reference to a string resource, so that
+it can be localized like other strings in the user interface.  
+However, as a convenience while you're developing the application, 
+it can also be set as a raw string.
+</p>
+
+<p>
+The default value is the label set by the parent component.  If the 
+parent does not specify a label, the default is the label set by the
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> element's 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html#label"> label</a></code> attribute.
+</p>
+
+<p>
+For more on intent filter labels, see 
+<a href="{@docRoot}guide/topics/manifest/manifest-intro.html#iconlabel">Icons and Labels</a>
+in the introduction.
+</p></dd>
+
+<dt><a name="priority"></a>{@code android:priority}</dt>
+<dd>The priority that should be given to the parent component with regard
+to handling intents of the type described by the filter.  This attribute has 
+meaning for both activities and broadcast receivers:
+
+<ul>
+<li>It provides information about how able an activity is to respond to 
+an intent that matches the filter, relative to other activities that could
+also respond to the intent.  When an intent could be handled by multiple 
+activities with different priorities, Android will consider only those with
+higher priority values as potential targets for the intent.</li>
+
+<li><p>It controls the order in which broadcast receivers are executed to
+receive broadcast messages.  Those with higher priority 
+values are called before those with lower values.  (The order applies only 
+to synchronous messages; it's ignored for asynchronous messages.)</p></li>
+</ul>
+
+<p>
+Use this attribute only if you really need to impose a specific order in 
+which the broadcasts are received, or want to force Android to prefer
+one activity over others.
+</p>
+
+<p>
+The value must be an integer, such as "{@code 100}".  Higher numbers have a
+higher priority.
+</p></dd>
+
+</dl></dd>
+
+<dt>see also:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/action-element.html">&lt;action&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/category-element.html">&lt;category&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/data-element.html">&lt;data&gt;</a></code></dd>
+
+</dl>
diff --git a/docs/html/guide/topics/manifest/manifest-element.jd b/docs/html/guide/topics/manifest/manifest-element.jd
new file mode 100644
index 0000000..2669487
--- /dev/null
+++ b/docs/html/guide/topics/manifest/manifest-element.jd
@@ -0,0 +1,94 @@
+page.title=&lt;manifest&gt;
+@jd:body
+
+<dl class="xml">
+<dt>syntax:</dt>
+<dd><pre class="stx">&lt;manifest xmlns:<a href="#nspace">android</a>="http://schemas.android.com/apk/res/android"
+          <a href="#package">package</a>="<i>string</i>"
+          android:<a href="#uid">sharedUserId</a>="<i>string</i>"
+          android:<a href="#vcode">versionCode</a>="<i>integer</i>"
+          android:<a href="#vname">versionName</a>="<i>string</i>" &gt;
+    . . .
+&lt;/manifest&gt;</pre></dd>
+
+<p>
+<dt>contained in:</dt>
+<dd><i>none</i></dd>
+
+<p>
+<p>
+<dt>must contain:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code></dd>
+
+<dt>can contain:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/instrumentation-element.html">&lt;instrumentation&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/permission-element.html">&lt;permission&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/permission-group-element.html">&lt;permission-group&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/permission-tree-element.html">&lt;permission-tree&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html">&lt;uses-permission&gt;</a></code></dd>
+
+<p>
+<dt>description:</dt>
+<dd>The root element of the AndroidManifest.xml file.  It must 
+contain an <code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> element 
+and specify {@code xlmns:android} and {@code package} attributes.</dd>
+
+<dt>attributes:</dt>
+<dd><dl class="attr">
+<dt><a name="nspace"></a>{@code xmlns:android}</dt>
+<dd>Defines the Android namespace.  This attribute should always be set 
+to "{@code http://schemas.android.com/apk/res/android}".</dd>
+
+<dt><a name="package"></a>{@code package}</dt>
+<dd>A full Java package name for the application.  The name should 
+be unique.  For example, applications published by Google could have 
+names in the form <code>com.google.app.<i>application_name</i></code>.
+
+<p>
+The package name serves as a unique identifier for the application.  
+It's also the default name for the application process (see the 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code>
+element's
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html#aff">process</a></code>
+process</a></code> attribute) and the default task affinity of an activity
+(see the 
+<code><a href="{@docRoot}guide/topics/manifest/activity-element.html">&lt;activity&gt;</a></code> 
+element's
+<code><a href="{@docRoot}guide/topics/manifest/activity-element.html#aff">taskAffinity</a></code> attribute).
+</p></dd>
+
+<dt><a name="uid"></a>{@code android:sharedUserId}</dt>
+<dd>The name of a Linux user ID that will be shared with other applications.  
+By default, Android assigns each application its own unique user ID.  
+However, if this attribute is set to the same value for two or more applications, 
+they will all share the same ID &mdash; provided that they are also signed 
+by the same certificate.  Application with the same user ID can access each 
+other's data and, if desired, run in the same  process.</dd>  
+
+<dt><a name="vcode"></a>{@code android:versionCode}</dt>
+<dd>An internal version number.  This number is used only to determine whether 
+one version is more recent than another, with higher numbers indicating more 
+recent versions.  This is not the version number shown to users; that number 
+is set by the {@code versionName} attribute.
+
+<p>
+The value must be set as an integer, such as "100".  You can define it however
+you want, as long as each successive version has a higher number.  For example, 
+it could be a build number.  Or you could translate a version number in "x.y" 
+format to an integer by encoding the "x" and "y" separately in the lower and 
+upper 16 bits.  Or you could simply increase the number by one each time a new 
+version is released.
+</p></dd>
+
+<dt><a name="vname"></a>{@code android:versionName}</dt>
+<dd>The version number shown to users.  This attribute can be set as a raw 
+string or as a reference to a string resource.  The string has no other purpose 
+than to be displayed to users.  The {@code versionCode} attribute holds 
+the significant version number used internally.
+</dl></dd>
+
+<p>
+<dt>see also:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code></dd>
+
+</dl>
diff --git a/docs/html/guide/topics/manifest/manifest-intro.jd b/docs/html/guide/topics/manifest/manifest-intro.jd
new file mode 100644
index 0000000..aa14308
--- /dev/null
+++ b/docs/html/guide/topics/manifest/manifest-intro.jd
@@ -0,0 +1,511 @@
+page.title=The AndroidManifest.xml File
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+
+<h2>In this document</h2>
+<ol>
+<li><a href="#filestruct">Structure of the Manifest File</a></li>
+<li><a href="#filec">File Conventions</a>
+<li><a href="#filef">File Features</a>
+	<ol>
+	<li><a href="#ifs">Intent Filters</a></li>
+	<li><a href="#iconlabel">Icons and Labels</a></li>
+	<li><a href="#perms">Permissions</a></li>
+	<li><a href="#libs">Libraries</a></li>
+	</ol></li>
+</ol>
+</div>
+</div>
+
+<p>
+Every application must have an AndroidManifest.xml file (with precisely that 
+name) in its root directory.  The manifest presents essential information about 
+the application to the Android system, information the system must have before 
+it can run any of the application's code.  Among other things, the manifest 
+does the following:
+</p>
+
+<ul>
+<li>It names the Java package for the application.
+The package name serves as a unique identifier for the application.</li>
+
+<li>It describes the components of the application &mdash; the activities, 
+services, broadcast receivers, and content providers that the application is 
+composed of.  It names the classes that implement each of the components and 
+publishes their capabilities (for example, which {@link android.content.Intent 
+Intent} messages they can handle).  These declarations let the Android system 
+know what the components are and under what conditions they can be launched.</li>
+
+<li>It determines which processes will host application components.</li>  
+
+<li>It declares which permissions the application must have in order to 
+access protected parts of the API and interact with other applications.</li>  
+
+<li>It also declares the permissions that others are required to have in 
+order to interact with the application's components.</li>
+
+<li>It lists the {@link android.app.Instrumentation} classes that provide 
+profiling and other information as the application is running.  These declarations 
+are present in the manifest only while the application is being developed and 
+tested; they're removed before the application is published.</li>
+
+<li>It declares the minimum level of the Android API that the application 
+requires.</li>
+
+<li>It lists the libraries that the application must be linked against.</li>
+</ul>
+
+
+<h2 id="filestruct">Structure of the Manifest File</h2>
+
+<p>
+The diagram below shows the general structure of the manifest file and 
+every element that it can contain.  Each element, along with all of its 
+attributes, is documented in full in a separate file.  To view detailed 
+information about any element, click on the element name in the diagram, 
+in the alphabetical list of elements that follows the diagram, or on any
+other mention of the element name. 
+</p>
+
+<pre>
+&lt;?xml version="1.0" encoding="utf-8"?&gt;
+
+<a href="{@docRoot}guide/topics/manifest/manifest-element.html">&lt;manifest&gt;</a>
+
+    <a href="{@docRoot}guide/topics/manifest/uses-permission-element.html">&lt;uses-permission /&gt;</a>
+    <a href="{@docRoot}guide/topics/manifest/permission-element.html">&lt;permission /&gt;</a>
+    <a href="{@docRoot}guide/topics/manifest/permission-tree-element.html">&lt;permission-tree /&gt;</a>
+    <a href="{@docRoot}guide/topics/manifest/permission-group-element.html">&lt;permission-group /&gt;</a>
+
+    <a href="{@docRoot}guide/topics/manifest/instrumentation-element.html">&lt;instrumentation /&gt;</a>
+
+    <a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html">&lt;uses-sdk /&gt;</a>
+
+    <a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a>
+
+        <a href="{@docRoot}guide/topics/manifest/activity-element.html">&lt;activity&gt;</a>
+            <a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">&lt;intent-filter&gt;</a>
+                <a href="{@docRoot}guide/topics/manifest/action-element.html">&lt;action /&gt;</a>
+                <a href="{@docRoot}guide/topics/manifest/category-element.html">&lt;category /&gt;</a>
+                <a href="{@docRoot}guide/topics/manifest/data-element.html">&lt;data /&gt;</a>
+            <a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">&lt;/intent-filter&gt;</a>
+            <a href="{@docRoot}guide/topics/manifest/meta-data-element.html">&lt;meta-data /&gt;</a>
+        <a href="{@docRoot}guide/topics/manifest/activity-element.html">&lt;/activity&gt;</a>
+
+        <a href="{@docRoot}guide/topics/manifest/activity-alias-element.html">&lt;activity-alias&gt;</a>
+            <a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">&lt;intent-filter&gt;</a> . . . <a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">&lt;/intent-filter&gt;</a>
+            <a href="{@docRoot}guide/topics/manifest/meta-data-element.html">&lt;meta-data /&gt;</a>
+        <a href="{@docRoot}guide/topics/manifest/activity-alias-element.html">&lt;/activity-alias&gt;</a>
+
+        <a href="{@docRoot}guide/topics/manifest/service-element.html">&lt;service&gt;</a>
+            <a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">&lt;intent-filter&gt;</a> . . . <a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">&lt;/intent-filter&gt;</a>
+            <a href="{@docRoot}guide/topics/manifest/meta-data-element.html">&lt;meta-data/&gt;</a>
+        <a href="{@docRoot}guide/topics/manifest/service-element.html">&lt;/service&gt;</a>
+
+        <a href="{@docRoot}guide/topics/manifest/receiver-element.html">&lt;receiver&gt;</a>
+            <a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">&lt;intent-filter&gt;</a> . . . <a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">&lt;/intent-filter&gt;</a>
+            <a href="{@docRoot}guide/topics/manifest/meta-data-element.html">&lt;meta-data /&gt;</a>
+        <a href="{@docRoot}guide/topics/manifest/receiver-element.html">&lt;/receiver&gt;</a>
+
+        <a href="{@docRoot}guide/topics/manifest/provider-element.html">&lt;provider&gt;</a>
+            <a href="{@docRoot}guide/topics/manifest/grant-uri-permission-element.html">&lt;grant-uri-permission /&gt;</a>
+            <a href="{@docRoot}guide/topics/manifest/meta-data-element.html">&lt;meta-data /&gt;</a>
+        <a href="{@docRoot}guide/topics/manifest/provider-element.html">&lt;/provider&gt;</a>
+
+        <a href="{@docRoot}guide/topics/manifest/uses-library-element.html">&lt;uses-library /&gt;</a>
+
+    <a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;/application&gt;</a>
+
+<a href="{@docRoot}guide/topics/manifest/manifest-element.html">&lt;/manifest&gt;</a>
+</pre>
+
+<p>
+All the elements that can appear in the manifest file are listed below 
+in alphabetical order.  These are the only legal elements; you cannot 
+add your own elements or attributes.  
+</p>
+
+<p style="margin-left: 2em">
+<code><a href="{@docRoot}guide/topics/manifest/action-element.html">&lt;action&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/activity-element.html">&lt;activity&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/activity-alias-element.html">&lt;activity-alias&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/category-element.html">&lt;category&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/data-element.html">&lt;data&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/grant-uri-permission-element.html">&lt;grant-uri-permission&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/instrumentation-element.html">&lt;instrumentation&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">&lt;intent-filter&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/manifest-element.html">&lt;manifest&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html">&lt;meta-data&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/permission-element.html">&lt;permission&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/permission-group-element.html">&lt;permission-group&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/permission-tree-element.html">&lt;permission-tree&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/provider-element.html">&lt;provider&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/receiver-element.html">&lt;receiver&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/service-element.html">&lt;service&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/uses-library-element.html">&lt;uses-library&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html">&lt;uses-permission&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html">&lt;uses-sdk&gt;</a></code>
+</p>
+
+
+
+<h2 id="filec">File Conventions</h2>
+
+<p>
+Some conventions and rules apply generally to all elements and attributes 
+in the manifest:
+</p>
+
+<dl>
+<dt><b>Elements</b></dt>
+<dd>Only the 
+<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html">&lt;manifest&gt;</a></code> and
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> 
+elements are required, they each must be present and can occur only once.  
+Most of the others can occur many times or not at all &mdash; although at 
+least some of them must be present for the manifest to accomplish anything 
+meaningful.
+
+<p>
+If an element contains anything at all, it contains other elements.  
+All values are set through attributes, not as character data within an element.
+</p>
+
+<p>
+Elements at the same level are generally not ordered.  For example,
+<code><a href="{@docRoot}guide/topics/manifest/activity-element.html">&lt;activity&gt;</a></code>, 
+<code><a href="{@docRoot}guide/topics/manifest/provider-element.html">&lt;provider&gt;</a></code>, and 
+<code><a href="{@docRoot}guide/topics/manifest/service-element.html">&lt;service&gt;</a></code> 
+elements can be intermixed in any sequence.  (An 
+<code><a href="{@docRoot}guide/topics/manifest/activity-alias-element.html">&lt;activity-alias&gt;</a></code>
+element is the exception to this rule:  It must follow the 
+<code><a href="{@docRoot}guide/topics/manifest/activity-element.html">&lt;activity&gt;</a></code> 
+it is an alias for.)
+</p></dd>
+
+<dt><b>Attributes</b></dt>
+<dd>In a formal sense, all attributes are optional.  However, there are some 
+that must be specified for an element to accomplish its purpose.  Use the 
+documentation as a guide.  For truly optional attributes, it mentions a default 
+value or states what happens in the absence of a specification.
+
+<p>Except for some attributes of the root 
+<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html">&lt;manifest&gt;</a></code> 
+element, all attribute names begin with an {@code android:} prefix &mdash; 
+for example, {@code android:alwaysRetainTaskState}.  Because the prefix is 
+universal, the documentation generally omits it when referring to attributes 
+by name.</p></dd>
+
+<dt><b>Declaring class names</b></dt>
+<dd>Many elements correspond to Java objects, including elements for the 
+application itself (the 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> 
+element) and its principal components &mdash; activities 
+(<code><a href="{@docRoot}guide/topics/manifest/activity-element.html">&lt;activity&gt;</a></code>), 
+services 
+(<code><a href="{@docRoot}guide/topics/manifest/service-element.html">&lt;service&gt;</a></code>), 
+broadcast receivers 
+(<code><a href="{@docRoot}guide/topics/manifest/receiver-element.html">&lt;receiver&gt;</a></code>), 
+and content providers 
+(<code><a href="{@docRoot}guide/topics/manifest/provider-element.html">&lt;provider&gt;</a></code>).  
+
+<p>
+If you define a subclass, as you almost always would for the component classes 
+({@link android.app.Activity}, {@link android.app.Service}, 
+{@link android.content.BroadcastReceiver}, and {@link android.content.ContentProvider}), 
+the subclass is declared through a {@code name} attribute.  The name must include 
+the full package designation.  
+For example, an {@link android.app.Service} subclass might be declared as follows:
+</p>
+
+<pre>&lt;manifest . . . &gt;
+    &lt;application . . . &gt;
+        &lt;service android:name="com.example.project.SecretService" . . . &gt;
+            . . .
+        &lt;/service&gt;
+        . . .
+    &lt;/application&gt;
+&lt;/manifest&gt;</pre>
+
+<p>
+However, as a shorthand, if the first character of the string is a period, the 
+string is appended to the application's package name (as specified by the 
+<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html">&lt;manifest&gt;</a></code> 
+element's 
+<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html#package">package</a></code> 
+attribute).  The following assignment is the same as the one above: 
+</p>
+
+<pre>&lt;manifest package="com.example.project" . . . &gt;
+    &lt;application . . . &gt;
+        &lt;service android:name=".SecretService" . . . &gt;
+            . . .
+        &lt;/service&gt;
+        . . .
+    &lt;/application&gt;
+&lt;/manifest&gt;</pre>
+
+<p>
+When starting a component, Android creates an instance of the named subclass.  
+If a subclass isn't specified, it creates an instance of the base class.
+</p></dd>
+
+<dt><b>Multiple values</b></dt>
+<dd>If more than one value can be specified, the element is almost always 
+repeated, rather than listing multiple values within a single element.  
+For example, an intent filter can list several actions:
+
+<pre>&lt;intent-filter . . . &gt;
+    &lt;action android:name="android.intent.action.EDIT" /&gt;
+    &lt;action android:name="android.intent.action.INSERT" /&gt;
+    &lt;action android:name="android.intent.action.DELETE" /&gt;
+    . . .
+&lt;/intent-filter&gt;</pre></dd>
+
+<dt><b>Resource values</b></dt>
+<dd>Some attributes have values that can be displayed to users &mdash; for 
+example, a label and an icon for an activity.  The values of these attributes 
+should be localized and therefore set from a resource or theme.  Resource 
+values are expressed in the following format,</p>
+
+<p style="margin-left: 2em">{@code @[<i>package</i>:]<i>type</i>:<i>name</i>}</p>
+
+<p>
+where the <i>package</i> name can be omitted if the resource is in the same package 
+as the application, <i>type</i> is a type of resource &mdash; such as "string" or 
+"drawable" &mdash; and <i>name</i> is the name that identifies the specific resource.  
+For example:
+</p>
+
+<pre>&lt;activity android:icon="@drawable/smallPic" . . . &gt</pre>
+
+<p>
+Values from a theme are expressed in a similar manner, but with an initial '{@code ?}' 
+rather than '{@code @}':
+</p>
+
+<p style="margin-left: 2em">{@code ?[<i>package</i>:]<i>type</i>:<i>name</i>}
+</p></dd>
+
+<dt><b>String values</b></dt>
+<dd>Where an attribute value is a string, double backslashes ('{@code \\}') 
+must be used to escape characters &mdash; for example, '{@code \\n}' for 
+a newline or '{@code \\uxxxx}' for a Unicode character.</dd>
+</dl>
+
+
+<h2 id="filef">File Features</h2>
+
+<p>
+The following sections describe how some Android features are reflected 
+in the manifest file.
+</p>
+
+
+<h3 id="ifs">Intent Filters</h3>
+
+<p>
+The core components of an application (its activities, services, and broadcast 
+receivers) are activated by <i>intents</i>.  An intent is a 
+bundle of information (an {@link android.content.Intent} object) describing a 
+desired action &mdash; including the data to be acted upon, the category of 
+component that should perform the action, and other pertinent instructions.  
+Android locates an appropriate component to respond to the intent, launches 
+a new instance of the component if one is needed, and passes it the 
+Intent object.
+</p>
+
+<p>
+Components advertise their capabilities &mdash; the kinds of intents they can 
+respond to &mdash; through <i>intent filters</i>.  Since the Android system 
+must learn which intents a component can handle before it launches the component, 
+intent filters are specified in the manifest as 
+<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">&lt;intent-filter&gt;</a></code> 
+elements.  A component may have any number of filters, each one describing 
+a different capability.
+</p>
+
+<p>
+An intent that explicitly names a target component will activate that component;
+the filter doesn't play a role.  But an intent that doesn't specify a target by
+name can activate a component only if it can pass through one of the component's
+filters.
+</p>
+
+<p>
+For information on how Intent objects are tested against intent filters, 
+see a separate document, 
+<a href="{@docRoot}guide/topics/intents/intents-filters.html">Intents 
+and Intent Filters</a>.
+</p>
+
+
+<h3 id="iconlabel">Icons and Labels</h3>
+
+<p>
+A number of elements have {@code icon} and {@code label} attributes for a 
+small icon and a text label that can be displayed to users.  Some also have a 
+{@code description} attribute for longer explanatory text that can also be 
+shown on-screen.  For example, the 
+<code><a href="{@docRoot}guide/topics/manifest/permission-element.html">&lt;permission&gt;</a></code>
+element has all three of these attributes, so that when the user is asked whether 
+to grant the permission to an application that has requested it, an icon representing 
+the permission, the name of the permission, and a description of what it 
+entails can all be presented to the user.
+</p>
+
+<p>
+In every case, the icon and label set in a containing element become the default 
+{@code icon} and {@code label} settings for all of the container's subelements.  
+Thus, the icon and label set in the 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> 
+element are the default icon and label for each of the application's components.  
+Similarly, the icon and label set for a component &mdash; for example, an 
+<code><a href="{@docRoot}guide/topics/manifest/activity-element.html">&lt;activity&gt;</a></code> 
+element &mdash; are the default settings for each of the component's 
+<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">&lt;intent-filter&gt;</a></code> 
+elements.  If an
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> 
+element sets a label, but an activity and its intent filter do not, 
+the application label is treated as the label for both the activity and 
+the intent filter.
+</p>
+
+<p>
+The icon and label set for an intent filter are used to represent a component 
+whenever the component is presented to the user as fulfilling the function
+advertised by the filter.  For example, a filter with 
+"{@code android.intent.action.MAIN}" and 
+"{@code android.intent.category.LAUNCHER}" settings advertises an activity 
+as one that initiates an application &mdash; that is, as
+one that should be displayed in the application launcher.  The icon and label 
+set in the filter are therefore the ones displayed in the launcher.
+</p>
+
+
+<h3 id="perms">Permissions</h3>
+
+<p>
+A <i>permission</i> is a restriction limiting access to a part of the code 
+or to data on the device.   The limitation is imposed to protect critical 
+data and code that could be misused to distort or damage the user experience.  
+</p>
+
+<p>
+Each permission is identified by a unique label.  Often the label indicates 
+the action that's restricted.  For example, here are some permissions defined 
+by Android:
+</p>
+
+<p style="margin-left: 2em">{@code android.permission.CALL_EMERGENCY_NUMBERS}
+<br/>{@code android.permission.READ_OWNER_DATA}
+<br/>{@code android.permission.SET_WALLPAPER}
+<br/>{@code android.permission.DEVICE_POWER}</p>
+
+<p>
+A feature can be protected by at most one permission.
+</p>
+
+<p>
+If an application needs access to a feature protected by a permission, 
+it must declare that it requires that permission with a 
+<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html">&lt;uses-permission&gt;</a></code> 
+element in the manifest.  Then, when the application is installed on 
+the device, the installer determines whether or not to grant the requested 
+permission by checking the authorities that signed the application's 
+certificates and, in some cases, asking the user.  
+If the permission is granted, the application is able to use the protected 
+features.  If not, its attempts to access those features will simply fail 
+without any notification to the user. 
+</p>
+
+<p>
+An application can also protect its own components (activities, services, 
+broadcast receivers, and content providers) with permissions.  It can employ 
+any of the permissions defined by Android (listed in 
+{@link android.Manifest.permission android.Manifest.permission}) or declared 
+by other applications.  Or it can define its own.  A new permission is declared 
+with the 
+<code><a href="{@docRoot}guide/topics/manifest/permission-element.html">&lt;permission&gt;</a></code> 
+element.  For example, an activity could be protected as follows:
+</p>
+
+<pre>
+&lt;manifest . . . &gt;
+    &lt;permission android:name="com.example.project.DEBIT_ACCT" . . . /&gt;
+    . . .
+    &lt;application . . .&gt;
+        &lt;activity android:name="com.example.project.FreneticActivity" . . . &gt;
+                  android:permission="com.example.project.DEBIT_ACCT"
+                  . . . &gt;
+            . . .
+        &lt;/activity&gt;
+    &lt;/application&gt;
+    . . .
+    &lt;uses-permission android:name="com.example.project.DEBIT_ACCT" /&gt;
+    . . .
+&lt;/manifest&gt;
+</pre>
+
+<p>
+Note that, in this example, the {@code DEBIT_ACCT} permission is not only 
+declared with the 
+<code><a href="{@docRoot}guide/topics/manifest/permission-element.html">&lt;permission&gt;</a></code> 
+element, its use is also requested with the 
+<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html">&lt;uses-permission&gt;</a></code> 
+element.  Its use must be requested in order for other components of the 
+application to launch the protected activity, even though the protection 
+is imposed by the application itself.  
+</p>
+
+<p>
+If, in the same example, the {@code permission} attribute was set to a 
+permission declared elsewhere 
+(such as {@code android.permission.CALL_EMERGENCY_NUMBERS}, it would not 
+have been necessary to declare it again with a 
+<code><a href="{@docRoot}guide/topics/manifest/permission-element.html">&lt;permission&gt;</a></code> 
+element.  However, it would still have been necessary to request its use with 
+<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html">&lt;uses-permission&gt;</a></code>. 
+</p>
+
+<p>
+The 
+<code><a href="{@docRoot}guide/topics/manifest/permission-tree-element.html">&lt;permission-tree&gt;</a></code> 
+element declares a namespace for a group of permissions that will be defined in 
+code.  And 
+<code><a href="{@docRoot}guide/topics/manifest/permission-group-element.html">&lt;permission-group&gt;</a></code>
+defines a label for a set of permissions (both those declared in the manifest with 
+<code><a href="{@docRoot}guide/topics/manifest/permission-element.html">&lt;permission&gt;</a></code> 
+elements and those declared elsewhere).  It affects only how the permissions are 
+grouped when presented to the user.  The 
+<code><a href="{@docRoot}guide/topics/manifest/permission-group-element.html">&lt;permission-group&gt;</a></code>
+element does not specify which permissions belong to the group; 
+it just gives the group a name.  A permission is placed in the group
+by assigning the group name to the
+<code><a href="{@docRoot}guide/topics/manifest/permission-element.html">&lt;permission&gt;</a></code> 
+element's 
+<code><a href="{@docRoot}guide/topics/manifest/permission-element.html#pgroup">permissionGroup</a></code> 
+attribute.
+</p>
+
+
+<h3 id="libs">Libraries</h3>
+
+<p>
+Every application is linked against the default Android library, which 
+includes the basic packages for building applications (with common classes 
+such as Activity, Service, Intent, View, Button, Application, ContentProvider, 
+and so on).
+</p>
+
+<p>
+However, some packages reside in their own libraries.  If your application 
+uses code from any of these packages, it must explicitly asked to be linked 
+against them.  The manifest must contain a separate 
+<code><a href="{@docRoot}guide/topics/manifest/uses-library-element.html">&lt;uses-library&gt;</a></code> 
+element to name each of the libraries.  (The library name can be found in the 
+documentation for the package.)
+</p>
diff --git a/docs/html/guide/topics/manifest/meta-data-element.jd b/docs/html/guide/topics/manifest/meta-data-element.jd
new file mode 100644
index 0000000..1c91407
--- /dev/null
+++ b/docs/html/guide/topics/manifest/meta-data-element.jd
@@ -0,0 +1,90 @@
+page.title=&lt;meta-data&gt;
+@jd:body
+
+<dl class="xml">
+<dt>syntax:</dt>
+<dd><pre class="stx">&lt;meta-data android:<a href="#nm">name</a>="<i>string</i>"
+           android:<a href="#rsrc">resource</a>="<i>resource specification</i>"
+           android:<a href="#val">value</a>="<i>string</i>" /&gt;</pre></dd>
+
+<dt>contained in:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/activity-element.html">&lt;activity&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/activity-alias-element.html">&lt;activity-alias&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/service-element.html">&lt;service&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/receiver-element.html">&lt;receiver&gt;</a></code></dd>
+
+<dt>description:</dt>
+<dd>A name-value pair for an item of additional, arbitrary data that can 
+be supplied to the parent component.  A component element can contain any 
+number of {@code &lt;meta-data&gt;} subelements.  The values from all of
+them are collected in a single {@link android.os.Bundle} object and made 
+available to the component as the 
+{@link android.content.pm.PackageItemInfo#metaData 
+PackageItemInfo.metaData} field.
+
+<p>
+Ordinary values are specified through the <code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html#value">value</a></code> 
+attribute.  However, to assign a resource ID as the value, use the 
+<code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html#resource">resource</a></code> attribute instead.  For example, 
+the following code assigns whatever value is stored in the {@code @string/kangaroo} 
+resource to the "{@code zoo}" name:
+</p>
+
+<pre>&lt;meta-data android:name="zoo" android:value="@string/kangaroo" /&gt;</pre>
+
+<p>
+On the other hand, using the {@code resource} attribute would assign "{@code zoo}"
+the numeric ID of the resource, not the value stored in the resource:
+</p>
+
+<pre>&lt;meta-data android:name="zoo" android:resource="@string/kangaroo" /&gt;</pre>
+
+<p>
+It is highly recommended that you avoid supplying related data as 
+multiple separate {@code &lt;meta-data&gt;} entries. Instead, if you 
+have complex data to associate with a component, store it as a resource and 
+use the {@code resource} attribute to inform the component of its ID.
+</p></dd>
+
+<dt>attributes:</dt>
+<dd><dl class="attr">
+<dt><a name="nm"></a>{@code android:name}</dt>
+<dd>A unique name for the item.  To ensure that the name is unique, use a 
+Java-style naming convention &mdash; for example, 
+"{@code com.example.project.activity.fred}".</dd>
+
+<dt><a name="rsrc"></a>{@code android:resource}</dt>
+<dd>A reference to a resource.  The ID of the resource is the value assigned 
+to the item.  The ID can be retrieved from the meta-data Bundle by the 
+{@link android.os.Bundle#getInt Bundle.getInt()} method.</dd>
+
+<dt><a name="val"></a>{@code android:value}</dt>
+<dd>The value assigned to the item.  The data types that can be assigned as values and the Bundle methods that  components use to retrieve those values are listed in the following table:
+
+<table>
+<tr>
+  <th>Type</th>
+  <th>Bundle method</th>
+</tr><tr>
+  <td>String value, using double backslashes ({@code \\}) to escape characters 
+      &mdash; such as "{@code \\n}" and "{@code \\uxxxxx}" for a Unicode character.</td>
+  <td>{@link android.os.Bundle#getString(String) getString()}</td>
+</tr><tr>
+  <td>Integer value, such as "{@code 100}"</td>
+  <td>{@link android.os.Bundle#getInt(String) getInt()}</td>
+</tr><tr>
+  <td>Boolean value, either "{@code true}" or "{@code false}"</td>
+  <td>{@link android.os.Bundle#getBoolean(String) getBoolean()}</td>
+</tr><tr>
+  <td>Color value, in the form "{@code #rgb}", "{@code #argb}", 
+      "{@code #rrggbb}", or "{@code #aarrggbb}"</td>
+  <td>{@link android.os.Bundle#getString(String) getString()}</td>
+</tr><tr>
+  <td>Float value, such as "{@code 1.23}"</td>
+  <td>{@link android.os.Bundle#getFloat(String) getFloat()}</td>
+</tr>
+</table>
+</dd>
+</dl></dd>
+
+</dl>
diff --git a/docs/html/guide/topics/manifest/permission-element.jd b/docs/html/guide/topics/manifest/permission-element.jd
new file mode 100644
index 0000000..6eef081
--- /dev/null
+++ b/docs/html/guide/topics/manifest/permission-element.jd
@@ -0,0 +1,131 @@
+page.title=&lt;permission&gt;
+@jd:body
+
+<dl class="xml">
+<dt>syntax:</dt></dt>
+<dd><pre class="stx">&lt;permission android:<a href="#desc">description</a>="<i>string resource</i>"
+            android:<a href="#icon">icon</a>="<i>drawable resource</i>"
+            android:<a href="#label">label</a>="<i>string resource</i>"
+            android:<a href="#nm">name</a>="<i>string</i>"
+            android:<a href="#pgroup">permissionGroup</a>="<i>string</i>"
+            android:<a href="#plevel">protectionLevel</a>=["normal" | "dangerous" | 
+                                     "signature" | "signatureOrSystem"] /&gt;</pre></dd>
+
+<dt>contained in:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/manifest-element.html">&lt;manifest&gt;</a></code></dd>
+
+<dt>description:</dt>
+<dd>Declares a security permission that can be used to limit access 
+to specific components or features of this or other applications.  
+See the <a href="{@docRoot}guide/topics/manifest/manifest-intro.html#perms">Permissions</a>
+section in the introduction,
+and the <a href="{@docRoot}guide/topics/security/security.html">Security and Permissions</a> 
+document for more information on how permissions work.</dd>
+
+<dt>attributes:</dt>
+<dd><dl class="attr">
+<dt><a name="desc"></a>{@code android:description}</dt>
+<dd>A user-readable description of the permission, longer and more 
+informative than the label.  It may be displayed to explain the 
+permission to the user &mdash; for example, when the user is asked 
+whether to grant the permission to another application.
+
+<p>
+This attribute must be set as a reference to a string resource; 
+unlike the {@code label} attribute, it cannot be a raw string.
+</p></dd>
+
+<dt><a name="icon"></a>{@code android:icon}</dt>
+<dd>A reference to a drawable resource for an icon that represents the 
+permission.</dd>
+
+<dt><a name="label"></a>{@code android:label}</dt>
+<dd>A name for the permission, one that can be displayed to users. 
+
+<p>
+As a convenience, the label can be directly set 
+as a raw string while you're developing the application.  However, 
+when the application is ready to be published, it should be set as a 
+reference to a string resource, so that it can be localized like other 
+strings in the user interface.
+</p></dd>
+
+<dt><a name="nm"></a>{@code android:name}</dt>
+<dd>The name of the permission.  This is the name that will be used in 
+code to refer to the permission &mdash; for example, in a 
+<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html">&lt;uses-permission&gt;</a></code> element and the
+{@code permission} attributes of application components.
+
+<p>
+The name must be unique, so it should use Java-style scoping &mdash; 
+for example, "{@code com.example.project.PERMITTED_ACTION}".
+</p></dd>
+
+<dt><a name="pgroup"></a>{@code android:permissionGroup}</dt>
+<dd>Assigns this permission to a group.  The value of this attribute is 
+the name of the group, which must be declared with the 
+<code><a href="{@docRoot}guide/topics/manifest/permission-group-element.html">&lt;permission-group&gt;</a></code> element in this 
+or another application.  If this attribute is not set, the permission
+does not belong to a group.</dd>
+
+<dt><a name="plevel"></a>{@code android:protectionLevel}</dt>
+<dd>Characterizes the potential risk implied in the permission and
+indicates the procedure the system should follow when determining
+whether or not to grant the permission to an application requesting it. 
+The value can be set to one of the following strings:
+
+<table>
+<tr>
+   <th>Value</th>
+   <th>Meaning</th>
+</tr><tr>
+   <td>"{@code normal}"</td>
+   <td>The default value.  A lower-risk permission that gives requesting 
+       applications access to isolated application-level features, with 
+       minimal risk to other applications, the system, or the user.  
+       The system automatically grants this type
+       of permission to a requesting application at installation, without
+       asking for the user's explicit approval (though the user always
+       has the option to review these permissions before installing).
+</tr><tr>
+   <td>"{@code dangerous}"</td>
+   <td>A higher-risk permission that would give a requesting application
+       access to private user data or control over the device that can
+       negatively impact the user.  Because this type of permission
+       introduces potential risk, the system may not automatically
+       grant it to the requesting application.  For example, any dangerous
+       permissions requested by an application may be displayed to the
+       user and require confirmation before proceeding, or some other
+       approach may be taken to avoid the user automatically allowing
+       the use of such facilities.
+</tr><tr>
+   <td>"{@code signature}"</td>
+   <td>A permission that the system grants only if the requesting
+       application is signed with the same certificate as the application
+       that declared the permission. If the certificates match, the system
+       automatically grants the permission without notifying the user or
+       asking for the user's explicit approval.
+</tr><tr>
+   <td>"{@code signatureOrSystem}"</td>
+   <td>A permission that the system grants only to applications that are 
+       in the Android system image <em>or</em> that are signed with the same
+       certificates as those in the system image.  Please avoid using this 
+       option, as the {@code signature} protection level should be sufficient 
+       for most needs and works regardless of exactly where applications are 
+       installed.  The "{@code signatureOrSystem}"
+       permission is used for certain special situations where multiple
+       vendors have applications built into a system image and need
+       to share specific features explicitly because they are being built
+       together.
+</tr>
+</table>
+</dd>
+</dl></dd>
+
+<dt>see also:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html">&lt;uses-permission&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/permission-tree-element.html">&lt;permission-tree&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/permission-group-element.html">&lt;permission-group&gt;</a></code></dd>
+</dd>
+
+</dl>
diff --git a/docs/html/guide/topics/manifest/permission-group-element.jd b/docs/html/guide/topics/manifest/permission-group-element.jd
new file mode 100644
index 0000000..9cfca6e
--- /dev/null
+++ b/docs/html/guide/topics/manifest/permission-group-element.jd
@@ -0,0 +1,59 @@
+page.title=&lt;permission-group&gt;
+@jd:body
+
+<dl class="xml">
+<dt>syntax:</dt>
+<dd><pre class="stx">&lt;permission-group android:<a href="#desc">description</a>="<i>string resource</i>"
+                  android:<a href="#icon">icon</a>="<i>drawable resource</i>"
+                  android:<a href="#label">label</a>="<i>string resource</i>"
+                  android:<a href="#nm">name</a>="<i>string</i>" /&gt;</pre></dd>
+
+<dt>contained in:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/manifest-element.html">&lt;manifest&gt;</a></code></dd>
+
+<dt>description:</dt>
+<dd>Declares a name for a logical grouping of related permissions.  Individual 
+permission join the group through the {@code permissionGroup} attribute of the
+<code><a href="{@docRoot}guide/topics/manifest/permission-element.html">&lt;permission&gt;</a></code> element.  Members of a group are
+presented together in the user interface.
+
+<p>
+Note that this element does not declare a permission itself, only a category in 
+which permissions can be placed.  See the 
+<code><a href="{@docRoot}guide/topics/manifest/permission-element.html">&lt;permission&gt;</a></code> element for element for information 
+on declaring permissions and assigning them to groups.
+</p></dd>
+
+<dt>attributes:</dt>
+<dd><dl class="attr">
+<dt><a name="desc"></a>{@code android:description}</dt>
+<dd>User-readable text that describes the group.  The text should be 
+longer and more explanatory than the label.  This attribute must be 
+set as a reference to a string resource.  Unlike the {@code label}
+attribute, it cannot be a raw string.</dd>
+
+<dt><a name="icon"></a>{@code android:icon}</dt>
+<dd>An icon representing the permission.  This attribute must be set
+as a reference to a drawable resource containing the image definition.</dd>
+
+<dt><a name="label"></a>{@code android:label}</dt>
+<dd>A user-readable name for the group.  As a convenience, the label can 
+be directly set as a raw string while you're developing the application.  
+However, when the application is ready to be published, it should be set 
+as a reference to a string resource, so that it can be localized like other 
+strings in the user interface.</dd>
+
+<dt><a name="nm"></a>{@code android:name}</dt>
+<dd>The name of the group.  This is the name that can be assigned to a
+<code><a href="{@docRoot}guide/topics/manifest/permission-element.html">&lt;permission&gt;</a></code>
+element's
+<code><a href="{@docRoot}guide/topics/manifest/permission-element.html#pgroup">&lt;permissionGroup&gt;</a></code>
+attribute.</dd>
+</dl></dd>
+
+<dt>see also:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/permission-element.html">&lt;permission&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/permission-tree-element.html">&lt;permission-tree&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html">&lt;uses-permission&gt;</a></code></dd>
+
+</dl>
diff --git a/docs/html/guide/topics/manifest/permission-tree-element.jd b/docs/html/guide/topics/manifest/permission-tree-element.jd
new file mode 100644
index 0000000..e2f7474
--- /dev/null
+++ b/docs/html/guide/topics/manifest/permission-tree-element.jd
@@ -0,0 +1,61 @@
+page.title=&lt;permission-tree&gt;
+@jd:body
+
+<dl class="xml">
+<dt>syntax:</dt>
+<dd><pre class="stx">&lt;permission-tree android:<a href="#icon">icon</a>="<i>drawable resource</i>"
+                 android:<a href="#label">label</a>="<i>string resource</i>" ]
+                 android:<a href="#nm">name</a>="<i>string</i>" /&gt;</pre></dd>
+
+<dt>contained in:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/manifest-element.html">&lt;manifest&gt;</a></code></dd>
+
+<dt>description:</dt>
+<dd>Declares the base name for a tree of permissions.  The application takes 
+ownership of all names within the tree.  It can dynamically add new permissions 
+to the tree by calling <code>{@link android.content.pm.PackageManager#addPermission PackageManager.addPermission()}</code>.  Names within the tree are separated by
+periods ('{@code .}').  For example, if the base name is
+{@code com.example.project.taxes}, permissions like the following might be
+added:
+
+<p style="margin-left: 2em">{@code com.example.project.taxes.CALCULATE}
+<br/>{@code com.example.project.taxes.deductions.MAKE_SOME_UP}
+<br/>{@code com.example.project.taxes.deductions.EXAGGERATE}</p>
+
+<p>
+Note that this element does not declare a permission itself, only a 
+namespace in which further permissions can be placed.  See the 
+<code><a href="{@docRoot}guide/topics/manifest/permission-element.html">&lt;permission&gt;</a></code> 
+element for information on declaring permissions.
+
+<dt>attributes:</dt>
+<dd><dl class="attr">
+<dt><a name="icon"></a>{@code android:icon}</dt>
+<dd>An icon representing all the permissions in the tree.  This attribute 
+must be set as a reference to a drawable resource containing the image 
+definition.</dd>
+
+<dt><a name="label"></a>{@code android:label}</dt>
+<dd>A user-readable name for the group.  As a convenience, the label can 
+be directly set as a raw string for quick and dirty programming.  However, 
+when the application is ready to be published, it should be set as a 
+reference to a string resource, so that it can be localized like other 
+strings in the user interface.</dd>
+
+<dt><a name="nm"</a>{@code android:name}</dt>
+<dd>The name that's at the base of the permission tree.  It serves as 
+a prefix to all permission names in the tree.  Java-style scoping should 
+be used to ensure that the name is unique.  The name must have more than 
+two period-separated seqments in its path &mdash; for example, 
+{@code com.example.base} is OK, but {@code com.example} is not.</dd>
+
+</dl></dd>
+
+<p>
+<dt>see also:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/permission-element.html">&lt;permission&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/permission-group-element.html">&lt;permission-group&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html">&lt;uses-permission&gt;</a></code>
+</dd>
+
+</dl>
diff --git a/docs/html/guide/topics/manifest/provider-element.jd b/docs/html/guide/topics/manifest/provider-element.jd
new file mode 100644
index 0000000..7359e50
--- /dev/null
+++ b/docs/html/guide/topics/manifest/provider-element.jd
@@ -0,0 +1,267 @@
+page.title=&lt;provider&gt;
+@jd:body
+
+<dl class="xml">
+<dt>syntax:</dt>
+<dd><pre class="stx">&lt;provider android:<a href="#auth">authorities</a>="<i>list</i>"
+          android:<a href="#enabled">enabled</a>=["true" | "false"]
+          android:<a href="#exported">exported</a>=["true" | "false"]
+          android:<a href="#gprmsn">grantUriPermissions</a>=["true" | "false"]
+          android:<a href="#icon">icon</a>="<i>drawable resource</i>"
+          android:<a href="#init">initOrder</a>="<i>integer</i>"
+          android:<a href="#label">label</a>="<i>string resource</i>"
+          android:<a href="#multi">multiprocess</a>=["true" | "false"]
+          android:<a href="#nm">name</a>="<i>string</i>"
+          android:<a href="#prmsn">permission</a>="<i>string</i>"
+          android:<a href="#proc">process</a>="<i>string</i>"
+          android:<a href="#rprmsn">readPermission</a>="<i>string</i>"
+          android:<a href="#sync">syncable</a>=["true" | "false"]
+          android:<a href="#wprmsn">writePermission</a>="<i>string</i>" &gt;
+    . . .
+&lt;/provider&gt;</pre></dd>
+
+<dt>contained in:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code></dd>
+
+<dt>can contain:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html">&lt;meta-data&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/grant-uri-permission-element.html">&lt;grant-uri-permission&gt;</a></code></dd>
+
+<dt>description:</dt>
+<dd>Declares a content provider &mdash; a subclass of 
+{@link android.content.ContentProvider} &mdash; that supplies structured 
+access to data managed by the application.  All content providers that 
+are part of the application must be represented by {@code &lt;provider&gt;} 
+elements in the manifest file.  The system cannot see, and therefore will 
+not run, any that are not declared.  (You need to declare only 
+those content providers that you develop as part of your application,
+not those developed by others that your application uses.)
+
+<p>
+The Android system identifies content providers by the authority part
+ of a {@code content:} URI.  For example, suppose that the following URI 
+is passed to <code>{@link android.content.ContentResolver#query 
+ContentResolver.query()}</code>:
+
+<p style="margin-left: 2em">{@code content://com.example.project.healthcareprovider/nurses/rn}</p>
+
+<p>
+The {@code content:} scheme identifies the data as belonging to a content 
+provider and the authority ({@code com.example.project.healthcareprovider}) 
+identifies the particular provider.  The authority therefore must be unique.  
+Typically, as in this example, it's the fully qualified name of a 
+ContentProvider subclass.  The path part of a URI may be used by a content 
+provider to identify particular data subsets, but those paths are not
+declared in the manifest.
+</p>
+
+<p>
+For information on using and developing content providers, see a separate document, 
+<a href="{@docRoot}guide/topics/providers/content-providers.html">Content Providers</a>.
+</p></dd>
+
+<dt>attributes:</dt>
+<dd><dl class="attr">
+<dt><a name="auth"></a>{@code android:authorities}</dt>
+<dd>A list of one or more URI authorities that identify data under the purview 
+of the content provider.
+Multiple authorities are listed by separating their names with a semicolon. 
+To avoid conflicts, authority names should use a Java-style naming convention 
+(such as {@code com.example.provider.cartoonprovider}).  Typically, it's the name
+of the ContentProvider subclass.
+
+<p>
+There is no default.  At least one authority must be specified.
+</p></dd>
+
+<dt><a name="enabled"></a>{@code android:enabled}</dt>
+<dd>Whether or not the content provider can be instantiated by the system &mdash; 
+"{@code true}" if it can be, and "{@code false}" if not.  The default value 
+is "{@code true}".
+
+<p>
+The <code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> element has its own 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html#enabled">enabled</a></code> attribute that applies to all 
+application components, including content providers.  The 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> and {@code &lt;provider&gt;} 
+attributes must both be "{@code true}" (as they both
+are by default) for the content provider to be enabled.  If either is 
+"{@code false}", the provider is disabled; it cannot be instantiated.
+</p></dd>
+
+<dt><a name="exported"></a>{@code android:exported}</dt>
+<dd>Whether or not the content provider can be used by components of other 
+applications &mdash; "{@code true}" if it can be, and "{@code false}" if not.  
+If "{@code false}", the provider is available only to components of the 
+same application or applications with the same user ID.  The default value
+is "{@code true}".
+
+<p>
+You can export a content provider but still limit access to it with the
+<code><a href="{@docRoot}guide/topics/manifest/provider-element.html#prmsn">permission</a></code> attribute.
+</p></dd> 
+
+<dt><a name="gprmsn"></a>{@code android:grantUriPermissions}</dt>
+<dd>Whether or not those who ordinarily would not have permission to 
+access the content provider's data can be granted permission to do so,
+temporarily overcoming the restriction imposed by the
+<code><a href="{@docRoot}guide/topics/manifest/provider-element.html#rprmsn">readPermission</a></code>,
+<code><a href="{@docRoot}guide/topics/manifest/provider-element.html#wprmsn">writePermission</a></code>, and 
+<code><a href="{@docRoot}guide/topics/manifest/provider-element.html#prmsn">permission</a></code> attributes 
+&mdash; 
+"{@code true}" if permission can be granted, and "{@ code false}" if not.  
+If "{@code true}", permission can be granted to any of the content 
+provider's data.  If "{@code false}", permission can be granted only 
+to the data subsets listed in 
+<code><a href="{@docRoot}guide/topics/manifest/grant-uri-permission-element.html">&lt;grant-uri-permission&gt;</a></code> subelements, 
+if any.  The default value is "{@code false}".
+
+<p>
+Granting permission is a way of giving an application component one-time 
+access to data protected by a permission.  For example, when an e-mail 
+message contains an attachment, the mail application may call upon the 
+appropriate viewer to open it, even though the viewer doesn't have general 
+permission to look at all the content provider's data. 
+</p>
+
+<p>  
+In such cases, permission is granted by 
+<code>{@link android.content.Intent#FLAG_GRANT_READ_URI_PERMISSION}</code> 
+and <code>{@link android.content.Intent#FLAG_GRANT_WRITE_URI_PERMISSION}</code> 
+flags in the Intent object that activates the component.  For example, the 
+mail application might put {@code FLAG_GRANT_READ_URI_PERMISSION} in the 
+Intent passed to {@code Context.startActivity()}.  The permission is specific 
+to the URI in the Intent.  
+</p>
+
+<p>
+If you enable this feature, either by setting this attribute to "{@code true}"
+or by defining <code><a href="{@docRoot}guide/topics/manifest/grant-uri-permission-element.html">&lt;grant-uri-permission&gt;</a></code> 
+subelements, you must call 
+<code>{@link android.content.Context#revokeUriPermission 
+Context.revokeUriPermission()}</code> when a covered URI is deleted from 
+the provider.
+</p>
+
+<p>
+See also the <code><a href="{@docRoot}guide/topics/manifest/grant-uri-permission-element.html">&lt;grant-uri-permission&gt;</a></code>
+element.
+</p></dd>
+
+<dt><a name="icon"></a>{@code android:icon}</dt>
+<dd>An icon representing the content provider. 
+This attribute must be set as a reference to a drawable resource containing 
+the image definition.  If it is not set, the icon specified for the application 
+as a whole is used instead (see the <code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> 
+element's <code><a href="{@docRoot}guide/topics/manifest/application-element.html#icon">icon</a></code> attribute).</dd>
+
+<dt><a name="init"></a>{@code android:initOrder}</dt>
+<dd>The order in which the content provider should be instantiated, 
+relative to other content providers hosted by the same process.  
+When there are dependencies among content providers, setting this 
+attribute for each of them ensures that they are created in the order 
+required by those dependencies.  The value is a simple integer, 
+with higher numbers being initialized first.</dd>
+
+<dt><a name="label"></a>{@code android:label}</dt>
+<dd>A user-readable label for the content provided.  
+If this attribute is not set, the label set for the application as a whole is 
+used instead (see the <code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> element's 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html#label">label</a></code> attribute).
+
+<p>
+The label should be set as a reference to a string resource, so that
+it can be localized like other strings in the user interface.  
+However, as a convenience while you're developing the application, 
+it can also be set as a raw string.
+</p></dd>
+
+<dt><a name="multi"></a>{@code android:multiprocess}</dt>
+<dd>Whether or not an instance of the content provider can be created in 
+every client process &mdash; "{@code true}" if instances can run in multiple
+processes, and "{@code false}" if not.  The default value is "{@code false}".
+
+<p>
+Normally, a content provider is instantiated in the process of the 
+application that defined it.  However, if this flag is set to "{@code true}", 
+the system can create an instance in every process where there's a client 
+that wants to interact withit, thus avoiding the overhead of interprocess 
+communication.
+</p></dd>
+
+<dt><a name="nm"></a>{@code android:name}</dt>
+<dd>The name of the class that implements the content provider, a subclass of 
+{@link android.content.ContentProvider}.  This should be a fully qualified 
+class name (such as, "{@code com.example.project.TransportationProvider}").  
+However, as a shorthand, if the first character of the name is a period, 
+it is appended to the package name specified in the 
+<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html">&lt;manifest&gt;</a></code> element.
+
+<p>
+There is no default.  The name must be specified.
+</p></dd>
+
+
+<dt><a name="prmsn"></a>{@code android:permission}</dt>
+<dd>The name of a permission that clients must have to read or write the
+content provider's data.  This attribute is a convenient way of setting a 
+single permission for both reading and writing.  However, the 
+<code><a href="#rprmsn">readPermission</a></code> and 
+<code><a href="#wprmsn">writePermission</a></code> attributes take precedence
+over this one.  If the <code><a href="{@docRoot}guide/topics/manifest/provider-element.html#rprmsn">readPermission</a></code> 
+attribute is also set, it controls access for querying the content provider.
+And if the <code><a href="#wprmsn">writePermission</a></code> attribute is set,
+it controls access for modifying the provider's data.
+
+<p>
+For more information on permissions, see the 
+<a href="{@docRoot}guide/topics/manifest/manifest-intro.html#sectperm">Permissions</a> 
+section in the introduction and a separate document, 
+<a href="{@docRoot}guide/topics/security/security.html">Security and
+Permissions</a>.
+</p></dd>
+
+<dt><a name="proc"></a>{@code android:process}</dt>
+<dd>The name of the process in which the content provider should run.  Normally, 
+all components of an application run in the default process created for the 
+application.  It has the same name as the application package.  The 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> element's 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html#proc">process</a></code> 
+attribute can set a different 
+default for all components.  But each component can override the default
+with its own {@code process} attribute, allowing you to spread your 
+application across multiple processes.
+
+<p>
+If the name assigned to this attribute begins with a colon (':'), a new 
+process, private to the application, is created when it's needed and 
+the activity runs in that process.
+If the process name begins with a lowercase character, the activity will run 
+in a global process of that name, provided that it has permission to do so.
+This allows components in different applications to share a process, reducing 
+resource usage.
+</p></dd>
+
+<dt><a name="rprmsn"></a>{@code android:readPermission}</dt>
+<dd>A permission that clients must have to query the content provider.  
+See also the <code><a href="#prmsn">permission</a></code> and 
+<code><a href="#wprmsn">writePermission</a></code> attributes.</dd>
+
+<dt><a name="sync"></a>{@code android:syncable}</dt>
+<dd>Whether or not the data under the content provider's control 
+is to be synchronized with data on a server &mdash; "{@code true}" 
+if it is to be synchronized, and "{@ code false}" if not.</dd>
+
+<dt><a name="wprmsn"></a>{@code android:writePermission}</dt>
+<dd>A permission that clients must have to make changes to the data 
+controlled by the content provider.  
+See also the <code><a href="#prmsn">permission</a></code> and 
+<code><a href="#rprmsn">readPermission</a></code> attributes.</dd>
+
+</dl></dd>
+
+<p>
+<dt>see also:</dt>
+<dd><a href="{@docRoot}guide/topics/providers/content-providers.html">Content Providers</a></dd>
+
+</dl>
diff --git a/docs/html/guide/topics/manifest/receiver-element.jd b/docs/html/guide/topics/manifest/receiver-element.jd
new file mode 100644
index 0000000..777d016
--- /dev/null
+++ b/docs/html/guide/topics/manifest/receiver-element.jd
@@ -0,0 +1,164 @@
+page.title=&lt;receiver&gt;
+@jd:body
+
+<dl class="xml">
+<dt>syntax:</dt>
+<dd><pre class="stx">&lt;receiver android:<a href="#enabled">enabled</a>=["true" | "false"]
+          android:<a href="#exported">exported</a>=["true" | "false"]
+          android:<a href="#icon">icon</a>="<i>drawable resource</i>"
+          android:<a href="#label">label</a>="<i>string resource</i>"
+          android:<a href="#nm">name</a>="<i>string</i>"
+          android:<a href="#prmsn">permission</a>="<i>string</i>"
+          android:<a href="#proc">process</a>="<i>string</i>" &gt;
+    . . .
+&lt;/receiver&gt;</pre></dd>
+
+<dt>contained in:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code></dd>
+
+<dt>can contain:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">&lt;intent-filer&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html">&lt;meta-data&gt;</a></code></dd>
+
+<dt>description:</dt>
+<dd>Declares a broadcast receiver (a {@link android.content.BroadcastReceiver} 
+subclass) as one of the application's components.  Broadcast receivers enable 
+applications to receive intents that are broadcast by the system or by other 
+applications, even when other components of the application are not running.
+
+<p>
+There are two ways to make a broadcast receiver known to the system:  One is
+declare it in the manifest file with this element.  The other is to create
+the receiver dynamically in code and register it with the <code>{@link 
+android.content.Context#registerReceiver Context.registerReceiver()}</code>
+method.  See the {@link android.content.BroadcastReceiver} class description
+for more on dynamically created receivers.
+</p></dd>
+
+<dt>attributes:</dt>
+<dd><dl class="attr">
+<dt><a name="enabled"></a>{@code android:enabled}</dt>
+<dd>Whether or not the broadcast receiver can be instantiated by the system &mdash; 
+"{@code true}" if it can be, and "{@code false}" if not.  The default value 
+is "{@code true}".
+
+<p>
+The <code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> element has its own 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html#enabled">enabled</a></code> attribute that applies to all 
+application components, including broadcast receivers.  The 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> and
+{@code &lt;receiver&gt;} attributes must both be "{@code true}" for 
+the broadcast receiver to be enabled.  If either is "{@code false}", it is
+disabled; it cannot be instantiated.
+</p></dd>
+
+<dt><a name="exported"></a>{@code android:exported}</dt>
+<dd>Whether or not the broadcast receiver can receive messages from sources 
+outside its application  &mdash; "{@code true}" if it can, and "{@code false}" 
+if not.  If "{@code false}", the only messages the broadcast receiver can 
+receive are those sent by components of the same application or applications 
+with the same user ID.  
+
+<p>
+The default value depends on whether the broadcast receiver contains intent filters.  
+The absence of any filters means that it can be invoked only by Intent objects that
+specify its exact class name.  This implies that the receiver is intended only for 
+application-internal use (since others would not normally know the class name).  
+So in this case, the default value is "{@code false}".
+On the other hand, the presence of at least one filter implies that the broadcast 
+receiver is intended to receive intents broadcast by the system or other applications, 
+so the default value is "{@code true}".
+</p>
+
+<p>
+This attribute is not the only way to limit a broadcast receiver's external exposure.  
+You can also use a permission to limit the external entities that can send it messages 
+(see the <code><a href="{@docRoot}guide/topics/manifest/receiver-element.html#prmsn">permission</a></code> attribute).
+</p></dd>
+
+<dt><a name="icon"></a>{@code android:icon}</dt>
+<dd>An icon representing the broadcast receiver. This attribute must be set 
+as a reference to a drawable resource containing the image definition.  
+If it is not set, the icon specified for the application as a whole is used 
+instead (see the <code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> 
+element's <code><a href="{@docRoot}guide/topics/manifest/application-element.html#icon">icon</a></code> attribute).
+
+<p>
+The broadcast receiver's icon &mdash; whether set here or by the 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> element &mdash; is also the 
+default icon for all the receiver's intent filters (see the 
+<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">&lt;intent-filter&gt;</a></code> element's 
+<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html#icon">icon</a></code> attribute). 
+</p></dd>
+
+<dt><a name="label"></a>{@code android:label}</dt>
+<dd>A user-readable label for the broadcast receiver.  If this attribute is not 
+set, the label set for the application as a whole is 
+used instead (see the <code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> element's 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html#label">label</a></code> attribute).
+
+<p>
+The broadcast receiver's label &mdash; whether set here or by the 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> element &mdash; is also the 
+default label for all the receiver's intent filters (see the 
+<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">&lt;intent-filter&gt;</a></code> element's 
+<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html#label">label</a></code> attribute). 
+</p>
+
+<p>
+The label should be set as a reference to a string resource, so that
+it can be localized like other strings in the user interface.  
+However, as a convenience while you're developing the application, 
+it can also be set as a raw string.
+</p></dd>
+
+<dt><a name="nm"></a>{@code android:name}</dt>
+<dd>The name of the class that implements the broadcast receiver, a subclass of 
+{@link android.content.BroadcastReceiver}.  This should be a fully qualified 
+class name (such as, "{@code com.example.project.ReportReceiver}").  However, 
+as a shorthand, if the first character of the name is a period (for example, 
+"{@code . ReportReceiver}"), it is appended to the package name specified in 
+the <code><a href="{@docRoot}guide/topics/manifest/manifest-element.html">&lt;manifest&gt;</a></code> element.  
+
+<p>
+There is no default.  The name must be specified.
+</p></dd>
+
+<dt><a name="prmsn"></a>{@code android:permission}</dt>
+<dd>The name of a permission that broadcasters must have to send a 
+message to the broadcast receiver.
+If this attribute is not set, the permission set by the 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> element's
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html#prmsn">permission</a></code> attribute applies 
+to the broadcast receiver.  If neither attribute is set, the receiver 
+is not protected by a permission.
+
+<p>
+For more information on permissions, see the 
+<a href="{@docRoot}guide/topics/manifest/manifest-intro.html#sectperm">Permissions</a> 
+section in the introduction and a separate document, 
+<a href="{@docRoot}guide/topics/security/security.html">Security and Permissions</a>.
+</p></dd>
+
+<dt><a name="proc"></a>{@code android:process}</dt>
+<dd>The name of the process in which the broadcast receiver should run.  
+Normally, all components of an application run in the default process created 
+for the application.  It has the same name as the application package.  The 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> element's 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html#proc">process</a></code> attribute can set a different 
+default for all components.  But each component can override the default
+with its own {@code process} attribute, allowing you to spread your 
+application across multiple processes.
+
+<p>
+If the name assigned to this attribute begins with a colon (':'), a new 
+process, private to the application, is created when it's needed and 
+the broadcast receiver runs in that process.
+If the process name begins with a lowercase character, the receiver will run 
+in a global process of that name, provided that it has permission to do so.
+This allows components in different applications to share a process, reducing 
+resource usage.
+</p></dd>
+</dl></dd>
+
+</dl>
diff --git a/docs/html/guide/topics/manifest/service-element.jd b/docs/html/guide/topics/manifest/service-element.jd
new file mode 100644
index 0000000..ad65abe
--- /dev/null
+++ b/docs/html/guide/topics/manifest/service-element.jd
@@ -0,0 +1,176 @@
+page.title=&lt;service&gt;
+@jd:body
+
+<dl class="xml">
+<dt>syntax:</dt>
+<dd><pre class="stx">&lt;service android:<a href="#enabled">enabled</a>=["true" | "false"]
+         android:<a href="#exported">exported[</a>="true" | "false"]
+         android:<a href="#icon">icon</a>="<i>drawable resource</i>"
+         android:<a href="#label">label</a>="<i>string resource</i>"
+         android:<a href="#nm">name</a>="<i>string</i>"
+         android:<a href="#prmsn">permission</a>="<i>string</i>"
+         android:<a href="#proc">process</a>="<i>string</i>" &gt;
+    . . .
+&lt;/service&gt;</pre></dd>
+
+<dt>contained in:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code></dd>
+
+<dt>can contain:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">&lt;intent-filer&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html">&lt;meta-data&gt;</a></code></dd>
+
+<dt>description:</dt>
+<dd>Declares a service (a {@link android.app.Service} subclass) as one 
+of the application's components.  Unlike activities, services lack a 
+visual user interface.  They're used to implement long-running background 
+operations or a rich communications API that can be called by other 
+applications.
+
+<p>
+All services must be represented by {@code &lt;service&gt;} elements in 
+the manifest file.  Any that are not declared there will not be seen 
+by the system and will never be run.
+</p></dd>
+
+<dt>attributes:</dt>
+<dd><dl class="attr">
+<dt><a name="enabled"></a>{@code android:enabled}</dt>
+<dd>Whether or not the service can be instantiated by the system &mdash; 
+"{@code true}" if it can be, and "{@code false}" if not.  The default value 
+is "{@code true}".
+
+<p>
+The <code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> element has its own 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html#enabled">enabled</a></code> attribute that applies to all 
+application components, including services.  The 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> and {@code &lt;service&gt;} 
+attributes must both be "{@code true}" (as they both
+are by default) for the service to be enabled.  If either is 
+"{@code false}", the service is disabled; it cannot be instantiated.
+</p></dd>
+
+<dt><a name="exported"></a>{@code android:exported}</dt>
+<dd>Whether or not components of other applications can invoke 
+the service or interact with it &mdash; "{@code true}" if they can, and 
+"{@code false}" if not.  When the value is "{@code false}", only 
+components of the same application or applications 
+with the same user ID can start the service or bind to it.
+
+<p>
+The default value depends on whether the service contains intent filters.  The 
+absence of any filters means that it can be invoked only by specifying 
+its exact class name.  This implies that the service is intended only for 
+application-internal use (since others would not know the class name).  So in 
+this case, the default value is "{@code false}".
+On the other hand, the presence of at least one filter implies that the service 
+is intended for external use, so the default value is "{@code true}".
+</p>
+
+<p>
+This attribute is not the only way to limit the exposure of a service to other
+applications.  You can also use a permission to limit the external entities that 
+can interact with the service (see the <code><a href="{@docRoot}guide/topics/manifest/service-element.html#prmsn">permission</a></code> 
+attribute).
+</p></dd>
+
+<dt><a name="icon"></a>{@code android:icon}</dt>
+<dd>An icon representing the service.  This attribute must be set as a 
+reference to a drawable resource containing the image definition.  
+If it is not set, the icon specified for the application 
+as a whole is used instead (see the <code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> 
+element's <code><a href="{@docRoot}guide/topics/manifest/application-element.html#icon">icon</a></code> attribute).
+</p>
+
+<p>
+The service's icon &mdash; whether set here or by the 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> element &mdash; is also the 
+default icon for all the service's intent filters (see the 
+<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">&lt;intent-filter&gt;</a></code> element's 
+<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html#icon">icon</a></code> attribute).
+</p></dd> 
+
+<dt><a name="label"></a>{@code android:label}</dt>
+<dd>A name for the service that can be displayed to users.  
+If this attribute is not set, the label set for the application as a whole is 
+used instead (see the <code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> element's 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html#label">label</a></code> attribute).
+
+<p>
+The service's label &mdash; whether set here or by the 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> element &mdash; is also the 
+default label for all the service's intent filters (see the 
+<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">&lt;intent-filter&gt;</a></code> element's 
+<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html#label">label</a></code> attribute). 
+</p>
+
+<p>
+The label should be set as a reference to a string resource, so that
+it can be localized like other strings in the user interface.  
+However, as a convenience while you're developing the application, 
+it can also be set as a raw string.
+</p></dd>
+
+<dt><a name="nm"></a>{@code android:name}</dt>
+<dd>The name of the {@link android.app.Service} subclass that implements 
+the service.  This should be a fully qualified class name (such as, 
+"{@code com.example.project.RoomService}").  However, as a shorthand, if 
+the first character of the name is a period (for example, "{@code .RoomService}"),
+it is appended to the package name specified in the 
+<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html">&lt;manifest&gt;</a></code> element.  
+
+<p>
+There is no default.  The name must be specified.
+</p></dd>
+
+<dt><a name="prmsn"></a>{@code android:permission}</dt>
+<dd>The name of a permission that that an entity must have in order to 
+launch the service or bind to it.  If a caller of 
+<code>{@link android.content.Context#startService startService()}</code>,
+<code>{@link android.content.Context#bindService bindService()}</code>, or
+<code>{@link android.content.Context#stopService stopService()}</code>,
+has not been granted this permission, the method will not work and the
+Intent object will not be delivered to the service.
+
+<p>
+If this attribute is not set, the permission set by the 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> element's
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html#prmsn">permission</a></code> 
+attribute applies to the service.  If neither attribute is set, the service is
+not protected by a permission.
+</p>
+
+<p>
+For more information on permissions, see the 
+<a href="{@docRoot}guide/topics/manifest/manifest-intro.html#sectperm">Permissions</a> 
+section in the introduction and a separate document, 
+<a href="{@docRoot}guide/topics/security/security.html">Security and Permissions</a>.
+</p></dd>
+
+<dt><a name="proc"></a>{@code android:process}</dt>
+<dd>The name of the process where the service is to run.  Normally, 
+all components of an application run in the default process created for the 
+application.  It has the same name as the application package.  The 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> element's 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html#proc">process</a></code> 
+attribute can set a different 
+default for all components.  But component can override the default
+with its own {@code process} attribute, allowing you to spread your 
+application across multiple processes.
+
+<p>
+If the name assigned to this attribute begins with a colon (':'), a new 
+process, private to the application, is created when it's needed and 
+the service runs in that process.
+If the process name begins with a lowercase character, the service will run 
+in a global process of that name, provided that it has permission to do so.
+This allows components in different applications to share a process, reducing 
+resource usage.
+</p></dd>
+</dl></dd>
+
+<dt>see also:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code>
+<br><code><a href="{@docRoot}guide/topics/manifest/activity-element.html">&lt;activity&gt;</a></code></dd>
+
+</dl>
diff --git a/docs/html/guide/topics/manifest/uses-library-element.jd b/docs/html/guide/topics/manifest/uses-library-element.jd
new file mode 100644
index 0000000..d66da2c
--- /dev/null
+++ b/docs/html/guide/topics/manifest/uses-library-element.jd
@@ -0,0 +1,32 @@
+page.title=&lt;uses-library&gt;
+@jd:body
+
+<dl class="xml">
+<dt>syntax:</dt>
+<dd><pre>&lt;uses-library android:<a href="#nm">name</a>="<i>string</i>" /&gt;</pre></dd>
+
+<dt>contained in:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code></dd>
+
+<dt>description:</dt>
+<dd>Specifies a shared library that the application must be linked against. 
+This element tells the system to include the library's code in the class 
+loader for the package.
+
+<p>
+All of the {@code android} packages (such as {@link android.app}, 
+{@link android.content}, {@link android.view}, and {@link android.widget}) 
+are in the default library that all applications are automatically linked 
+against.  However, some packages (such as {@code maps} and {@code awt} are 
+in separate libraries that are not automatically linked.  Consult the 
+documentation for the packages you're using to determine which library 
+contains the package code.
+</p></dd>
+
+<dt>attributes:</dt>
+<dd><dl class="attr">
+<dt><a name="nm"></a>{@code android:name}</dt>
+<dd>The name of the library.</dd>
+</dl></dd>
+
+</dl>
diff --git a/docs/html/guide/topics/manifest/uses-permission-element.jd b/docs/html/guide/topics/manifest/uses-permission-element.jd
new file mode 100644
index 0000000..07741b1
--- /dev/null
+++ b/docs/html/guide/topics/manifest/uses-permission-element.jd
@@ -0,0 +1,39 @@
+page.title=&lt;uses-permission&gt;
+@jd:body
+
+<dl class="xml">
+<dt>syntax:</dt>
+<dd><pre class="stx">&lt;uses-permission android:<a href="#nm">name</a>="<i>string</i>" /&gt;</pre></dd>
+
+<dt>contained in:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/manifest-element.html">&lt;manifest&gt;</a></code></dd>
+
+<dt>description:</dt>
+<dd>Requests a permission that the application must be granted in 
+order for it to operate correctly.  Permissions are granted when the 
+application is installed, not while it's running.
+
+<p>
+For more information on permissions, see the 
+<a href="{@docRoot}guide/topics/manifest/manifest-intro.html#perms">Permissions</a></code> 
+section in the introduction and the separate 
+<a href="{@docRoot}guide/topics/security/security.html">Security and Permissions</a> document.  
+A list of permissions defined by the base platform can be found at 
+{@link android.Manifest.permission android.Manifest.permission}.
+
+<dt>attributes:</dt>
+<dd><dl class="attr">
+<dt><a name="nm"></a>{@code android:name}</dt>
+<dd>The name of the permission.  It can be a permission defined by the 
+application with the <code><a href="{@docRoot}guide/topics/manifest/permission-element.html">&lt;permission&gt;</a></code> 
+element, a permission defined by another application, or one of the 
+standard system permissions, such as "{@code android.permission.CAMERA}" 
+or "{@code android.permission.READ_CONTACTS}".  As these examples show, 
+a permission name typically includes the package name as a prefix.</dd>
+
+</dl></dd>
+
+<dt>see also:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/permission-element.html">&lt;permission&gt;</a></code></dd>
+
+</dl>
diff --git a/docs/html/guide/topics/manifest/uses-sdk-element.jd b/docs/html/guide/topics/manifest/uses-sdk-element.jd
new file mode 100644
index 0000000..a88635a
--- /dev/null
+++ b/docs/html/guide/topics/manifest/uses-sdk-element.jd
@@ -0,0 +1,49 @@
+page.title=&lt;uses-sdk&gt;
+@jd:body
+
+<dl class="xml">
+<dt>syntax:</dt>
+<dd><pre class="stx">&lt;uses-sdk android:<a href="#min">minSdkVersion</a>="<i>integer</i>" /&gt;</pre></dd>
+
+<dt>contained in:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/manifest-element.html">&lt;manifest&gt;</a></code></dd>
+
+<dt>description:</dt>
+<dd>Declares which levels of the Android API the application can run against.  
+The level is incremented when there are additions to the API and resource tree, 
+so an application developed using level 3 of the API may not run against level 
+1 or 2, but should run against level 3, 4, 5, and above.
+</p>
+
+<p>
+The default level is 1. 
+</p>
+
+<p>
+For more information on the API level, see the 
+<a href="{@docRoot}guide/publishing/versioning.html#minsdkversion">Specifying 
+Minimum System API Version</a> section of 
+<a href="{@docRoot}guide/publishing/versioning.html">Versioning Your 
+Applications</a>.
+</p></dd> 
+
+
+<dt>attributes:</dt>
+<dd><dl class="attr">
+<dt><a name="min"></a>{@code android:minSdkVersion}</dt>
+<dd>An integer designating the minimum level of the Android API that's required 
+for the application to run.
+
+<p>
+Despite its name, this attribute is set to the API level, <em>not</em> to the 
+version number of the SDK (software development kit).  The API level is always 
+a single integer; the SDK version may be split into major and minor components 
+(such as 1.2).  You cannot derive the API level from the SDK version number 
+(for example, it is not the same as the major version or the sum of the major 
+and minor versions).  To learn what the API level is, check the notes that 
+came with the SDK you're using.
+</p></dd>
+
+</dl></dd>
+
+</dl>
diff --git a/docs/html/guide/topics/media/index.jd b/docs/html/guide/topics/media/index.jd
new file mode 100644
index 0000000..ba6d89f
--- /dev/null
+++ b/docs/html/guide/topics/media/index.jd
@@ -0,0 +1,188 @@
+page.title=Audio and Video
+@jd:body
+
+    <div id="qv-wrapper">
+    <div id="qv">
+
+<h2>Audio/Video quickview</h2>
+<ul>
+<li>Audio playback and record</li>
+<li>Video playback</li>
+<li>Handles data from raw resources, files, streams</li>
+<li>Built-in codecs for a variety of media. See <a href="{@docRoot}guide/appendix/media-formats.html">Android 1.0 Media Formats</a></li>
+</ul>
+
+<h2>Key classes</h2>
+<ol>
+<li><a href="{@docRoot}reference/android/media/MediaPlayer.html">MediaPlayer</a> (all audio and video formats)</li>
+<li><a href="{@docRoot}reference/android/media/MediaRecorder.html">MediaRecorder</a> (record, all audio formats)</li>
+</ol>
+
+<h2>In this document</h2>
+<ol>
+<li><a href="#playback.html">Audio and Video Playback</a></li>
+<li><a href="#capture">Audio Capture</a></li>
+</ol>
+
+<h2>See also</h2>
+<ol>
+<li><a href="{@docRoot}guide/topics/data/data-storage.html">Data Storage</a></li>
+</ol>
+
+</div>
+</div>
+
+<p>The Android platform offers built-in encoding/decoding for a variety of
+common media types, so that you can easily integrate audio, video, and images into your
+applications. Accessing the platform's media capabilities is fairly straightforward 
+&mdash; you do so using the same intents and activities mechanism that the rest of
+Android uses.</p>
+
+<p>Android lets you play audio and video from several types of data sources. You
+can play audio or video from media files stored in the application's resources
+(raw resources), from standalone files in the filesystem, or from a data stream
+arriving over a network connection. To play audio or video from your
+application, use the {@link android.media.MediaPlayer} class.</p>
+
+<p>The platform also lets you record audio, where supported by the mobile device
+hardware. Recording of video is not currently supported, but is planned for a
+future release. To record audio, use the 
+{@link android.media.MediaRecorder} class. Note that the emulator doesn't have
+hardware to capture audio, but actual mobile devices are likely to provide these
+capabilities that you can access through MediaRecorder. </p>
+
+<p>For a list of the media formats for which Android offers built-in support,
+see the <a href="{@docRoot}guide/appendix/media-formats.html">Android Media
+Formats</a> appendix. </p>
+
+<h2 id="play">Audio and Video Playback</h2>
+<p>Media can be played from anywhere: from a raw resource, from a file from the system, 
+or from an available network (URL).</p>
+  
+<p>You can play back the audio data only to the standard
+output device; currently, that is the mobile device speaker or Bluetooth headset. You
+cannot play sound files in the conversation audio. </p>
+
+<h3 id="playraw">Playing from a Raw Resource</h3>
+<p>Perhaps the most common thing to want to do is play back media (notably sound)
+within your own applications. Doing this is easy:</p>
+<ol>
+  <li>Put the sound (or other media resource) file into the <code>res/raw</code>
+  folder of your project, where the Eclipse plugin (or aapt) will find it and
+  make it into a resource that can be referenced from your R class</li>
+  <li>Create an instance of <code>MediaPlayer</code>, referencing that resource using
+  {@link android.media.MediaPlayer#create MediaPlayer.create}, and then call
+  {@link android.media.MediaPlayer#start() start()} on the instance:</li>
+</ol>
+<pre>
+    MediaPlayer mp = MediaPlayer.create(context, R.raw.sound_file_1);
+    mp.start();
+</pre>
+<p>To stop playback, call {@link android.media.MediaPlayer#stop() stop()}. If 
+you wish to later replay the media, then you must 
+{@link android.media.MediaPlayer#reset() reset()} and
+{@link android.media.MediaPlayer#prepare() prepare()} the MediaPlayer object
+before calling {@link android.media.MediaPlayer#start() start()} again. 
+(<code>create()</code> calls <code>prepare()</code> the first time.)</p>
+<p>To pause playback, call {@link android.media.MediaPlayer#pause() pause()}. 
+Resume playback from where you paused with 
+{@link android.media.MediaPlayer#start() start()}.</p>
+
+<h3 id="playfile">Playing from a File or Stream</h3>
+<p>You can play back media files from the filesystem or a web URL:</p>
+<ol>
+  <li>Create an instance of the <code>MediaPlayer</code> using <code>new</code></li>
+  <li>Call {@link android.media.MediaPlayer#setDataSource setDataSource()}
+    with a String containing the path (local filesystem or URL)
+    to the file you want to play</li>
+  <li>First {@link android.media.MediaPlayer#prepare prepare()} then
+  {@link android.media.MediaPlayer#start() start()} on the instance:</li>
+</ol>
+<pre>
+    MediaPlayer mp = new MediaPlayer();
+    mp.setDataSource(PATH_TO_FILE);
+    mp.prepare();
+    mp.start();
+</pre>
+<p>{@link android.media.MediaPlayer#stop() stop()} and 
+{@link android.media.MediaPlayer#pause() pause()} work the same as discussed
+above.</p>
+  <p class="note"><strong>Note:</strong> It is possible that <code>mp</code> could be
+  null, so good code should <code>null</code> check after the <code>new</code>.
+  Also, <code>IllegalArgumentException</code> and <code>IOException</code> either
+  need to be caught or passed on when using <code>setDataSource()</code>, since
+  the file you are referencing may not exist.</p>
+<p class="note"><strong>Note:</strong>
+If you're passing a URL to an online media file, the file must be capable of 
+progressive download.</p>
+
+<h2 id="capture">Audio Capture</h2>
+<p>Audio capture from the device is a bit more complicated than audio/video playback, but still fairly simple:</p>
+<ol>
+  <li>Create a new instance of {@link android.media.MediaRecorder 
+  android.media.MediaRecorder} using <code>new</code></li>
+  <li>Create a new instance of {@link android.content.ContentValues 
+  android.content.ContentValues} and put in some standard properties like
+  <code>TITLE</code>, <code>TIMESTAMP</code>, and the all important 
+  <code>MIME_TYPE</code></li>
+  <li>Create a file path for the data to go to (you can use {@link
+  android.content.ContentResolver android.content.ContentResolver} to
+  create an entry in the Content database and get it to assign a path
+  automatically which you can then use)</li>
+  <li>Set the audio source using {@link android.media.MediaRecorder#setAudioSource
+  MediaRecorder.setAudioSource()}. You will probably want to use
+  <code>MediaRecorder.AudioSource.MIC</code></li>
+  <li>Set output file format using {@link 
+        android.media.MediaRecorder#setOutputFormat MediaRecorder.setOutputFormat()}
+  </li>
+  <li>Set the audio encoder using 
+        {@link android.media.MediaRecorder#setAudioEncoder MediaRecorder.setAudioEncoder()}
+  </li>
+  <li>Call {@link android.media.MediaRecorder#prepare prepare()} 
+   on the MediaRecorder instance.</li>
+  <li>To start audio capture, call 
+  {@link android.media.MediaRecorder#start start()}. </li>
+  <li>To stop audio capture, call {@link android.media.MediaRecorder#stop stop()}.
+  <li>When you are done with the MediaRecorder instance, call
+{@link android.media.MediaRecorder#release release()} on it. </li>
+</ol>
+
+<h3>Example: Audio Capture Setup and Start</h3>
+<p>The example below illustrates how to set up, then start audio capture.</p>
+<pre>
+    recorder = new MediaRecorder();
+    ContentValues values = new ContentValues(3);
+
+    values.put(MediaStore.MediaColumns.TITLE, SOME_NAME_HERE);
+    values.put(MediaStore.MediaColumns.TIMESTAMP, System.currentTimeMillis());
+    values.put(MediaStore.MediaColumns.MIME_TYPE, recorder.getMimeContentType());
+    
+    ContentResolver contentResolver = new ContentResolver();
+    
+    Uri base = MediaStore.Audio.INTERNAL_CONTENT_URI;
+    Uri newUri = contentResolver.insert(base, values);
+    
+    if (newUri == null) {
+        // need to handle exception here - we were not able to create a new
+        // content entry
+    }
+    
+    String path = contentResolver.getDataFilePath(newUri);
+
+    // could use setPreviewDisplay() to display a preview to suitable View here
+    
+    recorder.setAudioSource(MediaRecorder.AudioSource.MIC);
+    recorder.setOutputFormat(MediaRecorder.OutputFormat.THREE_GPP);
+    recorder.setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB);
+    recorder.setOutputFile(path);
+    
+    recorder.prepare();
+    recorder.start();
+</pre>
+<h3>Stop Recording</h3>
+<p>Based on the example above, here's how you would stop audio capture. </p>
+<pre>
+    recorder.stop();
+    recorder.release();
+</pre>
+
diff --git a/docs/html/guide/topics/media/media.jd b/docs/html/guide/topics/media/media.jd
new file mode 100644
index 0000000..463686d
--- /dev/null
+++ b/docs/html/guide/topics/media/media.jd
@@ -0,0 +1,172 @@
+page.title=Media Capabilities
+@jd:body
+
+<div class="sidebox">
+
+<h3>Media Quickview</h3>
+
+<h4>Built-in capabilities</h4>
+<ul>
+<li>Audio playback and record</li>
+<li>Video playback</li>
+</ul>
+
+<h4>Data sources</h4>
+<ul>
+<li>Raw resources</li>
+<li>Data files</li>
+<li>Streams</li>
+</ul>
+
+<h4>Media Formats</h4>
+<ul>
+<li>See appendix <a href="{@docRoot}devguide/appendix/media_formats.html">Android 1.0 Media Formats</a></li>
+</ul>
+
+<h4>Key APIs</h4>
+<ul>
+<li>{@link android.media.MediaPlayer} (playback, all audio and video formats)</li>
+<li>{@link android.media.MediaRecorder} (record, all audio formats)</li>
+</ul>
+</div>
+
+<p>The Android platform offers built-in encoding/decoding for a variety of common media types, 
+so that you can easily integrate audio, video, and images into your applications. Accessing the platform's media 
+capabilities is fairly straightforward &mdash you do so using the same intents and
+activities mechanism that the rest of Android uses.</p>
+
+<p>Android lets you play audio and video from several types of data sources. You can play audio or video from media files stored in the application's resources (raw resources), from standalone files in the filesystem, or from a data stream arriving over a network connection. To play audio or video from your application, use the {@link android.media.MediaPlayer} class.</p>
+
+<p>The platform also lets you record audio, where supported by the mobile device hardware. Recording of video is not currently supported, but is planned for a future release. To record audio, use the 
+{@link android.media.MediaRecorder} class. Note that the emulator doesn't have hardware to capture audio, but actual mobile devices are likely to provide these capabilities that you can access through MediaRecorder. </p>
+
+<p>For a list of the media formats for which Android offers built-in support, see the <a href="{@docRoot}devguide/appendix/media_formats.html">Android Media Formats</a> appendix. </p>
+
+<h2>Playing Audio and Video</h2>
+<p>Media can be played from anywhere: from a raw resource, from a file from the system, 
+or from an available network (URL).</p>
+  
+<p>You can play back the audio data only to the standard
+output device; currently, that is the mobile device speaker or Bluetooth headset. You
+cannot play sound files in the conversation audio. </p>
+
+<h3>Playing from a Raw Resource</h3>
+<p>Perhaps the most common thing to want to do is play back media (notably sound)
+within your own applications. Doing this is easy:</p>
+<ol>
+  <li>Put the sound (or other media resource) file into the <code>res/raw</code>
+  folder of your project, where the Eclipse plugin (or aapt) will find it and
+  make it into a resource that can be referenced from your R class</li>
+  <li>Create an instance of <code>MediaPlayer</code>, referencing that resource using
+  {@link android.media.MediaPlayer#create MediaPlayer.create}, and then call
+  {@link android.media.MediaPlayer#start() start()} on the instance:<br><br></li>
+</ol>
+<pre>
+    MediaPlayer mp = MediaPlayer.create(context, R.raw.sound_file_1);
+    mp.start();
+</pre>
+<p>To stop playback, call {@link android.media.MediaPlayer#stop() stop()}. If 
+you wish to later replay the media, then you must 
+{@link android.media.MediaPlayer#reset() reset()} and
+{@link android.media.MediaPlayer#prepare() prepare()} the MediaPlayer object
+before calling {@link android.media.MediaPlayer#start() start()} again. 
+(<code>create()</code> calls <code>prepare()</code> the first time.)</p>
+<p>To pause playback, call {@link android.media.MediaPlayer#pause() pause()}. 
+Resume playback from where you paused with 
+{@link android.media.MediaPlayer#start() start()}.</p>
+
+<h3>Playing from a File or Stream</h3>
+<p>You can play back media files from the filesystem or a web URL:</p>
+<ol>
+  <li>Create an instance of the <code>MediaPlayer</code> using <code>new</code></li>
+  <li>Call {@link android.media.MediaPlayer#setDataSource setDataSource()}
+    with a String containing the path (local filesystem or URL)
+    to the file you want to play</li>
+  <li>First {@link android.media.MediaPlayer#prepare prepare()} then
+  {@link android.media.MediaPlayer#start() start()} on the instance:<br><br></li>
+</ol>
+<pre>
+    MediaPlayer mp = new MediaPlayer();
+    mp.setDataSource(PATH_TO_FILE);
+    mp.prepare();
+    mp.start();
+</pre>
+<p>{@link android.media.MediaPlayer#stop() stop()} and 
+{@link android.media.MediaPlayer#pause() pause()} work the same as discussed
+above.</p>
+  <p class="note"><strong>Note:</strong> It is possible that <code>mp</code> could be
+  null, so good code should <code>null</code> check after the <code>new</code>.
+  Also, <code>IllegalArgumentException</code> and <code>IOException</code> either
+  need to be caught or passed on when using <code>setDataSource()</code>, since
+  the file you are referencing may not exist.</p>
+<p class="note"><strong>Note:</strong>
+If you're passing a URL to an online media file, the file must be capable of 
+progressive download.</p>
+
+<h2>Recording Media Resources</h2>
+<p>Recording media is a little more involved than playing it back, as you would
+probably expect, but it is still fairly simple. There is just a little more set
+up to do</p>
+<ol>
+  <li>Create a new instance of {@link android.media.MediaRecorder 
+  android.media.MediaRecorder} using <code>new</code></li>
+  <li>Create a new instance of {@link android.content.ContentValues 
+  android.content.ContentValues} and put in some standard properties like
+  <code>TITLE</code>, <code>TIMESTAMP</code>, and the all important 
+  <code>MIME_TYPE</code></li>
+  <li>Create a file path for the data to go to (you can use {@link
+  android.content.ContentResolver android.content.ContentResolver} to
+  create an entry in the Content database and get it to assign a path
+  automatically which you can then use)</li>
+  <li>Set the audio source using {@link android.media.MediaRecorder#setAudioSource
+  MediaRecorder.setAudioSource()}. You will probably want to use
+  <code>MediaRecorder.AudioSource.MIC</code></li>
+  <li>Set output file format using {@link 
+        android.media.MediaRecorder#setOutputFormat MediaRecorder.setOutputFormat()}
+  </li>
+  <li>Set the audio encoder using 
+        {@link android.media.MediaRecorder#setAudioEncoder MediaRecorder.setAudioEncoder()}
+  </li>
+  <li>Finally, {@link android.media.MediaRecorder#prepare prepare()} and
+  {@link android.media.MediaRecorder#start start()} the recording.
+  {@link android.media.MediaRecorder#stop stop()} and
+  {@link android.media.MediaRecorder#release release()} when you are done</li>
+</ol>
+<p>Here is a code example that will hopefully help fill in the gaps:</p>
+<p><strong>Start Recording</strong></p>
+<pre>
+    recorder = new MediaRecorder();
+    ContentValues values = new ContentValues(3);
+
+    values.put(MediaStore.MediaColumns.TITLE, SOME_NAME_HERE);
+    values.put(MediaStore.MediaColumns.TIMESTAMP, System.currentTimeMillis());
+    values.put(MediaStore.MediaColumns.MIME_TYPE, recorder.getMimeContentType());
+    
+    ContentResolver contentResolver = new ContentResolver();
+    
+    Uri base = MediaStore.Audio.INTERNAL_CONTENT_URI;
+    Uri newUri = contentResolver.insert(base, values);
+    
+    if (newUri == null) {
+        // need to handle exception here - we were not able to create a new
+        // content entry
+    }
+    
+    String path = contentResolver.getDataFilePath(newUri);
+
+    // could use setPreviewDisplay() to display a preview to suitable View here
+    
+    recorder.setAudioSource(MediaRecorder.AudioSource.MIC);
+    recorder.setOutputFormat(MediaRecorder.OutputFormat.THREE_GPP);
+    recorder.setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB);
+    recorder.setOutputFile(path);
+    
+    recorder.prepare();
+    recorder.start();
+</pre>
+<p><strong>Stop Recording</strong></p>
+<pre>
+    recorder.stop();
+    recorder.release();
+</pre>
+
diff --git a/docs/html/guide/topics/processes/process-lifecycle.jd b/docs/html/guide/topics/processes/process-lifecycle.jd
new file mode 100644
index 0000000..0380f94
--- /dev/null
+++ b/docs/html/guide/topics/processes/process-lifecycle.jd
@@ -0,0 +1,120 @@
+page.title=Processes and Application Life Cycle
+@jd:body
+
+<p>In most cases, every Android application runs in its own Linux process.
+This process is created for the application when some of its code needs to
+be run, and will remain running until it is no longer needed <em>and</em>
+the system needs to reclaim its memory for use by other applications.</p>
+
+<p>An unusual and fundamental feature of Android is that an application process's
+lifetime is <em>not</em> directly controlled by the application itself.
+Instead, it is determined by the system through a combination of the parts of the application
+that the system knows are running, how important these things are to the user,
+and how much overall memory is available in the system.</p>
+
+<p>It is important that
+application developers understand how different application components
+(in particular {@link android.app.Activity}, {@link android.app.Service},
+and {@link android.content.BroadcastReceiver}) impact the lifetime
+of the application's process.  <strong>Not using these components correctly can
+result in the system killing the application's process while it is doing
+important work.</strong></p>
+
+<p>A common example of a process life-cycle bug is a
+{@link android.content.BroadcastReceiver} that starts a thread when it
+receives an Intent in its {@link android.content.BroadcastReceiver#onReceive
+BroadcastReceiver.onReceive()}
+method, and then returns from the function.  Once it returns, the system
+considers the BroadcastReceiver to be no longer active, and thus, its hosting
+process no longer needed (unless other application components are active in
+it).  So, the system may kill the process at any time to reclaim memory, and in doing so,
+it terminates the spawned thread running in the process.  The solution to this problem
+is to start a {@link android.app.Service} from the BroadcastReceiver, so the
+system knows that there is still active work being done in the process.</p>
+
+<p>To determine which processes should be killed when low on memory, Android
+places each process into an "importance hierarchy" based on the components running in
+them and the state of those components. These process types are (in order of importance):</p>
+
+<ol>
+
+<li>A <strong>foreground process</strong> is one that is required for
+what the user is currently doing.  Various application components can
+cause its containing process to be considered foreground in different
+ways.  A process is considered to be in the foreground if any of the
+following conditions hold:
+ <ul>
+  <li> It is running an {@link android.app.Activity}
+  at the top of the screen that the user is interacting with (its
+  {@link android.app.Activity#onResume} method has been called).</li>
+  <li> It has a {@link android.content.BroadcastReceiver} that is currently running
+  (its {@link android.content.BroadcastReceiver#onReceive 
+  BroadcastReceiver.onReceive()} method is executing).</li>
+  <li>It has a {@link android.app.Service} that is currently executing code
+  in one of its callbacks ({@link android.app.Service#onCreate Service.onCreate()},
+  {@link android.app.Service#onStart Service.onStart()}, or
+  {@link android.app.Service#onDestroy Service.onDestroy()}).</li>
+ </ul>
+</li>
+<p>There will only ever be a few such processes in the system, and these will only
+be killed as a last resort if memory is so low that not even these processes
+can continue to run.  Generally, at this point, the device has
+reached a memory paging state, so this action is required in order to keep the user
+interface responsive.</p>
+</li>
+
+<li>A <strong>visible process</strong> is one holding an {@link android.app.Activity}
+that is visible to the user on-screen but not in the foreground (its
+{@link android.app.Activity#onPause} method has been called).  This may
+occur, for example, if the foreground Activity is displayed as a dialog
+that allows the previous Activity to be seen behind it.  Such a
+process is considered extremely important and will not be killed unless doing so is
+required to keep all foreground processes running.
+</li>
+
+<li>A <strong>service process</strong> is one holding a {@link android.app.Service}
+that has been started with the
+{@link android.content.Context#startService startService()} method.  Though these
+processes are not directly visible to the user, they are generally doing things
+that the user cares about (such as background mp3 playback or background
+network data upload or download), so the system will always keep such processes
+running unless there is not enough memory to retain all foreground and visible process.
+</li>
+
+<li>A <strong>background process</strong> is one holding an {@link android.app.Activity}
+that is not currently visible to the user  (its
+{@link android.app.Activity#onStop} method has been called).  These processes
+have no direct impact on the user experience.  Provided they implement
+their Activity life-cycle correctly
+(see {@link android.app.Activity} for more details), the system
+can kill such processes at any time to reclaim memory for one of the three
+previous processes types.  Usually there are many of these processes running,
+so they are kept in an LRU list to ensure the process that was most recently seen
+by the user is the last to be killed when running low on memory.
+</li>
+
+<li>An <strong>empty process</strong> is one that doesn't hold any active application
+components.  The only reason to keep such a process around is as a cache to
+improve startup time the next time a component of its application needs to
+run.  As such, the system will often kill these processes in order to
+balance overall system resources between these empty cached processes and the
+underlying kernel caches.
+</li>
+
+</ol>
+
+<p>When deciding how to classify a process, the system will base its decision on the most
+important level found among all the components currently active in the process.
+See the {@link android.app.Activity}, {@link android.app.Service}, and
+{@link android.content.BroadcastReceiver} documentation for more detail on how
+each of these components contribute to the overall life-cycle of a process.
+The documentation for each of these classes describes in more detail how
+they impact the overall life-cycle of their application.</p>
+
+<p>A process's priority may also be increased based on other dependencies
+a process has to it.  For example, if process A has bound to a
+{@link android.app.Service} with
+the {@link android.content.Context#BIND_AUTO_CREATE Context.BIND_AUTO_CREATE}
+flag or is using a
+{@link android.content.ContentProvider} in process B, then process B's
+classification will always be at least as important as process A's.</p>
diff --git a/docs/html/guide/topics/providers/content-providers.jd b/docs/html/guide/topics/providers/content-providers.jd
new file mode 100644
index 0000000..86dcebf
--- /dev/null
+++ b/docs/html/guide/topics/providers/content-providers.jd
@@ -0,0 +1,922 @@
+page.title=Content Providers
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+<h2>Key classes</h2>
+<ol>
+<li>{@link android.content.ContentProvider}</li>
+<li>{@link android.content.ContentResolver}</li>
+<li>{@link android.database.Cursor}</li>
+</ol>
+
+<h2>In this document</h2>
+<ol>
+<li><a href="#basics">Content provider basics</a></li>
+<li><a href="#querying">Querying a content provider</a></li>
+<li><a href="#modifying">Modifying data in a provider</a></li>
+<li><a href="#creating">Creating a content provider</a></li>
+<li><a href="#urisum">Content URI summary</a></li>
+</ol>
+</div>
+</div>
+
+<p>
+Content providers store and retrieve data and make it accessible to all 
+applications.  They're the only way to share data across applications; there's 
+no common storage area that all Android packages can access.
+</p>   
+
+<p>
+Android ships with a number of content providers for common data types 
+(audio, video, images, personal contact information, and so on).  You can 
+see some of them listed in the {@link android.provider android.provider} 
+package.  You can query these providers for the data they contain (although,
+for some, you must acquire the proper permission to read the data).
+</p>   
+
+<p>
+If you want to make your own data public, you have two options:  You can 
+create your own content provider (a {@link android.content.ContentProvider} 
+subclass) or you can add the data to an existing provider &mdash; if there's 
+one that controls the same type of data and you have permission to write to it. 
+</p>   
+
+<p>
+This document is an introduction to using content providers.  After a 
+brief discussion of the fundamentals, it explores how to query a content 
+provider, how to modify data controlled by a provider, and how to create
+a content provider of your own.
+</p>   
+
+
+<h2><a name="basics"></a>Content Provider Basics</h2>
+
+<p>
+How a content provider actually stores its data under the covers is 
+up to its designer.  But all content providers implement a common interface 
+for querying the provider and returning results &mdash; as well as for 
+adding, altering, and deleting data.
+</p>   
+
+<p>
+It's an interface that clients use indirectly, most generally through 
+{@link android.content.ContentResolver} objects.  You get a ContentResolver 
+by calling <code>{@link android.content.Context#getContentResolver 
+getContentResolver()}</code> from within the implementation of an Activity 
+or other application component:
+</p>   
+
+<pre>ContentResolver cr = getContentResolver();</pre>
+
+<p>
+You can then use the ContentResolver's methods to interact with whatever 
+content providers you're interested in.
+</p>   
+
+<p>
+When a query is initiated, the Android system identifies the content provider 
+that's the target of the query and makes sure that it is up and running.  
+The system instantiates all ContentProvider objects; you never need to do it 
+on your own.  In fact, you never deal directly with ContentProvider objects 
+at all.  Typically, there's just a single instance of each type of 
+ContentProvider.  But it can communicate with multiple ContentResolver objects 
+in different applications and processes.  The interaction between processes is 
+handled by the ContentResolver and ContentProvider classes.
+</p>   
+
+
+<h3>The data model</h3>
+
+<p>
+Content providers expose their data as a simple table on a database model, 
+where each row is a record and each column is data of a particular type 
+and meaning.  For example, information about people and their phone numbers 
+might be exposed as follows: 
+</p>   
+
+<table>
+   <tr>
+      <th scope="col">_ID</th>
+      <th scope="col">NUMBER</th>
+      <th scope="col">NUMBER_KEY</th>
+      <th scope="col">LABEL</th>
+      <th scope="col">NAME</th>
+      <th scope="col">TYPE</th>
+   </tr>
+   <tr>
+      <td>13</td>
+      <td>(425) 555 6677</td>
+      <td>425 555 6677</td>
+      <td>Kirkland office</td>
+      <td>Bully Pulpit</td>
+      <td>{@code TYPE_WORK}</td>
+   </tr>
+   <tr>
+      <td>44</td>
+      <td>(212) 555-1234</td>
+      <td>212 555 1234</td>
+      <td>NY apartment</td>
+      <td>Alan Vain</td>
+      <td>{@code TYPE_HOME}</td>
+   </tr>
+   <tr>
+      <td>45</td>
+      <td>(212) 555-6657</td>
+      <td>212 555 6657</td>
+      <td>Downtown office</td>
+      <td>Alan Vain</td>
+      <td>{@code TYPE_MOBILE}</td>
+   </tr>
+   <tr>
+      <td>53</td>
+      <td>201.555.4433</td>
+      <td>201 555 4433</td>
+      <td>Love Nest</td>
+      <td>Rex Cars</td>
+      <td>{@code TYPE_HOME}</td>
+   </tr>
+</table>
+
+<p>
+Every record includes a numeric {@code _ID} field that uniquely identifies 
+the record within the table.  IDs can be used to match records in related 
+tables &mdash; for example, to find a person's phone number in one table 
+and pictures of that person in another.
+</p>   
+
+<p>
+A query returns a {@link android.database.Cursor} object that can move from 
+record to record and column to column to read the contents of each field.  
+It has specialized methods for reading each type of data.  So, to read a field, 
+you must know what type of data the field contains.  (There's more on query 
+results and Cursor objects later.)
+</p>   
+
+
+<h3><a name="uri"></a>URIs</h3>
+
+<p>
+Each content provider exposes a public URI (wrapped as a {@link android.net.Uri} 
+object) that uniquely identifies its data set.  A content provider that controls 
+multiple data sets (multiple tables) exposes a separate URI for each one.  All 
+URIs for providers begin with the string "{@code content://}".  The {@code content:} 
+scheme identifies the data as being controlled by a content provider.
+</p>   
+
+<p>
+If you're defining a content provider, it's a good idea to also define a 
+constant for its URI, to simplify client code and make future updates cleaner.  
+Android defines {@code CONTENT_URI} constants for all the providers that come 
+with the platform.  For example, the URI for the table that matches 
+phone numbers to people and the URI for the table that holds pictures of 
+people (both controlled by the Contacts content provider) are:
+</p>   
+
+<p>
+<p style="margin-left: 2em">{@code android.provider.Contacts.Phones.CONTENT_URI}
+<br/>{@code android.provider.Contacts.Photos.CONTENT_URI}
+</p>   
+
+<p>
+Similarly, the URIs for the table of recent phone calls and the table 
+of calendar entries are:
+</p>   
+
+<p>
+<p style="margin-left: 2em">{@code android.provider.CallLog.Calls.CONTENT_URI}
+<br/>{@code android.provider.Calendar.CONTENT_URI}
+</p>   
+
+<p>
+The URI constant is used in all interactions with the content provider. 
+Every {@link android.content.ContentResolver} method takes the URI 
+as its first argument.  It's what identifies which provider the ContentResolver 
+should talk to and which table of the provider is being targeted.
+</p>   
+
+
+<h2><a name="querying"></a>Querying a Content Provider</h2>
+
+<p>
+You need three pieces of information to query a content provider:
+</p>   
+
+<ul>
+<li>The URI that identifies the provider</li>
+<li>The names of the data fields you want to receive</li>
+<li>The data types for those fields</li>
+</ul>
+
+<p>
+If you're querying a particular record, you also need the ID for that record.
+</p>   
+
+
+<h3>Making the query</h3>
+
+<p>
+To query a content provider, you can use either the 
+<code>{@link android.content.ContentResolver#query ContentResolver.query()}</code> 
+method or the <code>{@link  android.app.Activity#managedQuery 
+Activity.managedQuery()}</code> method. 
+Both methods take the same set of arguments, and both return a 
+Cursor object.  However, {@code managedQuery()} 
+causes the activity to manage the life cycle of the Cursor.  A managed Cursor 
+handles all of the niceties, such as unloading itself when the activity pauses, 
+and requerying itself when the activity restarts.  You can ask an Activity to 
+begin managing an unmanaged Cursor object for you by calling 
+<code>{@link android.app.Activity#startManagingCursor 
+Activity.startManagingCursor()}</code>. 
+</p>   
+
+<p>
+The first argument to either <code>{@link android.content.ContentResolver#query query()}</code> 
+or <code>{@link android.app.Activity#managedQuery managedQuery()}</code> is the provider URI 
+&mdash; the {@code CONTENT_URI} constant that identifies a particular 
+ContentProvider and data set (see <a href="#uri">URIs</a> earlier).
+</p>   
+
+<p>
+To restrict a query to just one record, you can append the {@code _ID} value for 
+that record to the URI &mdash; that is, place a string matching the ID as the 
+last segment of the path part of the URI.  For example, if the ID is 23, 
+the URI would be:
+</p>   
+
+<p style="margin-left: 2em">{@code content://. . . ./23}</p>   
+
+<p>
+There are some helper methods, particularly 
+<code>{@link android.content.ContentUris#withAppendedId 
+ContentUris.withAppendedId()}</code> and <code>{@link 
+android.net.Uri#withAppendedPath Uri.withAppendedPath()}</code>, 
+that make it easy to append an ID to a URI.  Both are static methods that return 
+a Uri object with the ID added.  So, for example, if you were looking for record 
+23 in the database of people contacts, you might construct a query as follows:
+</p>   
+
+<pre>
+import android.provider.Contacts.People;
+import android.content.ContentUris;
+import android.net.Uri;
+import android.database.Cursor;
+
+// Use the ContentUris method to produce the base URI for the contact with _ID == 23.
+Uri myPerson = ContentUris.withAppendedId(People.CONTENT_URI, 23);
+
+// Alternatively, use the Uri method to produce the base URI.
+// It takes a string rather than an integer.
+Uri myPerson = Uri.withAppendedPath(People.CONTENT_URI, "23");
+
+// Then query for this specific record:
+Cursor cur = managedQuery(myPerson, null, null, null, null);
+</pre>
+
+<p>
+The other arguments to the <code>{@link android.content.ContentResolver#query query()}</code> 
+and <code>{@link android.app.Activity#managedQuery managedQuery()}</code> methods delimit 
+the query in more detail.  They are:
+</p>   
+
+<ul>
+<li>The names of the data columns that should be returned.  A {@code null} 
+value returns all columns.  Otherwise, only columns that are listed by name
+are returned.  All the content providers that come with the platform define 
+constants for their columns.  For example, the 
+{@link android.provider.Contacts.Phones android.provider.Contacts.Phones} class 
+defines constants for the names of the columns in the phone table illustrated 
+earlier &mdash {@code _ID}, {@code NUMBER}, {@code NUMBER_KEY}, {@code NAME},
+and so on.</li>
+
+<li><p>A filter detailing which rows to return, formatted as an SQL {@code WHERE} 
+clause (excluding the {@code WHERE} itself).  A {@code null} value returns 
+all rows (unless the URI limits the query to a single record).</p></li>
+
+<li><p>Selection arguments.</p></li>
+
+<li><p>A sorting order for the rows that are returned, formatted as an SQL 
+{@code ORDER BY} clause (excluding the {@code ORDER BY} itself).  A {@code null} 
+value returns the records in the default order for the table, which may be
+unordered.</p></li>  
+</ul>
+
+<p>
+Let's look at an example query to retrieve a list of contact names and their 
+primary phone numbers:
+</p>
+
+<pre>
+import android.provider.Contacts.People;
+import android.database.Cursor;
+
+// Form an array specifying which columns to return. 
+String[] projection = new String[] {
+                             People._ID,
+                             People._COUNT,
+                             People.NAME,
+                             People.NUMBER
+                          };
+
+// Get the base URI for the People table in the Contacts content provider.
+Uri contacts =  People.CONTENT_URI;
+
+// Make the query. 
+Cursor managedCursor = managedQuery(contacts,
+                         projection, // Which columns to return 
+                         null,       // Which rows to return (all rows)
+                         null,       // Selection arguments (none)
+                         // Put the results in ascending order by name
+                         People.NAME + " ASC");
+</pre>
+
+<p>
+This query retrieves data from the People table of the Contacts content 
+provider.  It gets the name, primary phone number, and unique record ID for
+each contact.  It also reports the number of records that are returned as 
+the {@code _COUNT} field of each record.
+</p>
+
+<p>
+The constants for the names of the columns are defined in various interfaces 
+&mdash; {@code _ID} and {@code _COUNT} in 
+{@link android.provider.BaseColumns BaseColumns}, {@code NAME} in {@link android.provider.Contacts.PeopleColumns PeopleColumns}, and {@code NUMBER} 
+in {@link android.provider.Contacts.PhonesColumns PhoneColumns}.  The 
+{@link android.provider.Contacts.People Contacts.People} class implements 
+each of these interfaces, which is why the code example above could refer 
+to them using just the class name. 
+</p>
+
+
+<h3>What a query returns</h3>
+
+<p>
+A query returns a set of zero or more database records.  The names of the 
+columns, their default order, and their data types are specific to each 
+content provider. 
+But every provider has an {@code _ID} column, which holds a unique numeric 
+ID for each record.  Every provider can also report the number
+of records returned as the {@code _COUNT} column; its value 
+is the same for all rows. 
+</p>
+
+<p> 
+Here is an example result set for the query in the previous section:
+</p>
+
+<table border="1">
+   <tbody>
+      <tr>
+         <th scope="col">_ID</th>
+         <th scope="col">_COUNT</th>
+         <th scope="col">NAME</th>
+         <th scope="col">NUMBER</th>     
+      </tr>
+      <tr>
+         <td>44</td>
+         <td>3</td>
+         <td>Alan Vain</td>
+         <td>212 555 1234</td>   
+      </tr>
+      <tr>
+         <td>13</td>
+         <td>3</td>
+         <td>Bully Pulpit</td>
+         <td>425 555 6677</td>   
+      </tr>
+      <tr>
+         <td>53</td>
+         <td>3</td>
+         <td>Rex Cars</td>
+         <td>201 555 4433</td>
+      </tr>
+   </tbody>
+</table>
+
+<p>
+The retrieved data is exposed by a {@link android.database.Cursor Cursor} 
+object that can be used to iterate backward or forward through the result 
+set.  You can use this object only to read the data.  To add, modify, or 
+delete data, you must use a ContentResolver object.
+</p>
+
+
+<h3>Reading retrieved data</h3>
+
+<p>
+The Cursor object returned by a query provides access to a recordset of
+results.  If you have queried for a specific record by ID, this set will
+contain only one value.  Otherwise, it can contain multiple values.  
+(If there are no matches, it can also be empty.)  You 
+can read data from specific fields in the record, but you must know the 
+data type of the field, because the Cursor object has a separate method
+for reading each type of data &mdash; such as <code>{@link 
+android.database.Cursor#getString getString()}</code>, <code>{@link 
+android.database.Cursor#getInt getInt()}</code>, and <code>{@link 
+android.database.Cursor#getFloat getFloat()}</code>.  
+(However, for most types, if you call the method for reading strings, 
+the Cursor object will give you the String representation of the data.)  
+The Cursor lets you request the column name from the index of the column, 
+or the index number from the column name.
+</p>
+
+<p>
+The following snippet demonstrates reading names and phone numbers from
+the query illustrated earlier:
+</p>
+
+<pre>
+import android.provider.Contacts.People;
+
+private void getColumnData(Cursor cur){ 
+    if (cur.moveToFirst()) {
+
+        String name; 
+        String phoneNumber; 
+        int nameColumn = cur.getColumnIndex(People.NAME); 
+        int phoneColumn = cur.getColumnIndex(People.NUMBER);
+        String imagePath; 
+    
+        do {
+            // Get the field values
+            name = cur.getString(nameColumn);
+            phoneNumber = cur.getString(phoneColumn);
+           
+	    // Do something with the values. 
+            ... 
+
+        } while (cur.moveToNext());
+
+    }
+}
+</pre>
+
+<p>
+If a query can return binary data, such as an image or sound, the data 
+may be directly entered in the table or the table entry for that data may be
+a string specifying a {@code content:} URI that you can use to get the data.  
+In general, smaller amounts of data (say, from 20 to 50K or less) are most often 
+directly entered in the table and can be read by calling 
+<code>{@link android.database.Cursor#getBlob Cursor.getBlob()}</code>.  
+It returns a byte array.
+</p>
+  
+<p>
+If the table entry is a {@code content:} URI, you should never try to open 
+and read the file directly (for one thing, permissions problems can make this 
+fail).  Instead, you should call 
+<code>{@link android.content.ContentResolver#openInputStream 
+ContentResolver.openInputStream()}</code> to get an 
+{@link java.io.InputStream} object that you can use to read the data.  
+</p>
+
+
+<h2><a name="modifying"></a>Modifying Data</h2>
+
+<p>
+Data kept by a content provider can be modified by:
+</p>
+
+<ul>
+<p><li>Adding new records</li>
+<li>Adding new values to existing records</li>
+<li>Batch updating existing records</li>
+<li>Deleting records</li>
+</ul>
+
+<p>
+All data modification is accomplished using {@link android.content.ContentResolver}
+methods.  Some content providers require a more restrictive permission for writing
+data than they do for reading it.  If you don't have permission to write to a 
+content provider, the ContentResolver methods will fail.
+</p>
+
+
+<h3>Adding records</h3>
+
+<p>
+To add a new record to a content provider, first set up a map of key-value pairs 
+in a {@link android.content.ContentValues} object, where each key matches 
+the name of a column in the content provider and the value is the desired 
+value for the new record in that column.  Then call <code>{@link 
+android.content.ContentResolver#insert ContentResolver.insert()}</code> and pass 
+it the URI of the provider and the ContentValues map.  This method returns 
+the full URI of the new record &mdash; that is, the provider's URI with 
+the appended ID for the new record.  You can then use this URI to query and 
+get a Cursor over the new record, and to further modify the record.  
+Here's an example:
+</p>
+
+<pre>
+import android.provider.Contacts.People;
+import android.content.ContentResolver;
+import android.content.ContentValues; 
+
+ContentValues values = new ContentValues();
+
+// Add Abraham Lincoln to contacts and make him a favorite.
+values.put(People.NAME, "Abraham Lincoln");
+// 1 = the new contact is added to favorites
+// 0 = the new contact is not added to favorites
+values.put(People.STARRED, 1);
+
+Uri uri = getContentResolver().insert(People.CONTENT_URI, values);
+</pre>
+
+
+<h3>Adding new values</h3>
+
+<p>
+Once a record exists, you can add new information to it or modify 
+existing information.  For example, the next step in the example above would 
+be to add contact information &mdash; like a phone number or an IM or e-mail 
+address &mdash; to the new entry.  
+</p>
+
+<p>
+The best way to add to a record in the Contacts database is to append 
+the name of the table where the new data goes to the URI for the 
+record, then use the amended URI to add the new data values.  Each
+Contacts table exposes a name for this purpose as a {@code 
+CONTENT_DIRECTORY} constant.  The following code continues the previous 
+example by adding a phone number and e-mail address for the record
+just created:
+</p>
+
+<pre>
+Uri phoneUri = null;
+Uri emailUri = null;
+
+// Add a phone number for Abraham Lincoln.  Begin with the URI for
+// the new record just returned by insert(); it ends with the _ID
+// of the new record, so we don't have to add the ID ourselves.
+// Then append the designation for the phone table to this URI,
+// and use the resulting URI to insert the phone number.
+phoneUri = Uri.withAppendedPath(uri, People.Phones.CONTENT_DIRECTORY);
+
+values.clear();
+values.put(People.Phones.TYPE, People.Phones.TYPE_MOBILE);
+values.put(People.Phones.NUMBER, "1233214567");
+getContentResolver().insert(phoneUri, values);
+
+// Now add an email address in the same way.
+emailUri = Uri.withAppendedPath(uri, People.ContactMethods.CONTENT_DIRECTORY);
+
+values.clear();
+// ContactMethods.KIND is used to distinguish different kinds of
+// contact methods, such as email, IM, etc. 
+values.put(People.ContactMethods.KIND, Contacts.KIND_EMAIL);
+values.put(People.ContactMethods.DATA, "test@example.com");
+values.put(People.ContactMethods.TYPE, People.ContactMethods.TYPE_HOME);
+getContentResolver().insert(emailUri, values);   
+</pre>
+
+<p>
+You can place small amounts of binary data into a table by calling 
+the version of <code>{@link android.content.ContentValues#put 
+ContentValues.put()}</code> that takes a byte array.  
+That would work for a small icon-like image or a short audio clip, for example.  
+However, if you have a large amount of binary data to add, such as a photograph
+or a complete song, put a {@code content:} URI for the data in the table and call
+<code>{@link android.content.ContentResolver#openOutputStream 
+ContentResolver.openOutputStream()}</code> 
+with the file's URI.  (That causes the content provider to store the data 
+in a file and record the file path in a hidden field of the record.)
+</p>
+
+<p>
+In this regard, the {@link android.provider.MediaStore} content 
+provider, the main provider that dispenses image, audio, and video 
+data, employs a special convention:  The same URI that is used with 
+{@code query()} or {@code managedQuery()} to get meta-information 
+about the binary data (such as, the caption of a photograph or the
+date it was taken) is used with {@code openInputStream()} 
+to get the data itself.  Similarly, the same URI that is used with
+{@code insert()} to put meta-information into a MediaStore record 
+is used with {@code openOutputStream()} to place the binary data there.
+The following code snippet illustrates this convention:
+</p>
+
+<pre>
+import android.provider.MediaStore.Images.Media;
+import android.content.ContentValues;
+import java.io.OutputStream;
+
+// Save the name and description of an image in a ContentValues map.  
+ContentValues values = new ContentValues(3);
+values.put(Media.DISPLAY_NAME, "road_trip_1");
+values.put(Media.DESCRIPTION, "Day 1, trip to Los Angeles");
+values.put(Media.MIME_TYPE, "image/jpeg");
+
+// Add a new record without the bitmap, but with the values just set.
+// insert() returns the URI of the new record.
+Uri uri = getContentResolver().insert(Media.EXTERNAL_CONTENT_URI, values);
+
+// Now get a handle to the file for that record, and save the data into it.
+// Here, sourceBitmap is a Bitmap object representing the file to save to the database.
+try {
+    OutputStream outStream = getContentResolver().openOutputStream(uri);
+    sourceBitmap.compress(Bitmap.CompressFormat.JPEG, 50, outStream);
+    outStream.close();
+} catch (Exception e) {
+    Log.e(TAG, "exception while writing image", e);
+}
+</pre>
+
+
+<h3>Batch updating records</h3>
+
+<p>
+To batch update a group of records (for example, to change "NY" to "New York" 
+in all fields), call the <code>{@link 
+android.content.ContentResolver#update ContentResolver.update()}</code> 
+method with the columns and values to change.
+</p>
+
+
+<h3><a name="deletingrecord"></a>Deleting a record</h3>
+
+<p>
+To delete a single record, call {<code>{@link 
+android.content.ContentResolver#delete ContentResolver.delete()}</code> 
+with the URI of a specific row.
+</p>
+
+<p>
+To delete multiple rows, call <code>{@link 
+android.content.ContentResolver#delete ContentResolver.delete()}</code> 
+with the URI of the type of record to delete (for example, {@code android.provider.Contacts.People.CONTENT_URI}) and an SQL {@code WHERE} 
+clause defining which rows to delete.  (<i><b>Caution</b>: 
+Be sure to include a valid {@code WHERE} clause if you're deleting a general 
+type, or you risk deleting more records than you intended!</i>).
+</p>
+
+
+<h2><a name="creating"></a>Creating a Content Provider</h2>
+
+<p>
+To create a content provider, you must:
+</p>
+
+<ul>
+<li>Set up a system for storing the data.  Most content providers 
+store their data using Android's file storage methods or SQLite databases, 
+but you can store your data any way you want.  Android provides the
+{@link android.database.sqlite.SQLiteOpenHelper SQLiteOpenHelper}
+class to help you create a database and {@link 
+android.database.sqlite.SQLiteDatabase SQLiteDatabase} to manage it.</li>
+
+<li><p>Extend the {@link android.content.ContentProvider} class to provide 
+access to the data.</p></li>
+
+<li><p>Declare the content provider in the manifest file for your 
+application (AndroidManifest.xml).</p></li>
+</ul>
+
+<p>
+The following sections have notes on the last two of these tasks.
+</p>
+
+
+<h3>Extending the ContentProvider class</h3>
+
+<p>
+You define a {@link android.content.ContentProvider} subclass to 
+expose your data to others using the conventions expected by 
+ContentResolver and Cursor objects.  Principally, this means 
+implementing six abstract methods declared in the ContentProvider class:
+</p>
+
+<p style="margin-left: 2em">{@code query()}
+<br/>{@code insert()}
+<br/>{@code update()}
+<br/>{@code delete()}
+<br/>{@code getType()}
+<br/>{@code onCreate()}</p>
+
+<p>
+The {@code query()} method must return a {@link android.database.Cursor} object 
+that can iterate over the requested data.  Cursor itself is an interface, but
+Android provides some ready-made Cursor objects that you can use.  For example,
+{@link android.database.sqlite.SQLiteCursor} can iterate over data stored in
+an SQLite database.  You get the Cursor object by calling any of the {@link 
+android.database.sqlite.SQLiteDatabase SQLiteDatabase} class's {@code query()}
+methods.  There are other Cursor implementations &mdash; such as {@link 
+android.database.MatrixCursor} &mdash; for data not stored in a database.
+</p>
+
+<p>
+Because these ContentProvider methods can be called from 
+various ContentResolver objects in different processes and threads, 
+they must be implemented in a thread-safe manner. 
+</p>
+
+<p>
+As a courtesy, you might also want to call <code>{@link android.content.ContentResolver#notifyChange(android.net.Uri,android.database.ContentObserver)
+ContentResolver.notifyChange()}</code> to notify listeners when there are 
+modifications to the data. 
+</p>
+
+<p>
+Beyond defining the subclass itself, there are other steps you should take
+to simplify the work of clients and make the class more accessible: 
+</p>
+
+<ul>
+<li>Define a {@code public static final} {@link android.net.Uri} 
+named {@code CONTENT_URI}.  This is the string that represents the full 
+{@code content:} URI that your content provider handles.  You must define a 
+unique string for this value.  The best solution is to use the fully-qualified 
+class name of the content provider (made lowercase).  So, for example, the 
+URI for a TransportationProvider class could be defined as follows:
+
+<pre>public static final Uri CONTENT_URI = 
+               Uri.parse("content://com.example.codelab.transporationprovider");</pre>
+
+<p>
+If the provider has subtables, also define {@code CONTENT_URI} constants for
+each of the subtables.  These URIs should all have the same authority (since
+that identifies the content provider), and be distinguished only by their paths. 
+For example:
+</p>
+
+<p style="margin-left: 2em">{@code content://com.example.codelab.transporationprovider/train} 
+<br/>{@code content://com.example.codelab.transporationprovider/air/domestic}
+<br/>{@code content://com.example.codelab.transporationprovider/air/international}</p>
+
+<p>
+For an overview of {@code content:} URIs, see the <a href="#urisum">Content URI 
+Summary</a> at the end of this document.
+</p></li>
+
+<li><p>Define the column names that the content provider will return to clients. 
+If you are using an underlying database, these column names are typically 
+identical to the SQL database column names they represent.  Also define
+{@code public static} String constants that clients can use to specify 
+the columns in queries and other instructions.
+</p>
+
+<p>
+Be sure to include an integer column named "{@code _id}" 
+(with the constant {@code _ID}) for 
+the IDs of the records.  You should have this field whether or not you have 
+another field (such as a URL) that is also unique among all records.  If 
+you're using the SQLite database, the {@code _ID} field should be the 
+following type:
+</p>
+
+<p style="margin-left: 2em">{@code INTEGER PRIMARY KEY AUTOINCREMENT}</p>
+
+<p>
+The {@code AUTOINCREMENT} descriptor is optional.  But without it, SQLite
+increments an ID counter field to the next number above the largest
+existing number in the column.  If you delete the last row, the next row added
+will have the same ID as the deleted row.  {@code AUTOINCREMENT} avoids this 
+by having SQLite increment to the next largest value whether deleted or not.
+</p>
+</li>
+
+<li><p>Carefully document the data type of each column.  Clients need this
+information to read the data.</p></li>
+
+<li><p>If you are handling a new data type, you must define a new MIME type 
+to return in your implementation of <code>{@link 
+android.content.ContentProvider#getType ContentProvider.getType()}</code>.  
+The type depends in part on whether or not the {@code content:} URI submitted 
+to {@code getType()} limits the request to a specific record.  There's one 
+form of the MIME type for a single record and another for multiple records.  
+Use the {@link android.net.Uri Uri} methods to help determine what is being 
+requested.  Here is the general format for each type:</p></li>
+
+<ul>
+<li><p>For a single record:&nbsp;&nbsp;&nbsp; {@code vnd.android.cursor.item/vnd.<em>yourcompanyname.contenttype</em}</p> 
+
+<p>For example, a request for train record 122, like this URI,</p>
+<p style="margin-left: 2em">{@code content://com.example.transportationprovider/trains/122}</p>
+
+<p>might return this MIME type:</p>
+<p style="margin-left: 2em">{@code vnd.android.cursor.item/vnd.example.rail}</p>
+</li>
+
+<li><p>For multiple records:&nbsp;&nbsp;&nbsp; {@code vnd.android.cursor.dir/vnd.<em>yourcompanyname.contenttype</em>}</p>
+
+<p>For example, a request for all train records, like the following URI,</p>
+<p style="margin-left: 2em">{@code content://com.example.transportationprovider/trains}</p>
+
+<p>might return this MIME type:</p>
+<p style="margin-left: 2em">{@code vnd.android.cursor.dir/vnd.example.rail}</p>
+</li>
+</ul>
+
+<li><p>If you are exposing byte data that's too big to put in the table itself
+&mdash; such as a large bitmap file &mdash; the field that exposes the
+data to clients should actually contain a {@code content:} URI string.
+This is the field that gives clients access to the data file.  The record 
+should also have another field, named "{@code _data}" that lists the exact file 
+path on the device for that file.  This field is not intended to be read by 
+the client, but by the ContentResolver.  The client will call <code>{@link 
+android.content.ContentResolver#openInputStream ContentResolver.openInputStream()}</code> 
+on the user-facing field holding the URI for the item.  The ContentResolver 
+will request the "{@code _data}" field for that record, and because
+it has higher permissions than a client, it should be able to access
+that file directly and return a read wrapper for the file to the client.</p></li>
+
+</ul>
+
+<p>
+For an example of a private content provider implementation, see the 
+NodePadProvider class in the Notepad sample application that ships with the SDK.
+</p>
+
+
+<h3>Declaring the content provider</h3>
+
+<p>
+To let the Android system know about the content provider you've developed, 
+declare it with a {@code &lt;provider&gt;} element in the application's 
+AndroidManifest.xml file.  Content providers that are not declared in the
+manifest are not visible to the Android system
+</p>
+
+<p>
+The {@code name} attribute is the fully qualified name of the ContentProvider
+subclass.  The {@code authorities} attribute is the authority part of the 
+{@code content:} URI that identifies the provider.
+For example if the ContentProvider subclass is AutoInfoProvider, the 
+{@code &lt;provider&gt;} element might look like this:
+</p>
+
+<pre>
+&lt;provider name="com.example.autos.AutoInfoProvider"
+          authorities="com.example.autos.autoinfoprovider" 
+          . . . /&gt
+&lt;/provider&gt;
+</pre>
+
+<p>
+Note that the {@code authorities} attribute omits the path part of a 
+{@code content:} URI.  For example, if AutoInfoProvider controlled subtables
+for different types of autos or different manufacturers,
+</p>
+
+<p style="margin-left: 2em">{@code content://com.example.autos.autoinfoprovider/honda}
+<br/>{@code content://com.example.autos.autoinfoprovider/gm/compact}
+<br/>{@code content://com.example.autos.autoinfoprovider/gm/suv}</p>
+
+<p>
+those paths would not be declared in the manifest.  The authority is what 
+identifies the provider, not the path; your provider can interpret the path 
+part of the URI in any way you choose.
+</p>
+
+<p>
+Other {@code &lt;provider&gt;} attributes can set permissions to read and 
+write data, provide for an icon and text that can be displayed to users, 
+enable and disable the provider, and so on.  Set the {@code multiprocess} 
+attribute to "{@code true}" if data does not need to be synchronized between 
+multiple running versions of the content provider.  This permits an instance 
+of the provider to be created in each client process, eliminating the need 
+to perform IPC. 
+</p>
+
+
+<h2><a name="urisum"></a>Content URI Summary</h2>
+
+<p>
+Here is a recap of the important parts of a content URI:
+</p>
+
+<p>
+<img src="{@docRoot}images/content_uri.png" alt="Elements of a content URI" 
+height="80" width="528">
+</p>
+
+<ol type="A">
+<li>Standard prefix indicating that the data is controlled by a
+content provider. It's never modified.</li>
+
+<li><p>The authority part of the URI; it identifies the content provider. 
+For third-party applications, this should be a fully-qualified class name 
+(reduced to lowercase) to ensure uniqueness.  The authority is declared in 
+the {@code &lt;provider&gt;} element's {@code authorities} attribute:</p>
+
+<pre>&lt;provider name=".TransportationProvider"
+          authorities="com.example.transportationprovider"
+          . . .  &gt;</pre></li>
+
+<li><p>The path that the content provider uses to determine what kind of data is
+being requested.  This can be zero or more segments long.  If the content provider
+exposes only one type of data (only trains, for example), it can be absent.
+If the provider exposes several types, including subtypes, it can be several 
+segments long &mdash; for example, "{@code land/bus}", "{@code land/train}", 
+"{@code sea/ship}", and "{@code sea/submarine}" to give four possibilities.</p></li>
+
+<li><p>The ID of the specific record being requested, if any.  This is the 
+{@code _ID} value of the requested record.  If the request is not limited to
+a single record, this segment and the trailing slash are omitted:</p>
+
+<p style="margin-left: 2em">{@code content://com.example.transportationprovider/trains}</p>
+</li>
+</ol>
+
+
diff --git a/docs/html/guide/topics/resources/available-resources.jd b/docs/html/guide/topics/resources/available-resources.jd
new file mode 100644
index 0000000..2a6a6ac
--- /dev/null
+++ b/docs/html/guide/topics/resources/available-resources.jd
@@ -0,0 +1,1135 @@
+page.title=Available Resource Types
+parent.title=Resources and Assets
+parent.link=index.html
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+
+  <h2>Key classes</h2>
+  <ol>
+    <li>{@link android.content.res.Resources}</li>
+    <li>{@link android.content.res.AssetManager}</li>
+  </ol>
+
+  <h2>In this document</h2>
+  <ol>
+    <li><a href="#simplevalues">Simple Values</a>
+      <ol>
+          <li><a href="#colorvals">Color Values</a></li>
+          <li><a href="#stringresources">Strings and Styled Text</a></li>
+          <li><a href="#dimension">Dimension Values</a></li>
+      </ol>
+    </li>
+    <li><a href="#drawables">Drawables</a>
+      <ol>
+          <li><a href="#imagefileresources">Bitmap Files</a></li>
+          <li><a href="#colordrawableresources">Color Drawables</a></li>
+          <li><a href="#ninepatch">Nine-Patch (Stretchable) Images</a></li>
+      </ol>
+    </li>
+    <li><a href="#animation">Animation</a></li>
+    <li><a href="#menus">Menus</a></li>
+    <li><a href="#layoutresources">Layout</a>
+      <ol>
+          <li><a href="#customresources">Custom Layout Resources</a>
+      </ol>
+    </li>
+    <li><a href="#stylesandthemes">Styles and Themes</a></li>
+  </ol>
+
+</div>
+</div>
+
+<p>This page describes the different types of resources that you can
+externalize from your code and package with your application. </p>
+
+
+<p>For more details on how to use resources in your application, please see the
+    <a href="resources-i18n.html">Resources and Internationalization</a>
+    documentation.</p>
+
+
+<h2 id="simplevalues">Simple Values</h2>
+
+<p>All simple resource values can be expressed as a string, using various
+formats to unambiguously indicate the type of resource being created.  For
+this reason, these values can be defined both as standard resources
+(under res/values/), as well as direct values supplied for
+mappings in <a href="#stylesandthemes">styles and themes</a>, and attributes in
+XML files such as <a href="#layoutresources">layouts</a>.</p>
+
+
+
+<h3 id="colorvals">Color Values</h3>
+<p>
+    A color value specifies an RGB value with an alpha channel, which can
+    be used in various places such as specifying a solid color for a {@link android.graphics.drawable.Drawable}
+    or the color to use for text.  A color value always begins with
+    a pound (#) character and then followed by the Alpha-Red-Green-Blue information
+    in one of the following formats:
+</p>
+<ul>
+<li> #RGB
+<li> #ARGB
+<li> #RRGGBB
+<li> #AARRGGBB
+</ul>
+<p>
+    If you want to retrieve the color represented by a resource ID, you can call
+    the {@link android.content.res.Resources#getColor(int) Resources.getColor()} method.
+</p>
+<p>
+    <strong>Source file format:</strong> XML file requiring a
+    <code>&lt;?xml version="1.0" encoding="utf-8"?&gt;</code> declaration, and
+    a root <code>&lt;resources&gt;</code> element containing one or more
+    <code>&lt;color&gt;</code> tags.
+</p>
+<p>
+    <strong>Resource source file location</strong>: res/values/<em>colors</em>.xml (file name is arbitrary)
+</p>
+<p>
+    <strong>Compiled resource datatype:</strong> Resource pointer to a Java int.
+</p>
+<p>
+    <strong>Resource reference name:</strong>
+</p>
+<ul>
+    <li>
+        <strong>Java:</strong> <code>R.color.<em>some_name</em></code>
+    </li>
+    <li>
+        <strong>XML:</strong> <code>@[<em>package</em>:]color/some_name</code> (where <em>some_name</em> is the <em>name</em> of a specific color)
+    </li>
+</ul>
+<p>
+    <strong>Syntax</strong>
+</p>
+<pre>
+&lt;color name=<em>color_name</em>&gt;<em>#color_value</em>&lt;/color&gt;
+</pre>
+<dl>
+    <dt>
+        &lt;color&gt;
+    </dt>
+    <dd>
+        Value is a color, using web-style syntax, as describe above. Has only one attribute:
+        <ul>
+            <li>
+                <em>name</em> - The name used in referring to this color.
+            </li>
+        </ul>
+    </dd>
+</dl>
+<p>
+    <strong>Example XML Declaration</strong>
+</p>
+<p>
+    The following code declares two colors, the first fully opaque, and the
+    second translucent.
+</p>
+<pre>
+&lt;resources&gt;
+   &lt;color name="opaque_red"&gt;#f00&lt;/color&gt;
+   &lt;color name="translucent_red"&gt;#80ff0000&lt;/color&gt;
+&lt;/resources&gt;
+</pre>
+<p>
+    <strong>Example Code Use</strong>
+</p>
+<p>
+    Example Java code
+</p>
+<pre>
+// Retrieve a color value.
+int color = getResources.getColor(R.color.opaque_red);
+</pre>
+<p>
+    Example XML code
+</p>
+<pre>
+&lt;TextView android:layout_width="fill_parent"
+          android:layout_height="wrap_content"
+          android:textAlign="center"
+          android:textColor="@color/translucent_red"
+          android:text="Some Text"/&gt;
+</pre>
+
+
+
+<h3 id="stringresources">Strings and Styled Text</h3>
+<p>
+    Strings, with optional <a href="#styledtext">simple formatting</a>, can be 
+stored and retrieved as resources. You can add formatting to your string by 
+using three standard HTML tags: &lt;b&gt;, &lt;i&gt;, and &lt;u&gt;. To 
+guarantee getting an unstyled string only (the raw text) call the 
+<code>toString()</code> method of the retrieved CharSequence object. 
+Methods that accept string resources should be able to process these styling 
+tags.
+</p>
+<p>
+    If you want to retrieve the String represented by a resource ID, you can call the {@link android.content.Context#getString(int) Context.getString()} method.
+</p>
+<p>
+    <strong>Note:</strong> If you use an apostrophe or a quote in your string, you must either escape it or enclose the whole string in the other kind of enclosing quotes:
+</p>
+<pre>
+&lt;string name="good_example"&gt;"This'll work"&lt;/string&gt;
+&lt;string name="good_example_2"&gt;This\'ll also work&lt;/string&gt;
+&lt;string name="bad_example"&gt;This won't work!&lt;/string&gt;
+&lt;string name="bad_example_2"&gt;XML encodings won&amp;apos;t work either!&lt;/string&gt;
+</pre>
+<p>
+    <strong>Source file format:</strong> XML file requiring a <code>&lt;?xml version="1.0" encoding="utf-8"?&gt;</code> declaration, and a root <code>&lt;resources&gt;</code> element containing one or more <code>&lt;string&gt;</code> tags.
+</p>
+<p>
+    <strong>Resource source file location</strong>: res/values/<em>strings</em>.xml (file name is arbitrary)
+</p>
+<p>
+    <strong>Compiled resource datatype:</strong> Resource pointer to a Java CharSequence.
+</p>
+<p>
+    <strong>Resource reference name:</strong>
+</p>
+<ul>
+    <li>
+        <strong>Java:</strong> <code>R.string.<em>some_name</em></code>
+    </li>
+    <li>
+        <strong>XML:</strong> <code>@[<em>package</em>:]string/some_name</code> (where <em>some_name</em> is the <em>name</em> of a specific string)
+    </li>
+</ul>
+<p>
+    <strong>Syntax</strong>
+</p>
+<pre>
+&lt;string name=<em>string_name</em>&gt;<em>string_value</em>&lt;/string&gt;
+</pre>
+<dl>
+    <dt>
+        &lt;string&gt;
+    </dt>
+    <dd>
+        Value is a string, with optional styling tags. Has only one attribute:
+        <ul>
+            <li>
+                <em>name</em> - The name used in referring to this string.
+            </li>
+        </ul>
+    </dd>
+</dl>
+<p>
+    <strong>Example XML Declaration</strong>
+</p>
+<p>
+    The following declares two strings: the first &mdash; simple text with no
+    formatting (resulting in a CharSequence that is simply a String object) &mdash; the second includes formatting information in the string (resulting
+    in a CharSequence that is a complex data structure). If you are using the custom editor for string files in Eclipse, the HTML formatting tags will automatically be escaped and you will need to use {@link android.content.Context#getString(int) Context.getString()} and {@link android.text.Html#fromHtml} to retreive the resource and then convert it to formatted text.
+</p>
+<pre>
+&lt;resources&gt;
+   &lt;string name="simple_welcome_message"&gt;Welcome!&lt;/string&gt;
+   &lt;string name="styled_welcome_message"&gt;We are &lt;b&gt;&lt;i&gt;so&lt;/i&gt;&lt;/b&gt; glad to see you.&lt;/string&gt;
+&lt;/resources&gt;
+</pre>
+<p>
+    <strong>Example Code Use</strong>
+</p>
+<p>
+    Example Java code
+</p>
+<pre>
+// Assign a styled string resource to a TextView
+// on the current screen.
+CharSequence str = getString(R.string.styled_welcome_message);
+TextView tv = (TextView)findViewByID(R.id.text);
+tv.setText(str);
+</pre>
+<p>
+    Example XML code
+</p>
+<pre>
+&lt;TextView android:layout_width="fill_parent"
+          android:layout_height="wrap_content"
+          android:textAlign="center"
+          android:text="@string/simple_welcome_message"/&gt; 
+</pre>
+
+
+<h4 id="styledtext">Using Styled Text as a Format String</h4>
+<p>
+Sometimes you may want to create a styled text resource that is also used as a 
+format string. This cannot be done directly because there is no way of passing 
+the styled text as the format string argument of String.format() 
+without stripping out the style information. The workaround is to store the 
+style tags as escaped HTML tags, and then convert the escaped HTML string into 
+a styled text after formatting has taken place.
+</p>
+<p>
+To use styled text as a format string, do the following.
+</p>
+<ol>
+  <li>Store your styled text resource as an escaped string, so that the HTML tags in your text resource are not interpreted as if they were XML tags:
+<pre>
+&lt;resources&gt;
+  &lt;string name="search_results_resultsTextFormat"&gt;%1$d results for &amp;lt;b>&amp;amp;quot;%2$s&amp;amp;quot;&amp;lt;/b>&lt;/string&gt;
+&lt;/resources&gt;
+</pre>
+<p>
+In this example the format string has two arguments: <code>%1$d</code> is a decimal number, <code>%2$s</code> is a string.
+</p>
+</li>
+<li>
+  Make sure any String arguments are properly escaped if they might contain '&lt;' or '&amp;' characters. 
+The {@link android.text.TextUtils#htmlEncode} method will do this:
+<pre>
+String escapedTitle = TextUtil.htmlEncode(title);
+</pre>
+</li>
+<li>
+ Use String.format() to format the HTML text, then use {@link android.text.Html#fromHtml} to convert the HTML text into styled text:
+<pre>
+String resultsTextFormat = getContext().getResources().getString(R.string.search_results_resultsTextFormat);
+String resultsText = String.format(resultsTextFormat, count, escapedTitle);
+CharSequence styledResults = Html.fromHtml(resultsText);
+</pre>
+</li>
+</ol>
+
+
+<h3 id="dimension"Dimension Values</h3>
+<p>You can create common dimensions to use for various screen elements by
+defining dimension values in XML. A dimension resource is a number followed by
+a unit of measurement. For example: 10px, 2in, 5sp. Here are the units of
+measurement supported by Android:</p>
+<dl>
+    <dt>px</dt>
+    <dd>Pixels - corresponds to actual pixels on the screen.</dd>
+
+    <dt>in</dt>
+    <dd>Inches - based on the physical size of the screen.</dd>
+
+    <dt>mm</dt>
+    <dd>Millimeters - based on the physical size of the screen.</dd>
+
+    <dt>pt</dt>
+    <dd>Points - 1/72 of an inch based on the physical size of the screen.</dd>
+
+    <dt>dp</dt>
+    <dd>Density-independent Pixels - an abstract unit that is based on the
+    physical density of the screen. These units are relative to a 160 dpi
+    screen, so one dp is one pixel on a 160 dpi screen. The ratio of
+    dp-to-pixel will change with the screen density, but not necessarily
+    in direct proportion. <strong>Note:</strong> The compiler accepts both "dip" and "dp", though "dp" is more consistent with "sp".</dd>
+
+    <dt>sp</dt>
+    <dd>Scale-independent Pixels - this is like the dp unit, but it is also
+    scaled by the user's font size preference. It is recommend you use this
+    unit when specifying font sizes, so they will be adjusted for both the
+    screen density and user's preference.</dd>
+</dl>
+
+<p>Dimension values are not normally used as raw resources, but rather as
+attribute values in XML files. You can, however, create plain resources
+containing this data type.</p>
+
+<p><strong>Source file format:</strong> XML file requiring a <code>&lt;?xml
+version="1.0" encoding="utf-8"?&gt;</code> declaration, and a root
+<code>&lt;resources&gt;</code> element containing one or more
+<code>&lt;dimen&gt;</code> tags.</p>
+
+<p><strong>Resource source file location</strong>: res/values/dimens.xml (File
+name is arbitrary; standard practice is to put all dimensions in one file
+devoted to dimensions.)</p>
+<p><strong>Compiled resource datatype:</strong> Resource pointer to a
+dimension.</p>
+<p>
+    <strong>Resource reference name:</strong>
+</p>
+<ul>
+    <li>
+        <strong>Java:</strong> <code>R.dimen.<em>some_name</em></code>
+    </li>
+    <li>
+        <strong>XML:</strong> <code>@[<em>package</em>:]dimen/<em>some_name</em></code> (where <em>some_name</em> is the <em>name</em> of a specific <code>&lt;dimen&gt;</code> element)
+    </li>
+</ul>
+<p>
+    <strong>Syntax</strong>
+</p>
+<pre>
+&lt;dimen name=<em>dimen_name</em>&gt;<em>dimen_value</em>&lt;/dimen&gt;
+</pre>
+<dl>
+    <dt>
+        &lt;dimen&gt;
+    </dt>
+    <dd>
+        A valid dimension value.
+        <ul>
+            <li>
+                <em>name</em> - The name used in referring to this dimension.
+            </li>
+        </ul>
+    </dd>
+</dl>
+<p>
+    <strong>Example XML Declaration</strong>
+</p>
+<p>
+    The following code declares several dimension values.
+</p>
+<pre>
+&lt;resources&gt;
+    &lt;dimen name="one_pixel"&gt;1px&lt;/dimen&gt;
+    &lt;dimen name="double_density"&gt;2dp&lt;/dimen&gt;
+    &lt;dimen name="sixteen_sp"&gt;16sp&lt;/dimen&gt;
+&lt;/resources&gt;
+</pre>
+<p>
+    <strong>Example Code Use</strong>
+</p>
+<p>
+    Example Java code:
+</p>
+<pre>
+float dimen = Resources.getDimen(R.dimen.one_pixel);
+</pre>
+<p>
+    Example XML code:
+</p>
+<pre>
+&lt;TextView android:layout_width="fill_parent"
+          android:layout_height="wrap_content"
+          android:textSize="@dimen/sixteen_sp"/&gt;
+</pre>
+
+
+<h2 id="drawables">Drawables</h2>
+
+<p>A {@link android.graphics.drawable.Drawable} is a type of resource that
+you retrieve with {@link android.content.res.Resources#getDrawable
+Resources.getDrawable()} and use to draw to the screen.  There are a
+number of drawable resources that can be created.</p>
+
+
+
+<h3 id="imagefileresources">Bitmap Files</h3>
+<p>Android supports bitmap resource files in a few different formats: png
+(preferred), jpg (acceptable), gif (discouraged). The bitmap file itself is
+compiled and referenced by the file name without the extension (so
+res/drawable/my_picture.png would be referenced as R.drawable.my_picture).</p>
+
+<p>
+    <strong>Source file formats:</strong> png (preferred), jpg (acceptable), gif (discouraged). One resource per file.
+</p>
+<p>
+    <strong>Resource file location</strong>: res/drawable/<em>some_file</em>.png or <em>some_file</em>.jpg or <em>some_file</em>.gif.
+</p>
+<p>
+    <strong>Compiled resource datatype:</strong> Resource pointer to a {@link android.graphics.drawable.BitmapDrawable BitmapDrawable}.
+</p>
+<p>
+    <strong>Resource reference name:</strong>
+</p>
+<ul>
+    <li>
+        <strong>Java:</strong> <code>R.drawable.<em>some_file</em></code>
+    </li>
+    <li>
+        <strong>XML:</strong> <code>@[<em>package</em>:]drawable/<em>some_file</em></code>
+    </li>
+</ul>
+
+<p>For more discussion and examples using drawable resources, see the discussion in <a href="{@docRoot}guide/topics/graphics/2d-graphics.html#drawable-resource#drawables">2D Graphics</a>.</p>
+
+
+<h3 id="colordrawableresources">Color Drawables</h3>
+<p>You can create a {@link android.graphics.drawable.PaintDrawable} object that is a rectangle of color,
+with optionally rounded corners. This element can be defined in any of the
+files inside res/values/.</p>
+<p><strong>Source file format:</strong> XML file requiring a <code>&lt;?xml
+version="1.0" encoding="utf-8"?&gt;</code> declaration, and a root
+<code>&lt;resources&gt;</code> element containing one or more
+<code>&lt;drawable&gt;</code> tags.</p>
+<p>
+    <strong>Resource source file location</strong>: res/values/colors.xml (File name is arbitrary; standard practice is to put the PaintDrawable items in the file along with the <a href="resources-i18n.html#numericcolorresources">numeric color values</a>.)
+</p>
+<p>
+    <strong>Compiled resource datatype:</strong> Resource pointer to a {@link android.graphics.drawable.PaintDrawable}.
+</p>
+<p>
+    <strong>Resource reference name:</strong>
+</p>
+<ul>
+    <li>
+        <strong>Java:</strong>  <code>R.drawable.<em>some_name</em></code>
+    </li>
+    <li>
+        <strong>XML:</strong>  <code>@[<em>package</em>:]drawable/<em>some_name</em></code>  (where <em>some_name</em> is the name of a specific resource)
+    </li>
+</ul>
+<p>
+    <strong>Syntax</strong>
+</p>
+<pre>
+&lt;drawable name=<em>color_name</em>&gt;<em>color_value</em>&lt;/drawable&gt;
+</pre>
+<dl>
+    <dt>
+        &lt;drawable&gt;
+    </dt>
+    <dd>
+        A valid <a href="#colorvals">color value</a>.
+        <ul>
+            <li>
+                <em>name</em> - The name used in referring to this drawable.
+            </li>
+        </ul>
+    </dd>
+</dl>
+<p>
+    <strong>Example XML Declaration</strong>
+</p>
+<p>
+    The following code declares several color drawables.
+</p>
+<pre>
+&lt;resources&gt;
+    &lt;drawable name="solid_red"&gt;#f00&lt;/drawable&gt;
+    &lt;drawable name="solid_blue"&gt;#0000ff&lt;/drawable&gt;
+    &lt;drawable name="solid_green"&gt;#f0f0&lt;/drawable&gt;
+&lt;/resources&gt;
+</pre>
+<p>
+    <strong>Example Code Use</strong>
+</p>
+<p>
+    Example Java code
+</p>
+<pre>
+// Assign a PaintDrawable as the background to
+// a TextView on the current screen.
+Drawable redDrawable = Resources.getDrawable(R.drawable.solid_red);
+TextView tv = (TextView)findViewByID(R.id.text);
+tv.setBackground(redDrawable);
+</pre>
+<p>
+    Example XML code
+</p>
+<pre>
+&lt;TextView android:layout_width="fill_parent"
+          android:layout_height="wrap_content"
+          android:textAlign="center"
+          android:background="@drawable/solid_red"/&gt;
+</pre>
+
+
+<h3 id="ninepatch">Nine-Patch (stretchable) Images</h3>
+<p>
+    Android supports a stretchable bitmap image, called a 
+    {@link android.graphics.NinePatch} graphic. This is a PNG image in which 
+    you define stretchable sections that Android will resize to fit the object 
+    at display time to accommodate variable sized sections, such as text strings. 
+    You typically assign this resource to the View's background. An example use 
+    of a stretchable image is the button backgrounds that Android uses; buttons 
+    must stretch to accommodate strings of various lengths.
+</p>
+
+<p>
+    <strong>Source file format:</strong> PNG &mdash; one resource per file
+</p>
+<p>
+    <strong>Resource source file location</strong>: res/drawable/<em>some_name</em>.9.png (must end in .9.png)
+</p>
+<p>
+    <strong>Compiled resource datatype:</strong> Resource pointer to a {@link android.graphics.drawable.NinePatchDrawable NinePatchDrawable}.
+</p>
+<p>
+    <strong>Resource reference name:</strong>
+</p>
+<ul>
+    <li>
+        <strong>Java:</strong> <code>R.drawable.<em>some_file</em></code>
+    </li>
+    <li>
+        <strong>XML:</strong> <code>@[<em>package</em>:]drawable.<em>some_file</em></code>
+    </li>
+</ul>
+
+
+<p>For more information and examples using NinePatch drawables, see the discussion
+in <a href="{@docRoot}guide/topics/graphics/2d-graphics.html#nine-patch">2D Graphics</a>.</p>
+
+
+
+<h2 id="animation">Animation</h2>
+
+<h3 id="tweenedanimation">Tweened Animation</h3>
+<p>
+    Android can perform simple animation on a graphic, or a series of graphics. These include rotations, fading, moving, and stretching.
+</p>
+<p>
+    <strong>Source file format:</strong> XML file, one resource per file, one root tag with no <code>&lt;?xml&gt;</code> declaration
+</p>
+<p>
+    <strong>Resource file location</strong>: res/anim/<em>some_file</em>.xml
+</p>
+<p>
+    <strong>Compiled resource datatype:</strong> Resource pointer to an {@link android.view.animation.Animation}.
+</p>
+<p>
+    <strong>Resource reference name:</strong>
+</p>
+<ul>
+    <li>
+        <strong>Java:</strong> <code>R.anim.<em>some_file</em></code>
+    </li>
+    <li>
+        <strong>XML:</strong> <code>@[<em>package</em>:]anim/<em>some_file</em></code>
+    </li>
+</ul>
+<p>
+    <strong>Syntax</strong>
+</p>
+<p>
+    The file must have a single root element: this will be either a single <code>&lt;alpha&gt;</code>, <code>&lt;scale&gt;</code>, <code>&lt;translate&gt;</code>, <code>&lt;rotate&gt;</code>, interpolator element, or <code>&lt;set&gt;</code> element that holds groups of these elements (which may include another <code>&lt;set&gt;</code>). By default, all elements are applied simultaneously. To have them occur sequentially, you must specify the <code>startOffset</code> attribute.
+</p>
+<pre>
+&lt;set android:shareInterpolator=boolean&gt;  // Only required if multiple tags are used.
+   &lt;alpha android:fromAlpha=float
+          android:toAlpha=float &gt;   |
+   &lt;scale android:fromXScale=float
+          android:toXScale=float
+          android:fromYScale=float
+          android:toYScale=float
+          android:pivotX=string
+          android:pivotY=string &gt;    |
+   &lt;translate android:fromX=string
+              android:toX=string
+              android:fromY=string
+              android:toY=string &gt;   |
+   &lt;rotate android:fromDegrees=float
+           android:toDegrees=float
+           android:pivotX=string
+           android:pivotY=string &gt; |
+   &lt;<em>interpolator tag</em>&gt;
+   &lt;set&gt;
+&lt;/set&gt;
+</pre>
+<p>
+    <strong>Elements and Attributes</strong>
+</p>
+<dl>
+    <dt>
+        &lt;set&gt;
+    </dt>
+    <dd>
+        A container that can recursively hold itself or other animations.
+        Represents an {@link android.view.animation.AnimationSet}. 
+        You can include as many child elements of the same or different types as you like. 
+        Supports the following attribute:
+        <ul>
+            <li>
+                <em>shareInterpolator</em> - Whether to share the same Interpolator among all immediate child elements.
+            </li>
+        </ul>
+    </dd>
+    <dt>
+        &lt;alpha&gt;
+    </dt>
+    <dd>
+        A fading animation. Represents an {@link android.view.animation.AlphaAnimation}. 
+        Supports the following attributes:
+        <ul>
+            <li>
+                <em>fromAlpha</em> - 0.0 to 1.0, where 0.0 is transparent.
+            </li>
+            <li>
+                <em>toAlpha</em> - 0.0 to 1.0, where 0.0 is transparent.
+            </li>
+        </ul>
+    </dd>
+    <dt>
+        &lt;scale&gt;
+    </dt>
+    <dd>
+        A resizing animation. Represents a {@link android.view.animation.ScaleAnimation}.
+         You can specify what is the center point of the image (the pinned center), from which it grows outward (or inward), by specifying pivotX and pivotY. So, for example, if these were 0, 0 (top left corner), all growth would be down and to the right. <code>scale</code> supports the following attributes:
+        <ul>
+            <li>
+                <em>fromXScale</em> - Starting X size, where 1.0 is no change.
+            </li>
+            <li>
+                <em>toXScale</em> - Ending X size, where 1.0 is no change.
+            </li>
+            <li>
+                <em>fromYScale</em> - Starting Y size, where 1.0 is no change.
+            </li>
+            <li>
+                <em>toYScale</em> - Ending Y size, where 1.0 is no change.
+            </li>
+            <li>
+                <em>pivotX</em> - The X coordinate of the pinned center.
+            </li>
+            <li>
+                <em>pivotY</em> - The Y coordinate of the pinned center.
+            </li>
+        </ul>
+    </dd>
+    <dt>
+        &lt;translate&gt;
+    </dt>
+    <dd>
+        A vertical/horizontal motion animation.
+        Represents a {@link android.view.animation.TranslateAnimation}. 
+Supports the following attributes in any of the following three formats: values from -100 to 100, ending with "%", indicating a percentage relative to itself; values from -100 to 100, ending in "%p", indicating a percentage relative to its parent; a float with no suffix, indicating an absolute value.
+        <ul>
+            <li>
+                <em>fromXDelta</em> - Starting X location.
+            </li>
+            <li>
+                <em>toXDelta</em> - Ending X location.
+            </li>
+            <li>
+                <em>fromYDelta</em> - Starting Y location.
+            </li>
+            <li>
+                <em>toYDelta</em> - Ending Y location.
+            </li>
+        </ul>
+    </dd>
+    <dt>
+        &lt;rotate&gt;
+    </dt>
+    <dd>
+        A rotation animation. Represents a {@link android.view.animation.RotateAnimation}.
+         Supports the following attributes:
+        <ul>
+            <li>
+                <em>fromDegrees</em> - Starting rotation, in degrees.
+            </li>
+            <li>
+                <em>toDegrees</em> - Ending rotation, in degrees.
+            </li>
+            <li>
+                <em>pivotX</em> - The X coordinate of the center of rotation, in pixels, where (0,0) is the top left corner.
+            </li>
+            <li>
+                <em>pivotY</em> - The Y coordinate of the center of rotation, in pixels, where (0,0) is the top left corner.
+            </li>
+        </ul>
+    </dd>
+    <dt>
+        <em>&lt;interpolator tag&gt;</em>
+    </dt>
+    <dd>
+        You can also use any of the interpolator subclass elements defined in {@link android.R.styleable}. Examples include &lt;CycleInterpolator&gt;, &lt;EaseInInterpolator&gt;, and &lt;EaseOutInterpolator&gt;. These objects define a velocity curve that describes how quickly a visual action takes place on a timeline (fast at first and slow later, slow at first and gradually faster, and so on).
+    </dd>
+</dl>
+<p>
+In addition to the attributes defined for each element above, the elements 
+<code>&lt;alpha&gt;</code>, <code>&lt;scale&gt;</code>, <code>&lt;translate&gt;</code>,
+<code>&lt;rotate&gt;</code>, and <code>&lt;set></code> all support the following attributes (inherited
+from the {@link android.view.animation.Animation} class):
+</p>
+<dl>
+    <dt><em>{@link android.R.attr#duration duration}</em></dt>
+    <dd>
+        Duration, in milliseconds, for this effect. 
+    </dd>
+    <dt><em>{@link android.R.attr#startOffset startOffset}</em></dt>
+    <dd>
+        Offset start time for this effect, in milliseconds. 
+    </dd>
+    <dt><em>{@link android.R.attr#fillBefore fillBefore}</em></dt>
+    <dd>
+        When set true, the animation transformation is applied before the animation begins.
+    </dd>
+    <dt><em>{@link android.R.attr#fillAfter fillAfter}</em></dt>
+    <dd>
+        When set true, the animation transformation is applied after the animation ends.
+    </dd>
+    <dt><em>{@link android.R.attr#repeatCount repeatCount}</em></dt>
+    <dd>
+        Defines the number of times the animation should repeat.
+    </dd>
+    <dt><em>{@link android.R.attr#repeatMode repeatMode}</em></dt>
+    <dd>
+        Defines the animation behavior when it reaches the end and the repeat count is greater than 0.
+        Options are to either restart or reverse the animation.
+    </dd>
+    <dt><em>{@link android.R.attr#zAdjustment zAdjustment}</em></dt>
+    <dd>
+        Defines the z-axis ordering mode to use when running the animation (normal, top, or bottom).
+    </dd>
+    <dt><em>{@link android.R.attr#interpolator interpolator}</em></dt>
+    <dd>
+        You can optionally set an interpolator for each element to determine how quickly or slowly it performs its effect over time. For example, slow at the beginning and faster at the end for EaseInInterpolator, and the reverse for EaseOutInterpolator. A list of interpolators is given in {@link android.R.anim}. To specify these, use the syntax @android:anim/<em>interpolatorName</em>.
+    </dd>
+</dl>
+
+<p>For more discussion and animation code samples, see the discussion in the 
+<a href="{@docRoot}guide/topics/graphics/2d-graphics.html#tween-animation">2D Graphics</a> document.</p>
+
+
+
+<h2 id="menus">Menus</h2>
+<p>Application menus (Options Menu, Context Menu, or Sub Menu) can be defined as
+XML resources and inflated by your application using {@link android.view.MenuInflater}.</p>
+
+<p><strong>Source file format:</strong> XML file, one resource per file, one root tag, 
+<code>&lt;?xml></code> declaration not required.</p>
+<p><strong>Resource file location:</strong> res/menu/<em>some_file</em>.xml</p>
+<p><strong>Compiled resource datatype:</strong> Resource pointer to a {@link android.view.Menu} (or subclass) resource.</p>
+<p><strong>Resource reference name:</strong> </p>
+<ul><li><strong>Java:</strong> <code>R.menu.<em>some_file</em></code></li></ul>
+
+<h3>Syntax</h3>
+<p>The file must have a single root element: a <code>&lt;menu></code> element. In all,
+there are three valid elements: <code>&lt;menu></code>, <code>&lt;group></code> and <code>&lt;item></code>. The
+<code>&lt;item></code> and <code>&lt;group></code> elements must be the children of a <code>&lt;menu></code>, but <code>&lt;item></code>
+elements can also be the children of a <code>&lt;group></code>, and another <code>&lt;menu></code> element may be the child
+of an <code>&lt;item></code> (to create a Sub Menu).</p>
+<pre>
+&lt;menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    &lt;item android:id="@+id/<em>example_item</em>
+          android:title="<em>Example Item</em>"
+          android:icon="<em>@drawable/example_item_icon</em>" />
+
+    &lt;group android:id="@+id/<em>example_group</em>">
+        &lt;item android:id="@+id/<em>example_item2</em>
+              android:title="<em>Example Item 2</em>"
+              android:icon="<em>@drawable/example_item2_icon</em>" />
+    &lt;/group>
+
+    &lt;item android:id="@+id/<em>example_submenu</em>
+          android:title="<em>Example Sub Menu</em>" >
+        &lt;menu>
+            &lt;item android:id="@+id/<em>example_submenu_item</em>
+                  android:title="<em>Example Sub Menu Item</em>" />
+        &lt;/menu>
+    &lt;/item>
+
+&lt;/menu>
+</pre>
+
+<h3>Elements and Attributes</h3>
+<p>All attributes must be defined with the <em>android</em> namespace (e.g., <em>android:icon="@drawable/icon"</em>).</p>
+<dl>
+  <dt>&lt;menu></dt>
+    <dd>The root of a menu. Contains <code>&lt;item></code> and <code>&lt;group></code> nodes. No attributes.</dd>
+  <dt>&lt;group></dt>
+    <dd>A menu group. Contains <code>&lt;item></code> elements. Valid attributes:
+      <ul>
+        <li><em>id</em> - A unique integer ID for the group.</li>
+        <li><em>menuCategory</em> - Value corresponding to Menu CATEGORY_* constants &mdash; defines the priority of the group. Valid values: 
+          <em>container</em>, <em>system</em>, <em>secondary</em>, and <em>alternative</em>.</li>
+        <li><em>orderInCategory</em> - An integer that defines the default order of the items within the category.</li>
+        <li><em>checkableBehavior</em> - Whether the items are checkable. Valid values: 
+          <em>none</em>, <em>all</em> (exclusive / radio buttons), <em>single</em> (non-exclusive / checkboxes)</li>
+        <li><em>visible</em> - Whether the group is visible. <em>true</em> or <em>false</em>.</li>
+        <li><em>enabled</em> - Whether the group is enabled. <em>true</em> or <em>false</em>.</li>
+      </ul>
+    </dd>
+  <dt>&lt;item></dt>
+    <dd>A menu item. May contain a <code>&lt;menu></code> element (for a Sub Menu). Valid attributes:
+      <ul>
+        <li><em>id</em> - A unique resource ID for the item.</li>
+        <li><em>menuCategory</em> - Used to define the menu category.</li>
+        <li><em>orderInCategory</em> - Used to define the order of the item, within a group.</li>
+        <li><em>title</em> - A string for the menu title.</li>
+        <li><em>titleCondensed</em> - A condensed string title, for situations in which the normal title is too long.</li>
+        <li><em>icon</em> - A resource identifier for a drawable icon.</li>
+        <li><em>alphabeticShortcut</em> - A character for the alphabetic shortcut key.</li>
+        <li><em>numericShortcut</em> - A number for the numeric shortcut key.</li>
+        <li><em>checkable</em> - Whether the item is checkable. <em>true</em> or <em>false</em>.</li>
+        <li><em>checked</em> - Whether the item is checked by default. <em>true</em> or <em>false</em>.</li>
+        <li><em>visible</em> - Whether the item is visible by default. <em>true</em> or <em>false</em>.</li>
+        <li><em>enabled</em> - Whether the item is enabled by default. <em>true</em> or <em>false</em>.</li>
+      </ul>
+    </dd>
+</dl>
+
+<p>For more discussion on how to create menus in XML and inflate them in your application, 
+read <a href="{@docRoot}guide/topics/ui/menus.html">Creating Menus</a>.</p>
+
+
+
+<h2 id="layoutresources">Layout</h2>
+<p>Android lets you specify screen layouts using XML elements inside an XML
+file, similar to designing screen layout for a webpage in an HTML file. Each
+file contains a whole screen or a part of a screen, and is compiled into a
+View resource that can be passed in to 
+{@link android.app.Activity#setContentView(int) Activity.setContentView} or used as a
+reference by other layout resource elements. Files are saved in the
+<code>res/layout/</code> folder of your project, and compiled by the Android resource
+compiler, aapt. </p> 
+
+<p> Every layout XML file must evaluate to a single root
+element. First we'll describe how to use the standard XML tags understood by
+Android as it is shipped, and then we'll give a little information on how you
+can define your own custom XML elements for custom View objects.
+
+<p> The root element must have
+the Android namespace "http://schemas.android.com/apk/res/android" defined in
+the root element.</p>
+
+<p>For a complete discussion on creating layouts, see the 
+<a href="{@docRoot}guide/topics/ui/index.html">User Interface</a> topic.</p>
+
+<p> <strong>Source file format:</strong> XML file
+requiring a <code>&lt;?xml version="1.0" encoding="utf-8"?&gt;</code>
+declaration, and a root element of one of the supported XML layout elements.
+</p> 
+
+
+<p><strong>Resource file location</strong>:
+res/layout/<em>some_file</em>.xml.</p>
+<p>
+    <strong>Compiled resource datatype:</strong> Resource pointer to a {@link android.view.View} (or subclass) resource.
+</p>
+<p>
+    <strong>Resource reference name:</strong>
+</p>
+<ul>
+    <li>
+        <strong>Java:</strong> <code>R.layout.<em>some_file</em></code>
+    </li>
+    <li>
+        <strong>XML:</strong> <code>@[<em>package</em>:]layout/<em>some_file</em></code>
+    </li>
+</ul>
+<p>
+    <strong>Syntax</strong>
+</p>
+<pre>
+&lt;<em>ViewGroupClass</em> xmlns:android="http://schemas.android.com/apk/res/android"
+                id="@+id/<em>string_name</em>" (attributes)&gt;
+   &lt;<em>widget</em> or other nested <em>ViewGroupClass</em>&gt;+
+   &lt;requestFocus/&gt;(0 or 1 per layout file, assigned to any element)
+&lt;/<em>ViewGroupClass</em>&gt;
+</pre>
+<dl>
+    <dt>
+        &lt;<em>ViewGroupClass</em>&gt;
+    </dt>
+    <dd>
+        <p>The file must have a single root element. This can be a ViewGroup class that contains other elements, or a widget (or custom item) if it's only one object. By default, you can use any (case-sensitive) Android {@link android.widget widget} or {@link android.view.ViewGroup ViewGroup} class name as an element. These elements support attributes that apply to the underlying class, but the naming is not as clear. How to discover what attributes are supported for what tags is discussed below. You should not assume that any nesting is valid (for example you cannot enclose <code>&lt;TextView&gt;</code> elements inside a <code>&lt;ListLayout&gt;</code>).</p>
+        <p>If a class derives from another class, the XML element inherits all the attributes from the element that it "derives" from. So, for example, <code>&lt;EditText&gt;</code> is the corresponding XML element for the EditText class. It exposes its own unique attributes (<code>EditText_numeric</code>), as well as all attributes supported by <code>&lt;TextView&gt;</code> and <code>&lt;View&gt;</code>. For the <em>id</em> attribute of a tag in XML, you should use a special syntax: "@+id/<em>somestringvalue</em>". The "@+" syntax creates a resource number in the R.id class, if one doesn't exist, or uses it, if it does exist. When declaring an ID value for an XML tag, use this syntax. Example: <code>&lt;TextView id="@+id/nameTextbox"/&gt;</code>, and refer to it this way in Java: <code>findViewById(R.id.nameTextbox)</code>. All elements support the following values:</p>
+        <ul>
+            <li>
+                <em>id</em> - An ID value used to access this element in Java. Typically you will use the syntax @+id/<em>string_name</em> to generate an ID for you in the id.xml file if you haven't created one yourself.
+            </li>
+            <li>
+                <code>xmlns:android="http://schemas.android.com/apk/res/android"</code> - <em><strong>Required for the root element only.</strong></em>
+            </li>
+        </ul>
+    </dd>
+    <dt>
+        &lt;requestFocus&gt;
+    </dt>
+    <dd>
+        Any element representing a View object can include this empty element, which gives it's parent tag initial focus on the screen. You can have only one of these elements per file.
+    </dd>
+</dl>
+<p>
+    <strong>What Attributes Are Supported for What Elements?</strong>
+</p>
+<p>
+    Android uses the {@link android.view.LayoutInflater} class at run time to load an XML layout resource and translate it into visual elements. By default, all widget class names are supported directly as tags, but a full list of supported tags and attributes is listed in the {@link android.R.styleable} reference page. However, the attribute names are somewhat obscure. If an underscore appears in the name, this indicates that it is an attribute &mdash; typically of the element before the underscore. So, for example, <code>EditText_autoText</code> means that the <code>&lt;EditText&gt;</code> tag supports an attribute <em>autoText</em>. When you actually use the attribute in that element, use only the portion after the last underscore, and prefix the attribute with the prefix "<code>android:</code>". So, for example, if {@link android.R.styleable} lists the following values:
+</p>
+<ul>
+    <li>
+        <code>TextView</code>
+    </li>
+    <li>
+        <code>TextView_lines</code>
+    </li>
+    <li>
+        <code>TextView_maxlines</code>
+    </li>
+</ul>
+<p>
+    You could create an element like this:
+</p>
+<pre>
+&lt;TextView android:lines="10" android:maxlines="20"/&gt;
+</pre>
+<p>
+    This would create a {@link android.widget.TextView} object and set its lines and maxlines properties.
+</p>
+<p>
+    Attributes come from three sources:
+</p>
+<ul>
+    <li>
+        <strong>Attributes exposed directly by the element.</strong> For example, <code>TextView</code> supports <code>TextView_text</code>, as discussed above.
+    </li>
+    <li>
+        <strong>Attributes exposed by all the superclasses of that element.</strong> For example, the TextView class extends the View class, so the <code>&lt;TextView&gt;</code> element supports all the attributes that the <code>&lt;View&gt;</code> element exposes &mdash; a long list, including <code>View_paddingBottom</code> and <code>View_scrollbars</code>. These too are used without the class name: <code>&lt;TextView android:paddingBottom="20" android:scrollbars="horizontal" /&gt;</code>.
+    </li>
+    <li>
+        <strong>Attributes of the object's {@link android.view.ViewGroup.LayoutParams} subclass.</strong> All View objects support a LayoutParams member (see <a href="{@docRoot}guide/topics/ui/declaring-layout.html#layout-params">Declaring Layout</a>). To set properties on an element's LayoutParams member, the attribute to use is "android:layout_<em>layoutParamsProperty</em>". For example: <code>android:layout_gravity</code> for an object wrapped by a <code>&lt;LinearLayout&gt;</code> element. Remember that each LayoutParams subclass also supports inherited attributes. Attributes exposed by each subclass are given in the format <em>someLayoutParamsSubclass</em>_Layout_layout_<em>someproperty</em>. This defines an attribute "android:layout_<em>someproperty</em>". Here is an example of how Android documentation lists the properties of the {@link android.widget.LinearLayout.LayoutParams LinearLayout.LayoutParams} class:
+    </li>
+</ul>
+<ul>
+    <li>LinearLayout_Layout // The actual object &mdash; not used.
+    </li>
+    <li>LinearLayout_Layout_layout_gravity // Exposes a <code>gravity</code> attribute
+    </li>
+    <li>LinearLayout_Layout_layout_height // Exposes a <code>height</code> attribute
+    </li>
+    <li>LinearLayout_Layout_layout_weight // Exposes a <code>weight</code> attribute
+    </li>
+    <li>LinearLayout_Layout_layout_width // Exposes a <code>width</code> attribute
+    </li>
+</ul>
+<p>
+    Here is an example that sets some of these values on a few objects, including direct attributes, inherited attributes, and LayoutParams attributes:
+</p>
+<pre>
+&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;!-- res/main_screen.xml --&gt;
+&lt;LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"    // The object's own orientation property
+              android:padding="4"               // Inherited View property
+              android:gravity="center"          // The object's own property
+              android:layout_width="fill_parent"  // Parent object's LinearLayout.LayoutParams.width
+              android:layout_height="fill_parent"&gt; // Parent object's LinearLayout.LayoutParams.height
+
+   &lt;TextView android:layout_width="fill_parent"   // TextView.LayoutParams.width
+             android:layout_height="wrap_content" // TextView.LayoutParams.height
+             android:layout_weight="0"            // TextView.LayoutParams.weight
+             android:paddingBottom="4"            // TextView.paddingBottom
+             android:text="@string/redirect_getter"/&gt; // TextView.text
+
+   &lt;EditText id="@+id/text"
+             android:layout_width="fill_parent"   // EditText.LayoutParams.width
+             android:layout_height="wrap_content" // EditText.LayoutParams.height
+             android:layout_weight="0"            // EditText.LinearLayoutParams.weight
+             android:paddingBottom="4"&gt;           // EditText.paddingBottom
+       &lt;requestFocus /&gt;
+   &lt;/EditText&gt;
+
+   &lt;Button id="@+id/apply"
+           android:layout_width="wrap_content"  // Button.LayoutParams.width
+           android:layout_height="wrap_content" // Button.LayoutParams.height
+           android:text="@string/apply" /&gt;      // TextView.text
+&lt;/LinearLayout&gt;
+</pre>
+<p>
+    <strong>Example Code Use</strong>
+</p>
+<p>
+    The most common use is to load the XML file (located at <em>res/main_screen.xml</em>) and use it as the current screen, as shown here with the preceding file:
+</p>
+<pre>
+setContentView(R.layout.main_screen); 
+</pre>
+<p>
+    However, layout elements can also represent repeating elements used as templates.
+</p>
+
+<p>Also see <a href="{@docRoot}guide/topics/ui/index.html">User Interface</a> for more information on layouts.</p>
+
+
+
+<h3 id="customresources">Custom Layout Resources</h3>
+<p>
+    You can define custom elements to use in layout resources. These custom elements can then be used the same as any Android layout elements: that is, you can use them and specify their attributes in other resources. The ApiDemos sample application has an example of creating a custom layout XML tag, LabelView. To create a custom element, you will need the following files:
+</p>
+<ul>
+    <li>
+        <strong>Java implementation file</strong> - The implementation file. The class must extend {@link android.view.View View} or a subclass. See LabelView.java in ApiDemos.
+    </li>
+    <li>
+        <strong>res/values/attrs.xml</strong> - Defines the XML element, and the attributes that it supports, for clients to use to instantiate your object in their layout XML file. Define your element in a <code>&lt;declare-styleable id=<em>your_java_class_name</em>&gt;</code>. See res/layout/attrs.xml in ApiDemos.
+    </li>
+    <li>
+        <strong>res/layout/<em>your_class</em>.xml</strong> [<em>optional</em>] - An optional XML file to describe the layout of your object. This could also be done in Java. See custom_view_1.xml in ApiDemos.
+    </li>
+</ul>
+<p>
+    <strong>Source file format:</strong> XML file without an <code>&lt;?xml&gt;</code> declaration, and a <code>&lt;resources&gt;</code> root element containing one or more custom element tags.
+</p>
+<p>
+    <strong>Resource file location</strong>: res/values/<em>attrs</em>.xml (file name is arbitrary).
+</p>
+<p>
+    <strong>Compiled resource datatype:</strong> Resource pointer to a {@link android.view.View} (or subclass) resource.
+</p>
+<p>
+    <strong>Resource reference name:</strong> R.styleable.<em>some_file</em> (Java).
+</p>
+
+
+
+<h2 id="stylesandthemes">Styles and Themes</h2>
+<p>
+    A <em>style</em> is one or more attributes applied to a single element (for example, 10 point red Arial font, applied to a TextView). A style is applied as an attribute to an element in a layout XML file.
+</p>
+<p>
+    A <em>theme</em> is one or more attributes applied to a whole screen &mdash; for example, you might apply the stock Android Theme.dialog theme to an activity designed to be a floating dialog box. A theme is assigned as an attribute to an Activity in the manifest file.
+</p>
+<p>
+    Both styles and themes are defined in a <code>&lt;style&gt;</code> block containing one or more string or numerical values (typically color values), or references to other resources (drawables and so on). These elements support inheritance, so you could have MyBaseTheme, MyBaseTheme.Fancy, MyBaseTheme.Small, and so on.
+</p>
+
+<p>For a complete discussion on styles and themes, read 
+<a href="{@docRoot}guide/topics/ui/themes.html">Applying Styles and Themes</a>.</p>
+
+<p>
+    <strong>Source file format:</strong> XML file requiring a <code>&lt;?xml version="1.0" encoding="utf-8"?&gt;</code> declaration, and a root <code>&lt;resources&gt;</code> element containing one or more <code>&lt;style&gt;</code> tags.
+</p>
+<p>
+    <strong>Resource source file location</strong>: res/values/styles.xml (file name is arbitrary). The file name is arbitrary, but standard practice is to put all styles into a file named styles.xml.
+</p>
+<p>
+    <strong>Compiled resource datatype:</strong> Resource pointer to a Java CharSequence.
+</p>
+<p>
+    <strong>Resource reference name:</strong>
+</p>
+<ul>
+    <li>
+        <strong>Java:</strong> <code>R.style.<em>styleID</em></code> for the whole style, <code>R.style.<em>styleID</em>.<em>itemID</em></code> for an individual setting
+    </li>
+    <li>
+        <strong>XML:</strong> <code>@[<em>package</em>:]style/<em>styleID</em></code> for a whole style, <code>@[<em>package</em>:]style/<em>styleID</em>/<em>itemID</em></code> for an individual item. <strong>Note</strong>: to refer to a value in the <em>currently</em> applied theme, use "?" instead of "@" as described below (XML).
+    </li>
+</ul>
+<p>
+    <strong>Syntax</strong>
+</p>
+<pre>
+&lt;style name=<em>string</em> [parent=<em>string</em>] &gt;
+   &lt;item name=<em>string</em>&gt;<em>Hex value | string value | reference</em>&lt;/item&gt;+<em>
+</em>&lt;/style&gt;
+</pre>
+<dl>
+    <dt>
+        &lt;style&gt;
+    </dt>
+    <dd>
+        Holds one or more &lt;item&gt; elements, each describing one value. This style, which is a bundle of values, can be referred to as a <em>theme</em>.
+        <ul>
+            <li>
+                <em>name</em> - The name used in referring to this theme.
+            </li>
+            <li>
+                <em>parent</em> - An optional parent theme. All values from the specified theme will be inherited into this theme. Any values with identical names that you specify will override inherited values. The name must be qualified by the package, but you don't need the /style directive (for example, <code>android:Theme</code> for the base Android theme, or <code>MyTheme</code> for a theme defined in your package).
+            </li>
+        </ul>
+    </dd>
+    <dt>
+        &lt;item&gt;
+    </dt>
+    <dd>
+        A value to use in this theme. It can be a standard string, a hex color value, or a reference to any other resource type.
+    </dd>
+</dl>
+
+<p>For examples of how to declare and apply styles and themes, read 
+<a href="{@docRoot}guide/topics/ui/themes.html">Applying Styles and Themes</a>.</p>
diff --git a/docs/html/guide/topics/resources/index.jd b/docs/html/guide/topics/resources/index.jd
new file mode 100644
index 0000000..7e3bce42
--- /dev/null
+++ b/docs/html/guide/topics/resources/index.jd
@@ -0,0 +1,40 @@
+page.title=Resources and Assets
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+
+  <h2>Key classes</h2>
+  <ol>
+    <li>{@link android.content.res.Resources}</li>
+    <li>{@link android.content.res.AssetManager}</li>
+  </ol>
+
+</div>
+</div>
+
+<p>Resources are an integral part of an Android application. 
+In general, these are external elements that you want to include and reference within your application, 
+like images, audio, video, text strings, layouts, themes, etc. Every Android application contains 
+a directory for resources (<code>res/</code>) and a directory for assets (<code>assets/</code>). 
+Assets are used less often, because their applications are far fewer. You only need to save data
+as an asset when you need to read the raw bites. 
+The directories for resources and assets both reside at the top of your project directory, alongside your source code directory 
+(<code>src/</code>).</p>
+
+<p>The difference between "resources" and "assets" isn't much on the surface, but in general, 
+you'll use resources to store your external content much more often than you'll use assets. 
+The real difference is that anything 
+placed in the resources directory will be easily accessible from your application from the 
+<code>R</code> class, which is compiled by Android. Whereas, anything placed in the assets
+directory will maintain its raw file format and, in order to read it, you must use the
+{@link android.content.res.AssetManager} to read the file as a stream of bytes. So keeping
+files and data in resources (<code>res/</code>) makes them easily accessible.</p>
+
+<p>Within the documents of this topic, you'll find information on the kinds of standard resources
+that are typically used in an Android application and how to reference them from you code.
+<a href="{@docRoot}guide/topics/resources/resources-i18n.html">Resources and Internationalization</a>
+is where you should start, to learn more about how Android utilizes project resources. Then, the 
+<a href="{@docRoot}guide/topics/resources/available-resources.html">Available Resource Types</a>
+document offers a summary of various resource types and a reference to their specifications.
+</p>
diff --git a/docs/html/guide/topics/resources/resources-i18n.jd b/docs/html/guide/topics/resources/resources-i18n.jd
new file mode 100644
index 0000000..b1da4cd
--- /dev/null
+++ b/docs/html/guide/topics/resources/resources-i18n.jd
@@ -0,0 +1,704 @@
+page.title=Resources and Internationalization
+parent.title=Resources and Assets
+parent.link=index.html
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+
+  <h2>Key classes</h2>
+  <ol>
+    <li>{@link android.content.res.Resources}</li>
+  </ol>
+
+  <h2>In this document</h2>
+  <ol>
+    <li><a href="#intro">Introduction</a></li>
+    <li><a href="#CreatingResources">Creating Resources</a></li>
+    <li><a href="#UsingResources">Using Resources</a>
+      <ol>
+        <li><a href="#ResourcesInCode">Using Resources in Code</a></li>
+        <li><a href="#ReferencesToResources">References to Resources</a></li>
+        <li><a href="#ReferencesToThemeAttributes">References to Theme Attributes</a></li>
+        <li><a href="#UsingSystemResources">Using System Resources</a></li>
+      </ol>
+    </li>
+    <li><a href="#AlternateResources">Alternate Resources</a></li>
+    <li><a href="#ResourcesTerminology">Terminology</a></li>
+    <li><a href="#i18n">Internationalization (I18N)</a></li>
+  </ol>
+</div>
+</div>
+
+<p>Resources are external files (that is, non-code files) that are used by
+your code and compiled into your application at build time. Android
+supports a number of different kinds of resource files, including XML,
+PNG, and JPEG files. The XML files have very different formats depending
+on what they describe. This document describes what kinds of files are
+supported, and the syntax or format of each.</p>
+<p>Resources are externalized from source code, and XML files are compiled into
+a binary, fast loading format for efficiency reasons. Strings, likewise are compressed
+into a more efficient storage form. It is for these reasons that we have these
+different resource types in the Android platform.</p>
+
+<p>This is a fairly technically dense document, and together with the
+<a href="available-resources.html">Available Resources</a>
+document, they cover a lot of information about resources. It is not necessary
+to know this document by heart to use Android, but rather to know that the
+information is here when you need it.</p>
+
+<a name="intro"></a>
+<h2>Introduction</h2>
+
+<p>This topic includes a terminology list associated with resources, and a series
+    of examples of using resources in code. For a complete guide to the supported 
+    Android resource types, see 
+    <a href="available-resources.html">Available Resources</a>.
+    </p>
+<p>The Android resource system keeps track of all non-code
+    assets associated with an application.  You use the
+    {@link android.content.res.Resources Resources} class to access your
+    application's resources; the Resources instance associated with your
+    application can generally be found through
+    {@link android.content.Context#getResources Context.getResources()}.</p>
+<p>An application's resources are compiled into the application
+binary at build time for you by the build system.  To use a resource,
+you must install it correctly in the source tree and build your
+application.  As part of the build process, symbols for each
+of the resources are generated that you can use in your source
+code -- this allows the compiler to verify that your application code matches
+up with the resources you defined.</p>
+
+<p>The rest of this section is organized as a tutorial on how to
+use resources in an application.</p>
+
+<a name="CreatingResources" id="CreatingResources"></a>
+<h2>Creating Resources</h2>
+
+<p>Android supports string, bitmap, and many other types of resource. The syntax and format
+of each, and where they're stored, depends upon the type of object. In
+general, though, you create resources from three types of files: XML files
+(everything but bitmaps and raw), bitmap files(for images) and Raw files (anything
+else, for example sound files, etc.). In fact, there are two different types of
+XML file as well, those that get compiled as-is into the package, and those that
+are used to generate resources by aapt. Here is a list of each
+resource type, the format of the file, a description of the file, and details
+of any XML files. </p>
+
+<p>You will create and store your resource files under the appropriate
+subdirectory under the <code>res/</code> directory in your project. Android
+has a resource compiler (aapt) that compiles resources according to which
+subfolder they are in, and the format of the file. Here is a list of the file
+types for each resource. See the 
+<a href="available-resources.html">Available Resources</a> for
+descriptions of each type of object, the syntax, and the format or syntax of
+the containing file.</p>
+
+<table width="100%" border="1">
+    <tr>
+        <th scope="col">Directory</th>
+        <th scope="col">Resource Types </th>
+    </tr>
+    <tr>
+        <td><code>res/anim/</code></td>
+        <td>XML files that are compiled into 
+        <a href="available-resources.html#animationdrawable">frame by
+        frame animation</a> or 
+        <a href="available-resources.html#tweenedanimation">tweened
+        animation</a> objects </td>
+    </tr>
+    <tr>
+        <td><code>res/drawable/</code></td>
+        <td><p>.png, .9.png, .jpg files that are compiled into the following
+                Drawable resource subtypes:</p>
+            <p>To get a resource of this type, use <code>Resource.getDrawable(<em>id</em>)</code>
+            <ul>
+                <li><a href="available-resources.html#imagefileresources">bitmap files</a></li>
+                <li><a href="available-resources.html#ninepatch">9-patches (resizable bitmaps)</a></li>
+            </ul></td>
+    </tr>
+    <tr>
+        <td><code>res/layout/</code></td>
+        <td>XML files that are compiled into screen layouts (or part of a screen).
+            See <a href="{@docRoot}guide/topics/ui/declaring-layout.html">Declaring Layout</a></td>
+    </tr>
+    <tr>
+        <td><code>res/values/</code></td>
+        <td><p>XML files that can be compiled into many kinds of resource.</p>
+            <p class="note"><strong>Note:</strong> unlike the other res/ folders, this one
+            can hold any number of files that hold descriptions of resources to create
+            rather than the resources themselves. The XML element types control
+            where these resources are placed under the R class.</p>
+            <p>While the files can be named anything, these are
+                the typical files in this folder (the convention is to name
+                the file after the type of elements defined within):</p>
+            <ul>
+                <li><strong>arrays.xml</strong> to define arrays </li>  
+                <!-- TODO: add section on arrays -->
+                <li><strong>colors.xml</strong> to define <a href="available-resources.html#colordrawableresources">color
+                        drawables</a> and <a  href="#colorvals">color string values</a>.
+                        Use <code>Resources.getDrawable()</code> and
+                        <code>Resources.getColor(), respectively,</code>
+                to get these resources.</li>
+                <li><strong>dimens.xml</strong> to define <a href="available-resources.html#dimension">dimension value</a>. Use <code>Resources.getDimension()</code> to get
+                these resources.</li>
+                <li><strong>strings.xml</strong> to define <a href="available-resources.html#stringresources">string</a> values (use either         
+                <code>Resources.getString</code> or preferably <code>Resources.getText()</code>
+                to get
+                these resources. <code>getText()</code> will retain any rich text styling
+                which is usually desirable for UI strings.</li>
+                <li><strong>styles.xml</strong> to define <a href="available-resources.html#stylesandthemes">style</a> objects.</li>
+            </ul></td>
+    </tr>
+    <tr>
+        <td><code>res/xml/</code></td>
+        <td>Arbitrary XML files that are compiled and can be read at run time by
+            calling {@link android.content.res.Resources#getXml(int) Resources.getXML()}.</td>
+    </tr>
+    <tr>
+        <td><code>res/raw/</code></td>
+        <td>Arbitrary files to copy directly to the device. They are added uncompiled
+            to the compressed file that your application build produces. To use these
+            resources in your application, call {@link android.content.res.Resources#openRawResource(int)
+            Resources.openRawResource()} with the resource ID, which is R.raw.<em>somefilename</em>.</td>
+    </tr>
+</table>
+<p>Resources are compiled into the final APK file. Android creates a wrapper class,
+    called R, that you can use to refer to these resources in your code. R contains subclasses
+    named according to the path and file name of the source file</p>
+<a name="colorvals" id="colorvals"></a>
+<h3>Global Resource Notes</h3>
+<ul>
+    <li>Several resources allow you to define colors. Android accepts color values
+        written in various web-style formats -- a hexadecimal constant in any of the
+        following forms: #RGB, #ARGB, #RRGGBB, #AARRGGBB. </li>
+    <li>All color values support setting an alpha channel value, where the first
+        two hexadecimal numbers specify the transparency. Zero in the alpha channel
+        means transparent. The default value is opaque. </li>
+</ul>
+<a name="UsingResources" id="UsingResources"></a>
+<h2>Using Resources </h2>
+<p>This section describes how to use the resources you've created. It includes the
+    following topics:</p>
+<ul>
+    <li><a href="#ResourcesInCode">Using resources in code</a>&nbsp;- How to call
+        resources in your code to instantiate them. </li>
+    <li><a href="#ReferencesToResources">Referring to resources from other resources</a> &nbsp;-
+        You can reference resources from other resources. This lets you reuse common 
+        resource values inside resources. </li>
+    <li><a href="#AlternateResources">Supporting Alternate Resources for Alternate
+            Configurations</a> - You can specify different resources
+            to load, depending on the language or display configuration of the host
+            hardware. </li>
+</ul>
+<p>At compile time, Android generates a class named R that contains resource identifiers
+    to all the resources in your program. This class contains several subclasses,
+    one for each type of resource supported by Android, and for which you provided
+    a resource file. Each class contains one or more identifiers for the compiled resources,
+    that you use in your code to load the resource. Here is a small resource file
+    that contains string, layout (screens or parts of screens), and image resources.</p>
+<p class="note"><strong>Note:</strong> the R class is an auto-generated file and is not
+designed to be edited by hand. It will be automatically re-created as needed when
+the resources are updated.</p>
+<pre class="prettyprint">package com.android.samples;
+public final class R {
+    public static final class string {
+        public static final int greeting=0x0204000e;
+        public static final int start_button_text=0x02040001;
+        public static final int submit_button_text=0x02040008;
+        public static final int main_screen_title=0x0204000a;
+    };
+    public static final class layout {
+        public static final int start_screen=0x02070000;
+        public static final int new_user_pane=0x02070001;
+        public static final int select_user_list=0x02070002;
+
+    };
+    public static final class drawable {
+        public static final int company_logo=0x02020005;
+        public static final int smiling_cat=0x02020006;
+        public static final int yellow_fade_background=0x02020007;
+        public static final int stretch_button_1=0x02020008;
+
+    };
+};
+</pre>
+<a name="ResourcesInCode" id="ResourcesInCode"></a>
+<h3>Using Resources in Code </h3>
+
+<p>Using resources in code is just a matter of knowing the full resource ID
+and what type of object your resource has been compiled into. Here is the
+syntax for referring to a resource:</p>
+<p><code>R.<em>resource_type</em>.<em>resource_name</em></code></p>
+<p>or</p>
+<p><code>android.R.<em>resource_type</em>.<em>resource_name</em></code></p>
+
+<p>Where <code>resource_type</code> is the R subclass that holds a specific type
+of resource. <code>resource_name</code> is the <em>name</em> attribute for resources
+defined in XML files, or the file name (without the extension) for resources
+defined by other file types. Each type of resource will be added to a specific
+R subclass, depending on the type of resource it is; to learn which R subclass
+hosts your compiled resource type, consult the 
+<a href="available-resources.html">Available Resources</a> document. Resources compiled by your own application can
+be referred to without a package name (simply as
+<code>R.<em>resource_type</em>.<em>resource_name</em></code>). Android contains
+a number of standard resources, such as screen styles and button backgrounds. To
+refer to these in code, you must qualify them with <code>android</code>, as in
+<code>android.R.drawable.button_background</code>.</p>
+
+<p>Here are some good and bad examples of using compiled resources in code:</p>
+
+<pre class="prettyprint">// Load a background for the current screen from a drawable resource.
+this.getWindow().setBackgroundDrawableResource(R.drawable.my_background_image);
+
+// WRONG Sending a string resource reference into a 
+// method that expects a string.
+this.getWindow().setTitle(R.string.main_title);
+
+// RIGHT Need to get the title from the Resources wrapper.
+this.getWindow().setTitle(Resources.getText(R.string.main_title));
+
+// Load a custom layout for the current screen.
+setContentView(R.layout.main_screen);
+
+// Set a slide in animation for a ViewFlipper object.
+mFlipper.setInAnimation(AnimationUtils.loadAnimation(this, 
+        R.anim.hyperspace_in));
+
+// Set the text on a TextView object.
+TextView msgTextView = (TextView)findViewByID(R.id.msg);
+msgTextView.setText(R.string.hello_message); </pre>
+
+<a name="ReferencesToResources" id="ReferencesToResources"></a>
+<h3>References to Resources</h3>
+
+<p>A value supplied in an attribute (or resource) can also be a reference to
+a resource.  This is often used in layout files to supply strings (so they
+can be localized) and images (which exist in another file), though a reference
+can be any resource type including colors and integers.</p>
+
+<p>For example, if we have 
+<a href="available-resources.html#colordrawableresources">color 
+resources</a>, we can write a layout file that sets the text color size to be
+the value contained in one of those resources:</p>
+
+<pre>
+&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
+&lt;EditText id=&quot;text&quot;
+    xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;
+    android:layout_width=&quot;fill_parent&quot; android:layout_height=&quot;fill_parent&quot;
+    <strong>android:textColor=&quot;&#64;color/opaque_red&quot;</strong>
+    android:text=&quot;Hello, World!&quot; /&gt;
+</pre>
+
+<p>Note here the use of the '@' prefix to introduce a resource reference -- the
+text following that is the name of a resource in the form
+of <code>@[package:]type/name</code>.  In this case we didn't need to specify
+the package because we are referencing a resource in our own package.  To
+reference a system resource, you would need to write:</p>
+
+<pre>
+&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
+&lt;EditText id=&quot;text&quot;
+    xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;
+    android:layout_width=&quot;fill_parent&quot; android:layout_height=&quot;fill_parent&quot;
+    android:textColor=&quot;&#64;<strong>android:</strong>color/opaque_red&quot;
+    android:text=&quot;Hello, World!&quot; /&gt;
+</pre>
+
+<p>As another example, you should always use resource references when supplying
+strings in a layout file so that they can be localized:</p>
+
+<pre>
+&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
+&lt;EditText id=&quot;text&quot;
+    xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;
+    android:layout_width=&quot;fill_parent&quot; android:layout_height=&quot;fill_parent&quot;
+    android:textColor=&quot;&#64;android:color/opaque_red&quot;
+    android:text=&quot;&#64;string/hello_world&quot; /&gt;
+</pre>
+
+<p>This facility can also be used to create references between resources.
+For example, we can create new drawable resources that are aliases for
+existing images:</p>
+
+<pre>
+&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
+&lt;resources&gt;
+    &lt;drawable id=&quot;my_background&quot;&gt;&#64;android:drawable/theme2_background&lt;/drawable&gt;
+&lt;/resources&gt;
+</pre>
+
+<a name="ReferencesToThemeAttributes"></a>
+<h3>References to Theme Attributes</h3>
+
+<p>Another kind of resource value allows you to reference the value of an
+attribute in the current theme.  This attribute reference can <em>only</em>
+be used in style resources and XML attributes; it allows you to customize the
+look of UI elements by changing them to standard variations supplied by the
+current theme, instead of supplying more concrete values.</p>
+
+<p>As an example, we can use this in our layout to set the text color to
+one of the standard colors defined in the base system theme:</p>
+
+<pre>
+&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
+&lt;EditText id=&quot;text&quot;
+    xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;
+    android:layout_width=&quot;fill_parent&quot; android:layout_height=&quot;fill_parent&quot;
+    <strong>android:textColor=&quot;?android:textDisabledColor&quot;</strong>
+    android:text=&quot;&#64;string/hello_world&quot; /&gt;
+</pre>
+
+<p>Note that this is very similar to a resource reference, except we are using
+an '?' prefix instead of '@'.  When you use this markup, you are supplying
+the name of an attribute resource that will be looked up in the theme --
+because the resource tool knows that an attribute resource is expected,
+you do not need to explicitly state the type (which would be
+<code>?android:attr/android:textDisabledColor</code>).</p>
+
+<p>Other than using this resource identifier to find the value in the
+theme instead of raw resources, the name syntax is identical to the '@' format:
+<code>?[namespace:]type/name</code> with the type here being optional.</p>
+
+<a name="UsingSystemResources"></a>
+<h3>Using System Resources</h3>
+
+<p>Many resources included with the system are available to applications.
+All such resources are defined under the class "android.R".  For example,
+you can display the standard application icon in a screen with the following
+code:</p>
+
+<pre class="prettyprint">
+public class MyActivity extends Activity
+{
+    public void onStart() 
+    {
+        requestScreenFeatures(FEATURE_BADGE_IMAGE);
+
+        super.onStart();
+
+        setBadgeResource(android.R.drawable.sym_def_app_icon);
+    }
+}
+</pre>
+
+<p>In a similar way, this code will apply to your screen the standard
+"green background" visual treatment defined by the system:</p>
+
+<pre class="prettyprint">
+public class MyActivity extends Activity
+{
+    public void onStart() 
+    {
+        super.onStart();
+
+        setTheme(android.R.style.Theme_Black);
+    }
+}
+</pre>
+
+<a name="AlternateResources" id="AlternateResources"></a>
+<h2>Alternate Resources (for alternate languages and configurations)</h2>
+
+<p>You can supply different resources for your product according to the UI
+language or hardware configuration on the device. Note that although you can
+include different string, layout, and other resources, the SDK does not expose
+methods to let you specify which alternate resource set to load. Android
+detects the proper set for the hardware and location, and loads them as
+appropriate. Users can select alternate language settings using the settings
+panel on the device. </p>
+<p>To include alternate resources, create parallel resource folders with
+qualifiers appended to the folder names, indicating the configuration it
+applies to (language, screen orientation, and so on). For example, here is a
+project that holds one string resource file for English, and another for
+French:</p>
+
+<pre>
+MyApp/
+    res/
+        values-en/
+            strings.xml
+        values-fr/
+            strings.xml
+</pre>
+
+<p>Android supports several types of qualifiers, with various values for each.
+Append these to the end of the resource folder name, separated by dashes. You
+can add multiple qualifiers to each folder name, but they must appear in the
+order they are listed here. For example, a folder containing drawable
+resources for a fully specified configuration would look like:</p>
+
+<pre>
+MyApp/
+    res/
+        drawable-en-rUS-port-160dpi-finger-keysexposed-qwerty-dpad-480x320/
+</pre>
+
+<p>More typically, you will only specify a few specific configuration options
+that a resource is defined for. You may drop any of the values from the
+complete list, as long as the remaining values are still in the same
+order:</p>
+
+<pre>
+MyApp/
+    res/
+        drawable-en-rUS-finger/
+        drawable-port/
+        drawable-port-160dpi/
+        drawable-qwerty/
+</pre>
+
+<table border="1">
+    <tr>
+        <th> Qualifier </th>
+        <th> Values </th>
+    </tr>
+    <tr>
+        <td>Language</td>
+        <td>The two letter <a href="http://www.loc.gov/standards/iso639-2/php/code_list.php">ISO
+                639-1</a> language code in lowercase. For example: 
+                <code>en</code>, <code>fr</code>, <code>es</code> </td>
+    </tr>
+    <tr>
+        <td>Region</td>
+        <td>The two letter
+        <a href="http://www.iso.org/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html">ISO
+                3166-1-alpha-2</a> language code in uppercase preceded by a lowercase
+            &quot;r&quot;. For example: <code>rUS</code>, <code>rFR</code>, <code>rES</code></td>
+    </tr>
+    <tr>
+        <td>Screen orientation</td>
+        <td><code>port</code>, <code>land</code>, <code>square</code> </td>
+    </tr>
+    <tr>
+        <td>Screen pixel density</td>
+        <td><code>92dpi</code>, <code>108dpi</code>, etc. </td>
+    </tr>
+    <tr>
+        <td>Touchscreen type</td>
+        <td><code>notouch</code>, <code>stylus</code>, <code>finger</code></td>
+    </tr>
+    <tr>
+        <td>Whether the keyboard is available to the user</td>
+        <td><code>keysexposed</code>, <code>keyshidden</code> </td>
+    </tr>
+    <tr>
+        <td>Primary text input method</td>
+        <td><code>nokeys</code>, <code>qwerty</code>, <code>12key</code> </td>
+    </tr>
+    <tr>
+        <td>Primary non-touchscreen<br />
+            navigation method</td>
+        <td><code>nonav</code>, <code>dpad</code>, <code>trackball</code>, <code>wheel</code> </td>
+    </tr>
+    <tr>
+        <td>Screen dimensions</td>
+        <td><code>320x240</code>, <code>640x480</code>, etc. The larger dimension
+            must be specified first. </td>
+    </tr>
+</table>
+
+<p>This list does not include device-specific parameters such as carrier,
+branding, device/hardware, or manufacturer. Everything that an application
+needs to know about the device that it is running on is encoded via the
+resource qualifiers in the table above.</p>
+
+<p>Here are some general guidelines on qualified resource directory names:</p>
+
+<ul>
+    <li>Values are separated by a dash (as well as a dash after the base directory
+        name) </li>
+    <li>Values are case-sensitive (even though they must be unique across all folder
+        names in a case-insensitive way)<br />For example,</li>
+    <ul>
+        <li>A portrait-specific <code>drawable</code> directory must be named
+            <code>drawable-port</code>, not <code>drawable-PORT</code>.</li>
+        <li>You may not have two directories named <code>drawable-port</code>
+            and <code>drawable-PORT</code>, even if you had intended "port" and
+            "PORT" to refer to different parameter values.</li>
+    </ul>
+    <li>Only one value for each qualifier type is supported (that is, you cannot
+        specify <code>drawable-rEN-rFR/</code>)</li>
+    <li>You can specify multiple parameters to define specific configurations,
+        but they must always be in the order listed above.
+        For example, <code>drawable-en-rUS-land</code> will apply to landscape view,
+        US-English devices. </li>
+    <li>Android will try to find the most specific matching directory for the current
+        configuration, as described below</li>
+    <li>The order of parameters listed in this table is used to break a tie in case
+        of multiple qualified directories (see the example given below) </li>
+    <li>All directories, both qualified and unqualified, live under the <code>res/</code> folder.
+        Qualified directories cannot be nested (you cannot have <code>res/drawable/drawable-en</code>) </li>
+    <li>All resources will be referenced in code or resource reference syntax by
+        their simple, undecorated name. So if a resource is named this:<br />
+        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<code>MyApp/res/drawable-port-92dp/myimage.png</code><br />
+        It would be referenced as this:<br />
+        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<code>R.drawable.myimage</code> (code)<br />
+        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<code>&#064;drawable/myimage</code> (XML)</li>
+</ul>
+
+<h3>How Android finds the best matching directory </h3>
+
+<p>Android will pick which of the various underlying resource files should be
+used at runtime, depending on the current configuration. The selection process
+is as follows:</p>
+
+<ol>
+    <li>
+            Eliminate any resources whose configuration does not match the current
+            device configuration. For example, if the screen pixel density is 108dpi,
+            this would eliminate only <code>MyApp/res/drawable-port-92dpi/</code>.
+        <blockquote>
+            <pre>
+MyApp/res/drawable/myimage.png
+MyApp/res/drawable-en/myimage.png
+MyApp/res/drawable-port/myimage.png
+<strike>MyApp/res/drawable-port-92dpi/myimage.png</strike>
+</pre>
+        </blockquote>
+    </li>
+    <li>
+            Pick the resources with the highest number of matching configurations.
+            For example, if our locale is en-GB and orientation is port, then we
+            have two candidates with one matching configuration each: 
+            <code>MyApp/res/drawable-en/</code> and <code>MyApp/res/drawable-port/</code>.
+            The directory <code>MyApp/res/drawable/</code> is eliminated because
+            it has zero matching configurations, while the others have one matching
+            configuration.
+        <blockquote>
+            <pre>
+<strike>MyApp/res/drawable/myimage.png</strike>
+MyApp/res/drawable-en/myimage.png
+MyApp/res/drawable-port/myimage.png
+</pre>
+        </blockquote>
+    </li>
+    <li>
+            Pick the final matching file based on configuration precedence, which
+            is the order of parameters listed in the table above. That is, it is
+            more important to match the language than the orientation, so we break
+            the tie by picking the language-specific file, <code>MyApp/res/drawable-en/</code>.
+        <blockquote>
+            <pre>MyApp/res/drawable-en/myimage.png
+<strike>MyApp/res/drawable-port/myimage.png</strike>
+</pre>
+        </blockquote>
+    </li>
+</ol>
+
+<a name="ResourcesTerminology"></a>
+<h2>Terminology</h2>
+
+<p>The resource system brings a number of different pieces together to
+form the final complete resource functionality.  To help understand the
+overall system, here are some brief definitions of the core concepts and
+components you will encounter in using it:</p>
+
+<p><strong>Asset</strong>: A single blob of data associated with an application. This
+includes object files compiled from the Java source code, graphics (such as PNG
+images), XML files, etc. These files are organized in a directory hierarchy
+that, during final packaging of the application, is bundled together into a
+single ZIP file.</p>
+
+<p><strong>aapt</strong>: Android Asset Packaging Tool. The tool that generates the 
+final ZIP file of application assets.  In addition to collecting raw assets 
+together, it also parses resource definitions into binary asset data.</p>
+
+<p><strong>Resource Table</strong>: A special asset that aapt generates for you,
+describing all of the resources contained in an application/package.
+This file is accessed for you by the Resources class; it is not touched
+directly by applications.</p>
+
+<p><strong>Resource</strong>: An entry in the Resource Table describing a single
+named value.  Broadly, there are two types of resources: primitives and
+bags.</p>
+
+<p><strong>Resource Identifier</strong>: In the Resource Table all resources are
+identified by a unique integer number.  In source code (resource descriptions,
+XML files, Java source code) you can use symbolic names that stand as constants for
+the actual resource identifier integer.</p>
+
+<p><strong>Primitive Resource</strong>: All primitive resources can be written as a
+simple string, using formatting to describe a variety of primitive types
+included in the resource system: integers, colors, strings, references to
+other resources, etc.  Complex resources, such as bitmaps and XML
+describes, are stored as a primitive string resource whose value is the path
+of the underlying Asset holding its actual data.</p>
+
+<p><strong>Bag Resource</strong>: A special kind of resource entry that, instead of a
+simple string, holds an arbitrary list of name/value pairs.  Each name is
+itself a resource identifier, and each value can hold
+the same kinds of string formatted data as a normal resource.  Bags also
+support inheritance: a bag can inherit the values from another bag, selectively
+replacing or extending them to generate its own contents.</p>
+
+<p><strong>Kind</strong>: The resource kind is a way to organize resource identifiers
+for various purposes.  For example, drawable resources are used to
+instantiate Drawable objects, so their data is a primitive resource containing
+either a color constant or string path to a bitmap or XML asset.  Other
+common resource kinds are string (localized string primitives), color
+(color primitives), layout (a string path to an XML asset describing a view
+layout), and style (a bag resource describing user interface attributes).
+There is also a standard "attr" resource kind, which defines the resource
+identifiers to be used for naming bag items and XML attributes</p>
+
+<p><strong>Style</strong>: The name of the resource kind containing bags that are used
+to supply a set of user interface attributes.  For example, a TextView class may
+be given a style resource that defines its text size, color, and alignment.
+In a layout XML file, you associate a style with a bag using the "style"
+attribute, whose value is the name of the style resource.</p>
+
+<p><strong>Style Class</strong>: Specifies a related set of attribute resources.
+This data is not placed in the resource table itself, but used to generate
+constants in the source code that make it easier for you to retrieve values out of
+a style resource and/or XML tag's attributes.  For example, the
+Android platform defines a "View" style class that
+contains all of the standard view attributes: padding, visibility,
+background, etc.; when View is inflated it uses this style class to
+retrieve those values from the XML file (at which point style and theme
+information is applied as approriate) and load them into its instance.</p>
+
+<p><strong>Configuration</strong>: For any particular resource identifier, there may be
+multiple different available values depending on the current configuration.
+The configuration includes the locale (language and country), screen
+orientation, screen density, etc.  The current configuration is used to
+select which resource values are in effect when the resource table is
+loaded.</p>
+
+<p><strong>Theme</strong>: A standard style resource that supplies global
+attribute values for a particular context.  For example, when writing an
+Activity the application developer can select a standard theme to use, such
+as the Theme.White or Theme.Black styles; this style supplies information
+such as the screen background image/color, default text color, button style,
+text editor style, text size, etc.  When inflating a layout resource, most
+values for widgets (the text color, selector, background) if not explicitly
+set will come from the current theme; style and attribute
+values supplied in the layout can also assign their value from explicitly
+named values in the theme attributes if desired.</p>
+
+<p><strong>Overlay</strong>: A resource table that does not define a new set of resources,
+but instead replaces the values of resources that are in another resource table.
+Like a configuration, this is applied at load time
+to the resource data; it can add new configuration values (for example
+strings in a new locale), replace existing values (for example change
+the standard white background image to a "Hello Kitty" background image),
+and modify resource bags (for example change the font size of the Theme.White
+style to have an 18 pt font size).  This is the facility that allows the
+user to select between different global appearances of their device, or
+download files with new appearances.</p>
+
+<h2>Resource Reference</h2>
+<p>The <a href="available-resources.html">Available Resources</a>
+document provides a detailed list of the various types of resource and how to use them
+from within the Java source code, or from other references.</p>
+
+<a name="i18n" id="i18n"></a>
+<h2>Internationalization and Localization</h2>
+<p class="note"><strong>Coming Soon:</strong> Internationalization and Localization are
+critical, but are also not quite ready yet in the current SDK. As the
+SDK matures, this section will contain information on the Internationalization
+and Localization features of the Android platform. In the meantime, it is a good
+idea to start by externalizing all strings, and practicing good structure in
+creating and using resources.</p>
+
diff --git a/docs/html/guide/topics/security/security.jd b/docs/html/guide/topics/security/security.jd
new file mode 100644
index 0000000..da201c4
--- /dev/null
+++ b/docs/html/guide/topics/security/security.jd
@@ -0,0 +1,397 @@
+page.title=Security and Permissions
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+
+<h2>In this document</h2>
+<ol>
+<li><a href="#arch">Security Architecture</a></li>
+<li><a href="#signing">Application Signing</a></li>
+<li><a href="#userid">User IDs and File Access</a></li>
+<li><a href="#permissions">Using Permissions</a></li>
+<li><a href="#declaring">Declaring and Enforcing Permissions</a>
+	<ol>
+	<li><a href="#manifest">...in AndroidManifest.xml</a></li>
+	<li><a href="#broadcasts">...when Sending Broadcasts</a></li>
+	<li><a href="#enforcement">Other Permission Enforcement</a></li>
+	</ol></li>
+<li><a href="#uri">URI Permissions</a></li>
+</ol>
+</div>
+</div>
+
+<p>Android is a multi-process system, in which each application (and parts of the
+system) runs in its own process.  Most security between applications and
+the system is enforced at the process level through standard Linux facilities,
+such as user and group IDs that are assigned to applications.
+Additional finer-grained security features are provided
+through a "permission" mechanism that enforces restrictions on the specific
+operations that a particular process can perform, and per-URI permissions
+for granting ad-hoc access to specific pieces of data.</p>
+
+<a name="arch"></a>
+<h2>Security Architecture</h2>
+
+<p>A central design point of the Android security architecture is that no
+application, by default, has permission to perform any operations that would
+adversely impact other applications, the operating system, or the user.  This
+includes reading or writing the user's private data (such as contacts or
+e-mails), reading or writing another application's files, performing
+network access, keeping the device awake, etc.<p>
+
+<p>An application's process is a secure sandbox.  It can't disrupt other
+applications, except by explicitly declaring the <em>permissions</em> it needs
+for additional capabilities not provided by the basic sandbox.  These
+permissions it requests can be handled by the operating in various ways,
+typically by automatically allowing or disallowing based on certificates or
+by prompting the user.  The permissions required by an application are declared
+statically in that application, so they can be known up-front at install time
+and will not change after that.</p>
+
+
+<a name="signing"></a>
+<h2>Application Signing</h2>
+
+<p>All Android applications (.apk files) must be signed with a certificate whose
+private key is held by their developer.  This certificate identifies the author
+of the application.  The certificate does <em>not</em> need to be signed by
+a certificate authority: it is perfectly allowable, and typical, for Android
+applications to use self-signed certificates.  The certificate is used only
+to establish trust relationships between applications, not for wholesale
+control over whether an application can be installed.  The most significant
+ways that signatures impact security is by determining who can access
+signature-based permissions and who can share user IDs.</p>
+
+
+<a name="userid"></a>
+<h2>User IDs and File Access</h2>
+
+<p>Each Android package (.apk) file installed on the device is given its
+own unique Linux user ID, creating a sandbox for it and preventing it from touching
+other applications (or other applications from touching it).  This user ID is
+assigned to it when the application is installed on the device, and
+remains constant for the duration of its life on that device.</p>
+
+<p>Because security enforcement happens at the
+process level, the code of any two packages can not normally
+run in the same process, since they need to run as different Linux users.
+You can use the {@link android.R.attr#sharedUserId} attribute in the
+<code>AndroidManifest.xml</code>'s
+{@link android.R.styleable#AndroidManifest manifest} tag of each package to
+have them assigned the same user ID.  By doing this, for purposes of security
+the two packages are then treated as being the same application, with the same
+user ID and file permissions.  Note that in order to retain security, only two applications
+signed with the same signature (and requesting the same sharedUserId) will
+be given the same user ID.</p>
+
+<p>Any data stored by an application will be assigned that application's user
+ID, and not normally accessible to other packages.  When creating a new file
+with {@link android.content.Context#getSharedPreferences},
+{@link android.content.Context#openFileOutput}, or
+{@link android.content.Context#openOrCreateDatabase},
+you can use the
+{@link android.content.Context#MODE_WORLD_READABLE} and/or
+{@link android.content.Context#MODE_WORLD_WRITEABLE} flags to allow any other
+package to read/write the file.  When setting these flags, the file is still
+owned by your application, but its global read and/or write permissions have
+been set appropriately so any other application can see it.</p>
+
+
+<a name="permissions"></a>
+<h2>Using Permissions</h2>
+
+<p>A basic Android application has no permissions associated with it,
+meaning it can not do anything that would adversely impact the user experience
+or any data on the device.  To make use of protected features of the device,
+you must include in your <code>AndroidManifest.xml</code> one or more
+<code>{@link android.R.styleable#AndroidManifestUsesPermission &lt;uses-permission&gt;}</code>
+tags declaring the permissions that your application needs.</p>
+
+<p>For example, an application that needs to monitor incoming SMS messages would
+specify:</p>
+
+<pre>&lt;manifest xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;
+    package=&quot;com.android.app.myapp&quot; &gt;
+
+    &lt;uses-permission android:name=&quot;android.permission.RECEIVE_SMS&quot; /&gt;
+
+&lt;/manifest&gt;</pre>
+
+<p>At application install time, permissions requested by the application are
+granted to it by the package installer, based on checks against the
+signatures of the applications declaring those permissions and/or interaction
+with the user. <em>No</em> checks with the user
+are done while an application is running: it either was granted a particular
+permission when installed, and can use that feature as desired, or the
+permission was not granted and any attempt to use the feature will fail
+without prompting the user.</p>
+
+<p>Often times a permission failure will result in a {@link
+java.lang.SecurityException} being thrown back to the application. However,
+this is not guaranteed to occur everywhere. For example, the {@link
+android.content.Context#sendBroadcast} method checks permissions as data is
+being delivered to each receiver, after the method call has returned, so you
+will not receive an exception if there are permission failures. In almost all
+cases, however, a permission failure will be printed to the system log.</p>
+
+<p>The permissions provided by the Android system can be found at {@link
+android.Manifest.permission}. Any application may also define and enforce its
+own permissions, so this is not a comprehensive list of all possible
+permissions.</p>
+
+<p>A particular permission may be enforced at a number of places during your
+program's operation:</p>
+
+<ul>
+<li>At the time of a call into the system, to prevent an application from
+executing certain functions.</li>
+<li>When starting an activity, to prevent applications from launching
+activities of other applications.</li>
+<li>Both sending and receiving broadcasts, to control who can receive
+your broadcast or who can send a broadcast to you.</li>
+<li>When accessing and operating on a content provider.</li>
+<li>Binding or starting a service.</li>
+</ul>
+
+
+<a name="declaring"></a>
+<h2>Declaring and Enforcing Permissions</h2>
+
+<p>To enforce your own permissions, you must first declare them in your
+<code>AndroidManifest.xml</code> using one or more
+<code>{@link android.R.styleable#AndroidManifestPermission &lt;permission&gt;}</code>
+tags.</p>
+
+<p>For example, an application that wants to control who can start one
+of its activities could declare a permission for this operation as follows:</p>
+
+<pre>&lt;manifest xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;
+    package=&quot;com.me.app.myapp&quot; &gt;
+
+    &lt;permission android:name=&quot;com.me.app.myapp.permission.DEADLY_ACTIVITY&quot;
+        android:label=&quot;&#64;string/permlab_deadlyActivity&quot;
+        android:description=&quot;&#64;string/permdesc_deadlyActivity&quot;
+        android:permissionGroup=&quot;android.permission-group.COST_MONEY&quot;
+        android:protectionLevel=&quot;dangerous&quot; /&gt;
+
+&lt;/manifest&gt;</pre>
+
+<p>The {@link android.R.styleable#AndroidManifestPermission_protectionLevel
+&lt;protectionLevel&gt;} attribute is required, telling the system how the
+user is to be informed of applications requiring the permission, or who is
+allowed to hold that permission, as described in the linked documentation.</p>
+
+<p>The {@link android.R.styleable#AndroidManifestPermission_permissionGroup
+&lt;permissionGroup&gt;} attribute is optional, and only used to help the system display
+permissions to the user.  You will usually want to set this to either a standard
+system group (listed in {@link android.Manifest.permission_group
+android.Manifest.permission_group}) or in more rare cases to one defined by
+yourself.  It is preferred to use an existing group, as this simplifies the
+permission UI shown to the user.</p>
+
+<p>Note that both a label and description should be supplied for the
+permission. These are string resources that can be displayed to the user when
+they are viewing a list of permissions
+(<code>{@link android.R.styleable#AndroidManifestPermission_label android:label}</code>)
+or details on a single permission (
+<code>{@link android.R.styleable#AndroidManifestPermission_description android:description}</code>).
+The label should be short, a few words
+describing the key piece of functionality the permission is protecting. The
+description should be a couple sentences describing what the permission allows
+a holder to do. Our convention for the description is two sentences, the first
+describing the permission, the second warning the user of what bad things
+can happen if an application is granted the permission.</p>
+
+<p>Here is an example of a label and description for the CALL_PHONE
+permission:</p>
+
+<pre>
+    &lt;string name=&quot;permlab_callPhone&quot;&gt;directly call phone numbers&lt;/string&gt;
+    &lt;string name=&quot;permdesc_callPhone&quot;&gt;Allows the application to call
+        phone numbers without your intervention. Malicious applications may
+        cause unexpected calls on your phone bill. Note that this does not
+        allow the application to call emergency numbers.&lt;/string&gt;
+</pre>
+
+<p>You can look at the permissions currently defined in the system with the
+shell command <code>adb shell pm list permissions</code>.  In particular,
+the '-s' option displays the permissions in a form roughly similar to how the
+user will see them:</p>
+
+<pre>
+$ adb shell pm list permissions -s      
+All Permissions:
+
+Network communication: view Wi-Fi state, create Bluetooth connections, full
+Internet access, view network state
+
+Your location: access extra location provider commands, fine (GPS) location,
+mock location sources for testing, coarse (network-based) location
+
+Services that cost you money: send SMS messages, directly call phone numbers
+
+...</pre>
+
+<a name="manifest"></a>
+<h3>Enforcing Permissions in AndroidManifest.xml</h3>
+
+<p>High-level permissions restricting access to entire components of the
+system or application can be applied through your
+<code>AndroidManifest.xml</code>. All that this requires is including an {@link
+android.R.attr#permission android:permission} attribute on the desired
+component, naming the permission that will be used to control access to
+it.</p>
+
+<p><strong>{@link android.app.Activity}</strong> permissions
+(applied to the
+{@link android.R.styleable#AndroidManifestActivity &lt;activity&gt;} tag)
+restrict who can start the associated
+activity.  The permission is checked during
+{@link android.content.Context#startActivity Context.startActivity()} and
+{@link android.app.Activity#startActivityForResult Activity.startActivityForResult()};
+if the caller does not have
+the required permission then {@link java.lang.SecurityException} is thrown
+from the call.</p>
+
+<p><strong>{@link android.app.Service}</strong> permissions
+(applied to the
+{@link android.R.styleable#AndroidManifestService &lt;service&gt;} tag)
+restrict who can start or bind to the
+associated service.  The permission is checked during
+{@link android.content.Context#startService Context.startService()},
+{@link android.content.Context#stopService Context.stopService()} and
+{@link android.content.Context#bindService Context.bindService()};
+if the caller does not have
+the required permission then {@link java.lang.SecurityException} is thrown
+from the call.</p>
+
+<p><strong>{@link android.content.BroadcastReceiver}</strong> permissions
+(applied to the
+{@link android.R.styleable#AndroidManifestReceiver &lt;receiver&gt;} tag)
+restrict who can send broadcasts to the associated receiver.
+The permission is checked <em>after</em>
+{@link android.content.Context#sendBroadcast Context.sendBroadcast()} returns,
+as the system tries
+to deliver the submitted broadcast to the given receiver.  As a result, a
+permission failure will not result in an exception being thrown back to the
+caller; it will just not deliver the intent.  In the same way, a permission
+can be supplied to
+{@link android.content.Context#registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, String, android.os.Handler)
+Context.registerReceiver()}
+to control who can broadcast to a programmatically registered receiver.
+Going the other way, a permission can be supplied when calling
+{@link android.content.Context#sendBroadcast(Intent, String) Context.sendBroadcast()}
+to restrict which BroadcastReceiver objects are allowed to receive the broadcast (see
+below).</p>
+
+<p><strong>{@link android.content.ContentProvider}</strong> permissions
+(applied to the
+{@link android.R.styleable#AndroidManifestProvider &lt;provider&gt;} tag)
+restrict who can access the data in
+a {@link android.content.ContentProvider}.  (Content providers have an important
+additional security facility available to them called
+<a href="#uri">URI permissions</a> which is described later.)
+Unlike the other components,
+there are two separate permission attributes you can set:
+{@link android.R.attr#readPermission android:readPermission} restricts who
+can read from the provider, and
+{@link android.R.attr#writePermission android:writePermission} restricts
+who can write to it.  Note that if a provider is protected with both a read
+and write permission, holding only the write permission does not mean
+you can read from a provider.  The permissions are checked when you first
+retrieve a provider (if you don't have either permission, a SecurityException
+will be thrown), and as you perform operations on the provider.  Using
+{@link android.content.ContentResolver#query ContentResolver.query()} requires
+holding the read permission; using
+{@link android.content.ContentResolver#insert ContentResolver.insert()},
+{@link android.content.ContentResolver#update ContentResolver.update()},
+{@link android.content.ContentResolver#delete ContentResolver.delete()}
+requires the write permission.
+In all of these cases, not holding the required permission results in a
+{@link java.lang.SecurityException} being thrown from the call.</p>
+
+
+<a name="broadcasts"></a>
+<h3>Enforcing Permissions when Sending Broadcasts</h3>
+
+<p>In addition to the permission enforcing who can send Intents to a
+registered {@link android.content.BroadcastReceiver} (as described above), you
+can also specify a required permission when sending a broadcast. By calling {@link
+android.content.Context#sendBroadcast(android.content.Intent,String)
+Context.sendBroadcast()} with a
+permission string, you require that a receiver's application must hold that
+permission in order to receive your broadcast.</p>
+
+<p>Note that both a receiver and a broadcaster can require a permission. When
+this happens, both permission checks must pass for the Intent to be delivered
+to the associated target.</p>
+
+
+<a name="enforcement"></a>
+<h3>Other Permission Enforcement</h3>
+
+<p>Arbitrarily fine-grained permissions can be enforced at any call into a
+service. This is accomplished with the {@link
+android.content.Context#checkCallingPermission Context.checkCallingPermission()}
+method. Call with a desired
+permission string and it will return an integer indicating whether that
+permission has been granted to the current calling process. Note that this can
+only be used when you are executing a call coming in from another process,
+usually through an IDL interface published from a service or in some other way
+given to another process.</p>
+
+<p>There are a number of other useful ways to check permissions. If you have
+the pid of another process, you can use the Context method {@link
+android.content.Context#checkPermission(String, int, int) Context.checkPermission(String, int, int)}
+to check a permission against that pid. If you have the package name of another
+application, you can use the direct PackageManager method {@link
+android.content.pm.PackageManager#checkPermission(String, String)
+PackageManager.checkPermission(String, String)}
+to find out whether that particular package has been granted a specific permission.</p>
+
+
+<a name="uri"></a>
+<h2>URI Permissions</h2>
+
+<p>The standard permission system described so far is often not sufficient
+when used with content providers.  A content provider may want to
+protect itself with read and write permissions, while its direct clients
+also need to hand specific URIs to other applications for them to operate on.
+A typical example is attachments in a mail application.  Access to the mail
+should be protected by permissions, since this is sensitive user data.  However,
+if a URI to an image attachment is given to an image viewer, that image viewer
+will not have permission to open the attachment since it has no reason to hold
+a permission to access all e-mail.</p>
+
+<p>The solution to this problem is per-URI permissions: when starting an
+activity or returning a result to an activity, the caller can set
+{@link android.content.Intent#FLAG_GRANT_READ_URI_PERMISSION
+Intent.FLAG_GRANT_READ_URI_PERMISSION} and/or
+{@link android.content.Intent#FLAG_GRANT_WRITE_URI_PERMISSION
+Intent.FLAG_GRANT_WRITE_URI_PERMISSION}.  This grants the receiving activity
+permission access the specific data URI in the Intent, regardless of whether
+it has any permission to access data in the content provider corresponding
+to the Intent.</p>
+
+<p>This mechanism allows a common capability-style model where user interaction
+(opening an attachment, selecting a contact from a list, etc) drives ad-hoc
+granting of fine-grained permission.  This can be a key facility for reducing
+the permissions needed by applications to only those directly related to their
+behavior.</p>
+
+<p>The granting of fine-grained URI permissions does, however, require some
+cooperation with the content provider holding those URIs.  It is strongly
+recommended that content providers implement this facility, and declare that
+they support it through the
+{@link android.R.styleable#AndroidManifestProvider_grantUriPermissions
+android:grantUriPermissions} attribute or
+{@link android.R.styleable#AndroidManifestGrantUriPermission
+&lt;grant-uri-permissions&gt;} tag.</p>
+
+<p>More information can be found in the
+{@link android.content.Context#grantUriPermission Context.grantUriPermission()},
+{@link android.content.Context#revokeUriPermission Context.revokeUriPermission()}, and
+{@link android.content.Context#checkUriPermission Context.checkUriPermission()}
+methods.</p>
+
diff --git a/docs/html/guide/topics/sensors/accelerometer.jd b/docs/html/guide/topics/sensors/accelerometer.jd
new file mode 100644
index 0000000..da760bc
--- /dev/null
+++ b/docs/html/guide/topics/sensors/accelerometer.jd
@@ -0,0 +1,18 @@
+page.title=Accelerometer
+parent.title=Sensors
+parent.link=index.html
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+
+  <h2>In this document</h2>
+  <ol>
+
+  </ol>
+
+</div>
+</div>
+
+
+TODO
\ No newline at end of file
diff --git a/docs/html/guide/topics/sensors/camera.jd b/docs/html/guide/topics/sensors/camera.jd
new file mode 100644
index 0000000..821333e
--- /dev/null
+++ b/docs/html/guide/topics/sensors/camera.jd
@@ -0,0 +1,18 @@
+page.title=Camera
+parent.title=Sensors
+parent.link=index.html
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+
+  <h2>Key class</h2>
+  <ol>
+    <li>{@link android.hardware.Camera android.hardware.Camera}</li>
+  </ol>
+  <h2>In this document</h2>
+  <ol>
+    <li>TODO</li>
+  </ol>
+</div>
+</div>
\ No newline at end of file
diff --git a/docs/html/guide/topics/sensors/compass.jd b/docs/html/guide/topics/sensors/compass.jd
new file mode 100644
index 0000000..1e45d2d
--- /dev/null
+++ b/docs/html/guide/topics/sensors/compass.jd
@@ -0,0 +1,18 @@
+page.title=Compass
+parent.title=Sensors
+parent.link=index.html
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+
+  <h2>In this document</h2>
+  <ol>
+
+  </ol>
+
+</div>
+</div>
+
+
+TODO
\ No newline at end of file
diff --git a/docs/html/guide/topics/sensors/index.jd b/docs/html/guide/topics/sensors/index.jd
new file mode 100644
index 0000000..54a0814
--- /dev/null
+++ b/docs/html/guide/topics/sensors/index.jd
@@ -0,0 +1,13 @@
+page.title=Sensors
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+
+
+
+<h2>Accelerometer</h2>
+<p>The accelerometer sensors allow you to detect the various movements of the device.</p>
+
+<h2>Compass</h2>
+<p>The compass provides data on the devices current polar orientation.</p>
\ No newline at end of file
diff --git a/docs/html/guide/topics/ui/binding.jd b/docs/html/guide/topics/ui/binding.jd
new file mode 100644
index 0000000..85aed18
--- /dev/null
+++ b/docs/html/guide/topics/ui/binding.jd
@@ -0,0 +1,113 @@
+page.title=Binding to Data with AdapterView
+parent.title=User Interface
+parent.link=index.html
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+  <h2>In this document</h2>
+  <ol>
+    <li><a href="#FillingTheLayout">Filling the Layout with Data</a></li>
+    <li><a href="#HandlingUserSelections">Handling User Selections</a></li>
+  </ol>
+  
+  <h2>See also</h2>
+  <ol>
+    <li><a href="{@docRoot}guide/tutorials/views/hello-spinner.html">Hello Spinner tutorial</a></li>
+    <li><a href="{@docRoot}guide/tutorials/views/hello-listview.html">Hello ListView tutorial</a></li>
+    <li><a href="{@docRoot}guide/tutorials/views/hello-gridview.html">Hello GridView tutorial</a></li>
+  </ol>
+</div>
+</div>
+
+<p>The {@link android.widget.AdapterView} is a ViewGroup subclass whose child Views are determined by an {@link android.widget.Adapter Adapter} that 
+binds to data of some type. AdapterView is useful whenever you need to display stored data (as opposed to resource strings or drawables) in your layout.</p>
+
+<p>{@link android.widget.Gallery Gallery}, {@link android.widget.ListView ListView}, and  {@link android.widget.Spinner Spinner} are examples of AdapterView subclasses that you can use to bind to a specific type of data and display it in a certain way. </p>
+
+
+<p>AdapterView objects have two main responsibilities: </p>
+<ul>
+    <li>Filling the layout with data
+    </li>
+    <li>Handling user selections
+    </li>
+</ul>
+
+
+<h2 id="FillingTheLayout">Filling the Layout with Data</h2>
+<p>Inserting data into the layout is typically done by binding the AdapterView class to an {@link
+android.widget.Adapter}, which retireves data from an external source (perhaps a list that
+the code supplies or query results from the device's database). </p>
+<p>The following code sample does the following:</p>
+<ol>
+  <li>Creates a {@link android.widget.Spinner Spinner} with an existing View and binds it to a new ArrayAdapter
+that reads an array of colors from the local resources.</li>
+  <li>Creates another Spinner object from a View and binds it to a new SimpleCursorAdapter that will read 
+people's names from the device contacts (see {@link android.provider.Contacts.People}).</li>
+</ol>
+
+<pre>
+// Get a Spinner and bind it to an ArrayAdapter that 
+// references a String array.
+Spinner s1 = (Spinner) findViewById(R.id.spinner1);
+ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(
+    this, R.array.colors, android.R.layout.simple_spinner_item);
+adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+s1.setAdapter(adapter);
+
+// Load a Spinner and bind it to a data query.
+private static String[] PROJECTION = new String[] {
+        People._ID, People.NAME
+    };
+
+Spinner s2 = (Spinner) findViewById(R.id.spinner2);
+Cursor cur = managedQuery(People.CONTENT_URI, PROJECTION, null, null);
+     
+SimpleCursorAdapter adapter2 = new SimpleCursorAdapter(this,
+    android.R.layout.simple_spinner_item, // Use a template
+                                          // that displays a
+                                          // text view
+    cur, // Give the cursor to the list adatper
+    new String[] {People.NAME}, // Map the NAME column in the
+                                         // people database to...
+    new int[] {android.R.id.text1}); // The "text1" view defined in
+                                     // the XML template
+					 
+adapter2.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+s2.setAdapter(adapter2);
+</pre>
+
+<p>Note that it is necessary to have the People._ID column in projection used with CursorAdapter
+or else you will get an exception.</p>
+
+<p>If, during the course of your application's life, you change the underlying data that is read by your Adapter,
+you should call {@link android.widget.ArrayAdapter#notifyDataSetChanged()}. This will notify the attached View
+that the data has been changed and it should refresh itself.</p>
+
+<h2 id="HandlingUserSelections">Handling User Selections</h2>
+<p>You handle the user's selecction by setting the class's {@link
+android.widget.AdapterView.OnItemClickListener} member to a listener and
+catching the selection changes. </p>
+<pre>
+// Create a message handling object as an anonymous class.
+private OnItemClickListener mMessageClickedHandler = new OnItemClickListener() {
+    public void onItemClick(AdapterView parent, View v, int position, long id)
+    {
+        // Display a messagebox.
+        Toast.makeText(mContext,"You've got an event",Toast.LENGTH_SHORT).show();
+    }
+};
+
+// Now hook into our object and set its onItemClickListener member
+// to our class handler object.
+mHistoryView = (ListView)findViewById(R.id.history);
+mHistoryView.setOnItemClickListener(mMessageClickedHandler); 
+</pre>
+
+<div class="special">
+<p>For more discussion on how to create different AdapterViews, read the following tutorials:
+<a href="{@docRoot}guide/tutorials/views/hello-spinner.html">Hello Spinner</a>,
+<a href="{@docRoot}guide/tutorials/views/hello-listview.html">Hello ListView</a>, and
+<a href="{@docRoot}guide/tutorials/views/hello-gridview.html">Hello GridView</a>.
+</div>
diff --git a/docs/html/guide/topics/ui/custom-components.jd b/docs/html/guide/topics/ui/custom-components.jd
new file mode 100644
index 0000000..eccc2ca
--- /dev/null
+++ b/docs/html/guide/topics/ui/custom-components.jd
@@ -0,0 +1,563 @@
+page.title=Building Custom Components
+parent.title=User Interface
+parent.link=index.html
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+  <h2>In this document</h2>
+  <ol>
+    <li><a href="#basic">The Basic Approach</a></li>
+    <li><a href="#custom">Fully Customized Components</a></li>
+    <li><a href="#compound">Compound Controls</a></li>
+    <li><a href="#modifying">Modifying an Existing View Type</a></li>
+  </ol>
+</div>
+</div>
+
+<p>Android offers a sophisticated and powerful componentized model for building your UI, 
+based on the fundamental layout classes: {@link android.view.View} and 
+{@link android.view.ViewGroup}. To start with, the platform includes a variety of prebuilt 
+View and ViewGroup subclasses &mdash; called widgets and layouts, respectively &mdash; 
+that you can use to construct your UI.</p>
+
+<p>A partial list of available widgets includes {@link android.widget.Button Button}, 
+{@link android.widget.TextView TextView}, 
+{@link android.widget.EditText EditText}, 
+{@link android.widget.ListView ListView},
+{@link android.widget.CheckBox CheckBox}, 
+{@link android.widget.RadioButton RadioButton}, 
+{@link android.widget.Gallery Gallery}, 
+{@link android.widget.Spinner Spinner}, and the more special-purpose 
+{@link android.widget.AutoCompleteTextView AutoCompleteTextView}, 
+{@link android.widget.ImageSwitcher ImageSwitcher}, and
+{@link android.widget.TextSwitcher TextSwitcher}. </p>
+
+<p>Among the layouts available are {@link android.widget.LinearLayout LinearLayout}, 
+{@link android.widget.FrameLayout FrameLayout}, {@link android.widget.AbsoluteLayout AbsoluteLayout}, 
+and others. For more examples, see <a href="layout-objects.html">Common Layout Objects</a>.</p>
+
+<p>If none of the prebuilt widgets or layouts meets your needs, you can create your own View subclass. 
+If you only need to make small adjustments to an existing widget or layout, you can simply subclass 
+the widget or layout and override its methods.
+</p>
+
+<p>Creating your own View subclasses gives you precise control over the appearance and function 
+of a screen element. To give an idea of the control you get with custom views, here are some 
+examples of what you could do with them:</p>
+ 
+<ul>
+  <li>
+    You could create a completely custom-rendered View type, for example a "volume
+    control" knob rendered using 2D graphics, and which resembles an
+    analog electronic control.
+  </li>
+  <li>
+    You could combine a group of View components into a new single component, perhaps
+    to make something like a ComboBox (a combination of popup list and free
+    entry text field), a dual-pane selector control (a left and right pane
+    with a list in each where you can re-assign which item is in which
+    list), and so on.
+  </li>
+  <li>
+    You could override the way that an EditText component is rendered on the screen
+    (the <a href="{@docRoot}guide/samples/NotePad/index.html">Notepad Tutorial</a> uses this to good effect, 
+    to create a lined-notepad page).
+  </li>
+  <li>
+    You could capture other events like key presses and handle them in some custom
+    way (such as for a game).
+  </li>
+</ul>
+<p>
+The sections below explain how to create custom Views and use them in your application. 
+For detailed reference information, see the {@link android.view.View} class. </p>
+
+
+<h2 id="basic">The Basic Approach</h2>
+
+<p>Here is a high level overview of what you need to know to get started in creating your own
+View components:</p>
+ 
+<ol>
+  <li>
+    Extend an existing {@link android.view.View View} class or subclass 
+	with your own class.
+  </li>
+  <li>
+    Override some of the methods from the superclass. The superclass methods 
+    to override start with '<code>on</code>', for
+    example, {@link android.view.View#onDraw onDraw()}, 
+    {@link android.view.View#onMeasure onMeasure()}, and 
+    {@link android.view.View#onKeyDown onKeyDown()}.
+    This is similar to the <code>on...</code> events in {@link android.app.Activity Activity} 
+    or {@link android.app.ListActivity ListActivity}
+    that you override for lifecycle and other functionality hooks.
+  <li>
+    Use your new extension class. Once completed, your new extension class 
+    can be used in place of the view upon which it was based.
+  </li>
+</ol>  
+<p class="note"><strong>Tip:</strong>
+    Extension classes can be defined as inner classes inside the activities
+    that use them. This is useful because it controls access to them but
+    isn't necessary (perhaps you want to create a new public View for
+    wider use in your application).
+</p>
+
+
+
+<h2 id="custom">Fully Customized Components</h2>
+<p>
+Fully customized components can be used to create graphical components that
+appear however you wish. Perhaps a graphical VU
+meter that looks like an old analog gauge, or a sing-a-long text view where
+a bouncing ball moves along the words so you can sing along with a karaoke
+machine. Either way, you want something that the built-in components just
+won't do, no matter how you combine them.</p>
+<p>Fortunately, you can easily create components that look and behave in any
+way you like, limited perhaps only by your imagination, the size of the
+screen, and the available processing power (remember that ultimately your
+application might have to run on something with significantly less power
+than your desktop workstation).</p>
+<p>To create a fully customized component:</p> 
+<ol>
+  <li>
+    The most generic view you can extend is, unsurprisingly, {@link
+    android.view.View View}, so you will usually start by extending this to
+    create your new super component.
+  </li>
+  <li>
+    You can supply a constructor which can
+    take attributes and parameters from the XML, and you can also consume
+    your own such attributes and parameters (perhaps the color and range of
+    the VU meter, or the width and damping of the needle, etc.)
+  </li>
+  <li>
+    You will probably want to create your own event listeners,
+    property accessors and modifiers, and possibly more sophisticated
+    behavior in your component class as well.
+  </li>
+  <li>
+    You will almost certainly want to override <code>onMeasure()</code> and
+    are also likely to need to override <code>onDraw()</code> if you want
+    the component to show something. While both have default behavior,
+    the default <code>onDraw()</code> will do nothing, and the default
+    <code>onMeasure()</code> will always set a size of 100x100 &mdash; which is
+    probably not what you want.
+  </li>
+  <li>
+    Other <code>on...</code> methods may also be overridden as required.
+  </li>
+</ol>
+
+<h3>Extend <code>onDraw()</code> and <code>onMeasure()</code></h3>
+<p>The <code>onDraw()</code> method delivers you a {@link android.graphics.Canvas Canvas}
+upon which you can implement anything you want: 2D graphics, other standard or
+custom components, styled text, or anything else you can think of.</p>
+
+<p class="note"><strong>Note:</strong>
+This does not apply to 3D graphics. If you want to
+use 3D graphics, you must extend {@link android.view.SurfaceView SurfaceView}
+instead of View, and draw from a seperate thread. See the
+GLSurfaceViewActivity sample
+for details.</p>
+
+<p><code>onMeasure()</code> is a little more involved. <code>onMeasure()</code>
+is a critical piece of the rendering contract between your component and its
+container. <code>onMeasure()</code> should be overridden to efficiently and
+accurately report the measurements of its contained parts. This is made
+slightly more complex by the requirements of limits from the parent
+(which are passed in to the <code>onMeasure()</code> method) and by the
+requirement to call the <code>setMeasuredDimension()</code> method with the
+measured width and height once they have been calculated. If you fail to
+call this method from an overridden <code>onMeasure()</code> method, the 
+result will be an exception at measurement time.</p>
+<p>At a high level, implementing <code>onMeasure()</code> looks something 
+ like this:</p>
+ 
+<ol>
+  <li>
+    The overridden <code>onMeasure()</code> method is called with width and
+    height measure specifications (<code>widthMeasureSpec</code> and
+    <code>heightMeasureSpec</code> parameters, both are integer codes
+    representing dimensions) which should be treated as requirements for
+    the restrictions on the width and height measurements you should produce. A
+    full reference to the kind of restrictions these specifications can require
+    can be found in the reference documentation under {@link
+    android.view.View#onMeasure View.onMeasure(int, int)} (this reference
+    documentation does a pretty good job of explaining the whole measurement
+    operation as well).
+  </li>
+  <li>
+    Your component's <code>onMeasure()</code> method should calculate a
+    measurement width and height which will be required to render the
+    component. It should try to stay within the specifications passed in,
+    although it can choose to exceed them (in this case, the parent can
+    choose what to do, including clipping, scrolling, throwing an exception, 
+    or asking the <code>onMeasure()</code> to try again, perhaps with
+    different measurement specifications).
+  </li>
+  <li>
+    Once the width and height are calculated, the <code>setMeasuredDimension(int
+    width, int height)</code> method must be called with the calculated
+    measurements. Failure to do this will result in an exception being
+    thrown.
+  </li>
+</ol>
+
+<p>
+Here's a summary of some of the other standard methods that the framework calls on views:
+</p>
+<table border="2" width="85%" align="center" cellpadding="5">
+       <thead>
+           <tr><th>Category</th> <th>Methods</th> <th>Description</th></tr>
+       </thead>
+       
+       <tbody>
+       <tr>
+           <td rowspan="2">Creation</td>
+           <td>Constructors</td>
+           <td>There is a form of the constructor that are called when the view
+           is created from code and a form that is called when the view is
+           inflated from a layout file. The second form should parse and apply
+           any attributes defined in the layout file.
+           </td>
+       </tr>
+       <tr>
+           <td><code>{@link android.view.View#onFinishInflate()}</code></td>
+           <td>Called after a view and all of its children has been inflated
+           from XML.</td>
+       </tr>
+       
+       <tr>
+           <td rowspan="3">Layout</td>
+           <td><code>{@link  android.view.View#onMeasure}</code></td>
+           <td>Called to determine the size requirements for this view and all
+           of its children.
+           </td>
+       </tr>
+       <tr>
+           <td><code>{@link  android.view.View#onLayout}</code></td>
+           <td>Called when this view should assign a size and position to all
+           of its children.
+           </td>
+       </tr>
+       <tr>
+           <td><code>{@link  android.view.View#onSizeChanged}</code></td>
+           <td>Called when the size of this view has changed.
+           </td>
+       </tr>
+       
+       <tr>
+           <td>Drawing</td>
+           <td><code>{@link  android.view.View#onDraw}</code></td>
+           <td>Called when the view should render its content.
+           </td>
+       </tr>
+  
+       <tr>
+           <td rowspan="4">Event processing</td>
+           <td><code>{@link  android.view.View#onKeyDown}</code></td>
+           <td>Called when a new key event occurs.
+           </td>
+       </tr>
+       <tr>
+           <td><code>{@link  android.view.View#onKeyUp}</code></td>
+           <td>Called when a key up event occurs.
+           </td>
+       </tr>   
+       <tr>
+           <td><code>{@link  android.view.View#onTrackballEvent}</code></td>
+           <td>Called when a trackball motion event occurs.
+           </td>
+       </tr>  
+       <tr>
+           <td><code>{@link  android.view.View#onTouchEvent}</code></td>
+           <td>Called when a touch screen motion event occurs.
+           </td>
+       </tr>  
+       
+       <tr>
+           <td rowspan="2">Focus</td>
+           <td><code>{@link  android.view.View#onFocusChanged}</code></td>
+           <td>Called when the view gains or loses focus.
+           </td>
+       </tr>
+       
+       <tr>
+           <td><code>{@link  android.view.View#onWindowFocusChanged}</code></td>
+           <td>Called when the window containing the view gains or loses focus.
+           </td>
+       </tr>
+       
+       <tr>
+           <td rowspan="3">Attaching</td>
+           <td><code>{@link  android.view.View#onAttachedToWindow()}</code></td>
+           <td>Called when the view is attached to a window.
+           </td>
+       </tr>
+  
+       <tr>
+           <td><code>{@link  android.view.View#onDetachedFromWindow}</code></td>
+           <td>Called when the view is detached from its window.
+           </td>
+       </tr>     
+  
+       <tr>
+           <td><code>{@link  android.view.View#onWindowVisibilityChanged}</code></td>
+           <td>Called when the visibility of the window containing the view
+           has changed.
+           </td>
+       </tr>     
+       </tbody>
+       
+   </table>
+
+
+
+<h3 id="customexample">A Custom View Example</h3>
+<p>The CustomView sample in the 
+<a href="{@docRoot}guide/samples/ApiDemos/index.html">API Demos</a> provides an example
+of a customized View. The custom View is defined in the
+<a href="{@docRoot}guide/samples/ApiDemos/src/com/example/android/apis/view/LabelView.html">LabelView</a>
+class.</p>
+<p>The LabelView sample demonstrates a number of different aspects of custom components:</p>
+<ul>
+  <li>Extending the View class for a completely custom component.</li>
+  <li>Parameterized constructor that takes the view inflation parameters
+  (parameters defined in the XML). Some of these are passed through to the
+  View superclass, but more importantly, there are some custom attributes defined
+  and used for LabelView.</li>
+  <li>Standard public methods of the type you would expect to see for a label
+  component, for example <code>setText()</code>, <code>setTextSize()</code>,
+  <code>setTextColor()</code> and so on.</li>
+  <li>An overridden <code>onMeasure</code> method to determine and set the
+  rendering size of the component. (Note that in LabelView, the real work is done
+  by a private <code>measureWidth()</code> method.)</li>
+  <li>An overridden <code>onDraw()</code> method to draw the label onto the
+  provided canvas.</li>
+</ul>
+<p>You can see some sample usages of the LabelView custom View in
+<a href="{@docRoot}guide/samples/ApiDemos/res/layout/custom_view_1.html">custom_view_1.xml</a>
+from the samples. In particular, you can see a mix of both <code>android:</code>
+namespace parameters and custom <code>app:</code> namespace parameters. These
+<code>app:</code> parameters are the custom ones that the LabelView recognizes
+and works with, and are defined in a styleable inner class inside of the
+samples R resources definition class.</p>
+
+
+<h2 id="compound">Compound Controls
+</h2>
+<p>If you don't want to create a completely customized component, but instead
+are looking to put together a reusable component that consists of a group of
+existing controls, then creating a Compound Component (or Compound Control) might
+fit the bill. In a nutshell, this brings together a number of more atomic
+controls (or views) into a logical group of items that can be treated as a
+single thing. For example, a Combo Box can be thought of as a
+combination of a single line EditText field and an adjacent button with an attached
+ PopupList. If you press the button and select
+something from the list, it populates the EditText field, but the user can
+also type something directly into the EditText if they prefer.</p>
+<p>In Android, there are actually two other Views readily available to do
+this: {@link android.widget.Spinner Spinner} and 
+{@link android.widget.AutoCompleteTextView AutoCompleteTextView}, but 
+regardless, the concept of a Combo Box makes an easy-to-understand 
+example.</p>
+<p>To create a compound component:</p>
+<ol>
+  <li>
+    The usual starting point is a Layout of some kind, so create a class
+    that extends a Layout. Perhaps in the case of a Combo box we might use
+    a LinearLayout with horizontal orientation. Remember that other layouts
+    can be nested inside, so the compound component can be arbitrarily
+    complex and structured. Note that just like with an Activity, you can
+    use either the declarative (XML-based) approach to creating the
+    contained components, or you can nest them programmatically from your
+    code.
+  </li>
+  <li>
+    In the constructor for the new class, take whatever parameters the
+    superclass expects, and pass them through to the superclass constructor
+    first. Then you can set up the other views to use within your new
+    component; this is where you would create the EditText field and the
+    PopupList. Note that you also might introduce your own attributes and
+    parameters into the XML that can be pulled out and used by your
+    constructor.
+  </li>
+  <li>
+    You can also create listeners for events that your contained views might
+    generate, for example, a listener method for the List Item Click Listener
+    to update the contents of the EditText if a list selection is made.
+  </li>
+  <li>
+    You might also create your own properties with accessors and modifiers,
+    for example, allow the EditText value to be set initially in the
+    component and query for its contents when needed.
+  </li>
+  <li>
+    In the case of extending a Layout, you don't need to override the
+    <code>onDraw()</code> and <code>onMeasure()</code> methods since the
+    layout will have default behavior that will likely work just fine. However, 
+    you can still override them if you need to.
+  </li>
+  <li>
+    You might override other <code>on...</code> methods, like
+    <code>onKeyDown()</code>, to perhaps choose certain default values from
+    the popup list of a combo box when a certain key is pressed.
+  </li>
+</ol>
+<p>
+ To summarize, the use of a Layout as the basis for a Custom Control has a
+number of advantages, including:</p>
+ 
+<ul>
+  <li>
+    You can specify the layout using the declarative XML files just like
+    with an activity screen, or you can create views programmatically and
+    nest them into the layout from your code.
+  </li>
+  <li>
+    The <code>onDraw()</code> and <code>onMeasure()</code> methods (plus
+    most of the other <code>on...</code> methods) will likely have suitable behavior so
+    you don't have to override them.
+  </li>
+  <li>
+    In the end, you can very quickly construct arbitrarily complex compound
+    views and re-use them as if they were a single component.
+  </li>
+</ul>
+<h4>Examples of Compound Controls</h4>
+<p>In the API Demos project
+ that comes with the SDK, there are two List
+ examples &mdash; Example 4 and Example 6 under Views/Lists demonstrate a
+ SpeechView which extends LinearLayout to make a component for displaying
+ Speech quotes. The corresponding classes in the sample code are
+ <code>List4.java</code> and <code>List6.java</code>.</p>
+ 
+
+
+<h2 id="modifying">Modifying an Existing View Type</h2>
+<p>There is an even easier option for creating a custom View which is
+useful in certain circumstances. If there is a component that is already very
+similar to what you want, you can simply extend that component and just
+override the behavior that you want to change. You can do all of the things
+you would do with a fully customized component, but by starting with a more
+specialized class in the View heirarchy, you can also get a lot of behavior for
+free that probably does exactly what you want.</p>
+<p>For example, the SDK includes a <a
+href="{@docRoot}guide/samples/NotePad/index.html">NotePad application</a> in the
+samples. This demonstrates many aspects of using the Android platform, among
+them is extending an EditText View to make a lined notepad. This is not a
+perfect example, and the APIs for doing this might change from this early
+preview, but it does demonstrate the principles.</p>
+<p>If you haven't done so already, import the 
+NotePad sample into Eclipse (or
+just look at the source using the link provided). In particular look at the definition of
+<code>MyEditText</code> in the <a
+href="{@docRoot}guide/samples/NotePad/src/com/example/android/notepad/NoteEditor.html">NoteEditor.java</a>
+file.</p>
+<p>Some points to note here</p>
+<ol>
+  <li>
+    <strong>The Definition</strong>
+    <p>The class is defined with the following line:<br/>
+     <code>public static class MyEditText extends EditText</code></p>
+     
+    <ul>
+      <li>
+        It is defined as an inner class within the <code>NoteEditor</code>
+        activity, but it is public so that it could be accessed as
+        <code>NoteEditor.MyEditText</code> from outside of the <code>NoteEditor</code>
+        class if desired.
+      </li>
+      <li>
+        It is <code>static</code>, meaning it does not generate the so-called
+        "synthetic methods" that allow it to access data from the parent
+        class, which in turn means that it really behaves as a separate
+        class rather than something strongly related to <code>NoteEditor</code>.
+        This is a cleaner way to create inner classes if they do not need
+        access to state from the outer class, keeps the generated class
+        small, and allows it to be used easily from other classes.
+      </li>
+      <li>
+        It extends <code>EditText</code>, which is the View we have chosen to
+        customize in this case. When we are finished, the new class will be
+        able to substitute for a normal <code>EditText</code> view.
+      </li>
+    </ul>
+  </li>
+  <li>
+    <strong>Class Initialization</strong>
+    <p>As always, the super is called first. Furthermore, 
+    this is not a default constructor, but a parameterized one. The
+    EditText is created with these parameters when it is inflated from an
+    XML layout file, thus, our constructor needs to both take them and pass them
+    to the superclass constructor as well.</p>
+  </li>
+  <li>
+    <strong>Overridden Methods</strong>
+    <p>In this example, there is only one method to be overridden: 
+    <code>onDraw()</code> &mdash; but there could easily be others needed when you
+    create your own custom components.</p>
+    <p>For the NotePad sample, overriding the <code>onDraw()</code> method allows
+    us to paint the blue lines on the <code>EditText</code> view canvas (the
+    canvas is passed into the overridden <code>onDraw()</code> method). The
+    super.onDraw() method is called before the method ends. The
+    superclass method should be invoked, but in this case, we do it at the
+    end after we have painted the lines we want to include.</p>
+  <li>
+    <strong>Use the Custom Component</strong>
+    <p>We now have our custom component, but how can we use it? In the
+    NotePad example, the custom component is used directly from the
+    declarative layout, so take a look at <code>note_editor.xml</code> in the
+    <code>res/layout</code> folder.</p>
+<pre>
+&lt;view
+  class=&quot;com.android.notepad.NoteEditor$MyEditText&quot; 
+  id=&quot;&#64;+id/note&quot;
+  android:layout_width=&quot;fill_parent&quot;
+  android:layout_height=&quot;fill_parent&quot;
+  android:background=&quot;&#64;android:drawable/empty&quot;
+  android:padding=&quot;10dip&quot;
+  android:scrollbars=&quot;vertical&quot;
+  android:fadingEdge=&quot;vertical&quot; /&gt;
+</pre>
+     
+    <ul>
+      <li>
+        The custom component is created as a generic view in the XML, and
+        the class is specified using the full package. Note also that the
+        inner class we defined is referenced using the
+        <code>NoteEditor$MyEditText</code> notation which is a standard way to
+        refer to inner classes in the Java programming language.
+        <p>If your custom View component is not defined as an inner class, then you can,
+        alternatively, declare the View component 
+        with the XML element name, and exclude the <code>class</code> attribute. For example:</p>
+<pre>
+&lt;com.android.notepad.MyEditText
+  id=&quot;&#64;+id/note&quot;
+  ... />
+</pre>
+      <p>Notice that the <code>MyEditText</code> class is now a separate class file. When the class
+      is nested in the <code>NoteEditor</code> class, this technique will not work.</p>
+      </li>
+      <li>
+        The other attributes and parameters in the definition are the ones
+        passed into the custom component constructor, and then passed
+        through to the EditText constructor, so they are the same
+        parameters that you would use for an EditText view. Note that it is
+        possible to add your own parameters as well, and we will touch on
+        this again below.
+      </li>
+    </ul>
+  </li>
+</ol>
+<p>And that's all there is to it. Admittedly this is a simple case, but
+that's the point &mdash; creating custom components is only as complicated as you
+need it to be.</p>
+<p>A more sophisticated component may override even more <code>on...</code> methods and
+introduce some of its own helper methods, substantially customizing its properties and
+behavior. The only limit is your imagination and what you need the component to
+do.</p>
+
diff --git a/docs/html/guide/topics/ui/declaring-layout.jd b/docs/html/guide/topics/ui/declaring-layout.jd
new file mode 100644
index 0000000..7ef22a6
--- /dev/null
+++ b/docs/html/guide/topics/ui/declaring-layout.jd
@@ -0,0 +1,275 @@
+page.title=Declaring Layout
+parent.title=User Interface
+parent.link=index.html
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+  <h2>Key classes</h2>
+  <ol>
+    <li>{@link android.view.View}</li>
+    <li>{@link android.view.ViewGroup}</li>
+    <li>{@link android.view.ViewGroup.LayoutParams}</li>
+  </ol>
+  <h2>In this document</h2>
+  <ol>
+    <li><a href="#write">Write the XML</a></li>
+    <li><a href="#load">Load the XML Resource</a></li>
+    <li><a href="#attributes">Attributes</a>
+      <ol>
+        <li><a href="#id">ID</a></li>
+        <li><a href="#layout-params">Layout Parameters</a></li>
+      </ol>
+    </li>
+    <li><a href="#Position">Position</a></li>
+    <li><a href="#SizePaddingMargin">Size, Padding and Margins</a></li>
+    <li><a href="#example">Example Layout</a></li>
+  </ol>
+</div>
+</div>
+
+<p>Your layout is the architecture for the user interface in an Activity.
+It defines the layout structure and holds all the elements that appear to the user. 
+You can declare your layout in two ways:</p>
+<ul>
+<li><strong>Declare UI elements in XML</strong>. Android provides a straightforward XML 
+vocabulary that corresponds to the View classes and subclasses, such as those for widgets and layouts.</li>
+<li><strong>Instantiate layout elements at runtime</strong>. Your 
+application can create View and ViewGroup objects (and manipulate their properties) programmatically. </li>
+</ul>
+
+<p>The Android framework gives you the flexibility to use either or both of these methods for declaring and managing your application's UI. For example, you could declare your application's default layouts in XML, including the screen elements that will appear in them and their properties. You could then add code in your application that would modify the state of the screen objects, including those declared in XML, at run time. </p>
+
+<div class="sidebox">
+  <p>The <a href="{@docRoot}guide/developing/tools/adt.html">Android Development Tools</a> 
+  (ADT) plugin for Eclipse offers a layout preview of your XML &mdash; 
+  with the XML file opened, select the <strong>Layout</strong> tab.</p>
+  <p>You should also try the 
+  <a href="{@docRoot}guide/developing/tools/hierarchy-viewer.html">Hierarchy Viewer</a> tool, 
+  for debugging layouts &mdash; it reveals layout property values, 
+  draws wireframes with padding/margin indicators, and full rendered views while 
+  you debug on the emulator or device.</p>
+</div>
+
+<p>The advantage to declaring your UI in XML is that it enables you to better separate the presentation of your application from the code that controls its behavior. Your UI descriptions are external to your application code, which means that you can modify or adapt it without having to modify your source code and recompile. For example, you can create XML layouts for different screen orientations, different device screen sizes, and different languages. Additionally, declaring the layout in XML makes it easier to visualize the structure of your UI, so it's easier to debug problems. As such, this document focuses on teaching you how to declare your layout in XML. If you're
+interested in instantiating View objects at runtime, refer to the {@link android.view.ViewGroup} and 
+{@link android.view.View} class references.</p>
+
+<p>In general, the XML vocabulary for declaring UI elements closely follows the structure and naming of the classes and methods, where element names correspond to class names and attribute names correspond to methods. In fact, the correspondence is often so direct that you can guess what XML attribute corresponds to a class method, or guess what class corresponds to a given xml element. However, note that not all vocabulary is identical. In some cases, there are slight naming differences. For
+example, the EditText element has a <code>text</code> attribute that corresponds to
+<code>EditText.setText()</code>. </p>
+
+<p class="note"><strong>Tip:</strong> Learn more about different layout types in <a href="{@docRoot}guide/topics/ui/layout-objects.html">Common
+Layout Objects</a>. There are also a collection of tutorials on building various layouts in the
+<a href="{@docRoot}guide/tutorials/views/index.html">Hello Views</a> tutorial guide.</p>
+
+<h2 id="write">Write the XML</h2>
+
+<div class="sidebox"><p>For your convenience, the API reference documentation for UI related classes lists the available XML attributes that correspond to the class methods, including inherited attributes.</p>
+<p>To learn more about the available XML elements and attributes, as well as the format of the XML file, see <a
+href="{@docRoot}guide/topics/resources/available-resources.html#layoutresources">Layout Resources</a>.</p>
+ </div>
+
+<p>Using Android's XML vocabulary, you can quickly design UI layouts and the screen elements they contain, in the same way you create web pages in HTML &mdash; with a series of nested elements. </p>
+
+<p>Each layout file must contain exactly one root element, which must be a View or ViewGroup object. Once you've defined the root element, you can add additional layout objects or widgets as child elements to gradually build a View hierarchy that defines your layout. For example, here's an XML layout that uses a vertical {@link android.widget.LinearLayout}
+to hold a {@link android.widget.TextView} and a {@link android.widget.Button}:</p>
+<pre>
+&lt;?xml version="1.0" encoding="utf-8"?>
+&lt;LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="fill_parent" 
+              android:layout_height="fill_parent" 
+              android:orientation="vertical" >
+    &lt;TextView android:id="@+id/text"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:text="Hello, I am a TextView" />
+    &lt;Button android:id="@+id/button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Hello, I am a Button" />
+&lt;/LinearLayout>
+</pre>
+
+<p>After you've declared your layout in XML, save the file with the <code>.xml</code> extension, 
+in your Android project's <code>res/layout/</code> directory, so it will properly compile. </p>
+
+<p>We'll discuss each of the attributes shown here a little later.</p>
+
+<h2 id="load">Load the XML Resource</h2>
+
+<p>When you compile your application, each XML layout file is compiled into a
+{@link android.view.View} resource. You should load the layout resource from your application code, in your 
+{@link android.app.Activity#onCreate(android.os.Bundle) Activity.onCreate()} callback implementation.
+Do so by calling <code>{@link android.app.Activity#setContentView(int) setContentView()}</code>, 
+passing it the reference to your layout resource in the form of: 
+<code>R.layout.<em>layout_file_name</em></code>  
+For example, if your XML layout is saved as <code>main_layout.xml</code>, you would load it
+for your Activity like so:</p>
+<pre>
+public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView.(R.layout.main_layout);
+}
+</pre>
+
+<p>The <code>onCreate()</code> callback method in your Activity is called by the Android framework when
+your Activity is launched (see the discussion on Lifecycles, in the 
+<a href="{@docRoot}guide/topics/fundamentals.html#lcycles">Application Fundamantals</a>, for more on this).</p>
+
+
+<h2 id="attributes">Attributes</h2>
+
+<p>Every View and ViewGroup object supports their own variety of XML attributes.
+Some attributes are specific to a View object (for example, TextView supports the <code>textSize</code>
+attribute), but these attributes are also inherited by any View objects that may extend this class.
+Some are common to all View objects, because they are inherited from the root View class (like 
+the <code>id</code> attribute). And, other attributes are considered "layout parameters," which are 
+attributes that describe certain layout orientations of the View object, as defined by that object's
+parent ViewGroup object.</p>
+
+<h3 id="id">ID</h3>
+
+<p>Any View object may have an integer ID associated with it, to uniquely identify the View within the tree.
+When the application is compiled, this ID is referenced as an integer, but the ID is typically 
+assigned in the layout XML file as a string, in the <code>id</code> attribute.
+This is an XML attribute common to all View objects
+(defined by the {@link android.view.View} class) and you will use it very often. 
+The syntax for an ID, inside an XML tag is:</p>
+<pre>android:id="&#64;+id/my_button"</pre>
+
+<p>The  at-symbol (&#64;) at the beginning of the string indicates that the XML parser should parse and expand the rest
+of the ID string and identify it as an ID resource. The plus-symbol (+) means that this is a new resource name that must
+be created and added to our resources (in the <code>R.java</code> file). There are a number of other ID resources that
+are offered by the Android framework. When referencing an Android resource ID, you do not need the plus-symbol,
+but must add the <code>android</code> package namespace, like so:</p>
+<pre>android:id="&#64;android:id/empty"</pre>
+<p>With the <code>android</code> package namespace in place, we're now referencing an ID from the <code>android.R</code>
+resources class, rather than the local resources class.</p>
+
+<p>In order to create views and reference them from the application, a common pattern is to:</p>
+<ol>
+  <li>Define a view/widget in the layout file and assign it a unique ID:
+<pre>
+&lt;Button android:id="&#64;+id/my_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="&#64;string/my_button_text"/>
+</pre>
+  </li>
+  <li>Then create an instance of the view object and capture it from the layout 
+(typically in the <code>{@link android.app.Activity#onCreate(Bundle) onCreate()}</code> method):
+<pre>
+Button myButton = (Button) findViewById(R.id.my_button);
+</pre>
+  </li>
+</ol>
+<p>Defining IDs for view objects is important when creating a {@link android.widget.RelativeLayout}.
+In a relative layout, sibling views can define their layout relative to another sibling view, 
+which is referenced by the unique ID.</p>
+<p>An ID need not be unique throughout the entire tree, but it should be
+unique within the part of the tree you are searching (which may often be the entire tree, so it's best 
+to be completely unique when possible).</p>
+
+
+<h3 id="layout-params">Layout Parameters</h3>
+
+<p>XML layout attributes named <code>layout_<em>something</em></code> define 
+layout parameters for the View that are appropriate for the ViewGroup in which it resides.</p>
+
+<p>Every ViewGroup class implements a nested class that extends {@link
+android.view.ViewGroup.LayoutParams}. This subclass
+contains property types that define the size and position for each child view, as
+appropriate for the view group. As you can see in the figure below, the parent
+view group defines layout parameters for each child view (including the child view group).</p>
+
+<img src="{@docRoot}images/layoutparams.png" alt="" height="300" align="center"/>
+
+<p>Note that every LayoutParams subclass has its own syntax for setting
+values. Each child element must define LayoutParams that are appropriate for its parent, 
+though it may also define different LayoutParams for its own children. </p>
+
+<p>All view groups include a width and height (<code>layout_width</code> and <code>layout_height</code>), 
+and each view is required to define them. 
+Many LayoutParams also include optional margins and
+borders. You can specify width and height with exact measurements, though you probably won't want
+to do this often. More often, you will tell your view to size itself either to
+the dimensions required by its content, or to become as big as its parent view group
+will allow (with the <var>wrap_content</var> and <var>fill_parent</var> values, respectively).
+The accepted measurement types are defined in the 
+<a href="{@docRoot}guide/topics/resources/available-resources.html#dimension">Available Resources</a> document.</p>
+
+
+<h2 id="Position">Layout Position</h2>
+   <p>
+   The geometry of a view is that of a rectangle. A view has a location,
+   expressed as a pair of <em>left</em> and <em>top</em> coordinates, and
+   two dimensions, expressed as a width and a height. The unit for location
+   and dimensions is the pixel.
+   </p>
+  
+   <p>
+   It is possible to retrieve the location of a view by invoking the methods
+   {@link android.view.View#getLeft()} and {@link android.view.View#getTop()}. The former returns the left, or X,
+   coordinate of the rectangle representing the view. The latter returns the
+   top, or Y, coordinate of the rectangle representing the view. These methods
+   both return the location of the view relative to its parent. For instance,
+   when getLeft() returns 20, that means the view is located 20 pixels to the
+   right of the left edge of its direct parent.
+   </p>
+  
+   <p>
+   In addition, several convenience methods are offered to avoid unnecessary
+   computations, namely {@link android.view.View#getRight()} and {@link android.view.View#getBottom()}.
+   These methods return the coordinates of the right and bottom edges of the
+   rectangle representing the view. For instance, calling {@link android.view.View#getRight()}
+   is similar to the following computation: <code>getLeft() + getWidth()</code>.
+   </p>
+   
+
+<h2 id="SizePaddingMargins">Size, Padding and Margins</h2>
+   <p>
+   The size of a view is expressed with a width and a height. A view actually
+   possess two pairs of width and height values.
+   </p>
+  
+   <p>
+   The first pair is known as <em>measured width</em> and
+   <em>measured height</em>. These dimensions define how big a view wants to be
+   within its parent. The
+   measured dimensions can be obtained by calling {@link android.view.View#getMeasuredWidth()}
+   and {@link android.view.View#getMeasuredHeight()}.
+   </p>
+  
+   <p>
+   The second pair is simply known as <em>width</em> and <em>height</em>, or
+   sometimes <em>drawing width</em> and <em>drawing height</em>. These
+   dimensions define the actual size of the view on screen, at drawing time and
+   after layout. These values may, but do not have to, be different from the
+   measured width and height. The width and height can be obtained by calling
+   {@link android.view.View#getWidth()} and {@link android.view.View#getHeight()}. 
+   </p>
+  
+   <p>
+   To measure its dimensions, a view takes into account its padding. The padding
+   is expressed in pixels for the left, top, right and bottom parts of the view.
+   Padding can be used to offset the content of the view by a specific amount of
+   pixels. For instance, a left padding of 2 will push the view's content by
+   2 pixels to the right of the left edge. Padding can be set using the
+   {@link android.view.View#setPadding(int, int, int, int)} method and queried by calling
+   {@link android.view.View#getPaddingLeft()}, {@link android.view.View#getPaddingTop()},
+   {@link android.view.View#getPaddingRight()} and {@link android.view.View#getPaddingBottom()}.  
+   </p>
+  
+   <p>
+   Even though a view can define a padding, it does not provide any support for
+   margins. However, view groups provide such a support. Refer to
+   {@link android.view.ViewGroup} and
+   {@link android.view.ViewGroup.MarginLayoutParams} for further information.
+   </p>
+
+<p>For more information about dimensions, see <a href="{@docRoot}guide/topics/resources/available-resources.html#dimension">Dimension Values</a>.</p>
+   
+
+
+
diff --git a/docs/html/guide/topics/ui/how-android-draws.jd b/docs/html/guide/topics/ui/how-android-draws.jd
new file mode 100644
index 0000000..a511005
--- /dev/null
+++ b/docs/html/guide/topics/ui/how-android-draws.jd
@@ -0,0 +1,94 @@
+page.title=How Android Draws Views
+parent.title=User Interface
+parent.link=index.html
+@jd:body
+
+
+<p>When an Activity receives focus, it will be requested to draw its layout.
+The Android framework will handle the procedure for drawing, but the Activity must provide
+the root node of its layout hierarchy.</p>
+
+<p>Drawing begins with the root node of the layout. It is requested to measure and 
+draw the layout tree. Drawing is handled by walking the tree and rendering each View that
+   intersects the invalid region. In turn, each View group is responsible for requesting
+each of its children to be drawn (with the <code>{@link android.view.View#draw(Canvas) draw()}</code> method) 
+and each View is responsible for drawing itself.
+ Because the tree is traversed in-order,
+   this means that parents will be drawn before (i.e., behind) their children, with
+   siblings drawn in the order they appear in the tree.
+   </p>
+
+<div class="sidebox">
+  <p>The framework will not draw Views that are not in the invalid region, and also 
+   will take care of drawing the Views background for you.</p>
+   <p>You can force a View to draw, by calling <code>{@link android.view.View#invalidate()}</code>.
+   </p>
+</div>
+
+<p>
+   Drawing the layout is a two pass process: a measure pass and a layout pass. The measuring
+   pass is implemented in <code>{@link android.view.View#measure(int, int)}</code> and is a top-down traversal
+   of the View tree. Each View pushes dimension specifications down the tree
+   during the recursion. At the end of the measure pass, every View has stored
+   its measurements. The second pass happens in
+   <code>{@link android.view.View#layout(int,int,int,int)}</code> and is also top-down. During
+   this pass each parent is responsible for positioning all of its children
+   using the sizes computed in the measure pass.
+   </p>
+   
+   <p>
+   When a View's <code>measure()</code> method returns, its <code>{@link android.view.View#getMeasuredWidth()}</code> and
+   <code>{@link android.view.View#getMeasuredHeight()}</code> values must be set, along with those for all of
+   that View's descendants. A View's measured width and measured height values
+   must respect the constraints imposed by the View's parents. This guarantees
+   that at the end of the measure pass, all parents accept all of their
+   children's measurements. A parent View may call <code>measure()</code> more than once on
+   its children. For example, the parent may measure each child once with
+   unspecified dimensions to find out how big they want to be, then call
+   <code>measure()</code> on them again with actual numbers if the sum of all the children's
+   unconstrained sizes is too big or too small (i.e., if the children don't agree among themselves
+  as to how much space they each get, the parent will intervene and set the rules on the second pass).
+   </p>
+   
+   <div class="sidebox"><p>
+   To intiate a layout, call <code>{@link android.view.View#requestLayout}</code>. This method is typically
+   called by a View on itself when it believes that is can no longer fit within
+   its current bounds.</p>
+   </div>
+
+   <p>
+   The measure pass uses two classes to communicate dimensions. The
+   {@link android.view.View.MeasureSpec} class is used by Views to tell their parents how they
+   want to be measured and positioned. The base LayoutParams class just
+   describes how big the View wants to be for both width and height. For each
+   dimension, it can specify one of:</p>
+   <ul>
+    <li> an exact number
+    <li><var>FILL_PARENT</var>, which means the View wants to be as big as its parent
+    (minus padding)</li>
+    <li><var>WRAP_CONTENT</var>, which means that the View wants to be just big enough to
+    enclose its content (plus padding).</li>
+   </ul>
+  <p>There are subclasses of LayoutParams for different subclasses of ViewGroup.
+   For example, AbsoluteLayout has its own subclass of LayoutParams which adds
+   an X and Y value.
+   </p>
+   
+   <p>
+   MeasureSpecs are used to push requirements down the tree from parent to
+   child. A MeasureSpec can be in one of three modes:</p>
+   <ul>
+    <li><var>UNSPECIFIED</var>: This is used by a parent to determine the desired dimension
+    of a child View. For example, a LinearLayout may call <code>measure()</code> on its child
+    with the height set to <var>UNSPECIFIED</var> and a width of <var>EXACTLY</var> 240 to find out how
+    tall the child View wants to be given a width of 240 pixels.</li>
+    <li><var>EXACTLY</var>: This is used by the parent to impose an exact size on the
+    child. The child must use this size, and guarantee that all of its
+    descendants will fit within this size.</li>
+    <li><var>AT_MOST</var>: This is used by the parent to impose a maximum size on the
+    child. The child must gurantee that it and all of its descendants will fit
+    within this size.</li>
+   </ul>
+   
+
+
diff --git a/docs/html/guide/topics/ui/index.jd b/docs/html/guide/topics/ui/index.jd
new file mode 100644
index 0000000..6bd1d15
--- /dev/null
+++ b/docs/html/guide/topics/ui/index.jd
@@ -0,0 +1,235 @@
+page.title=User Interface
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+
+  <h2>Key classes</h2>
+  <ol>
+    <li>{@link android.view.View}</li>
+    <li>{@link android.view.ViewGroup}</li>
+    <li>{@link android.widget Widget classes}</li>
+  </ol>
+
+  <h2>In this document</h2>
+  <ol>
+    <li><a href="#ViewHierarchy">View Hierarchy</a></li>
+    <li><a href="#Layout">Layout</a></li>
+    <li><a href="#Widgets">Widgets</a></li>
+    <li><a href="#Events">UI Events</a></li>
+    <li><a href="#Menus">Menus</a></li>
+    <li><a href="#Advanced">Advanced Topics</a>
+      <ol>
+        <li><a href="#Adapters">Adapters</a></li>
+        <li><a href="#StylesAndThemes">Styles and Themes</a></li>
+      </ol>
+    </li>
+  </ol>
+</div>
+</div>
+
+<p>In an Android application, the user interface is built using {@link android.view.View} and 
+{@link android.view.ViewGroup} objects. There are many types of views and view groups, each of which 
+is a descendant of the {@link android.view.View} class.</p>
+
+<p>View objects are the basic units of user interface expression on the Android platform. 
+The View class serves as the base for subclasses called "widgets," which offer fully implemented
+UI objects, like text fields and buttons. The ViewGroup class serves as the base for subclasses called "layouts,"
+which offer different kinds of layout architecture, like linear, tabular and relative.</p>
+
+<p>A View object is a data structure whose properties store the layout parameters and content for a specific 
+rectangular area of the screen. A View object handles its own measurement, layout, drawing, focus change, 
+scrolling, and key/gesture interactions for the rectangular area of the screen in which it resides. As an
+object in the user interface, a View is also a point of interaction for the user and the receiver
+of the interaction events.</p>
+
+
+<h2 id="ViewHierarchy">View Hierarchy</h2>
+
+<p>On the Android platform, you define an Activity's UI using a hierarchy of View and ViewGroup nodes, 
+as shown in the diagram below. This hierarchy tree can be as simple or complex as you need it to be, and you 
+can build it up using Android's set of predefined widgets and layouts, or with custom Views that you 
+create yourself.</p>
+
+<img src="{@docRoot}images/viewgroup.png" alt="" width="312" height="211" align="center"/>
+
+<p>
+In order to attach the view hierarchy tree to the screen for rendering, your Activity must call the
+<code>{@link android.app.Activity#setContentView(int) setContentView()}</code> 
+method and pass a reference to the root node object. The Android system
+receives this reference and uses it to invalidate, measure, and draw the tree. The root node of the hierarchy requests 
+that its child nodes draw themselves &mdash; in turn, each view group node is responsible for calling 
+upon each of its own child views to draw themselves.
+The children may request a size and location within the parent, but the parent object has the final 
+decision on where how big each child can be.  Android parses 
+the elements of your layout in-order (from the top of the hierarchy tree), instantiating the Views and 
+adding them to their parent(s). Because these are drawn in-order, if there are elements that
+overlap positions, the last one to be drawn will lie on top of others previously drawn to that space.</p>
+
+<p>For a more detailed discussion on how view hierarchies are measured
+and drawn, read <a href="how-android-draws.html">How Android Draws Views</a>.</p>
+
+
+<h2 id="Layout">Layout</h2>
+
+<p>The most common way to define your layout and express the view hierarchy is with an XML layout file.
+XML offers a human-readable structure for the layout, much like HTML. Each element in XML is 
+either a View or ViewGroup object (or descendent thereof). View objects are leaves in the tree, 
+ViewGroup objects are branches in the tree (see the View Hierarchy figure above).</p>
+<p>The name of an XML element
+is respective to the Java class that it represents. So a <code>&lt;TextView></code> element creates
+a {@link android.widget.TextView} in your UI, and a <code>&lt;LinearLayout></code> element creates
+a {@link android.widget.LinearLayout} view group. When you load a layout resource, 
+the Android system initializes these run-time objects, corresponding to the elements in your layout.</p>
+
+<p>For example, a simple vertical layout with a text view and a button looks like this:</p>
+<pre>
+&lt;?xml version="1.0" encoding="utf-8"?>
+&lt;LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="fill_parent" 
+              android:layout_height="fill_parent"
+              android:orientation="vertical" >
+    &lt;TextView android:id="@+id/text"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:text="Hello, I am a TextView" />
+    &lt;Button android:id="@+id/button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Hello, I am a Button" />
+&lt;/LinearLayout>
+</pre>
+
+<p>Notice that the LinearLayout element contains both the TextView and the Button. You can nest
+another LinearLayout (or other type of view group) inside here, to lengthen the view hierarchy and create a more
+complex layout.</p>
+
+<p>For more on building a UI layout, read <a href="declaring-layout.html">Declaring Layout</a>.
+
+<div class="sidebox-wrapper">
+<div class="sidebox-inner">
+  <p><b>Tip:</b> You can also draw View and ViewGroups objects in Java code, 
+  using the <code>{@link android.view.ViewGroup#addView(View)}</code> methods 
+  to dynamically insert new View and ViewGroup objects.</p>
+</div>
+</div>
+
+<p>There are a variety of ways in which you can layout your views. Using more and different kinds of view groups,
+you can structure child views and view groups in an infinite number of ways.
+Some pre-defined view groups offered by Android (called layouts) include LinearLayout, RelativeLayout, AbsoluteLayout,
+TableLayout, GridLayout and others. Each offers a unique set of layout parameters that are used to define the
+positions of child views and layout structure.</p>
+<p>To learn about some of the different kinds of view groups used for a layout, 
+read <a href="layout-objects.html">Common Layout Objects</a>.</p>
+
+
+<h2 id="Widgets">Widgets</h2>
+
+<p>A widget is a View object that serves as an interface for interaction with the user. 
+Android provides a set of fully implemented 
+widgets, like buttons, checkboxes, and text-entry fields, so you can quickly build your UI. 
+Some widgets provided by Android are more complex, like a date picker, a clock, and zoom controls.
+But you're not limited to the kinds of widgets provided by the Android platform. If you'd
+like to do something more customized and create your own actionable elements, you can, by defining your own 
+View object or by extending and combining existing widgets.</p>
+<p>Read more in <a href="custom-components.html">Building Custom Components</a>.</p>
+
+<p>For a list of the widgets provided by Android, see the {@link android.widget} package.</p>
+
+
+<h2 id="Events">UI Events</h2>
+
+<p>Once you've added some Views/widgets to the UI, you probably want to know about the 
+user's interaction with them, so you can perform actions. To be informed of UI events, you need to 
+do one of two things:</p>
+<ul>
+  <li><strong>Define an event listener and register it with the View.</strong> More often than not,
+this is how you'll listen for events. The View class contains a collection of nested interfaces named
+On<em>&lt;something></em>Listener, each with a callback method called <code>On<em>&lt;something></em>()</code>.
+For example, {@link android.view.View.OnClickListener} (for handling "clicks" on a View),
+{@link android.view.View.OnTouchListener} (for handling touch screen events in a View), and
+{@link android.view.View.OnKeyListener} (for handling device key presses within a View). So if you want your View
+to be notified when it is "clicked" (such as when a button is selected), implement OnClickListener and define
+its <code>onClick()</code> callback method (where you perform the action upon click), and register it
+to the View with <code>{@link android.view.View#setOnClickListener(View.OnClickListener) setOnClickListener()}</code>.
+</li>
+  <li><strong>Override an existing callback method for the View.</strong> This is
+what you should do when you've implemented your own View class and want to listen for specific events 
+that occur within it. Example events you can handle include when the
+screen is touched (<code>{@link android.view.View#onTouchEvent(MotionEvent) onTouchEvent()}</code>), when
+the trackball is moved (<code>{@link android.view.View#onTrackballEvent(MotionEvent) onTrackballEvent()}</code>), 
+or when a key on the device is pressed (<code>{@link android.view.View#onKeyDown(int, KeyEvent)
+onKeyDown()}</code>). This allows you to define the default behavior for each event inside your custom View and determine
+whether the event should be passed on to some other child View. Again, these are callbacks to the View class,
+so your only chance to define them is when you 
+<a href="{@docRoot}guide/topics/ui/custom-components.html">build a custom component</a>.
+</li>
+</ul>
+
+<p>Continue reading about handling user interaction with Views in the <a href="ui-events.html">Handling UI Events</a>
+document.</p>
+
+
+<h2 id="Menus">Menus</h2>
+
+<p>Application menus are another important part of an application's UI. Menus offers a reliable interface that reveals
+application functions and settings. The most common application menu is revealed by pressing
+the MENU key on the device. However, you can also add Context Menus, which may be revealed when the user presses
+and holds down on an item.</p>
+
+<p>Menus are also structured using a View hierarchy, but you don't define this structure yourself. Instead,
+you define the <code>{@link android.app.Activity#onCreateOptionsMenu(Menu) onCreateOptionsMenu()}</code> or 
+<code>{@link android.app.Activity#onCreateContextMenu(ContextMenu,View,ContextMenu.ContextMenuInfo) onCreateContextMenu()}</code> 
+callback methods for your Activity and declare the items that you want to include in your menu. 
+At the appropriate time, Android will automatically create the necessary View hierarchy for the menu and 
+draw each of your menu items in it.</p>
+
+<p>Menus also handle their own events, so there's no need to register event listeners on the items in your menu.
+When an item in your menu is selected, the <code>{@link android.app.Activity#onOptionsItemSelected(MenuItem) 
+onOptionsItemSelected()}</code> or 
+<code>{@link android.app.Activity#onContextItemSelected(MenuItem) onContextItemSelected()}</code>
+method will be called by the framework.</p>
+
+<p>And just like your application layout, you have the option to declare the items for you menu in an XML file.</p>
+
+<p>Read <a href="{@docRoot}guide/topics/ui/menus.html">Creating Menus</a> to learn more.</p>
+
+
+<h2 id="Advanced">Advanced Topics</h2>
+
+<p>Once you've grappled the fundamentals of creating a user interface, you can explore
+some advanced features for creating a more complex application interface.</p>
+
+<h3 id="Adapters">Adapters</h3>
+
+<p>Sometimes you'll want to populate a view group with some information that can't be hard-coded, instead, 
+you want to bind your view to an external source of data. To do this, you use an AdapterView as
+your view group and each child View is initialized and populated with data from the Adapter.</p>
+<p>The AdapterView object is an implementation of ViewGroup that determines its child views
+based on a given Adapter object. The Adapter acts like a courier between your data source (perhaps an
+array of external strings) and the AdapterView, which displays it. There are several implementations
+of the Adapter class, for specific tasks, such as the CursorAdapter for reading database data from a Cursor,
+or an ArrayAdapter for reading from an arbitrary array.</p>
+<p>To learn more about using an Adapter to populate your views, read 
+<a href="binding.html">Binding to Data with AdapterView</a>.</p>
+
+
+<h3 id="StylesAndThemes">Styles and Themes</h3>
+
+<p>Perhaps you're not satisfied with the look of the standard widgets. To revise them, you can create some 
+of your own styles and themes.</p>
+
+<ul>
+  <li>A style is a set of one or more formatting attributes that you can apply as a unit to individual elements 
+in your layout. For example, you could define a style that specifies a certain text size and color, then 
+apply it to only specific View elements.</li>
+  <li>A theme is a set of one or more formatting attributes that you can apply as a unit to all activities in 
+an application, or just a single activity. For example, you could define a theme that sets specific colors for 
+the window frame and the panel background, and sets text sizes and colors for menus. This theme can then be 
+applied to specific activities or the entire application.</li>
+</ul>
+
+<p>Styles and themes are resources. Android provides some default style and theme resources that you can use, 
+or you can declare your own custom style and theme resources.</p>
+<p>Learn more about using styles and themes in the
+<a href="themes.html">Applying Styles and Themes</a> document.</p>
diff --git a/docs/html/guide/topics/ui/layout-objects.jd b/docs/html/guide/topics/ui/layout-objects.jd
new file mode 100644
index 0000000..cf85fd6
--- /dev/null
+++ b/docs/html/guide/topics/ui/layout-objects.jd
@@ -0,0 +1,305 @@
+page.title=Common Layout Objects
+parent.title=User Interface
+parent.link=index.html
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+  <h2>In this document</h2>
+  <ol>
+    <li><a href="#framelayout">FrameLayout</a></li>
+    <li><a href="#linearlayout">LinearLayout</a></li>
+    <li><a href="#tablelayout">TableLayout</a></li>
+    <li><a href="#absolutelayout">AbsoluteLayout</a></li>
+    <li><a href="#relativelayout">RelativeLayout</a></li>
+    <li><a href="#viewgroupsummary">Summary of Important View Groups</a></li>
+  </ol>
+</div>
+</div>
+
+<p>This section describes some of the more common types of layout objects
+to use in your applications. Like all layouts, they are subclasses of {@link android.view.ViewGroup ViewGroup}.</p>
+
+<p>Also see the <a href="{@docRoot}guide/tutorials/views/index.html">Hello Views</a> tutorials for
+some guidance on using more Android View layouts.</p>
+
+<h2 id="framelayout">FrameLayout</h2>
+<p>{@link android.widget.FrameLayout FrameLayout} is the simplest type of layout
+object. It's basically a blank space on your screen that you can
+later fill with a single object &mdash; for example, a picture that you'll swap in and out.
+All child elements of the FrameLayout are pinned to the top left corner of the screen; you cannot
+specify a different location for a child view. Subsequent child views will simply be drawn over previous ones,
+partially or totally obscuring them (unless the newer object is transparent).
+</p>
+
+
+<h2 id="linearlayout">LinearLayout</h2>
+<p>{@link android.widget.LinearLayout LinearLayout} aligns all children in a
+single direction &mdash; vertically or horizontally, depending on how you 
+define the <code>orientation</code> attribute. All children are
+stacked one after the other, so a vertical list will only have one child per
+row, no matter how wide they are, and a horizontal list will only be one row
+high (the height of the tallest child, plus padding). A {@link
+android.widget.LinearLayout LinearLayout} respects <em>margin</em>s between children
+and the <em>gravity</em> (right, center, or left alignment) of each child. </p>
+
+<p>{@link android.widget.LinearLayout LinearLayout} also supports assigning a
+<em>weight</em> to individual children. This attribute assigns an "importance" value to a view,
+and allows it to expand to fill any remaining space in the parent view. 
+Child views can specify an integer weight value, and then any remaining space in the view group is
+assigned to children in the proportion of their declared weight. Default
+weight is zero. For example, if there are three text boxes and two of
+them declare a weight of 1, while the other is given no weight (0), the third text box without weight
+will not grow and will only occupy the area required by its content.
+The other two will expand equally to fill the space remaining after all three boxes are measured. 
+If the third box is then given a weight of 2 (instead of 0), then it is now declared 
+"more important" than both the others, so it gets half the total remaining space, while the first two
+share the rest equally.</p>
+
+<div class="sidebox">
+<p><strong>Tip</strong>: To create a proportionate size
+layout on the screen, create a container view group object with the 
+<code>layout_width</code> and <code>layout_height</code> attributes set to <var>fill_parent</var>; assign
+the children <code>height</code> or <code>width</code> to <code>0</code> (zero); then assign relative 
+<code>weight</code> values
+to each child, depending on what proportion of the screen each should
+have.</p>
+</div>
+
+<p>The following two forms represent a {@link android.widget.LinearLayout LinearLayout} with a set of elements: a
+button, some labels and text boxes. The text boxes have their width set to <var>fill_parent</var>; other
+elements are set to <var>wrap_content</var>. The gravity, by default, is left. 
+The difference between the two versions of the form is that the form
+on the left has weight values unset (0 by default), while the form on the right has
+the comments text box weight set to 1. If the Name textbox had also been set
+to 1, the Name and Comments text boxes would be the same height. </p>
+
+<img src="{@docRoot}images/linearlayout.png" alt="" />
+
+<p>Within a horizontal {@link android.widget.LinearLayout LinearLayout}, items are aligned by the position of
+their text base line (the first line of the first list element &mdash; topmost or
+leftmost &mdash; is considered the reference line). This is so that people scanning
+elements in a form shouldn't have to jump up and down to read element text in
+neighboring elements. This can be turned off by setting
+<code>android:baselineAligned=&quot;false&quot;</code> in the layout XML. </p>
+
+<p>To view other sample code, see the 
+<a href="{@docRoot}guide/tutorials/views/hello-linearlayout.html">Hello LinearLayout</a> tutorial.</p>
+
+
+<h2 id="tablelayout">TableLayout</h2>
+<p>{@link android.widget.TableLayout} positions its children into rows
+    and columns. TableLayout containers do not display border lines for their rows, columns,
+    or cells. The table will have as many columns as the row with the most cells. A table can leave
+cells empty, but cells cannot span columns, as they can in HTML.</p>
+<p>{@link android.widget.TableRow} objects are the child views of a TableLayout
+(each TableRow defines a single row in the table).
+Each row has zero or more cells, each of which is defined by any kind of other View. So, the cells of a row may be
+composed of a variety of View objects, like ImageView or TextView objects.
+A cell may also be a ViewGroup object (for example, you can nest another TableLayout as a cell).</p>
+<p>The following sample layout has two rows and two cells in each. The accompanying screenshot shows the 
+result, with cell borders displayed as dotted lines (added for visual effect). </p>
+
+<table class="columns">
+    <tr>
+        <td>
+        <pre>
+&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
+&lt;TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:stretchColumns="1">
+    &lt;TableRow>
+        &lt;TextView
+            android:text="@string/table_layout_4_open"
+            android:padding="3dip" />
+        &lt;TextView
+            android:text="@string/table_layout_4_open_shortcut"
+            android:gravity="right"
+            android:padding="3dip" />
+    &lt;/TableRow>
+
+    &lt;TableRow>
+        &lt;TextView
+            android:text="@string/table_layout_4_save"
+            android:padding="3dip" />
+        &lt;TextView
+            android:text="@string/table_layout_4_save_shortcut"
+            android:gravity="right"
+            android:padding="3dip" />
+    &lt;/TableRow>
+&lt;/TableLayout>
+</pre></td>
+        <td><img src="{@docRoot}images/table_layout.png" alt="" style="margin:0" /></td>
+    </tr>
+</table>
+
+<p>Columns can be hidden, marked to stretch and fill the available screen space,
+    or can be marked as shrinkable to force the column to shrink until the table
+    fits the screen. See the {@link android.widget.TableLayout TableLayout reference} 
+documentation for more details. </p>
+
+<p>To view sample code, see the <a href="{@docRoot}guide/tutorials/views/hello-tablelayout.html">Hello
+TableLayout</a> tutorial.</p>
+
+
+<h2 id="absolutelayout">AbsoluteLayout</h2>
+<p>{@link android.widget.AbsoluteLayout} enables child views to specify
+    their own exact x/y coordinates on the screen. Coordinates <em>(0,0)</em> is the upper left
+    corner, and values increase as you move down and to the right. Margins are not
+    supported, and overlapping elements are allowed (although not recommended). We
+    generally recommend against using AbsoluteLayout unless you have good reasons
+    to use it, because it is fairly rigid and does not adjust to different types of
+    displays. </p>
+
+
+<h2 id="relativelayout">RelativeLayout</h2>
+<p>{@link android.widget.RelativeLayout} lets child views specify their
+    position relative to the parent view or to each other (specified by ID). So you can
+    align two elements by right border, or make one below another, centered in
+    the screen, centered left, and so on. Elements are rendered in the order given, so if the first element
+    is centered in the screen, other elements aligning themselves to that element
+    will be aligned relative to screen center. Also, because of this ordering, if using XML to specify this layout, 
+    the element that you will reference (in order to position other view objects) must be listed in the XML 
+file before you refer to it from the other views via its reference ID. </p>
+<p>The example below shows an XML file and the resulting screen in the UI. 
+Note that the attributes that refer to relative elements (e.g., <var>layout_toLeft</var>)
+refer to the ID using the syntax of a relative resource
+(<var>@id/<em>id</em></var>). </p>
+
+<table class="columns">
+    <tr>
+        <td>
+        <pre>
+&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
+&lt;RelativeLayout xmlns:android=&quot;http://schemas.android.com/apk/res/android
+                android:layout_width=&quot;fill_parent&quot; 
+                android:layout_height=&quot;wrap_content&quot;
+                android:background=&quot;@drawable/blue&quot;
+                android:padding=&quot;10px&quot; &gt;
+
+    &lt;TextView android:id=&quot;@+id/label&quot; 
+              android:layout_width=&quot;fill_parent&quot; 
+              android:layout_height=&quot;wrap_content&quot; 
+              android:text=&quot;Type here:&quot; /&gt;
+
+    &lt;EditText android:id=&quot;@+id/entry&quot; 
+              android:layout_width=&quot;fill_parent&quot; 
+              android:layout_height=&quot;wrap_content&quot; 
+              android:background=&quot;@android:drawable/editbox_background&quot;
+              android:layout_below=&quot;@id/label&quot; /&gt;
+  
+    &lt;Button android:id=&quot;@+id/ok&quot; 
+            android:layout_width=&quot;wrap_content&quot; 
+            android:layout_height=&quot;wrap_content&quot; 
+            android:layout_below=&quot;@id/entry&quot;
+            android:layout_alignParentRight=&quot;true&quot;
+            android:layout_marginLeft=&quot;10px&quot;
+            android:text=&quot;OK&quot; /&gt;
+
+    &lt;Button android:layout_width=&quot;wrap_content&quot; 
+            android:layout_height=&quot;wrap_content&quot;
+            android:layout_toLeftOf=&quot;@id/ok&quot;
+            android:layout_alignTop=&quot;@id/ok&quot;
+            android:text=&quot;Cancel&quot; /&gt;
+&lt;/RelativeLayout&gt;
+</pre></td>
+        <td><img src="{@docRoot}images/designing_ui_layout_example.png" alt="" style="margin:0"  /></td>
+    </tr>
+</table>
+
+
+<p>Some of these properties are supported directly by
+    the element, and some are supported by its LayoutParams member (subclass RelativeLayout
+    for all the elements in this screen, because all elements are children of a RelativeLayout
+    parent object). The defined RelativeLayout parameters are: <code>width</code>, <code>height</code>, 
+    <code>below</code>, <code>alignTop</code>, <code>toLeft</code>, <code>padding[Bottom|Left|Right|Top]</code>, 
+    and <code>margin[Bottom|Left|Right|Top]</code>. Note that some of these parameters specifically support
+    relative layout positions &mdash; their values must be the ID of the element to which you'd like this view laid relative.
+    For example, assigning the parameter <code>toLeft="my_button"</code> to a TextView would place the TextView to 
+    the left of the View with the ID <var>my_button</var> (which must be written in the XML <em>before</em> the TextView). </p>
+
+<p>To view this sample code, see the <a href="{@docRoot}guide/tutorials/views/hello-relativelayout.html">Hello
+RelativeLayout</a> tutorial.</p>
+
+
+<h2 id="viewgroupsummary">Summary of Important View Groups</h2>
+<p>These objects all hold child UI elements. Some provide their own form of a visible UI, while others
+    are invisible structures that only manage the layout of their child views.  </p>
+<table width="100%" border="1">
+    <tr>
+        <th scope="col">Class</th>
+        <th scope="col">Description</th>
+    </tr>
+    <tr>
+        <td>{@link android.widget.AbsoluteLayout AbsoluteLayout}<br /></td>
+        <td>Enables you to specify the location of child objects relative to the
+            parent in exact measurements (for example, pixels). </td>
+    </tr>
+    <tr>
+        <td>{@link android.widget.FrameLayout FrameLayout}</td>
+        <td>Layout that acts as a view frame to display
+            a single object. </td>
+    </tr>
+    <tr>
+        <td>{@link android.widget.Gallery Gallery} </td>
+        <td>A horizontal scrolling display of images, from a bound list. </td>
+    </tr>
+    <tr>
+        <td>{@link android.widget.GridView GridView} </td>
+        <td>Displays a scrolling grid of m columns and n rows.</td>
+    </tr>
+    <tr>
+        <td>{@link android.widget.LinearLayout LinearLayout} </td>
+        <td>A layout that organizes its children into a single horizontal or vertical
+            row. It creates a scrollbar if the length of the window exceeds the length
+            of the screen. </td>
+    </tr>
+    <tr>
+        <td>{@link android.widget.ListView ListView} </td>
+        <td>Displays a scrolling single column list. </td>
+    </tr>
+    <tr>
+        <td>{@link android.widget.RelativeLayout RelativeLayout} </td>
+        <td>Enables you to specify the location of child objects relative to each
+            other (child A to the left of child B) or to the parent (aligned to the
+            top of the parent). </td>
+    </tr>
+    <tr>
+        <td>{@link android.widget.ScrollView ScrollView} </td>
+        <td>A vertically scrolling column of elements. </td>
+    </tr>
+    <tr>
+        <td>{@link android.widget.Spinner Spinner} </td>
+        <td>Displays a single item at a time from a bound list, inside a one-row
+            textbox. Rather like a one-row listbox that can scroll either horizontally
+            or vertically. </td>
+    </tr>
+    <tr>
+        <td>{@link android.view.SurfaceView SurfaceView} </td>
+        <td>Provides direct access to a dedicated drawing surface. It can hold child
+            views layered on top of the surface, but is intended for applications
+            that need to draw pixels, rather than using widgets. </td>
+    </tr>
+    <tr>
+        <td>{@link android.widget.TabHost TabHost} </td>
+        <td>Provides a tab selection list that monitors clicks and enables the application
+            to change the screen whenever a tab is clicked. </td>
+    </tr>
+	<tr>
+        <td>{@link android.widget.TableLayout TableLayout} </td>
+        <td>A tabular layout with an arbitrary number of rows and columns, each cell
+            holding the widget of your choice. The rows resize to fit the largest
+            column. The cell borders are not
+            visible. </td>
+    </tr>
+    <tr>
+        <td>{@link android.widget.ViewFlipper ViewFlipper} </td>
+        <td>A list that displays one item at a time, inside a one-row textbox. It
+            can be set to swap items at timed intervals, like a slide show. </td>
+    </tr>
+    <tr>
+        <td>{@link android.widget.ViewSwitcher ViewSwitcher} </td>
+        <td>Same as ViewFlipper. </td>
+    </tr>
+</table>
diff --git a/docs/html/guide/topics/ui/menus.jd b/docs/html/guide/topics/ui/menus.jd
new file mode 100644
index 0000000..bae94ca
--- /dev/null
+++ b/docs/html/guide/topics/ui/menus.jd
@@ -0,0 +1,522 @@
+page.title=Creating Menus
+parent.title=User Interface
+parent.link=index.html
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+  <h2>Key classes</h2>
+  <ol>
+    <li>{@link android.view.Menu}</li>
+    <li>{@link android.view.ContextMenu}</li>
+    <li>{@link android.view.SubMenu}</li>
+  </ol>
+  <h2>In this document</h2>
+  <ol>
+    <li><a href="#options-menu">Options Menu</a></li>
+    <li><a href="#context-menu">Context Menu</a></li>
+    <li><a href="#submenu">Submenu</a></li>
+    <li><a href="#xml">Define Menus in XML</a></li>
+    <li><a href="#features">Menu Features</a>
+      <ol>
+        <li><a href="#groups">Menu groups</a></li>
+        <li><a href="#checkable">Checkable menu items</a></li>
+        <li><a href="#shortcuts">Shortcut keys</a></li>
+        <li><a href="#intents">Menu item intents</a></li>
+      </ol>
+    </li>
+  </ol>
+</div>
+</div>
+
+<p>Menus are an important part of any application. They provide familiar interfaces
+that reveal application functions and settings. Android offers an easy programming interface
+for developers to provide standardized application menus for various situations.</p>
+
+<p>Android offers three fundamental types of application menus:</p>
+<dl>
+  <dt><strong>Options Menu</strong></dt>
+    <dd>This is the primary set of menu items for an Activity. It is revealed by pressing 
+    the device MENU key. Within the Options Menu are two groups of menu items:
+      <dl style="margin-top:1em">
+        <dt><em>Icon Menu</em></dt>
+          <dd>This is the collection of items initially visible at the bottom of the screen 
+          at the press of the MENU key. It supports a maximum of six menu items.
+          These are the only menu items that support icons and the only menu items that <em>do not</em> support
+          checkboxes or radio buttons.</dd>
+        <dt><em>Expanded Menu</em></dt>
+          <dd>This is a vertical list of items exposed by the "More" menu item from the Icon Menu.
+          It exists only when the Icon Menu becomes over-loaded and is comprised of the sixth 
+          Option Menu item and the rest.</dd>
+      </dl>
+    </dd>
+  <dt><strong>Context Menu</strong></dt>
+    <dd>This is a floating list of menu items that may appear when you perform a long-press on a View 
+    (such as a list item). </dd>
+  <dt><strong>Submenu</strong></dt>
+    <dd>This is a floating list of menu items that is revealed by an item in the Options Menu
+    or a Context Menu. A Submenu item cannot support nested Submenus. </dd>
+</dl>
+
+
+<h2 id="options-menu">Options Menu</h2>
+<img align="right" src="{@docRoot}images/options_menu.png" />
+<p>The Options Menu is opened by pressing the device MENU key.
+When opened, the Icon Menu is displayed, which holds the first six menu items.
+If more than six items are added to the Options Menu, then those that can't fit
+in the Icon Menu are revealed in the Expanded Menu, via the "More" menu item. The Expanded Menu
+is automatically added when there are more than six items.</p>
+
+<p>The Options Menu is where you should include basic application functions
+and any necessary navigation items (e.g., to a home screen or application settings).
+You can also add <a href="#submenu">Submenus</a> for organizing topics 
+and including extra menu functionality.</p>
+
+<p>When this menu is opened for the first time, 
+the Android system will call the Activity <code>{@link android.app.Activity#onCreateOptionsMenu(Menu)
+onCreateOptionsMenu()}</code> callback method. Override this method in your Activity
+and populate the {@link android.view.Menu} object given to you. You can populate the menu by
+inflating a menu resource that was <a href="#xml">defined in XML</a>, or by calling 
+<code>{@link android.view.Menu#add(CharSequence) add()}</code>
+for each item you'd like in the menu. This method adds a {@link android.view.MenuItem}, and returns the
+newly created object to you. You can use the returned MenuItem to set additional properties like 
+an icon, a keyboard shortcut, an intent, and other settings for the item.</p>
+
+<p>There are multiple <code>{@link android.view.Menu#add(CharSequence) add()}</code> methods.
+Usually, you'll want to use one that accepts an <var>itemId</var> argument. 
+This is a unique integer that allows you to identify the item during a callback.</p>
+
+<p>When a menu item is selected from the Options Menu, you will recieve a callback to the
+<code>{@link android.app.Activity#onOptionsItemSelected(MenuItem) onOptionsItemSelected()}</code> 
+method of your Activity. This callback passes you the 
+<code>MenuItem</code> that has been selected. You can identify the item by requesting the 
+<var>itemId</var>, with <code>{@link android.view.MenuItem#getItemId() getItemId()}</code>,
+which returns the integer that was assigned with the <code>add()</code> method. Once you identify
+the menu item, you can take the appropriate action.</p>
+
+<p>Here's an example of this procedure, inside an Activity, wherein we create an 
+Options Menu and handle item selections:</p>
+
+<pre>
+/* Creates the menu items */
+public boolean onCreateOptionsMenu(Menu menu) {
+    menu.add(0, MENU_NEW_GAME, 0, "New Game");
+    menu.add(0, MENU_QUIT, 0, "Quit");
+    return true;
+}
+
+/* Handles item selections */
+public boolean onOptionsItemSelected(MenuItem item) {
+    switch (item.getItemId()) {
+    case MENU_NEW_GAME:
+        newGame();
+        return true;
+    case MENU_QUIT:
+        quit();
+        return true;
+    }
+    return false;
+}
+</pre>
+
+<p>The <code>add()</code> method used in this sample takes four arguments: 
+<var>groupId</var>, <var>itemId</var>, <var>order</var>, and <var>title</var>.
+The <var>groupId</var> allows you to associate this menu item with a group of other items
+(more about <a href="#groups">Menu groups</a>, below) &mdash; in 
+this example, we ignore it. <var>itemId</var> is a unique integer that we give the 
+MenuItem so that can identify it in the next callback. <var>order</var> allows us to 
+define the display order of the item &mdash; by default, they are displayed by the
+order in which we add them. <var>title</var> is, of course, the name that goes on the 
+menu item (this can also be a 
+<a href="{@docRoot}guide/topics/resources/available-resources.html#stringresources">string resource</a>, 
+and we recommend you do it that way for easier localization).</p>
+
+<p class="note"><strong>Tip:</strong>
+If you have several menu items that can be grouped together with a title, 
+consider organizing them into a <a href="#submenu">Submenu</a>.</p>
+
+<h3>Adding icons</h3>
+<p>Icons can also be added to items that appears in the Icon Menu with
+<code>{@link android.view.MenuItem#setIcon(Drawable) setIcon()}</code>. For example:</p>
+<pre>
+menu.add(0, MENU_QUIT, 0, "Quit")
+    .setIcon(R.drawable.menu_quit_icon);</pre>
+
+<h3>Modifying the menu</h3>
+<p>If you want to sometimes re-write the Options Menu as it is opened, override the 
+<code>{@link android.app.Activity#onPrepareOptionsMenu(Menu) onPrepareOptionsMenu()}</code> method, which is
+called each time the menu is opened. This will pass you the Menu object, just like the 
+<code>onCreateOptionsMenu()</code> callback. This is useful if you'd like to add or remove
+menu options depending on the current state of an application or game.</p>
+
+<p class="note"><strong>Note:</strong> 
+When changing items in the menu, it's bad practice to do so based on the currently selected item.
+Keep in mind that, when in touch mode, there will not be a selected (or focused) item. Instead, you
+should use a <a href="#context-menu">Context Menu</a> for such behaviors, when you want to provide 
+functionality based on a particular item in the UI.</p>
+
+
+<h2 id="context-menu">Context Menu</h2>
+<p>The Android context menu is similar, in concept, to the menu revealed with a "right-click" on a PC. 
+When a view is registered to a context menu, 
+performing a "long-press" (press and hold for about two seconds) on the object
+will reveal a floating menu that provides functions relating to that item. 
+Context menus can be registered to any View object,
+however, they are most often used for items in a 
+{@link android.widget.ListView}, which helpfully indicates the presence of the context menu
+by transforming the background color of the ListView item when pressed.
+(The items in the phone's contact list offer an example of this feature.)
+</p>
+
+<p class="note"><strong>Note:</strong> Context menu items do not support icons or shortcut keys.</p>
+
+<p>To create a context menu, you must override the Activity's context menu callback methods:
+<code>{@link android.app.Activity#onCreateContextMenu(ContextMenu,View,ContextMenuInfo) onCreateContextMenu()}</code> and 
+<code>{@link android.app.Activity#onContextItemSelected(MenuItem) onContextItemSelected()}</code>.
+Inside the <code>onCreateContextMenu()</code> callback method, you can add menu items using one of the 
+<code>{@link android.view.Menu#add(CharSequence) add()}</code> methods, or by 
+inflating a menu resource that was <a href="#xml">defined in XML</a>.
+Then, register a {@link android.view.ContextMenu} for the View, with 
+<code>{@link android.app.Activity#registerForContextMenu(View) registerForContextMenu()}</code>.</p>
+
+<p>For example, here is some code that can be used with the 
+<a href="{@docRoot}guide/tutorials/notepad/index.html">Notepad application</a>
+to add a context menu for each note in the list:</p>
+<pre>
+public void onCreateContextMenu(ContextMenu menu, View v,
+                                ContextMenuInfo menuInfo) {
+  super.onCreateContextMenu(menu, v, menuInfo);
+  menu.add(0, EDIT_ID, 0, "Edit");
+  menu.add(0, DELETE_ID, 0,  "Delete");
+}
+
+public boolean onContextItemSelected(MenuItem item) {
+  AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();
+  switch (item.getItemId()) {
+  case EDIT_ID:
+    editNote(info.id);
+    return true;
+  case DELETE_ID:
+    deleteNote(info.id);
+    return true;
+  default:
+    return super.onContextItemSelected(item);
+  }
+}
+</pre>
+
+<p>In <code>onCreateContextMenu()</code>, we are given not only the ContextMenu to
+which we will add {@link android.view.MenuItem}s, but also the {@link android.view.View}
+that was selected and a {@link android.view.ContextMenu.ContextMenuInfo ContextMenuInfo} object,
+which provides additional information about the object that was selected. 
+In this example, nothing special is done in <code>onCreateContextMenu()</code> &mdash; just
+a couple items are added as usual. In the <code>onContextItemSelected()</code>
+callback, we request the {@link android.widget.AdapterView.AdapterContextMenuInfo AdapterContextMenuInfo} 
+from the {@code MenuItem}, which provides information about the currently selected item. 
+All we need from
+this is the list ID for the selected item, so whether editing a note or deleting it, 
+we find the ID with the {@code AdapterContextMenuInfo.info} field of the object. This ID
+is passed to the <code>editNote()</code> and <code>deleteNote()</code> methods to perfrom
+the respective action.</p>
+
+<p>Now, to register this context menu for all the items in a {@link android.widget.ListView},
+we pass the entire {@code ListView} to the 
+<code>{@link android.app.Activity#registerForContextMenu(View)}</code> method:</p>
+
+<pre>registerForContextMenu(getListView());</pre>
+<p>Remember, you can pass any View object to register a context menu. Here,
+<code>{@link android.app.ListActivity#getListView()}</code> returns the ListView
+object used in the Notepad application's {@link android.app.ListActivity}. As such, each item 
+in the list is registered to this context menu.</p>
+
+
+
+<h2 id="submenu">Submenus</h2>
+<p>A sub menu can be added within any menu, except another sub menu.
+These are very useful when your application has a lot of functions that may be
+organized in topics, like the items in a PC application's menu bar (File, Edit, View, etc.).</p>
+
+<p>A sub menu is created by adding it to an existing {@link android.view.Menu}
+with <code>{@link android.view.Menu#addSubMenu(CharSequence) addSubMenu()}</code>. 
+This returns a {@link android.view.SubMenu} object (an extension of {@link android.view.Menu}). 
+You can then add additional items to this menu, with the normal routine, using
+the <code>{@link android.view.Menu#add(CharSequence) add()}</code> methods. For example:</p>
+
+<pre>
+public boolean onCreateOptionsMenu(Menu menu) {
+  boolean result = super.onCreateOptionsMenu(menu);
+
+  SubMenu fileMenu = menu.addSubMenu("File");
+  SubMenu editMenu = menu.addSubMenu("Edit");
+  fileMenu.add("new");
+  fileMenu.add("open");
+  fileMenu.add("save");
+  editMenu.add("undo");
+  editMenu.add("redo");
+
+  return result;
+}
+</pre>
+<p>Callbacks for items selected in a sub menu are made to the parent menu's callback method. 
+For the example above, selections in the sub menu will be handled by the 
+<code>onOptionsItemSelected()</code> callback.</p>
+<p>You can also add Submenus when you <a href="#xml">define the parent menu in XML</a>.</p>
+
+
+<h2 id="xml">Define Menus in XML</h2>
+<p>Just like Android UI layouts, you can define application menus in XML, then inflate them 
+in your menu's <code>onCreate...()</code> callback method. This makes your application code cleaner and
+separates more interface design into XML, which is easier to visualize.</p>
+
+<p>To start, create a new folder in your project <code>res/</code> directory called <code>menu</code>.
+This is where you should keep all XML files that define your application menus.</p>
+
+<p>In a menu XML layout, there are
+three valid elements: <code>&lt;menu></code>, <code>&lt;group></code> and <code>&lt;item></code>. The
+<code>item</code> and <code>group</code> elements must be children of a <code>menu</code>, but <code>item</code>
+elements may also be the children of a <code>group</code>, and another <code>menu</code> element may be the child
+of an <code>item</code> (to create a Submenu). Of course, the root node of any file
+must be a <code>menu</code> element.</p>
+
+<p>As an example, we'll define the same menu created in the <a href="#options-menu">Options Menu</a> section, 
+above. We start with an XML file named <code>options_menu.xml</code> inside the <code>res/menu/</code> folder:</p>
+<pre>
+&lt;menu xmlns:android="http://schemas.android.com/apk/res/android">
+    &lt;item android:id="@+id/new_game"
+          android:title="New Game" />
+    &lt;item android:id="@+id/quit"
+          android:title="Quit" />
+&lt;/menu>
+</pre>
+
+<p>Then, in the <code>onCreateOptionsMenu()</code> method, we inflate this resource using
+<code>{@link android.view.MenuInflater#inflate(int,Menu) MenuInflater.inflate()}</code>:</p>
+<pre>
+public boolean onCreateOptionsMenu(Menu menu) {
+    MenuInflater inflater = getMenuInflater();
+    inflater.inflate(R.menu.options_menu, menu);
+    return true;
+}
+</pre>
+
+<p>The <code>{@link android.app.Activity#getMenuInflater()}</code> method returns the {@link android.view.MenuInflater}
+for our activity's context. We then call <code>{@link android.view.MenuInflater#inflate(int,Menu) inflate()}</code>,
+passing it a pointer to our menu resource and the Menu object given by the callback.</code></p>
+
+<p>While this small sample may seem like more effort, compared to creating the menu items in the 
+<code>onCreateOptionsMenu()</code> method, this will save a lot of trouble when dealing with more items
+and it keeps your application code clean.</p>
+
+<p>You can define <a href="#groups">menu groups</a> by wrapping <code>item</code> elements in a <code>group</code>
+element, and create Submenus by nesting another <code>menu</code> inside an <code>item</code>.
+Each element also supports all the necessary attributes to control features like shortcut keys,
+checkboxes, icons, and more. To learn about these attributes and more about the XML syntax, see the Menus
+topic in the <a href="{@docRoot}guide/topics/resources/available-resources.html#menus">Available 
+Resource Types</a> document.</p>
+
+<h2 id="features">Menu Features</h2>
+<p>Here are some other features that can be applied to most menu items.</p>
+
+<h3 id="groups">Menu groups</h3>
+<p>When adding new items to a menu, you can optionally include each item in a group.
+A menu group is a collection of menu items that can share certain traits, like
+whether they are visible, enabled, or checkable.</p>
+
+<p>A group is defined by an integer (or a resource id, in XML). A menu item is added to the group when it is
+added to the menu, using one of the <code>add()</code> methods that accepts a <var>groupId</var>
+as an argument, such as <code>{@link android.view.Menu#add(int,int,int,int)}</code>.</p>
+
+<p>You can show or hide the entire group with 
+<code>{@link android.view.Menu#setGroupVisible(int,boolean) setGroupVisible()}</code>; 
+enable or disable the group with 
+<code>{@link android.view.Menu#setGroupEnabled(int,boolean) setGroupEnabled()}</code>;
+and set whether the items can be checkable with
+<code>{@link android.view.Menu#setGroupCheckable(int,boolean,boolean) setGroupCheckable()}</code>.
+</p>
+
+<h3 id="checkable">Checkable menu items</h3>
+<img align="right" src="{@docRoot}images/radio_buttons.png" alt="" />
+<p>Any menu item can be used as an interface for turning options on and off. This can
+be indicated with a checkbox for stand-alone options, or radio buttons for groups of
+mutually exlusive options (see the screenshot, to the right).</p>
+
+<p class="note"><strong>Note:</strong> Menu items in the Icon Menu cannot
+display a checkbox or radio button. If you choose to make items in the Icon Menu checkable,
+then you must personally indicate the state by swapping the icon and/or text 
+each time the state changes between on and off.</p>
+
+<p>To make a single item checkable, use the <code>{@link android.view.MenuItem#setCheckable(boolean)
+setCheckable()}</code> method, like so:</p>
+<pre>
+menu.add(0, VIBRATE_SETTING_ID, 0, "Vibrate")
+    .setCheckable(true);
+</pre>
+<p>This will display a checkbox with the menu item (unless it's in the Icon Menu). When the item
+is selected, the <code>onOptionsItemSelected()</code> callback is called as usual. It is here that
+you must set the state of the checkbox. You can query the current state of the item with
+<code>{@link android.view.MenuItem#isChecked()}</code> and set the checked state with
+<code>{@link android.view.MenuItem#setChecked(boolean) setChecked()}</code>. 
+Here's what this looks like inside the 
+<code>onOptionsItemSelected()</code> callback:</p>
+<pre>
+switch (item.getItemId()) {
+case VIBRATE_SETTING_ID:
+  if (item.isChecked()) item.setChecked(false);
+  else item.setChecked(true);
+  return true;
+...
+}
+</pre>
+
+<p>To make a group of mutually exclusive radio button items, simply 
+assign the same group ID to each menu item 
+and call <code>{@link android.view.Menu#setGroupCheckable(int,boolean,boolean) 
+setGroupCheckable()}</code>. In this case, you don't need to call <code>setCheckable()</code>
+on each menu items, because the group as a whole is set checkable. Here's an example of
+two mutually exclusive options in a Submenu:</p>
+<pre>
+SubMenu subMenu = menu.addSubMenu("Color");
+subMenu.add(COLOR_MENU_GROUP, COLOR_RED_ID, 0, "Red");
+subMenu.add(COLOR_MENU_GROUP, COLOR_BLUE_ID, 0, "Blue");
+subMenu.setGroupCheckable(COLOR_MENU_GROUP, true, true);
+</pre>
+<p>In the <code>setGroupCheckable()</code> method, the first argument is the group ID
+that we want to set checkable. The second argument is whether we want the group items
+to be checkable. The last one is whether we want each item to be exclusively checkable 
+(if we set this <em>false</em>, then all the items will be checkboxes instead of radio buttons).
+When the group is set to be exclusive (radio buttons), each time a new item is selected, 
+all other are automatically de-selected.</p>
+<p>
+
+<p class="note"><strong>Note:</strong>
+Checkable menu items are intended to be used only on a per-session basis and not saved to the device 
+(e.g., the <em>Map mode</em> setting in the Maps application is not saved &mdash; screenshot above).
+If there are application settings that you would like to save for the user,
+then you should store the data using <a href="#{@docRoot}guide/topics/data/data-storage.html#pref">Preferences</a>,
+and manage them with a {@link android.preference.PreferenceActivity}.</p>
+
+
+<h3 id="shortcuts">Shortcut keys</h3>
+<p>Quick access shortcut keys using letters and/or numbers can be added to menu items with
+<code>setAlphabeticShortcut(char)</code> (to set char shortcut), <code>setNumericShortcut(int)</code>
+(to set numeric shortcut),
+or <code>setShortcut(char,int)</code> (to set both)</code>. Case is <em>not</em> sensitive.
+
+For example:</p>
+<pre>
+menu.add(0, MENU_QUIT, 0, "Quit")
+    .setAlphabeticShortcut('q');
+</pre>
+<p>Now, when the menu is open (or while holding the MENU key), pressing the "q" key will 
+select this item.</p>
+<p>This shortcut key will be displayed as a tip in the menu item, below the menu item name
+(except for items in the Icon Menu).</p>
+<p class="note"><strong>Note:</strong> Shortcuts cannot be added to items in a Context Menu.</p>
+
+
+<h3 id="intents">Menu item intents</h3>
+<p>If you've read the <a href="{@docRoot}guide/topics/fundamentals.html">Application
+Fundamentals</a>, then you're at least a little familiar
+with Android Intents. These allow applications to bind with each other, share information,
+and perform user tasks cooperatively. Just like your application might fire an Intent to launch a web browser,
+an email client, or another Activity in your application,
+you can perform such actions from within a menu.
+There are two ways to do this: define an Intent and assign it to a single menu item, or
+define an Intent and allow Android to search the device for activities and dynamically add a 
+menu item for each one that meets the Intent criteria.</p>
+
+<p>For more information on creating Intents and providing your application's services to other applications, 
+read the <a href="/guide/topics/intents/intents-filters.html">Intents 
+and Intent Filters</a> document.</p>
+
+<h4>Set an intent for a single menu item</h4>
+<p>If you want to offer a specific menu item that launches a new Activity, then you 
+can specifically define an Intent for the menu item with the
+<code>{@link android.view.MenuItem#setIntent(Intent)
+setIntent()}</code> method.</p>
+
+<p>For example, inside the <code>{@link android.app.Activity#onCreateOptionsMenu(Menu)
+onCreateOptionsMenu()}</code> method, you can define a new menu item with an Intent like this:</p>
+<pre>
+MenuItem menuItem = menu.add(0, PHOTO_PICKER_ID, 0, "Select Photo");
+menuItem.setIntent(new Intent(this, PhotoPicker.class));
+</pre>
+<p>Android will automatically launch the Activity when the item is selected.</p>
+
+<p class="note"><strong>Note:</strong> This will not return a result to your Activity.
+If you wish to be returned a result, then do not use <code>setIntent()</code>.
+Instead, handle the selection as usual in the <code>onOptionsMenuItemSelected()</code>
+or <code>onContextMenuItemSelected()</code> callback and call
+<code>{@link android.app.Activity#startActivityForResult(Intent,int) startActivityForResult()}</code>.
+</p>
+
+<h4>Dynamically add intents</h4>
+
+<p>If there are potentially multiple activities that are relevant to your current
+Activity or selected item, then the application can dynamically add menu items that execute other
+services.</p>
+<p>During menu creation, define an Intent with the category <var>Intent.ALTERNATIVE_CATEGORY</var> and/or
+<var>Intent.SELECTED_ALTERNATIVE</var>, the MIME type currently selected (if any), and any other
+requirements, the same way as you would satisfy an intent filter to open a new
+Activity. Then call  
+<code>{@link android.view.Menu#addIntentOptions(int,int,int,ComponentName,Intent[],Intent,int,MenuItem[]) 
+addIntentOptions()}</code> to have Android search for any services meeting those requirements
+and add them to the menu for you. If there are no applications installed
+that satisfy the Intent, then no additional menu items are added.</p>
+
+<p class="note"><strong>Note:</strong>
+<var>SELECTED_ALTERNATIVE</var> is used to handle the currently selected element on the 
+screen. So, it should only be used when creating a Menu in <code>onCreateContextMenu()</code> or
+<code>onPrepareOptionsMenu()</code>, which is called every time the Options Menu is opened.</p>
+
+<p>Here's an example demonstrating how an application would search for
+additional services to display on its menu.</p>
+
+<pre>
+public boolean onCreateOptionsMenu(Menu menu){
+    super.onCreateOptionsMenu(menu);
+
+    // Create an Intent that describes the requirements to fulfill, to be included
+    // in our menu. The offering app must include a category value of Intent.CATEGORY_ALTERNATIVE. 
+    Intent intent = new Intent(null, getIntent().getData());
+    intent.addCategory(Intent.CATEGORY_ALTERNATIVE);
+        
+    // Search for, and populate the menu with, acceptable offering applications.
+    menu.addIntentOptions(
+         thisClass.INTENT_OPTIONS,  // Menu group 
+         0,      // Unique item ID (none)
+         0,      // Order for the items (none)
+         this.getComponentName(),   // The current Activity name
+         null,   // Specific items to place first (none)
+         intent, // Intent created above that describes our requirements
+         0,      // Additional flags to control items (none)
+         null);  // Array of MenuItems that corrolate to specific items (none)
+
+    return true;
+}</pre>
+
+<p>For each Activity found that provides an Intent Filter matching the Intent defined, a menu
+item will be added, using the <var>android:label</var> value of the intent filter as the text
+for the menu item. 
+The <code>{@link android.view.Menu#addIntentOptions(int,int,int,ComponentName,Intent[],Intent,int,MenuItem[]) addIntentOptions()}</code> method will also return the number of menu items added.</p>
+<p>Also be aware that, when <code>addIntentOptions()</code> is called, it will override any and all
+menu items in the menu group specified in the first argument.</p>
+
+<p>If you wish to offer the services of your Activity to other application menus, then you 
+only need to define an intent filter as usual. Just be sure to include the <var>ALTERNATIVE</var> and/or
+<var>SELECTED_ALTERNATIVE</var> values in the <var>name</var> attribute of 
+a <code>&lt;category></code> element in the intent filter. For example:</p>
+<pre>
+&lt;intent-filter label="Resize Image">
+    ...
+    &lt;category android:name="android.intent.category.ALTERNATIVE" />
+    &lt;category android:name="android.intent.category.SELECTED_ALTERNATIVE" />
+    ...
+&lt;/intent-filter>
+</pre>
+<p>read more about writing intent filters in the 
+<a href="/guide/topics/intents/intents-filters.html">Intents and Intent Filters</a> document.</p>
+
+<p>For a sample application using this technique, see the 
+<a href="{@docRoot}guide/samples/NotePad/index.html">Note Pad</a>
+sample code.</p>
diff --git a/docs/html/guide/topics/ui/themes.jd b/docs/html/guide/topics/ui/themes.jd
new file mode 100644
index 0000000..41e8563
--- /dev/null
+++ b/docs/html/guide/topics/ui/themes.jd
@@ -0,0 +1,177 @@
+page.title=Applying Styles and Themes
+parent.title=User Interface
+parent.link=index.html
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+  <h2>In this document</h2>
+  <ol>
+    <li><a href="#styles">Styles</a></li>
+    <li><a href="#themes">Themes</a>
+      <ol>
+        <li><a href="#inTheManifest">Set the theme in the manifest</a></li>
+        <li><a href="#fromTheApp">Set the theme from the application</a></li>
+      </ol>
+    </li>
+  </ol>
+  <h2>See also</h2>
+  <ol>
+    <li><a href="{@docRoot}guide/topics/resources/available-resources.html#stylesandthemes">Style and Theme Resources</a></li>
+  </ol>
+</div>
+</div>
+
+<p>When designing your application, you can use <em>styles</em> and <em>themes</em> to apply uniform formatting to its various screens and UI elements.
+
+<ul>
+  <li>A style is a set of one or more formatting attributes that you can apply as a unit to single elements in your layout XML file(s). For example, you could define a style that specifies a certain text size and color, then apply it to instances of a certain type of View element.</li>
+  <li>A theme is a set of one or more formatting attributes that you can apply as a unit to all activities in an application or just a single activity. For example, you could define a theme that sets specific colors for the window frame and the panel foreground and background, and sets text sizes and colors for menus, then apply it to the activities of your application.</li>
+</ul>
+
+<p>Styles and themes are resources. Android provides some default style and theme resources that you can use, or you can declare your own custom style and theme resources.</p>
+
+<p>To create custom styles and themes:</p>
+<ol>
+  <li>Create a file named <code>styles.xml</code> in the your application's <code>res/values</code> directory. Add a root <code>&lt;resources></code> node.</li>
+  <li>For each style or theme, add a <code>&lt;style&gt;</code> element with a unique <code>name</code> and, optionally, a <code>parent</code> attribute.
+    The name is used for referencing these styles later, and the parent indicates what style resource to inherit from.</li>
+  <li>Inside the <code>&lt;style></code> element, declare format values in one or more <code>&lt;item&gt;</code> element(s). 
+    Each <code>&lt;item&gt;</code> identifies its style property with a <code>name</code> attribute and defines its style value inside the element.</li>
+  <li>You can then reference the custom resources from other XML resources, your manifest or application code.</li>
+</ol>
+
+
+<h2 id="styles">Styles</h2>
+
+<p>Here's an example declaration of a style: </p>
+
+<pre>
+&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;resources&gt;
+    &lt;style name="SpecialText" parent="@style/Text"&gt;
+        &lt;item name="android:textSize"&gt;18sp&lt;/item&gt;
+        &lt;item name="android:textColor"&gt;#008&lt;/item&gt;
+    &lt;/style&gt;
+&lt;/resources&gt;
+</pre>
+
+<p>As shown, you can use <code>&lt;item&gt;</code> elements to set specific formatting values for the style. 
+The <code>name</code> attribute in the <code>item</code> can refer to a standard string, a hex color value, 
+or a reference to any other resource type.</p>
+
+<p>Notice the <code>parent</code> attribute in the <code>&lt;style></code> element. This attribute lets you specify a resource from which the current style will inherit values. The style can inherit from any type of resource that contains the style(s) you want. In general, your styles should always inherit (directly or indirectly) from a standard Android style resource. This way, you only have to define the values that you want to change.</p>
+
+<p>Here's how you would reference the custom style from an XML layout, in this case, for an EditText element:</p>
+
+<pre>
+&lt;EditText id="@+id/text1"
+          style="@style/SpecialText"
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content"
+          android:text="Hello, World!" /&gt;
+</pre>
+
+<p>Now this EditText widget will be styled as defined by the XML example above.</p>
+
+
+<h2 id="themes">Themes</h2>
+
+<p>Just like styles, themes are also declared in XML <code>&lt;style&gt;</code> elements, and are referenced in the same manner.
+The difference is that you add a theme to an entire application or activity, via the <code>&lt;application&gt;</code> 
+and <code>&lt;activity&gt;</code> elements in the Android Manifest &mdash;
+themes cannot be applied to individual Views.</p>
+
+<p>Here's an example declaration of a theme:</p>
+
+<pre>
+&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;resources&gt;
+  &lt;style name="CustomTheme"&gt;        
+    &lt;item name="android:windowNoTitle">true&lt;/item>
+    &lt;item name="windowFrame"&gt;@drawable/screen_frame&lt;/item&gt;
+    &lt;item name="windowBackground"&gt;@drawable/screen_background_white&lt;/item&gt;
+    &lt;item name="panelForegroundColor"&gt;#FF000000&lt;/item&gt;
+    &lt;item name="panelBackgroundColor"&gt;#FFFFFFFF&lt;/item&gt;
+    &lt;item name="panelTextColor"&gt;?panelForegroundColor&lt;/item&gt;
+    &lt;item name="panelTextSize"&gt;14&lt;/item&gt;
+    &lt;item name="menuItemTextColor"&gt;?panelTextColor&lt;/item&gt;
+    &lt;item name="menuItemTextSize"&gt;?panelTextSize&lt;/item&gt;
+  &lt;/style&gt;
+&lt;/resources>
+</pre>
+
+<p>Notice the use of the at-symbol (@) and the question-mark (?) to reference resources.
+The at-symbol indicates that we're referencing a resource previously defined elsewhere (which may be from
+this project or from the Android framework).
+The question-mark indicates that we're referencing a resource value in the currently loaded theme. This
+is done by referring to a specific <code>&lt;item></code> by its <code>name</code> value. (E.g., 
+<em>panelTextColor</em> uses the same color assigned to <em>panelForegroundColor</em>, defined beforehand.)
+This technique can be used only in XML resources.
+</p>
+
+<h3 id="inTheManifest">Set the theme in the manifest</h3>
+<p>To set this theme for all the activites of your application, open the AndroidManifest.xml file and 
+edit the <code>&lt;application></code> tag to include the <code>android:theme</code> attribute with the 
+theme name:</p>
+
+<pre>
+&lt;application android:theme="@style/CustomTheme">
+</pre>
+
+<p>If you want the theme applied to just one Activity in your application, then add the theme
+attribute to the <code>&lt;activity></code> tag, instead.</p>
+
+<p>Just as Android provides other built-in resources, there are several themes that you swap in
+without having to write one yourself. For example, you can use the Dialog theme to make your Activity 
+appear like a dialog box. In the manifest, reference an Android theme like so:</p>
+
+<pre>
+&lt;activity android:theme="@android:style/Theme.Dialog">
+</pre>
+
+<p>If you like a theme, but want to slightly tweak it, just add the theme as the <code>parent</code> of your custom theme.
+For example, we'll modify the <code>Theme.Dialog</code> theme. To do so, create a style
+with <code>Theme.Dialog</code> as the parent:</p>
+<pre>
+&lt;style name="CustomDialogTheme" parent="@android:style/Theme.Dialog">
+</pre>
+<p>There it is. We've inherited the Android Dialog theme so we can adjust its styles as we like. 
+So, for each item in the Dialog theme that we want to change, we re-define the value here and 
+use <var>CustomDialogTheme</var> instead of <var>Theme.Dialog</var> inside the Android Manifest.</p>
+
+<h3 id="fromTheApp">Set the theme from the application</h3>
+<p>You can also load a theme for an Activity programmatically, if needed. 
+To do so, use the {@link android.app.Activity#setTheme(int) setTheme()} 
+method. Note that, when doing so, you must be sure to set the theme <em>before</em> 
+instantiating any Views in the context, for example, before calling 
+<code>setContentView(View)</code> or <code>inflate(int, ViewGroup)</code>. This ensures that 
+the system applies the same theme for all of your UI screens. Here's an example:</p>
+
+<pre>
+ protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    ...
+    setTheme(android.R.style.Theme_Light);
+    setContentView(R.layout.linear_layout_3);
+}
+</pre>
+
+<p>If you are considering loading a theme programmatically for the main
+screen of your application, note that the theme would not be applied
+in any animations the system would use to start the activity, which
+would take place before your application opens. In most cases, if 
+you want to apply a theme to your main screen, doing so in XML
+ is a better approach. </p>
+
+<p>For detailed information about custom styles and themes and referencing them from your application, see
+<a href="{@docRoot}guide/topics/resources/available-resources.html#stylesandthemes">Available Resource Types:
+Style and Themes</a>.</p>
+
+<p>For information about default themes and styles available, see {@link android.R.style}.</p>
+
+
+
+
+
+
diff --git a/docs/html/guide/topics/ui/ui-events.jd b/docs/html/guide/topics/ui/ui-events.jd
new file mode 100644
index 0000000..f4d114a
--- /dev/null
+++ b/docs/html/guide/topics/ui/ui-events.jd
@@ -0,0 +1,283 @@
+page.title=Handling UI Events
+parent.title=User Interface
+parent.link=index.html
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+  <h2>In this document</h2>
+  <ol>
+    <li><a href="#EventListeners">Event Listeners</a></li>
+    <li><a href="#EventHandlers">Event Handlers</a></li>
+    <li><a href="#TouchMode">Touch Mode</a></li>
+    <li><a href="#HandlingFocus">Handling Focus</a></li>
+  </ol>
+
+  <h2>See also</h2>
+  <ol>
+    <li><a href="{@docRoot}guide/tutorials/views/hello-formstuff.html">Hello Form Stuff tutorial</a></li>
+  </ol>
+</div>
+</div>
+
+<p>On Android, there's more than one way to intercept the events from a user's interaction with your application.
+When considering events within your user interface, the approach is to capture the events from
+the specific View object that the user interacts with. The View class provides the means to do so.</p>
+
+<p>Within the various View classes that you'll use to compose your layout, you may notice several public callback 
+methods that look useful for UI events. These methods are called by the Android framework when the 
+respective action occurs on that object. For instance, when a View (such as a Button) is touched,
+the <code>onTouchEvent()</code> method is called on that object. However, in order to intercept this, you must extend
+the class and override the method. Obviously, extending every View object
+you want to use (just to handle an event) would be obsurd. This is why the View class also contains
+a collection of nested interfaces with callbacks that you can much more easily define. These interfaces,
+called <a href="#EventListeners">event listeners</a>, are your ticket to capturing the user interaction with your UI.</p>
+
+<p>While you will more commonly use the event listeners to listen for user interaction, there may
+come a time when you do want to extend a View class, in order to build a custom component. 
+Perhaps you want to extend the {@link android.widget.Button}
+class to make something more fancy. In this case, you'll be able to define the default event behaviors for your
+class using the class <a href="#EventHandlers">event handlers</a>.</p>
+
+
+<h2 id="EventListeners">Event Listeners</h2>
+
+<p>An event listener is an interface in the {@link android.view.View} class that contains a single 
+callback method. These methods will be called by the Android framework when the View to which the listener has
+been registered is triggered by user interaction with the item in the UI.</p>
+
+<p>Included in the event listener interfaces are the following callback methods:</p>
+
+<dl>
+  <dt><code>onClick()</code></dt>
+    <dd>From {@link android.view.View.OnClickListener}. 
+    This is called when the user either touches the item 
+    (when in touch mode), or focuses upon the item with the navigation-keys or trackball and
+    presses the suitable "enter" key or presses down on the trackball.</dd>
+  <dt><code>onLongClick()</code></dt>
+    <dd>From {@link android.view.View.OnLongClickListener}. 
+    This is called when the user either touches and holds the item (when in touch mode), or 
+    focuses upon the item with the navigation-keys or trackball and
+    presses and holds the suitable "enter" key or presses and holds down on the trackball (for one second).</dd>
+  <dt><code>onFocusChange()</code></dt>
+    <dd>From {@link android.view.View.OnFocusChangeListener}. 
+    This is called when the user navigates onto or away from the item, using the navigation-keys or trackball.</dd>
+  <dt><code>onKey()</code></dt>
+    <dd>From {@link android.view.View.OnKeyListener}. 
+    This is called when the user is focused on the item and presses or releases a key on the device.</dd>
+  <dt><code>onTouch()</code></dt>
+    <dd>From {@link android.view.View.OnTouchListener}. 
+    This is called when the user performs an action qualified as a touch event, including a press, a release,
+    or any movement gesture on the screen (within the bounds of the item).</dd>
+  <dt><code>onCreateContextMenu()</code></dt>
+    <dd>From {@link android.view.View.OnCreateContextMenuListener}. 
+    This is called when a Context Menu is being built (as the result of a sustained "long click"). See the discussion
+    on context menus in <a href="{@docRoot}guide/topics/ui/menus.html#context-menu">Creating Menus</a> for more information.</dd>
+</dl>
+
+<p>These methods are the sole inhabitants of their respective interface. To define one of these methods
+and handle your events, implement the nested interface in your Activity or define it as an anonymous class.
+Then, pass an instance of your implementation
+to the respective <code>View.set...Listener()</code> method. (E.g., call 
+<code>{@link android.view.View#setOnClickListener(View.OnClickListener) setOnClickListener()}</code> 
+and pass it your implementation of the {@link android.view.View.OnClickListener OnClickListener}.)</p>
+
+<p>The example below shows how to register an on-click listener for a Button. </p>
+
+<pre>
+// Create an anonymous implementation of OnClickListener
+private OnClickListener mCorkyListener = new OnClickListener() {
+    public void onClick(View v) {
+      // do something when the button is clicked
+    }
+};
+
+protected void onCreate(Bundle savedValues) {
+    ...
+    // Capture our button from layout
+    Button button = (Button)findViewById(R.id.corky);
+    // Register the onClick listener with the implementation above
+    button.setOnClickListener(mCorkyListener);
+    ...
+}
+</pre>
+
+<p>You may also find it more conventient to implement OnClickListener as a part of your Activity.
+This will avoid the extra class load and object allocation. For example:</p>
+<pre>
+public class ExampleActivity extends Activity implements OnClickListener {
+    protected void onCreate(Bundle savedValues) {
+        ...
+        Button button = (Button)findViewById(R.id.corky);
+        button.setOnClickListener(this);
+    }
+
+    // Implement the OnClickListener callback
+    public void onClick(View v) {
+      // do something when the button is clicked
+    }
+    ...
+}
+</pre>
+
+<p>Notice that the <code>onClick()</code> callback in the above example has
+no return value, but some other event listener methods must return a boolean. The reason
+depends on the event. For the few that do, here's why:</p>
+<ul>
+  <li><code>{@link android.view.View.OnLongClickListener#onLongClick(View) onLongClick()}</code> - 
+    This returns a boolean to indicate whether you have consumed the event and it should not be carried further. 
+    That is, return <em>true</em> to indicate that you have handled the event and it should stop here; 
+    return <em>false</em> if you have not handled it and/or the event should continue to any other
+    on-click listeners.</li>
+  <li><code>{@link android.view.View.OnKeyListener#onKey(View,int,KeyEvent) onKey()}</code> - 
+    This returns a boolean to indicate whether you have consumed the event and it should not be carried further.
+    That is, return <em>true</em> to indicate that you have handled the event and it should stop here; 
+    return <em>false</em> if you have not handled it and/or the event should continue to any other
+    on-key listeners.</li>
+  <li><code>{@link android.view.View.OnTouchListener#onTouch(View,MotionEvent) onTouch()}</code> - 
+    This returns a boolean to indicate whether your listener consumes this event. The important thing is that
+    this event can have multiple actions that follow each other. So, if you return <em>false</em> when the
+    down action event is received, you indicate that you have not consumed the event and are also
+    not interested in subsequent actions from this event. Thus, you will not be called for any other actions
+    within the event, such as a fingure gesture, or the eventual up action event.</li>
+</ul>
+
+<p>Remember that key events are always delivered to the View currently in focus. They are dispatched starting from the top
+of the View hierarchy, and then down, until they reach the appropriate destination. If your View (or a child of your View)
+currently has focus, then you can see the event travel through the <code>{@link android.view.View#dispatchKeyEvent(KeyEvent)
+dispatchKeyEvent()}</code> method. As an alternative to capturing key events through your View, you can also receive 
+all of the events inside your Activity with <code>{@link android.app.Activity#onKeyDown(int,KeyEvent) onKeyDown()}</code>
+and <code>{@link android.app.Activity#onKeyUp(int,KeyEvent) onKeyUp()}</code>.</p>
+
+<p class="note"><strong>Note:</strong> Android will call event handlers first and then the appropriate default
+handlers from the class definition second. As such, returning <em>true</em> from these event listeners will stop
+the propagation of the event to other event listeners and will also block the callback to the
+default event handler in the View. So be certain that you want to terminate the event when you return <em>true</em>.</p>
+
+
+<h2 id="EventHandlers">Event Handlers</h2>
+
+<p>If you're building a custom component from  View, then you'll be able to define several callback methods
+used as default event handlers.
+In the document on <a href="{@docRoot}guide/topics/ui/custom-components.html">Building Custom Components</a>,
+you'll learn see some of the common callbacks used for event handling, including:</p>
+<ul>
+  <li><code>{@link  android.view.View#onKeyDown}</code> - Called when a new key event occurs.</li>
+  <li><code>{@link  android.view.View#onKeyUp}</code> - Called when a key up event occurs.</li>
+  <li><code>{@link  android.view.View#onTrackballEvent}</code> - Called when a trackball motion event occurs.</li>
+  <li><code>{@link  android.view.View#onTouchEvent}</code> - Called when a touch screen motion event occurs.</li>
+  <li><code>{@link  android.view.View#onFocusChanged}</code> - Called when the view gains or loses focus.</li>
+</ul>
+<p>There are some other methods that you should be awere of, which are not part of the View class, 
+but can directly impact the way you're able to handle events. So, when managing more complex events inside 
+a layout, consider these other methods:</p>
+<ul>
+  <li><code>{@link  android.app.Activity#dispatchTouchEvent(MotionEvent)
+    Activity.dispatchTouchEvent(MotionEvent)}</code> - This allows your {@link 
+    android.app.Activity} to intercept all touch events before they are dispatched to the window.</li>
+  <li><code>{@link  android.view.ViewGroup#onInterceptTouchEvent(MotionEvent)
+    ViewGroup.onInterceptTouchEvent(MotionEvent)}</code> - This allows a {@link
+    android.view.ViewGroup} to watch events as they are dispatched to child Views.</li>
+  <li><code>{@link  android.view.ViewParent#requestDisallowInterceptTouchEvent(boolean)
+    ViewParent.requestDisallowInterceptTouchEvent(boolean)}</code> - Call this
+    upon a parent View to indicate that it should not intercept touch events with <code>{@link 
+    android.view.ViewGroup#onInterceptTouchEvent(MotionEvent)}</code>.</li>
+</ul>
+
+<h2 id="TouchMode">Touch Mode</h2>
+<p>
+When a user is navigating a user interface with directional keys or a trackball, it is
+necessary to give focus to actionable items (like buttons) so the user can see
+what will accept input.  If the device has touch capabilities, however, and the user
+begins interacting with the interface by touching it, then it is no longer necessary to
+highlight items, or give focus to a particular View.  Thus, there is a mode
+for interaction named "touch mode." 
+</p>
+<p>
+For a touch-capable device, once the user touches the screen, the device
+will enter touch mode.  From this point onward, only Views for which
+{@link android.view.View#isFocusableInTouchMode} is true will be focusable, such as text editing widgets.
+Other Views that are touchable, like buttons, will not take focus when touched; they will
+simply fire their on-click listeners when pressed.
+</p>
+<p>
+Any time a user hits a directional key or scrolls with a trackball, the device will
+exit touch mode, and find a view to take focus. Now, the user may resume interacting
+with the user interface without touching the screen.
+</p>
+<p>
+The touch mode state is maintained throughout the entire system (all windows and activities). 
+To query the current state, you can call
+{@link android.view.View#isInTouchMode} to see whether the device is currently in touch mode.
+</p>
+
+
+<h2 id="HandlingFocus">Handling Focus</h2>
+
+<p>The framework will handle routine focus movement in response to user input.
+This includes changing the focus as Views are removed or hidden, or as new
+Views become available. Views indicate their willingness to take focus
+through the <code>{@link android.view.View#isFocusable()}</code> method. To change whether a View can take
+focus, call <code>{@link android.view.View#setFocusable(boolean) setFocusable()}</code>.  When in touch mode,
+you may query whether a View allows focus with <code>{@link android.view.View#isFocusableInTouchMode()}</code>.
+You can change this with <code>{@link android.view.View#setFocusableInTouchMode(boolean) setFocusableInTouchMode()}</code>.
+</p>
+
+<p>Focus movement is based on an algorithm which finds the nearest neighbor in a
+given direction. In rare cases, the default algorithm may not match the
+intended behavior of the developer. In these situations, you can provide
+explicit overrides with the following XML attributes in the layout file:
+<var>nextFocusDown</var>, <var>nextFocusLeft</var>, <var>nextFocusRight</var>, and
+<var>nextFocusUp</var>. Add one of these attributes to the View <em>from</em> which
+the focus is leaving. Define the value of the attribute to be the id of the View
+<em>to</em> which focus should be given. For example:</p>
+<pre>
+&lt;LinearLayout
+    android:orientation="vertical"
+    ... >
+  &lt;Button android:id="@+id/top"
+          android:nextFocusUp="@+id/bottom"
+          ... />
+  &lt;Button android:id="@+id/bottom"
+          android:nextFocusDown="@+id/top"
+          ... />
+&lt;/LinearLayout>
+</pre>
+
+<p>Ordinarily, in this vertical layout, navigating up from the first Button would not go
+anywhere, nor would navigating down from the second Button. Now that the top Button has
+defined the bottom one as the <var>nextFocusUp</var> (and vice versa), the navigation focus will 
+cycle from top-to-bottom and bottom-to-top.</p>
+
+<p>If you'd like to declare a View as focusable in your UI (when it is traditionally not), 
+add the <code>android:focusable</code> XML attribute to the View, in your layout declaration.
+Set the value <var>true</var>. You can also declare a View
+as focusable while in Touch Mode with <code>android:focusableInTouchMode</code>.</p>
+<p>To request a particular View to take focus, call <code>{@link android.view.View#requestFocus()}</code>.</p>
+<p>To listen for focus events (be notified when a View receives or looses focus), use
+<code>{@link android.view.View.OnFocusChangeListener#onFocusChange(View,boolean) onFocusChange()}</code>,
+as discussed in the <a href="#EventListeners">Event Listeners</a> section, above.</p>
+
+
+
+<!--
+<h2 is="EventCycle">Event Cycle</h2>
+   <p>The basic cycle of a View is as follows:</p>
+   <ol>
+    <li>An event comes in and is dispatched to the appropriate View. The View
+    handles the event and notifies any listeners.</li>
+    <li>If, in the course of processing the event, the View's bounds may need
+    to be changed, the View will call {@link android.view.View#requestLayout()}.</li>
+    <li>Similarly, if in the course of processing the event the View's appearance
+    may need to be changed, the View will call {@link android.view.View#invalidate()}.</li>
+    <li>If either {@link android.view.View#requestLayout()} or {@link android.view.View#invalidate()} were called,
+    the framework will take care of measuring, laying out, and drawing the tree
+    as appropriate.</li>
+   </ol>
+   
+   <p class="note"><strong>Note:</strong> The entire View tree is single threaded. You must always be on
+   the UI thread when calling any method on any View.
+   If you are doing work on other threads and want to update the state of a View
+   from that thread, you should use a {@link android.os.Handler}.
+   </p>
+-->
diff --git a/docs/html/guide/topics/views/custom-views.jd b/docs/html/guide/topics/views/custom-views.jd
new file mode 100644
index 0000000..c5f9346
--- /dev/null
+++ b/docs/html/guide/topics/views/custom-views.jd
@@ -0,0 +1,544 @@
+page.title=Building Custom Views
+parent.title=Views and Layout
+parent.link=index.html
+@jd:body
+
+<p>Android offers a sophisticated and powerful componentized model for building your UI, based on the fundamental building block classes {@link android.view.View} and {@link android.view.ViewGroup}. To start with, the platform includes a variety of prebuilt View and ViewGroup subclasses &mdash; called widgets and layouts, respectively &mdash; that you can use to construct your UI. The widgets and layouts are fully implemented and handle all of their own measuring and drawing, so you can use them right away. You can make new types of UI elements simply by nesting and grouping the widgets and layouts. Using widgets and layouts is the recommended approach to building a UI for your applications.</p>
+
+<p>A partial list of available widgets includes {@link android.widget.Button Button}, 
+{@link android.widget.TextView TextView}, 
+{@link android.widget.EditText EditText}, 
+{@link android.widget.ListView ListView},
+{@link android.widget.CheckBox CheckBox}, 
+{@link android.widget.RadioButton RadioButton}, 
+{@link android.widget.Gallery Gallery}, 
+{@link android.widget.Spinner Spinner}, and the more special-purpose 
+{@link android.widget.AutoCompleteTextView AutoCompleteTextView}, 
+{@link android.widget.ImageSwitcher ImageSwitcher}, and
+{@link android.widget.TextSwitcher TextSwitcher}. </p>
+
+<p>Among the layouts available are {@link android.widget.LinearLayout LinearLayout}, 
+{@link android.widget.FrameLayout FrameLayout}, {@link android.widget.AbsoluteLayout AbsoluteLayout}, and others. For more examples, see <a href="layout">Common Layout Objects</a>.</p>
+
+<p>If none of the prebuilt widgets or layouts meets your needs, you can also create your own View subclass, such as a layout group or compound control. If you only need to make small adjustments to an existing widget or layout, you can simply subclass the widget or layout and override its methods.
+</p>
+
+<p>Creating your own View subclasses gives you precise control over the appearance and function of a screen element. To give an idea of the control you get with custom views, here are some examples of what you could do with them:</p>
+ 
+<ul>
+  <li>
+    You could create a completely custom-rendered View type, for example a "volume
+    control" knob rendered using 2D graphics, and which resembles an
+    analog electronic control.
+  </li>
+  <li>
+    You could combine a group of View components into a new single component, perhaps
+    to make something like a ComboBox (a combination of popup list and free
+    entry text field), a dual-pane selector control (a left and right pane
+    with a list in each where you can re-assign which item is in which
+    list), and so on.
+  </li>
+  <li>
+    You could override the way that an EditText component is rendered on the screen
+    (the <a href="{@docRoot}guide/samples/NotePad/">Notepad sample</a> uses this to good effect, 
+    to create a lined-notepad page).
+  </li>
+  <li>
+    You could capture other events like key presses and handle them in some custom
+    way (such as for a game).
+  </li>
+</ul>
+<p>
+The sections below explain how to create custom Views and use them in your application. 
+For detailed reference information, see the {@link android.view.View} class. </p>
+
+<p>This document covers the following:</p>
+<ol class="toc">
+  <li><a href="#basic">The Basic Approach</a></li>
+  <li><a href="#custom">Fully Customized Views</a></li>
+  <li><a href="#customexample">Customized View Example</a></li> 
+  <li><a href="#compound">Compound Controls</a></li>
+  <li><a href="#tweaking">Modifying an Existing Component Type</a></li>
+</ol>
+
+<a name="basic"></a> 
+<h2>The Basic Approach
+</h2>
+<p>
+These steps provide a high level overview of
+what you need to know to get started in creating your own
+View components:</p>
+ 
+<ol>
+  <li>
+    Extend an existing {@link android.view.View View} class or subclass 
+	with your own class.
+  </li>
+  <li>
+    Override some of the methods from the superclass: the superclass methods 
+    to override start with '<code>on</code>', for
+    example, {@link android.view.View#onDraw onDraw()}, 
+    {@link android.view.View#onMeasure onMeasure()}, and 
+    {@link android.view.View#onKeyDown onKeyDown()}.
+    <ul>
+      <li>
+        This is similar to the <code>on...</code> events in {@link android.app.Activity
+	    Activity} or {@link android.app.ListActivity ListActivity}
+        that you override for life cycle and other functionality hooks.
+      </li>
+    </ul>
+  <li>
+    Use your new extension class: once completed, your new extension class 
+    can be used in place of the view upon which it was based, but now with the new 
+    functionality.
+  </li>
+</ol>  
+<p class="note"><strong>Tip:</strong>
+    Extension classes can be defined as inner classes inside the activities
+    that use them. This is useful because it controls access to them but
+    isn't necessary (perhaps you want to create a new public View for
+    wider use in your application).
+</p>
+
+<a name="custom"></a> 
+<h2>Fully Customized Components</h2>
+<p>
+Fully customized components can be used to create graphical components that
+appear however you wish. Perhaps a graphical VU
+meter that looks like an old analog gauge, or a sing-a-long text view where
+a bouncing ball moves along the words so you can sing along with a karaoke
+machine. Either way, you want something that the built-in components just
+won't do, no matter how you combine them.</p>
+<p>Fortunately, you can easily create components that look and behave in any
+way you like, limited perhaps only by your imagination, the size of the
+screen, and the available processing power (remember that ultimately your
+application might have to run on something with significantly less power
+than your desktop workstation).</p>
+<p>To create a fully customized component:</p> 
+<ol>
+  <li>
+    The most generic view you can extend is, unsurprisingly, {@link
+    android.view.View View}, so you will usually start by extending this to
+    create your new super component.
+  </li>
+  <li>
+    You can supply a constructor which can
+    take attributes and parameters from the XML, and you can also consume
+    your own such attributes and parameters (perhaps the color and range of
+    the VU meter, or the width and damping of the needle, etc.)
+  </li>
+  <li>
+    You will probably want to create your own event listeners,
+    property accessors and modifiers, and possibly more sophisticated
+    behavior in your component class as well.
+  </li>
+  <li>
+    You will almost certainly want to override <code>onMeasure()</code> and
+    are also likely to need to override <code>onDraw()</code> if you want
+    the component to show something. While both have default behavior,
+    the default <code>onDraw()</code> will do nothing, and the default
+    <code>onMeasure()</code> will always set a size of 100x100 &mdash; which is
+    probably not what you want.
+  </li>
+  <li>
+    Other <code>on...</code> methods may also be overridden as required.
+  </li>
+</ol>
+<h4><code>onDraw()</code> and <code>onMeasure()</code></h4>
+<p><code>onDraw()</code> delivers you a {@link android.graphics.Canvas Canvas}
+upon which you can implement anything you want: 2D graphics, other standard or
+custom components, styled text, or anything else you can think of.</p>
+<p><em>Note:</em>
+Except for 3D graphics. If you want to
+use 3D graphics, you must extend {@link android.view.SurfaceView SurfaceView}
+instead of View, and draw from a seperate thread. See the
+GLSurfaceViewActivity sample
+for details.</p>
+<p><code>onMeasure()</code> is a little more involved. <code>onMeasure()</code>
+is a critical piece of the rendering contract between your component and its
+container. <code>onMeasure()</code> should be overridden to efficiently and
+accurately report the measurements of its contained parts. This is made
+slightly more complex by the requirements of limits from the parent
+(which are passed in to the <code>onMeasure()</code> method) and by the
+requirement to call the <code>setMeasuredDimension()</code> method with the
+measured width and height once they have been calculated. If you fail to
+call this method from an overridden <code>onMeasure()</code> method, the 
+result will be an exception at measurement time.</p>
+<p>At a high level, implementing <code>onMeasure()</code> looks something 
+ like this:</p>
+ 
+<ol>
+  <li>
+    The overridden <code>onMeasure()</code> method is called with width and
+    height measure specifications (<code>widthMeasureSpec</code> and
+    <code>heighMeasureSpec</code> parameters, both are integer codes
+    representing dimensions) which should be treated as requirements for
+    the restrictions on the width and height measurements you should produce. A
+    full reference to the kind of restrictions these specifications can require
+    can be found in the reference documentation under {@link
+    android.view.View#onMeasure View.onMeasure(int, int)} (this reference
+    documentation does a pretty good job of explaining the whole measurement
+    operation as well).
+  </li>
+  <li>
+    Your component's <code>onMeasure()</code> method should calculate a
+    measurement width and height which will be required to render the
+    component. It should try to stay within the specifications passed in,
+    although it can choose to exceed them (in this case, the parent can
+    choose what to do, including clipping, scrolling, throwing an exception, 
+    or asking the <code>onMeasure()</code> to try again, perhaps with
+    different measurement specifications).
+  </li>
+  <li>
+    Once the width and height are calculated, the <code>setMeasuredDimension(int
+    width, int height)</code> method must be called with the calculated
+    measurements. Failure to do this will result in an exception being
+    thrown.
+  </li>
+</ol>
+
+<p>
+Here's a summary of some of the other standard methods that the framework calls on views:
+</p>
+<table border="2" width="85%" align="center" cellpadding="5">
+       <thead>
+           <tr><th>Category</th> <th>Methods</th> <th>Description</th></tr>
+       </thead>
+       
+       <tbody>
+       <tr>
+           <td rowspan="2">Creation</td>
+           <td>Constructors</td>
+           <td>There is a form of the constructor that are called when the view
+           is created from code and a form that is called when the view is
+           inflated from a layout file. The second form should parse and apply
+           any attributes defined in the layout file.
+           </td>
+       </tr>
+       <tr>
+           <td><code>{@link android.view.View#onFinishInflate()}</code></td>
+           <td>Called after a view and all of its children has been inflated
+           from XML.</td>
+       </tr>
+       
+       <tr>
+           <td rowspan="3">Layout</td>
+           <td><code>{@link  android.view.View#onMeasure}</code></td>
+           <td>Called to determine the size requirements for this view and all
+           of its children.
+           </td>
+       </tr>
+       <tr>
+           <td><code>{@link  android.view.View#onLayout}</code></td>
+           <td>Called when this view should assign a size and position to all
+           of its children.
+           </td>
+       </tr>
+       <tr>
+           <td><code>{@link  android.view.View#onSizeChanged}</code></td>
+           <td>Called when the size of this view has changed.
+           </td>
+       </tr>
+       
+       <tr>
+           <td>Drawing</td>
+           <td><code>{@link  android.view.View#onDraw}</code></td>
+           <td>Called when the view should render its content.
+           </td>
+       </tr>
+  
+       <tr>
+           <td rowspan="4">Event processing</td>
+           <td><code>{@link  android.view.View#onKeyDown}</code></td>
+           <td>Called when a new key event occurs.
+           </td>
+       </tr>
+       <tr>
+           <td><code>{@link  android.view.View#onKeyUp}</code></td>
+           <td>Called when a key up event occurs.
+           </td>
+       </tr>   
+       <tr>
+           <td><code>{@link  android.view.View#onTrackballEvent}</code></td>
+           <td>Called when a trackball motion event occurs.
+           </td>
+       </tr>  
+       <tr>
+           <td><code>{@link  android.view.View#onTouchEvent}</code></td>
+           <td>Called when a touch screen motion event occurs.
+           </td>
+       </tr>  
+       
+       <tr>
+           <td rowspan="2">Focus</td>
+           <td><code>{@link  android.view.View#onFocusChanged}</code></td>
+           <td>Called when the view gains or loses focus.
+           </td>
+       </tr>
+       
+       <tr>
+           <td><code>{@link  android.view.View#onWindowFocusChanged}</code></td>
+           <td>Called when the window containing the view gains or loses focus.
+           </td>
+       </tr>
+       
+       <tr>
+           <td rowspan="3">Attaching</td>
+           <td><code>{@link  android.view.View#onAttachedToWindow()}</code></td>
+           <td>Called when the view is attached to a window.
+           </td>
+       </tr>
+  
+       <tr>
+           <td><code>{@link  android.view.View#onDetachedFromWindow}</code></td>
+           <td>Called when the view is detached from its window.
+           </td>
+       </tr>     
+  
+       <tr>
+           <td><code>{@link  android.view.View#onWindowVisibilityChanged}</code></td>
+           <td>Called when the visibility of the window containing the view
+           has changed.
+           </td>
+       </tr>     
+       </tbody>
+       
+   </table>
+
+
+<a name="customexample"></a>
+<h3>A Custom View Example</h3>
+<p>The CustomView sample in the 
+<a href="{@docRoot}samples/ApiDemos/index.html">API Demos</a> provides an example
+of a customized View. The custom View is defined in the
+<a href="{@docRoot}samples/ApiDemos/src/com/example/android/apis/view/LabelView.html">LabelView</a>
+class.</p>
+<p>The LabelView sample demonstrates a number of different aspects of custom components:</p>
+<ul>
+  <li>Extending the View class for a completely custom component.</li>
+  <li>Parameterized constructor that takes the view inflation parameters
+  (parameters defined in the XML). Some of these are passed through to the
+  View superclass, but more importantly, there are some custom attributes defined
+  and used for LabelView.</li>
+  <li>Standard public methods of the type you would expect to see for a label
+  component, for example <code>setText()</code>, <code>setTextSize()</code>,
+  <code>setTextColor()</code> and so on.</li>
+  <li>An overridden <code>onMeasure</code> method to determine and set the
+  rendering size of the component. (Note that in LabelView, the real work is done
+  by a private <code>measureWidth()</code> method.)</li>
+  <li>An overridden <code>onDraw()</code> method to draw the label onto the
+  provided canvas.</li>
+</ul>
+<p>You can see some sample usages of the LabelView custom View in
+<a href="{@docRoot}samples/ApiDemos/res/layout/custom_view_1.html">custom_view_1.xml</a>
+from the samples. In particular, you can see a mix of both <code>android:</code>
+namespace parameters and custom <code>app:</code> namespace parameters. These
+<code>app:</code> parameters are the custom ones that the LabelView recognizes
+and works with, and are defined in a styleable inner class inside of the
+samples R resources definition class.</p>
+
+<a name="compound"></a>  
+<h2>Compound Controls
+</h2>
+<p>If you don't want to create a completely customized component, but instead
+are looking to put together a reusable component that consists of a group of
+existing controls, then creating a Compound Component (or Compound Control) might
+fit the bill. In a nutshell, this brings together a number of more atomic
+controls (or views) into a logical group of items that can be treated as a
+single thing. For example, a Combo Box can be thought of as a
+combination of a single line EditText field and an adjacent button with an attached
+ PopupList. If you press the button and select
+something from the list, it populates the EditText field, but the user can
+also type something directly into the EditText if they prefer.</p>
+<p>In Android, there are actually two other Views readily available to do
+this: {@link android.widget.Spinner Spinner} and 
+{@link android.widget.AutoCompleteTextView AutoCompleteTextView}, but 
+regardless, the concept of a Combo Box makes an easy-to-understand 
+example.</p>
+<p>To create a compound component:</p>
+<ol>
+  <li>
+    The usual starting point is a Layout of some kind, so create a class
+    that extends a Layout. Perhaps in the case of a Combo box we might use
+    a LinearLayout with horizontal orientation. Remember that other layouts
+    can be nested inside, so the compound component can be arbitrarily
+    complex and structured. Note that just like with an Activity, you can
+    use either the declarative (XML-based) approach to creating the
+    contained components, or you can nest them programmatically from your
+    code.
+  </li>
+  <li>
+    In the constructor for the new class, take whatever parameters the
+    superclass expects, and pass them through to the superclass constructor
+    first. Then you can set up the other views to use within your new
+    component; this is where you would create the EditText field and the
+    PopupList. Note that you also might introduce your own attributes and
+    parameters into the XML that can be pulled out and used by your
+    constructor.
+  </li>
+  <li>
+    You can also create listeners for events that your contained views might
+    generate, for example, a listener method for the List Item Click Listener
+    to update the contents of the EditText if a list selection is made.
+  </li>
+  <li>
+    You might also create your own properties with accessors and modifiers,
+    for example, allow the EditText value to be set initially in the
+    component and query for its contents when needed.
+  </li>
+  <li>
+    In the case of extending a Layout, you don't need to override the
+    <code>onDraw()</code> and <code>onMeasure()</code> methods since the
+    layout will have default behavior that will likely work just fine. However, 
+    you can still override them if you need to.
+  </li>
+  <li>
+    You might override other <code>on...</code> methods, like
+    <code>onKeyDown()</code>, to perhaps choose certain default values from
+    the popup list of a combo box when a certain key is pressed.
+  </li>
+</ol>
+<p>
+ To summarize, the use of a Layout as the basis for a Custom Control has a
+number of advantages, including:</p>
+ 
+<ul>
+  <li>
+    You can specify the layout using the declarative XML files just like
+    with an activity screen, or you can create views programmatically and
+    nest them into the layout from your code.
+  </li>
+  <li>
+    The <code>onDraw()</code> and <code>onMeasure()</code> methods (plus
+    most of the other <code>on...</code> methods) will likely have suitable behavior so
+    you don't have to override them.
+  </li>
+  <li>
+    In the end, you can very quickly construct arbitrarily complex compound
+    views and re-use them as if they were a single component.
+  </li>
+</ul>
+<h4>Examples of Compound Controls</h4>
+<p>In the API Demos project
+ that comes with the SDK, there are two List
+ examples &mdash; Example 4 and Example 6 under Views/Lists demonstrate a
+ SpeechView which extends LinearLayout to make a component for displaying
+ Speech quotes. The corresponding classes in the sample code are
+ <code>List4.java</code> and <code>List6.java</code>.</p>
+ 
+<a name="tweaking"></a>  
+<h2>Modifying an Existing View Type
+</h2>
+<p>There is an even easier option for creating a custom View which is
+useful in certain circumstances. If there is a component that is already very
+similar to what you want, you can simply extend that component and just
+override the behavior that you want to change. You can do all of the things
+you would do with a fully customized component, but by starting with a more
+specialized class in the View heirarchy, you can also get a lot of behavior for
+free that probably does exactly what you want.</p>
+<p>For example, the SDK includes a <a
+href="{@docRoot}samples/NotePad/index.html">NotePad application</a> in the
+samples. This demonstrates many aspects of using the Android platform, among
+them is extending an EditText View to make a lined notepad. This is not a
+perfect example, and the APIs for doing this might change from this early
+preview, but it does demonstrate the principles.</p>
+<p>If you haven't done so already, import the 
+NotePad sample into Eclipse (or
+just look at the source using the link provided). In particular look at the definition of
+<code>MyEditText</code> in the <a
+href="{@docRoot}samples/NotePad/src/com/example/android/notepad/NoteEditor.html">NoteEditor.java</a>
+file.</p>
+<p>Some points to note here</p>
+<ol>
+  <li>
+    <strong>The Definition</strong>
+    <p>The class is defined with the following line:</p>
+     <code>public static class MyEditText extends EditText</code><br><br>
+     
+    <ul>
+      <li>
+        It is defined as an inner class within the <code>NoteEditor</code>
+        activity, but it is public so that it could be accessed as
+        <code>NoteEditor.MyEditText</code> from outside of the <code>NoteEditor</code>
+        class if desired.
+      </li>
+      <li>
+        It is <code>static</code>, meaning it does not generate the so-called
+        "synthetic methods" that allow it to access data from the parent
+        class, which in turn means that it really behaves as a separate
+        class rather than something strongly related to <code>NoteEditor</code>.
+        This is a cleaner way to create inner classes if they do not need
+        access to state from the outer class, keeps the generated class
+        small, and allows it to be used easily from other classes.
+      </li>
+      <li>
+        It extends <code>EditText</code>, which is the View we have chosen to
+        customize in this case. When we are finished, the new class will be
+        able to substitute for a normal <code>EditText</code> view.<br>
+        <br>
+      </li>
+    </ul>
+  </li>
+  <li>
+    <strong>Class Initialization</strong>
+    <p>As always, the super is called first. Furthermore, 
+    this is not a default constructor, but a parameterized one. The
+    EditText is created with these parameters when it is inflated from an
+    XML layout file, thus, our constructor needs to both take them and pass them
+    to the superclass constructor as well.</p>
+  </li>
+  <li>
+    <strong>Overridden Methods</strong>
+    <p>In this example, there is only one method to be overridden: 
+    <code>onDraw()</code> &mdash; but there could easily be others needed when you
+    create your own custom components.</p>
+    <p>For the NotePad sample, overriding the <code>onDraw()</code> method allows
+    us to paint the blue lines on the <code>EditText</code> view canvas (the
+    canvas is passed into the overridden <code>onDraw()</code> method). The
+    super.onDraw() method is called before the method ends. The
+    superclass method should be invoked, but in this case, we do it at the
+    end after we have painted the lines we want to include.</p>
+  <li>
+    <strong>Use the Custom Component</strong>
+    <p>We now have our custom component, but how can we use it? In the
+    NotePad example, the custom component is used directly from the
+    declarative layout, so take a look at <code>note_editor.xml</code> in the
+    <code>res/layout</code> folder.</p>
+    <pre>
+&lt;view xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot; 
+  class=&quot;com.android.notepad.NoteEditor$MyEditText&quot; 
+  id=&quot;&#64;+id/note&quot;
+  android:layout_width=&quot;fill_parent&quot;
+  android:layout_height=&quot;fill_parent&quot;
+  android:background=&quot;&#64;android:drawable/empty&quot;
+  android:padding=&quot;10dip&quot;
+  android:scrollbars=&quot;vertical&quot;
+  android:fadingEdge=&quot;vertical&quot; /&gt; </pre>
+     
+    <ul>
+      <li>
+        The custom component is created as a generic view in the XML, and
+        the class is specified using the full package. Note also that the
+        inner class we defined is referenced using the
+        <code>NoteEditor$MyEditText</code> notation which is a standard way to
+        refer to inner classes in the Java programming language.
+      </li>
+      <li>
+        The other attributes and parameters in the definition are the ones
+        passed into the custom component constructor, and then passed
+        through to the EditText constructor, so they are the same
+        parameters that you would use for an EditText view. Note that it is
+        possible to add your own parameters as well, and we will touch on
+        this again below.
+      </li>
+    </ul>
+  </li>
+</ol>
+<p>And that's all there is to it. Admittedly this is a simple case, but
+that's the point &mdash; creating custom components is only as complicated as you
+need it to be.</p>
+<p>A more sophisticated component may override even more <code>on...</code> methods and
+introduce some of its own helper methods, substantially customizing its properties and
+behavior. The only limit is your imagination and what you need the component to
+do.</p>
+
diff --git a/docs/html/guide/topics/views/intro.jd b/docs/html/guide/topics/views/intro.jd
new file mode 100644
index 0000000..f49f547
--- /dev/null
+++ b/docs/html/guide/topics/views/intro.jd
@@ -0,0 +1,49 @@
+page.title=Introduction to Views
+parent.title=Views and Layout
+parent.link=index.html
+@jd:body
+
+<p>The basic functional unit of an Android application is the <em>activity</em> &mdash; an object of the class {@link android.app.Activity android.app.Activity}. An activity can do many things, but by itself it does not have a  presence on the  screen. To give your activity a screen presence and design its UI, you work with <em>views</em> and <em>viewgroups</em> -- basic units of user interface expression on the Android platform.</p>
+
+<h2>Views</h2>
+<p>A view is an object of base class {@link android.view.View android.view.View}. It's a data structure whose   properties store the layout and content for a specific rectangular area of the screen. A View object handles measuring and layout, drawing, focus change, scrolling, and key/gestures for the screen area it represents. </p>
+<p>The View  class serves as a base  class for <em>widgets </em> &mdash; a set of fully implemented subclasses that draw interactive screen elements. Widgets handle their own measuring and drawing, so you can use them to build your UI more quickly. The list of  widgets available includes Text, EditText, InputMethod, MovementMethod, Button, RadioButton, Checkbox, and ScrollView.</p>
+
+<h2>Viewgroups </h2>
+
+<p>A viewgroup is an object of class {@link android.view.ViewGroup android.view.Viewgroup}. As its name indicates, a viewgroup is a special type of view object whose function is to contain and manage a subordinate set of views and other viewgroups, Viewgroups let you add structure to your UI and build up complex screen elements that can be addressed as a single entity. </p>
+
+<p>The Viewgroup class serves as a base class for <em>layouts</em> &mdash; a set of fully implemented subclasses that provide common types of screen layout. The layouts give you a way to build a structure for a set of views. </p>
+
+<h2>A Tree-Structured UI</h2>
+
+<p>On the Android platform, you define an Activity's UI using a tree of view and viewgroup nodes, as shown in the diagram below. The tree can be as simple or complex as you need to make it, and you can build it up using Android's set of predefined widgets and layouts  or  custom view types that you create yourself. </p>
+
+<img src={@docRoot}images/viewgroup.png alt="An example of a tree of views and viewgroups" width="312" height="211" align="center"/>
+
+<p>To attach the tree to the screen for rendering, your Activity calls its  setContentView() method and passes a reference to the root node  object. Once the Android system has the reference to the root node object, it can work directly with the node to invalidate, measure, and draw the tree. When your Activity becomes active and receives focus, the system notifies your activity and requests the root node to measure and draw the tree. The root node then requests that its child nodes draw themselves &mdash; in turn, each viewgroup node in the tree is responsible for drawing its direct children. </p>
+
+<p>As mentioned previously, each view group has the responsibility of
+  measuring its available space, laying out its children, and calling Draw() on
+  each child to let it render itself. The children may request a size and location
+  in the parent, but the parent object has the final decision on where how big
+  each child can be.</p>
+
+<h2>LayoutParams: How a Child Specifies Its Position and Size</h2>
+
+<p>Every viewgroup class uses a nested class that extends {@link
+android.view.ViewGroup.LayoutParams ViewGroup.LayoutParams}. This subclass
+  contains property types that define a child's size and position, in properties
+  appropriate for that view group class. </p>
+
+<img src={@docRoot}images/layoutparams.png alt="An example of layoutparams" width="632" height="369" align="center"/>
+
+<p>Note that every LayoutParams subclass has its own syntax for setting
+values. Each child element must define LayoutParams that are appropriate for its parent, although it may define different LayoutParams for its children. </p>
+
+<p>All viewgroups include width and height. Many also include margins and
+borders. You can specify width and height  exactly, though you probably won't want
+to do this often. More often you will tell your view to size itself either to
+the dimensions of its content, or to become as big as its containing object
+will allow.</p>
+
diff --git a/docs/html/guide/topics/views/ui-xml.jd b/docs/html/guide/topics/views/ui-xml.jd
new file mode 100644
index 0000000..8ae599c
--- /dev/null
+++ b/docs/html/guide/topics/views/ui-xml.jd
@@ -0,0 +1,133 @@
+page.title=Declaring a UI in XML
+parent.title=Views and Layout
+parent.link=index.html
+@jd:body
+
+<p>You can create your application's user interface in two ways: 
+<ul>
+<li>You can declare UI elements statically, in XML. Android provides a straightforward XML vocabulary that corresponds to the View classes and subclasses, such as those for widgets and layouts. </li>
+<li>You can instantiate screen elements dynamically, at runtime, through code in your application. Your application can refer to or create View or other class objects and manipulate their properties programmatically. </li>
+</ul>
+
+<p>One advantage of declaring your UI in XML is that it enables you to better separate the presentation of your application from the code that controls it's behavior. Your UI description is external to your application code, which means that you can modify or adapt it without having to modify your source code and recompile. For example, you can create XML layouts for different screen orientations and for a variety of device screen sizes or languages. Additionally, declaring in XML makes it easier to see the elements and structure of your UI, so it's easier to debug problems. </p>
+
+<p>The Android framework gives you the flexibility to use either or both of these ways of declaring and managing your application's UI. For example, you could declare your application's default layouts in XML, including the screen elements that will appear in them and their properties. You could then add code in your application that would modify the state of the screen objects, including those declared in XML, at run time. </p>
+
+<p>You build your application's UI in approximately the same way, whether you are declaring it in XML or programmatically. In both cases, your UI will be a tree structure that may include multiple View or Viewgroup subclasses. <p>
+
+<p>In general, the XML vocabulary for declaring UI elements closely follows the structure and naming of the framework's UI-related classes and methods, where element names correspond to class names and attribute names correspond to methods. In fact, the correspondence is often so direct that you can guess what XML attribute corresponds to a class method, or guess what class corresponds to a given xml element. </p>
+
+<p>However, note that the XML vocabulary for defining UI is not entirely identical to the framework's classes and methods. In some cases, there are slight naming differences. For
+example, the EditText element has a <code>text</code> attribute that corresponds to
+EditText.setText. </p>
+
+<div class="sidebox"><p>For your convenience, the API reference documentation for UI related classes lists the available XML attributes that correspond to the class methods, including inherited attributes.</p>
+
+<p>To learn more about the available XML elements and attributes, as well as the format of the XML file, see <a
+href="{@docRoot}reference/available-resources.html#layoutresources">Layout Resources</a>.</p>
+ </div>
+
+<p>Using Android's XML vocabulary, you can quickly design UI layouts and the screen elements they contain, in the same way you create HTML files &mdash; as a series of nested tags. </p>
+
+<p>Each layout file must contain exactly one root element, and the root element must be a View or ViewGroup object. Once you've defined the root element, you can add additional layout objects or controls as child elements of the root element, if needed. In the example below, the tree of XML elements evaluates to the outermost LinearLayout object.
+
+<p>After you've declared your layout in XML, you must save the file, with the <code>.xml</code> extension, in the proper location, so that it will be compiled correctly. The proper location for storing layout files is in your application's <code>res/layout/</code> directory. </p>
+
+<p>When you compile your application, each XML layout file is compiled into an
+android.view.View resource. You can then load the layout resource from your application code, by calling <code>setContentView(R.layout.<em>layout_file_name</em>)</code> in your {@link android.app.Activity#onCreate(android.os.Bundle) Activity.onCreate()} 
+implementation.</p>
+
+<p>When you load a layout resource, the Android system initializes run-time objects corresponding to the elements in your layout. It parses the elements of your layout in-order (depth-first), instantiating the Views and adding them to their parent(s). </p>
+
+<p>Attributes named <code>layout_<em>something</em></code> apply to that
+object's LayoutParams member. <a href="{@docRoot}reference/available-resources.html#layoutresources">Layout
+Resources</a> also describes how to learn the syntax for specifying
+LayoutParams properties. </p>
+
+<p>Also note that Android draws elements in the order in which they
+appear in the XML. Therefore, if elements overlap, the last one in the XML
+file will probably be drawn on top of any previously listed elements in that
+same space.</p>
+
+<p>The following values are supported for dimensions (described in {@link
+android.util.TypedValue TypedValue}):</p>
+
+<ul>
+    <li>px (pixels) </li>
+    <li>dip (device independent pixels) </li>
+    <li>sp (scaled pixels &mdash; best for text size) </li>
+    <li>pt (points) </li>
+    <li>in (inches) </li>
+    <li>mm (millimeters) </li>
+</ul>
+
+<p>Example: <code>android:layout_width=&quot;25px&quot;</code> </p>
+
+<p>For more information about these dimensions, see <a href="{@docRoot}reference/available-resources.html#dimension">Dimension Values</a>.</p>
+
+<p>The example below shows an XML file and the resulting screen in the UI. Note that the text on the
+top of the screen was set by calling {@link
+android.app.Activity#setTitle(java.lang.CharSequence) Activity.setTitle}. Note
+that the attributes that refer to relative elements (i.e., layout_toLeft)
+refer to the ID using the syntax of a relative resource
+(@id/<em>id_number</em>). </p>
+
+<table border="1">
+    <tr>
+        <td>
+        <pre>&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
+&lt;!-- Demonstrates using a relative layout to create a form --&gt;
+&lt;RelativeLayout xmlns:android=&quot;http://schemas.android.com/apk/res/android
+                android:layout_width=&quot;fill_parent&quot; 
+                android:layout_height=&quot;wrap_content&quot;
+                android:background=&quot;@drawable/blue&quot;
+                android:padding=&quot;10px&quot;&gt;
+
+    &lt;TextView id=&quot;@+id/label&quot; 
+              android:layout_width=&quot;fill_parent&quot; 
+              android:layout_height=&quot;wrap_content&quot; 
+              android:text=&quot;Type here:&quot;/&gt;
+
+    &lt;EditText id=&quot;@+id/entry&quot; 
+              android:layout_width=&quot;fill_parent&quot; 
+              android:layout_height=&quot;wrap_content&quot; 
+              android:background=&quot;@android:drawable/editbox_background&quot;
+              android:layout_below=&quot;@id/label&quot;/&gt;
+  
+    &lt;Button id=&quot;@+id/ok&quot; 
+            android:layout_width=&quot;wrap_content&quot; 
+            android:layout_height=&quot;wrap_content&quot; 
+            android:layout_below=&quot;@id/entry&quot;
+            android:layout_alignParentRight=&quot;true&quot;
+            android:layout_marginLeft=&quot;10px&quot;
+            android:text=&quot;OK&quot; /&gt;
+
+    &lt;Button android:layout_width=&quot;wrap_content&quot; 
+            android:layout_height=&quot;wrap_content&quot;
+            android:layout_toLeftOf=&quot;@id/ok&quot;
+            android:layout_alignTop=&quot;@id/ok&quot;
+            android:text=&quot;Cancel&quot; /&gt;
+&lt;/RelativeLayout&gt;</pre></td>
+        <td><img src="{@docRoot}images/designing_ui_layout_example.png" alt="Screen shot showing how this layout XML file is rendered."  /></td>
+    </tr>
+</table>
+
+<h3>Loading the XML Resource </h3>
+
+<p>Loading the compiled layout resource is very easy, and done with a single
+call in the activity's onCreate() method, as shown here:</p>
+
+<pre>
+protected void onCreate(Bundle savedValues)
+{
+   // Be sure to call the super class.
+   super.onCreate(savedValues);
+
+   // Load the compiled layout resource into the window's
+   // default ViewGroup.
+   // The source file is res/layout/hello_activity.xml
+    setContentView(R.layout.hello_activity);
+  
+   // Retrieve any important stored values.
+   restoreValues(savedValues);
+} </pre>
diff --git a/docs/html/guide/topics/wireless/bluetooth.jd b/docs/html/guide/topics/wireless/bluetooth.jd
new file mode 100644
index 0000000..710cd4c
--- /dev/null
+++ b/docs/html/guide/topics/wireless/bluetooth.jd
@@ -0,0 +1,18 @@
+page.title=Bluetooth
+parent.title=Wireless Controls
+parent.link=index.html
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+
+  <h2>In this document</h2>
+  <ol>
+
+  </ol>
+
+</div>
+</div>
+
+
+TODO
\ No newline at end of file
diff --git a/docs/html/guide/topics/wireless/index.jd b/docs/html/guide/topics/wireless/index.jd
new file mode 100644
index 0000000..a3a2b363f
--- /dev/null
+++ b/docs/html/guide/topics/wireless/index.jd
@@ -0,0 +1,19 @@
+page.title=Wireless Controls
+@jd:body
+
+
+
+<h2>Wi-Fi</h2>
+<p>The Wi-Fi APIs provide a means by which application can communicate with the lower-level
+wireless stack that provides Wi-Fi network access. Almost all information from the device supplicant
+is available, including the connected network's link speed, IP address, negotiation state, and more. 
+It also provides information about all non-connected available networks. Some of the available network
+interactions include the ability to scan, add, dave, terminate and initiate connections.</p>
+
+
+<h2>Bluetooth</h2>
+<p>The Bluetooth APIs allow applications to scan, connect and pair with other Bluetooth devices.
+THESE APIS ARE NOT YET AVAILABLE.</p>
+
+
+
diff --git a/docs/html/guide/topics/wireless/wifi.jd b/docs/html/guide/topics/wireless/wifi.jd
new file mode 100644
index 0000000..520feafe
--- /dev/null
+++ b/docs/html/guide/topics/wireless/wifi.jd
@@ -0,0 +1,18 @@
+page.title=Wi-Fi
+parent.title=Wireless Controls
+parent.link=index.html
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+
+  <h2>In this document</h2>
+  <ol>
+
+  </ol>
+
+</div>
+</div>
+
+
+TODO
\ No newline at end of file
diff --git a/docs/html/guide/tutorials/hello-android.jd b/docs/html/guide/tutorials/hello-android.jd
new file mode 100644
index 0000000..c37d6f9
--- /dev/null
+++ b/docs/html/guide/tutorials/hello-android.jd
@@ -0,0 +1,473 @@
+page.title=Hello, Android!
+@jd:body
+
+<p>First impressions matter, and as a developer you know that the first impression
+you get of a development framework is how easy it is to write "Hello,
+World!" Well, in Android, it's pretty easy. Here's how it looks:</p>
+
+<ul>
+  <li><a href="#create">Create the Project</a></li>
+  <li><a href="#ui">Construct the UI</a></li>
+  <li><a href="#run">Run the Code: Hello, Android</a></li>
+</ul>
+
+<p>The sections below spell it all out in detail. </p>
+
+<ul>
+  <li><a href="#upgrading">Upgrading the UI to an XML Layout</a> </li>
+  <li><a href="#debugging">Debugging Your Project</a> </li>
+  <li><a href="#noeclipse">Creating a Project without Eclipse</a> </li>
+</ul>
+<p>Let's jump in!</p>
+
+<a name="create"></a>
+
+<h2>Create the Project </h2>
+
+<p>Creating the project is as simple as can be. An Eclipse
+plugin is available making Android development a snap. </p>
+
+<p>You'll need to have a development computer with the Eclipse IDE installed (see <a
+href="{@docRoot}intro/installing.html#developmentrequirements">System and Software Requirements</a>), and
+you'll need to install the <a 
+href="{@docRoot}intro/installing.html#installingplugin">Android Eclipse Plugin (ADT)</a>. Once you have those ready, come back here. </p>
+
+<p>First, here's a high-level summary of how to build "Hello, World!":</p>
+
+<ol>
+  <li>
+    Create a new "Android Project" via the <strong>File &gt; New &gt; Project</strong> menu.
+  </li>
+  <li>
+    Fill out the project details in the New Android Project dialog.
+  </li>
+  <li>
+    Edit the auto-generated source code template to display some output.
+  </li>
+</ol>
+<p> That's it! Next, let's go through each step above in detail. </p>
+<ol class="listhead">
+    <li>Create a new Android Project
+        <p>From Eclipse, select the <strong>File &gt; New &gt; Project</strong> menu item. If the Android
+            Plugin for Eclipse has been successfully installed, the resulting dialog
+            should have a folder labeled "Android" which should contain a single entry:
+            "Android Project".</p>
+            
+            <p><img src="{@docRoot}images/hello_world_0.png"/></p>
+
+            <p>Once you've selected "Android Project", click the Next button.</p>
+    </li>
+
+    <li>Fill out the project details
+        <p>The next screen allows you to enter the relevant details for your project.
+        Here's an example:</p>
+
+        <p><img src="{@docRoot}images/hello_world_1.png"/></p>
+
+        <p>Here's what each field on this screen means:</p>
+
+    
+  <table>
+      <tbody>
+        <tr>
+            <td>Project Name </td>
+            <td>This is the name of the directory or folder on your computer that you
+                want to contain the project.</td>
+        </tr>
+        <tr>
+            <td>Package Name </td>
+            <td>This is the package namespace (following the same rules as for
+            packages in the Java programming language) that you want all your source code to
+            reside under. This also sets the package name under which the stub
+            Activity will be generated.<p/>
+            The package name you use in your application must be unique across
+            all packages installed on the system;  for this reason, it's very
+            important to use a standard domain-style package for your
+            applications.  In the example above, we used the
+            package domain "com.android"; you should use a
+            different one appropriate to your organization.</td>
+        </tr>
+        <tr>
+            <td>Activity Name </td>
+            <td>This is the name for the class stub that will be generated by the plugin.
+                This will be a subclass of Android's Activity class.  An Activity is simply a
+                class that can run and do work. It can create a UI if it chooses, but it
+                doesn't need to. </td>
+        </tr>
+        <tr>
+            <td> Application Name </td>
+            <td> This is the human-readable title for your application. </td>
+        </tr>
+    </tbody>
+  </table>
+
+<p>The checkbox for toggling "Use default location" allows you to change the
+location on disk where the project's files will be generated and stored.</p>
+</li>
+
+<li>Edit the auto-generated source code
+
+<p>After the plugin runs, you'll have a class named HelloAndroid 
+(found in your package, HelloAndroid > src > com.android.hello). It should look like
+this:</p>
+
+<pre>public class HelloAndroid extends Activity {
+    /** Called when the activity is first created. */
+    &#64;Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.main);
+    }
+}</pre>
+
+<p>Now, you <em>could</em> run this right away, but let's go a little further, 
+so we understand more about what's happening.
+So, the next step is to modify some code! </p>
+</li>
+</ol>
+
+<a name="ui"></a>
+
+<h2>Construct the UI</h2>
+
+<p>Take a look at this revised code, below, and make the same changes to your HelloAndroid.java file. We'll dissect
+it line by line:</p>
+
+<pre>
+package com.android.hello;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.TextView;
+
+public class HelloAndroid extends Activity {
+   /** Called when the activity is first created. */
+   &#64;Override
+   public void onCreate(Bundle savedInstanceState) {
+       super.onCreate(savedInstanceState);
+       TextView tv = new TextView(this);
+       tv.setText(&quot;Hello, Android&quot;);
+       setContentView(tv);
+   }
+}</pre>
+
+<p class="note"><strong>Tip:</strong> If you forgot to import the TextView package, try this:
+press <strong>Ctrl-Shift-O</strong> (<strong>Cmd-Shift-O</strong>, on Mac). This is an Eclipse 
+shortcut to organize imports&mdash;it identifies missing packages and adds them for you.</p>
+
+<p>In Android, user interfaces are composed of hierarchies of classes called
+Views. A View is simply a drawable object, such as a radio button, an
+animation, or (in our case) a text label. The specific name for the View
+subclass that handles text is simply TextView.</p>
+
+<p>Here's how you construct a TextView:</p>
+
+<pre>TextView tv = new TextView(this);</pre>
+
+<p>The argument to TextView's constructor is an Android Context instance. The
+Context is simply a handle to the system; it provides services like
+resolving resources, obtaining access to databases and preferences, and so
+on. The Activity class inherits from Context.  Since our
+HelloAndroid class is a subclass of Activity, it is also a Context, and so we can
+pass the <code>this</code> reference to the TextView.</p>
+
+<p>Once we've constructed the TextView, we need to tell it what to display:</p>
+
+<pre>tv.setText(&quot;Hello, Android&quot;);</pre>
+
+<p>Nothing too surprising there.</p>
+
+<p>At this point, we've constructed a TextView and told it what text to
+display. The final step is to connect this TextView with the on-screen
+display, like so:</p>
+
+<pre>setContentView(tv);</pre>
+
+<p>The <code>setContentView()</code> method on Activity indicates to the system which
+View should be associated with the Activity's UI. If an Activity doesn't
+call this method, no UI is present at all and the system will display a blank
+screen. For our purposes, all we want is to display some text, so we pass it
+the TextView we just created.</p>
+
+<p>There it is &mdash; "Hello, World" in Android! The next step, of course, is
+to see it running.</p>
+
+<a name="run"></a>
+
+<h2>Run the Code: Hello, Android</h2>
+
+<p>The Eclipse plugin makes it very easy to run your applications. Begin by
+selecting the <strong>Run &gt; Open Run Dialog</strong> menu entry (in Eclipse 3.4, it's 
+<strong>Run > Run Configurations</strong>). You should see a dialog
+like this:</p>
+
+<div id="o.:l" style="PADDING:1em 0pt; TEXT-ALIGN:left">
+  <img src="{@docRoot}images/hello_world_2.png"/>
+</div>
+
+<p>Next, highlight the "Android Application" entry, and then click the icon in the
+top left corner (the one depicting a sheet of paper with a plus sign in the
+corner) or simply double-click the "Android Application" entry. You should
+have a new launcher entry named "New_configuration".</p>
+
+<div id="z4_b" style="PADDING:1em 0pt; TEXT-ALIGN:left">
+  <img src="{@docRoot}images/hello_world_3.png"/>
+</div>
+
+<p>Change the name to something expressive, like "Hello, Android", and then pick
+your project by clicking the Browse button. (If you have more than one
+Android project open in Eclipse, be sure to pick the right one.) The
+plugin will automatically scan your project for Activity subclasses, and add
+each one it finds to the drop-down list under the "Activity:" label. Since
+your "Hello, Android" project only has one, it will be the default, and you can
+simply continue.</p>
+
+<p>Click the "Apply" button. Here's an example:</p>
+
+<div id="t66_" style="PADDING:1em 0pt; TEXT-ALIGN:left">
+  <img src="{@docRoot}images/hello_world_4.png"/>
+</div>
+
+<p>That's it &mdash; you're done! Click the Run button, and the Android Emulator
+should start.  Once it's booted up your application will appear.  When all is said and done, you should
+see something like this:</p>
+
+<div id="qnhl" style="PADDING:1em 0pt; TEXT-ALIGN:left">
+  <img src="{@docRoot}images/hello_world_5.png"/>
+</div>
+
+<p>That's "Hello, World" in Android. Pretty straightforward, eh?
+The next sections of the tutorial offer more detailed information that you may find valuable as you
+learn more about Android.</p>
+
+<a name="upgrading"></a>
+
+<h2>Upgrading the UI to an XML Layout</h2>
+
+<p>The "Hello, World" example you just completed uses what we call "programmatic"
+UI layout. This means that you construct and build your application's UI
+directly in source code. If you've done much UI programming, you're
+probably familiar with how brittle that approach can sometimes be: small
+changes in layout can result in big source-code headaches. It's also very
+easy to forget to properly connect Views together, which can result in errors in
+your layout and wasted time debugging your code.</p>
+
+<p>That's why Android provides an alternate UI construction model: XML-based
+layout files. The easiest way to explain this concept is to show an
+example. Here's an XML layout file that is identical in behavior to the
+programmatically-constructed example you just completed:</p>
+
+<pre>&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
+&lt;TextView xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;
+  android:layout_width=&quot;fill_parent&quot;
+  android:layout_height=&quot;fill_parent&quot;
+  android:text=&quot;Hello, Android&quot;/&gt;</pre>
+
+<p>The general structure of an Android XML layout file is simple.  It's a tree
+of tags, where each tag is the name of a View class. In this example, it's
+a very simple tree of one element, a TextView. You can use the
+name of any class that extends View as a tag name in your XML layouts,
+including custom View classes you define in your own code. This
+structure makes it very easy to quickly build up UIs, using a much simpler
+structure and syntax than you would in source code. This model is inspired
+by the web development model, where you can separate the presentation of your
+application (its UI) from the application logic used to fetch and fill in data.</p>
+
+<p>In this example, there are also four XML attributes.  Here's a summary of what
+they mean:</p>
+
+<table>
+    <tbody>
+        <tr>
+            <th>
+                Attribute
+            </th>
+            <th>
+                Meaning
+            </th>
+        </tr>
+        <tr>
+            <td>
+                <code>xmlns:android</code>
+            </td>
+            <td>
+                This is an XML namespace declaration that tells the Android tools that you are going to refer to common attributes defined in the Android namespace. The outermost tag in every Android layout file must have this attribute.<br>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <code>android:layout_width</code>
+            </td>
+            <td>
+                This attribute defines how much of the available width on the screen this View should consume. In this case, it's our only View so we want it to take up the entire screen, which is what a value of "fill_parent" means.<br>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <code>android:layout_height</code>
+            </td>
+            <td>
+                This is just like android:layout_width, except that it refers to available screen height.
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <code>android:text</code>
+            </td>
+            <td>
+                This sets the text that the TextView should contain. In this example, it's our usual "Hello, Android" message.
+            </td>
+        </tr>
+    </tbody>
+</table>
+
+
+<p>So, that's what the XML layout looks like, but where do you put it?  Under the /res/layout directory in your project. The "res" is
+short for "resources" and that directory contains all the non-code assets that
+your application requires. This includes things like images, localized
+strings, and XML layout files.</p>
+
+<p>The Eclipse plugin creates one of these XML files for you.  In our example
+above, we simply never used it.  In the Package Explorer, expand the
+folder /res/layout, and edit the file main.xml.  Replace its contents with
+the text above and save your changes.</p>
+
+<p>Now open the file named R.java in your source code folder in the Package
+Explorer. You'll see that it now looks something like this:</p>
+
+<pre>
+public final class R {
+    public static final class attr {
+    };
+    public static final class drawable {
+        public static final int icon=0x7f020000;
+    };
+    public static final class layout {
+        public static final int main=0x7f030000;
+    };
+    public static final class string {
+        public static final int app_name=0x7f040000;
+    };
+};
+</pre>
+
+<p>A project's R.java file is an index into all the resources defined in the
+file. You use this class in your source code as a sort of short-hand
+way to refer to resources you've included in your project. This is
+particularly powerful with the code-completion features of IDEs like Eclipse 
+because it lets you quickly and interactively locate the specific reference
+you're looking for.</p>
+
+<p>The important thing to notice for now is the inner class named "layout", and its
+member field "main". The Eclipse plugin noticed that you added a new XML
+layout file and then regenerated this R.java file.  As you add other
+resources to your projects you'll see R.java change to keep up.</p>
+
+<p>The last thing you need to do is modify your HelloAndroid source code to use the new
+XML version of your UI, instead of the hard-coded version. Here's what
+your new class will look like.  As you can see, the source code becomes much
+simpler:</p>
+
+<pre>package com.android.hello;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class HelloAndroid extends Activity {
+    /** Called when the activity is first created. */
+    &#64;Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.main);
+    }
+}</pre>
+
+<p>When you make this change, don't just copy-and-paste it in. Try out the code-completion feature on that R class. You'll probably find that it helps a lot.</p>
+
+<p>Now that you've made this change, go ahead and re-run your application &mdash; all
+you need to do is click the green Run arrow icon, or select 
+<strong>Run &gt; Run History &gt; Hello, Android</strong>  from the menu. You should see.... well, exactly the same thing
+you saw before! After all, the point was to show that the two different
+layout approaches produce identical results.</p>
+
+<p>There's a lot more to creating these XML layouts, but that's as far as we'll go
+here. Read the <a
+href="{@docRoot}devel/implementing-ui.html">Implementing a User Interface</a> documentation for more 
+information on the power of this approach.</p>
+
+<a name="debugging"></a>
+
+<h2>Debugging Your Project</h2>
+
+<p>The Android Plugin for Eclipse also has excellent integration with the Eclipse
+debugger. To demonstrate this, let's introduce a bug into
+our code. Change your HelloAndroid source code to look like this:</p>
+
+<pre>
+package com.android.hello;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class HelloAndroid extends Activity {
+    /** Called when the activity is first created. */
+    &#64;Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Object o = null;
+        o.toString();
+        setContentView(R.layout.main);
+    }
+}</pre>
+
+<p>This change simply introduces a NullPointerException into your code. If
+you run your application again, you'll eventually see this:</p>
+
+<div id="go-9" style="PADDING:1em 0pt; TEXT-ALIGN:left">
+  <img src="{@docRoot}images/hello_world_8.png"/>
+</div>
+
+<p>Press "Force Quit" to terminate the application and close the emulator window.</p>
+
+<p>To find out more about the error, set a breakpoint in your source code 
+on the line <code>Object o = null;</code> (double-click on the marker bar next to the source code line). Then select <strong>Run &gt; Debug History &gt; Hello, 
+Android</strong> from the menu to enter debug mode. Your app will restart in the 
+emulator, but this time it will suspend when it reaches the breakpoint you
+set. You can then step through the code in Eclipse's Debug Perspective,
+just as you would for any other application.</p>
+
+<div id="w2c9" style="PADDING:1em 0pt; TEXT-ALIGN:left">
+  <img src="{@docRoot}images/hello_world_9.png"/>
+</div>
+
+<a name="noeclipse"></a>
+
+<h2>Creating the Project without Eclipse</h2>
+
+<p>If you don't use Eclipse (such as if you prefer another IDE, or simply use text
+editors and command line tools) then the Eclipse plugin can't help you.
+Don't worry though &mdash; you don't lose any functionality just because you don't
+use Eclipse.</p>
+
+<p>The Android Plugin for Eclipse is really just a wrapper around a set of tools
+included with the Android SDK. (These tools, like the emulator, aapt, adb,
+ddms, and others are <a href="tools.html">documented elsewhere.</a>) Thus, it's possible to
+wrap those tools with another tool, such as an 'ant' build file.</p>
+
+<p>The Android SDK includes a Python script named "activitycreator.py" that can be
+used to create all the source code and directory stubs for your project, as well
+as an ant-compatible build.xml file. This allows you to build your project
+from the command line, or integrate it with the IDE of your choice.</p>
+
+<p>For example, to create a HelloAndroid project similar to the one we just created
+via Eclipse, you'd use this command:</p>
+
+<pre>activitycreator.py --out HelloAndroid com.android.hello.HelloAndroid</pre>
+
+<p>To build the project, you'd then run the command 'ant'. When that command
+successfully completes, you'll be left with a file named HelloAndroid.apk under
+the 'bin' directory. That .apk file is an Android Package, and can be
+installed and run in your emulator using the 'adb' tool.</p>
+
+<p>For more information on how to use these tools, please read the documentation
+cited above.</p>
diff --git a/docs/html/guide/tutorials/hello-world.jd b/docs/html/guide/tutorials/hello-world.jd
new file mode 100644
index 0000000..7b9287f
--- /dev/null
+++ b/docs/html/guide/tutorials/hello-world.jd
@@ -0,0 +1,500 @@
+page.title=Hello, World
+@jd:body
+
+<p>As a developer, you know that the first impression
+of a development framework is how easy it is to write "Hello,
+World." Well, on Android, it's pretty easy. 
+It's particularly easy if you're using Eclipse as your IDE, because we've provided a
+great plugin that handles your project creation and management to greatly speed up your
+development cycles.</p>
+
+<p>If you're not using Eclipse, that's okay. Familiarize yourself with 
+<a href="{@docRoot}guide/developing/other-ide.html">Developing in Other IDEs</a>.
+You can then come back here and ignore anything about Eclipse.</p>
+
+<p>Before you start, you should already have the latest SDK installed, and if you're using
+Eclipse, you should have installed the ADT plugin as well. See 
+<a href="{@docRoot}sdk/1.1_r1/installing.html">Installing the Android SDK</a> to get these
+installed.</p>
+
+<p class="note"><strong>Note:</strong>
+In some cases, you might want to click the screenshots below to get a bigger view.
+</p>
+
+<h2 id="create">Create the Project</h2>
+
+<ol>
+    <li><strong>Open a new Android Project.</strong>
+        <p>From Eclipse, select the <strong>File &gt; New &gt; Project</strong> menu item. If the Android
+            Plugin for Eclipse has been successfully installed, the resulting dialog
+            should have a folder labeled "Android" which should contain a single entry:
+            "Android Project".</p>
+        <p>Selected "Android Project" and click <strong>Next</strong>.</p>
+            
+            <a href="images/hello_world_0.png"><img src="images/hello_world_0.png" style="height:230px" alt="" /></a>
+
+    </li>
+
+    <li><strong>Fill out the project details.</strong>
+        <p>The next screen allows you to enter the relevant details for your project:</p>
+        <ul>
+          <li><em>Project name:</em> HelloAndroid</li>
+          <li><em>Package name:</em> com.example.hello (or your own private namespace)</li>
+          <li><em>Activity name:</em> HelloAndroid</li>
+          <li><em>Application name:</em> Hello, Android</li>
+        </ul>
+        <p>Click <strong>Finish</strong>.</p>
+        <a href="images/hello_world_1.png"><img src="images/hello_world_1.png" style="height:230px" alt="" /></a>
+
+        <p>Here's what each field on this screen means:</p>
+      
+        <dl>
+            <dt><em>Project Name</em></dt>
+                <dd>This is the name of the directory or folder on your computer that you
+                      want to contain the project.</dd>
+            <dt><em>Package Name</em></dt>
+                <dd>This is the package namespace (following the same rules as for
+                  packages in the Java programming language) that you want all your source code to
+                  reside under. This also sets the package name under which the stub
+                  Activity will be generated.
+                  <p>The package name you use in your application must be unique across
+                  all packages installed on the system;  for this reason, it's very
+                  important to use a standard domain-style package for your
+                  applications.  In the example above, we used the
+                  package domain "com.android"; you should use a
+                  different one appropriate to your organization.</p></dd>
+            <dt><em>Activity Name</em></dt>
+                <dd>This is the name for the class stub that will be generated by the plugin.
+                      This will be a subclass of Android's Activity class.  An Activity is simply a
+                      class that can run and do work. It can create a UI if it chooses, but it
+                      doesn't need to.</dd>
+            <dt><em>Application Name</em></dt>
+                <dd>This is the human-readable title for your application.</dd>
+        </dl>
+      
+        <p>The checkbox for toggling "Use default location" allows you to change 
+                  the location on disk where the project's files will be generated and stored.</p>
+
+    </li>
+
+<li><strong>View the auto-generated source code.</strong>
+<p>After the plugin completes your project creations, you'll have a class named <code>HelloAndroid</code> 
+(found in your project package, <em>HelloAndroid > src > com.android.hello</em>). It should look like
+this:</p>
+
+<pre>
+package com.example.hello;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class HelloAndroid extends Activity {
+    /** Called when the activity is first created. */
+    &#64;Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.main);
+    }
+}</pre>
+
+<p>Now let's modify some code! </p>
+</li>
+</ol>
+
+
+<h2 id="ui">Construct the UI</h2>
+
+<p>Take a look at this revised code, below, and make the same changes to your HelloAndroid.java file. We'll dissect
+it line by line:</p>
+
+<pre>
+package com.android.hello;
+
+import android.app.Activity;
+import android.os.Bundle;
+<strong>import android.widget.TextView;</strong>
+
+public class HelloAndroid extends Activity {
+   /** Called when the activity is first created. */
+   &#64;Override
+   public void onCreate(Bundle savedInstanceState) {
+       super.onCreate(savedInstanceState);
+       <strong>TextView tv = new TextView(this);
+       tv.setText(&quot;Hello, Android&quot;);
+       setContentView(tv);</strong>
+   }
+}</pre>
+
+<p class="note"><strong>Tip:</strong> If you forgot to import the TextView package, try this:
+press <strong>Ctrl-Shift-O</strong> (<strong>Cmd-Shift-O</strong>, on Mac). This is an Eclipse 
+shortcut to organize imports&mdash;it identifies missing packages and adds them for you.</p>
+
+<p>Notice that our class is based on the {@link android.app.Activity} class. An Activity is a 
+single application entity that is used to perform actions. An application may have many, but the user
+interacts with them only one at a time. An Activity is not required to actually have a user interface,
+but usually will.</p>
+
+<p>An Android user interface is composed of hierarchies of objects called
+Views. A {@link android.view.View} is simply a drawable object, such as a radio button, an
+animation, or (in our case) a text label. The specific name for the View
+subclass that handles text, which we use here, is {@link android.widget.TextView}.</p>
+
+<p>Here's how you construct a TextView:</p>
+
+<pre>TextView tv = new TextView(this);</pre>
+
+<p>The argument to TextView's constructor is an Android {@link android.content.Context} instance. The
+Context is simply a handle to the system; it provides services like
+resolving resources, obtaining access to databases and preferences, and so
+on. The Activity class inherits from Context.  Since our
+HelloAndroid class is a subclass of Activity, it is also a Context, and so we can
+pass the <code>this</code> reference to the TextView.</p>
+
+<p>Once we've constructed the TextView, we need to tell it what to display:</p>
+
+<pre>tv.setText(&quot;Hello, Android&quot;);</pre>
+
+<p>Nothing too surprising there.</p>
+
+<p>At this point, we've constructed a TextView and told it what text to
+display. The final step is to connect this TextView with the on-screen
+display, like so:</p>
+
+<pre>setContentView(tv);</pre>
+
+<p>The <code>setContentView()</code> method on Activity indicates to the system which
+View should be associated with the Activity's UI. If an Activity doesn't
+call this method, no UI is present at all and the system will display a blank
+screen. For our purposes, all we want is to display some text, so we pass it
+the TextView we just created.</p>
+
+<p>There it is &mdash; "Hello, World" in Android! The next step, of course, is
+to see it running.</p>
+
+
+
+<h2 id="run">Run the Code: Hello, Android</h2>
+
+<p>The Eclipse plugin makes it very easy to run your applications. Begin by
+selecting the <strong>Run &gt; Open Run Dialog</strong> menu entry (in Eclipse 3.4, it's 
+<strong>Run > Run Configurations</strong>). You should see a dialog
+like this:</p>
+
+  <a href="images/hello_world_2.png"><img src="images/hello_world_2.png" style="height:230px" alt="" /></a>
+
+<p>Next, highlight the "Android Application" entry, and then click the icon in the
+top left corner (the one depicting a sheet of paper with a plus sign in the
+corner) or simply double-click the "Android Application" entry. You should
+have a new launcher entry named "New_configuration".</p>
+
+  <a href="images/hello_world_3.png"><img src="images/hello_world_3.png" style="height:230px" alt="" /></a>
+
+<p>Change the name to something expressive, like "Hello, Android", and then pick
+your project by clicking the Browse button. (If you have more than one
+Android project open in Eclipse, be sure to pick the right one.) The
+plugin will automatically scan your project for Activity subclasses, and add
+each one it finds to the drop-down list under the "Activity:" label. Since
+your "Hello, Android" project only has one, it will be the default, and you can
+simply continue.</p>
+
+<p>Click the "Apply" button. Here's an example:</p>
+
+  <a href="images/hello_world_4.png"><img src="images/hello_world_4.png" style="height:230px" alt="" /></a>
+
+<p>Now click <strong>Run</strong>, and the Android Emulator should start and open the application.  
+Once it's booted up your application will appear. (Once booted, you may need to unlock the emulator's phone screen
+by pressing the device MENU key.) When all is said and done, you should
+see something like this:</p>
+
+  <a href="images/hello_world_5.png"><img src="images/hello_world_5.png" style="height:230px" alt="" /></a>
+
+
+<p>That's "Hello, World" in Android. Pretty straightforward, eh?
+The next sections of the tutorial offer more detailed information that you may find valuable as you
+learn more about Android.</p>
+
+
+
+
+<h2 id="upgrading">Upgrading the UI to an XML Layout</h2>
+
+<p>The "Hello, World" example you just completed uses what we call "programmatic"
+UI layout. This means that you construct and build your application's UI
+directly in source code. If you've done much UI programming, you're
+probably familiar with how brittle that approach can sometimes be: small
+changes in layout can result in big source-code headaches. It's also very
+easy to forget to properly connect Views together, which can result in errors in
+your layout and wasted time debugging your code.</p>
+
+<p>That's why Android provides an alternate UI construction model: XML-based
+layout files. The easiest way to explain this concept is to show an
+example. Here's an XML layout file that is identical in behavior to the
+programmatically-constructed example you just completed:</p>
+
+<pre>&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
+&lt;TextView xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;
+  android:layout_width=&quot;fill_parent&quot;
+  android:layout_height=&quot;fill_parent&quot;
+  android:text=&quot;@string/hello&quot;/&gt;</pre>
+
+<p>The general structure of an Android XML layout file is simple: it's a tree
+of XML elements, where each element is the name of a View class 
+(this example, however, is just one element). You can use the
+name of any class that extends {@link android.view.View} as an element in your XML layouts,
+including custom View classes you define in your own code. This
+structure makes it very easy to quickly build up UIs, using a more simple
+structure and syntax than you would in source code. This model is inspired
+by the web development model, where you can separate the presentation of your
+application (its UI) from the application logic used to fetch and fill in data.</p>
+
+<p>In this example, there's just one View element, the <code>TextView</code>, 
+which has four XML attributes.  Here's a summary of what they mean:</p>
+
+<table>
+    <tbody>
+        <tr>
+            <th>
+                Attribute
+            </th>
+            <th>
+                Meaning
+            </th>
+        </tr>
+        <tr>
+            <td>
+                <code>xmlns:android</code>
+            </td>
+            <td>
+                This is an XML namespace declaration that tells the Android tools that you are going to refer to common attributes defined in the Android namespace. The outermost tag in every Android layout file must have this attribute.<br>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <code>android:layout_width</code>
+            </td>
+            <td>
+                This attribute defines how much of the available width on the screen this View should consume. In this case, it's our only View so we want it to take up the entire screen, which is what a value of "fill_parent" means.<br>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <code>android:layout_height</code>
+            </td>
+            <td>
+                This is just like android:layout_width, except that it refers to available screen height.
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <code>android:text</code>
+            </td>
+            <td>
+                This sets the text that the TextView should display. In this example, we use a string 
+                resource instead of a hard-coded string value.
+                The <em>hello</em> string is defined in the <em>res/values/strings.xml</em> file. This is the
+                recommended practice for inserting strings to your application, because it makes the localization
+                of your application to other languages graceful, without need to hard-code changes to the layout file.
+                For more information, see <a href="{@docRoot}guide/topics/resources/resources-i18n.html">Resources
+                and Internationalization</a>.
+            </td>
+        </tr>
+    </tbody>
+</table>
+
+
+<p>These layout files belong in the <em>res/layout/</em> directory in your project. The "res" is
+short for "resources" and that directory contains all the non-code assets that
+your application requires. Resources also include things like images, localized
+strings, and XML layout files.</p>
+
+<div class="sidebox">
+  <h2>Landscape layout</h2>
+  <p>When you want a different design for landscape, put your layout XML file
+  in <code>res/layout-land/</code>. Android will automatically look here when the layout changes.
+  Without it the layout will just be stretched.</p>
+</div>
+
+<p>The Eclipse plugin automatically creates one of these layout files for you (<code>main.xml</code>). In our example
+above, we just ignored it and created our layout programmatically. We did so just to teach you a little more
+about the framework, but you should almost always define your layout in an XML file instead of in your code.</p>
+
+<p>So, let's put it to use and change the "Hello, Android" sample to use the XML layout.</p>
+
+<ol>
+  <li>In the Eclipse Package Explorer, expand the
+folder <em>res/layout/</em>, and open the file <code>main.xml</code> (once opened, you might need to click 
+the "main.xml" tab at the bottom to see the XML source). Replace its contents with
+the following XML:
+<pre>&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
+&lt;TextView xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;
+  android:layout_width=&quot;fill_parent&quot;
+  android:layout_height=&quot;fill_parent&quot;
+  android:text=&quot;@string/hello&quot;/&gt;</pre>
+<p>Save the file.</p>
+</li>
+
+<li>Inside the project folder <em>res/values/</em>, open the file <code>strings.xml</code>.
+This is where you should save all default text strings for your user interface. If you're using Eclipse, then
+ADT will have started you with two strings, <em>hello</em> and <em>app_name</em>. 
+Revise <em>hello</em> to something else. Perhaps "Hello, Android! I am a string resource!"
+The entire file should now look like this:
+<pre>
+&lt;?xml version="1.0" encoding="utf-8"?>
+&lt;resources>
+    &lt;string name="hello">Hello, Android! I am a string resource!&lt;/string>
+    &lt;string name="app_name">Hello, Android&lt;/string>
+&lt;/resources>
+</pre>
+</li>
+
+<li>Now open and modify your <code>HelloAndroid</code> class source code to read the
+XML layout, instead of the hard-coded version. Edit the file to look like this:
+<pre>
+package com.example.hello;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class HelloAndroid extends Activity {
+    /** Called when the activity is first created. */
+    &#64;Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.main);
+    }
+}</pre>
+
+<p>When you make this change, type it by hand to try the code-completion feature on that R class. You'll probably find that it helps a lot.</p>
+
+<p>Now, instead of passing <code>setContentView()</code> a View object, we give it a reference to our layout resource.
+The resource is identified as <code>R.layout.main</code>, which is actually a compiled object representation of
+the layout defined in <em>layout/main.xml</em>. The Eclipse plugin automatically creates this reference for
+us inside the project's R.java class. If you're not using Eclipse, then the R.java class will be generated for you
+when you run Ant to build the application. (More about the R class in a moment.)</p>
+</li>
+</ol>
+
+<p>Now that you've made this change, go ahead and re-run your application &mdash; all
+you need to do is click the green Run arrow icon, or select 
+<strong>Run &gt; Run History &gt; Hello, Android</strong>  from the menu. You should see pretty much the same thing
+you saw before! After all, the point was to show that the two different
+layout approaches produce identical results.</p>
+
+<p class="note"><strong>Tip:</strong> Use the shortcut <strong>Ctrl-Shift-F11</strong> 
+(<strong>Cmd-Shift-F11</strong>, on Mac) to run your currently visible application.</p>
+
+<p>You've just completed your first Android application! Continue reading for an introduction
+to debugging and a little more information on using other IDEs. Once you're ready to move on,
+please begin by reading <a href="{@docRoot}guide/topics/fundamentals.html">Application
+Fundamentals</a>. Also refer to the <a href="{@docRoot}guide/index.html">Developer's Guide</a>
+introduction page for an overview of the <em>Dev Guide</em> documentation.</p>
+
+
+<div class="special">
+<h3>R class</h3>
+<p>In Eclipse, open the file named R.java in your source code folder in the Package
+Explorer. It should look something like this:</p>
+
+<pre>
+public final class R {
+    public static final class attr {
+    }
+    public static final class drawable {
+        public static final int icon=0x7f020000;
+    }
+    public static final class layout {
+        public static final int main=0x7f030000;
+    }
+    public static final class string {
+        public static final int app_name=0x7f040001;
+        public static final int hello=0x7f040000;
+    }
+}
+</pre>
+
+<p>A project's R.java file is an index into all the resources defined in the
+file. You use this class in your source code as a sort of short-hand
+way to refer to resources you've included in your project. This is
+particularly powerful with the code-completion features of IDEs like Eclipse 
+because it lets you quickly and interactively locate the specific reference
+you're looking for.</p>
+
+<p>It's possible yours looks slighly different than this (perhaps the hexadecimal values are different). 
+For now, notice the inner class named "layout", and its
+member field "main". The Eclipse plugin noticed the XML
+layout file named main.xml and generated a class for it here.  As you add other
+resources to your project (such as strings in the <em>res/values/string.xml</em> file or drawables inside
+the <em>res/drawable/</em> direcory) you'll see R.java change to keep up.</p>
+<p>When not using Eclipse, this class file will be generated for you at build time (with the Ant tool).</p>
+<p><em>You should never edit this file by hand.</em></p>
+</div>
+
+<h2 id="debugging">Debugging Your Project</h2>
+
+<p>The Android Plugin for Eclipse also has excellent integration with the Eclipse
+debugger. To demonstrate this, let's introduce a bug into
+our code. Change your HelloAndroid source code to look like this:</p>
+
+<pre>
+package com.android.hello;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class HelloAndroid extends Activity {
+    /** Called when the activity is first created. */
+    &#64;Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Object o = null;
+        o.toString();
+        setContentView(R.layout.main);
+    }
+}</pre>
+
+<p>This change simply introduces a NullPointerException into your code. If
+you run your application again, you'll eventually see this:</p>
+
+  <a href="images/hello_world_8.png"><img src="images/hello_world_8.png" style="height:230px" alt="" /></a>
+
+<p>Press "Force Quit" to terminate the application and close the emulator window.</p>
+
+<p>To find out more about the error, set a breakpoint in your source code 
+on the line <code>Object o = null;</code> (double-click on the marker bar next to the source code line). Then select <strong>Run &gt; Debug History &gt; Hello, 
+Android</strong> from the menu to enter debug mode. Your app will restart in the 
+emulator, but this time it will suspend when it reaches the breakpoint you
+set. You can then step through the code in Eclipse's Debug Perspective,
+just as you would for any other application.</p>
+
+  <a href="images/hello_world_9.png"><img src="images/hello_world_9.png" style="height:230px" alt="" /></a>
+
+
+<h2 id="noeclipse">Creating the Project without Eclipse</h2>
+  
+  <p>If you don't use Eclipse (such as if you prefer another IDE, or simply use text
+  editors and command line tools) then the Eclipse plugin can't help you.
+  Don't worry though &mdash; you don't lose any functionality just because you don't
+  use Eclipse.</p>
+  
+  <p>The Android Plugin for Eclipse is really just a wrapper around a set of tools
+  included with the Android SDK. (These tools, like the emulator, aapt, adb,
+  ddms, and others are <a href="{@docRoot}guide/developing/tools/index.html">documented elsewhere.</a>) Thus, it's possible to
+  wrap those tools with another tool, such as an 'ant' build file.</p>
+  
+  <p>The Android SDK includes a Python script named "activitycreator.py" that can be
+  used to create all the source code and directory stubs for your project, as well
+  as an ant-compatible build.xml file. This allows you to build your project
+  from the command line, or integrate it with the IDE of your choice.</p>
+  
+  <p>For example, to create a HelloAndroid project similar to the one we just created
+  via Eclipse, you'd use this command:</p>
+  
+  <pre>activitycreator.py --out HelloAndroid com.android.hello.HelloAndroid</pre>
+  
+  <p>To build the project, you'd then run the command 'ant'. When that command
+  successfully completes, you'll be left with a file named HelloAndroid.apk under
+  the 'bin' directory. That .apk file is an Android Package, and can be
+  installed and run in your emulator using the 'adb' tool.</p>
+  
+  <p>For more information on how to use these tools, please read the documentation
+  cited above.</p>
diff --git a/docs/html/guide/tutorials/images/hello_world_0.png b/docs/html/guide/tutorials/images/hello_world_0.png
new file mode 100644
index 0000000..c174fba
--- /dev/null
+++ b/docs/html/guide/tutorials/images/hello_world_0.png
Binary files differ
diff --git a/docs/html/guide/tutorials/images/hello_world_1.png b/docs/html/guide/tutorials/images/hello_world_1.png
new file mode 100644
index 0000000..f08438a
--- /dev/null
+++ b/docs/html/guide/tutorials/images/hello_world_1.png
Binary files differ
diff --git a/docs/html/guide/tutorials/images/hello_world_2.png b/docs/html/guide/tutorials/images/hello_world_2.png
new file mode 100644
index 0000000..58f5703
--- /dev/null
+++ b/docs/html/guide/tutorials/images/hello_world_2.png
Binary files differ
diff --git a/docs/html/guide/tutorials/images/hello_world_3.png b/docs/html/guide/tutorials/images/hello_world_3.png
new file mode 100644
index 0000000..d2d2ff6
--- /dev/null
+++ b/docs/html/guide/tutorials/images/hello_world_3.png
Binary files differ
diff --git a/docs/html/guide/tutorials/images/hello_world_4.png b/docs/html/guide/tutorials/images/hello_world_4.png
new file mode 100644
index 0000000..5c41e80
--- /dev/null
+++ b/docs/html/guide/tutorials/images/hello_world_4.png
Binary files differ
diff --git a/docs/html/guide/tutorials/images/hello_world_5.png b/docs/html/guide/tutorials/images/hello_world_5.png
new file mode 100644
index 0000000..96b830a
--- /dev/null
+++ b/docs/html/guide/tutorials/images/hello_world_5.png
Binary files differ
diff --git a/docs/html/guide/tutorials/images/hello_world_8.png b/docs/html/guide/tutorials/images/hello_world_8.png
new file mode 100644
index 0000000..07db360
--- /dev/null
+++ b/docs/html/guide/tutorials/images/hello_world_8.png
Binary files differ
diff --git a/docs/html/guide/tutorials/images/hello_world_9.png b/docs/html/guide/tutorials/images/hello_world_9.png
new file mode 100644
index 0000000..e172e63
--- /dev/null
+++ b/docs/html/guide/tutorials/images/hello_world_9.png
Binary files differ
diff --git a/docs/html/guide/tutorials/index.html b/docs/html/guide/tutorials/index.html
new file mode 100644
index 0000000..4881acf
--- /dev/null
+++ b/docs/html/guide/tutorials/index.html
@@ -0,0 +1,8 @@
+<html>
+<head>
+<meta http-equiv="refresh" content="0;url=../index.html">
+</head>
+<body>
+<a href="../index.html">click here</a> if you are not redirected.
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/html/guide/tutorials/notepad/codelab/NotepadCodeLab.zip b/docs/html/guide/tutorials/notepad/codelab/NotepadCodeLab.zip
new file mode 100644
index 0000000..c7dd989
--- /dev/null
+++ b/docs/html/guide/tutorials/notepad/codelab/NotepadCodeLab.zip
Binary files differ
diff --git a/docs/html/guide/tutorials/notepad/index.jd b/docs/html/guide/tutorials/notepad/index.jd
new file mode 100644
index 0000000..6319fad
--- /dev/null
+++ b/docs/html/guide/tutorials/notepad/index.jd
@@ -0,0 +1,142 @@
+page.title=Notepad Tutorial
+@jd:body
+
+
+<p>This tutorial on writing a notepad application gives you a &quot;hands-on&quot; introduction
+to the Android framework and the  tools you use to build  applications on it.
+Starting from a preconfigured project file, it guides you through the process of
+developing a simple notepad application and provides concrete examples of how to
+set up the project,  develop the application logic and user interface, and then
+compile and run the application. </p>
+
+<p>The tutorial presents the application development as a set of 
+exercises (see below), each consisting of several steps. You should follow 
+the steps in each exercise to gradually build and refine your  
+application. The exercises explain each step in detail and provide all the 
+sample code you need to complete the application. </p>
+
+<p>When you are finished with the tutorial, you will have created a functioning
+Android application and will have learned many of the most important
+concepts in Android development. If you want to add more complex features to
+your application, you can examine the code in an alternative implementation
+of a Note Pad application, in the 
+<a href="{@docRoot}guide/samples/index.html">Sample Code</a> section. </p>
+
+
+<a name="who"></a>
+<h2>Who Should Use this Tutorial</h2>
+
+<p>This tutorial is designed for  experienced developers, especially those with 
+knowledge of the Java programming language. If you haven't written Java
+applications before, you can still use the tutorial, but you might need to work
+at a slower pace. </p>
+
+<p>Also note that this tutorial uses
+the Eclipse development environment, with the Android plugin installed. If you
+are not using Eclipse, you can  follow  the exercises and build the application,
+but you will need to determine how to accomplish the Eclipse-specific
+steps in your environment. </p>
+
+<a name="preparing"></a>
+<h2>Preparing for the Exercises</h2>
+
+<p>The tutorial  assumes that you have some familiarity with basic Android
+application concepts and terminology. If you are not, you
+should read <a href="{@docRoot}guide/topics/fundamentals.html">Application 
+Fundamentals</a> before continuing. </p>
+
+<p>This tutorial also builds on the introductory information provided in the 
+<a href="{@docRoot}guide/tutorials/hello-world.html">Hello World</a>
+tutorial, which explains how to set up your Eclipse environment
+for building Android applications. We recommend you complete the Hello World
+tutorial before starting this one.</p>
+
+<p>To prepare for this lesson:</p>
+
+<ol>
+  <li>Download the <a href="codelab/NotepadCodeLab.zip">project
+      exercises archive (.zip)</a>.</li>
+  <li>Unpack the archive file to a suitable location on your machine.</li>
+  <li>Open the <code>NotepadCodeLab</code> folder.</li>
+</ol>
+
+<p>Inside the <code>NotepadCodeLab</code> folder, you should see six project
+files: <code>Notepadv1</code>,
+    <code>Notepadv2</code>, <code>Notepadv3</code>,
+    <code>Notepadv1Solution</code>, <code>Notepadv2Solution</code>
+    and <code>Notepadv3Solution</code>. The <code>Notepadv#</code> projects are
+the starting points for each of the exercises, while the
+<code>Notepadv#Solution</code> projects are the exercise
+    solutions. If you are having trouble with a particular exercise, you
+    can compare your current work against the exercise solution.</p>
+
+<a name="exercises"></a>
+<h2> Exercises</h2>
+
+  <p>The table below lists the tutorial exercises and describes the development
+areas that each covers. Each exercise assumes that you have completed any
+previous exercises.</p>
+
+  <table border="0" style="padding:4px;spacing:2px;" summary="This
+table lists the
+tutorial examples and describes what each covers. ">
+    <tr>
+      <th width="120"><a href="{@docRoot}guide/tutorials/notepad/notepad-ex1.html">Exercise
+1</a></th>
+      <td>Start here. Construct a simple notes list that lets the user add new notes but not
+edit them. Demonstrates the basics of <code>ListActivity</code> and creating
+and handling
+      menu options. Uses a SQLite database to store the notes.</td>
+    </tr>
+    <tr>
+      <th><a href="{@docRoot}guide/tutorials/notepad/notepad-ex2.html">Exercise 2</a></th>
+      <td>Add a second Activity to the
+application. Demonstrates constructing a
+new Activity, adding it to the Android manifest, passing data between the
+activities, and using more advanced screen layout. Also shows how to
+invoke another Activity to return a result, using
+<code>startActivityForResult()</code>.</td>
+    </tr>
+    <tr>
+      <th><a href="{@docRoot}guide/tutorials/notepad/notepad-ex3.html">Exercise 3</a></th>
+      <td>Add handling of life-cycle events to
+the application, to let it
+maintain application state across the life cycle. </td>
+    </tr>
+    <tr>
+    <th><a href="{@docRoot}guide/tutorials/notepad/notepad-extra-credit.html">Extra
+Credit</a></th>
+    <td>Demonstrates how to use the Eclipse
+debugger and how you can use it to
+view life-cycle events as they are generated. This section is optional but
+highly recommended.</td>
+    </tr>
+</table>
+
+
+<a name="other"></a>
+<h2>Other Resources and Further Learning</h2>
+<ul>
+<li>For a lighter but broader introduction to concepts not covered in the
+tutorial,
+take a look at <a href="{@docRoot}guide/appendix/faq/commontasks.html">Common Android Tasks</a>.</li>
+<li>The Android SDK includes a variety of fully functioning sample applications
+that make excellent opportunities for further learning. You can find the sample
+applications in the <code>samples/</code> directory of your downloaded SDK, or browser them
+here, in the <a href="{@docRoot}guide/samples/index.html">Sample Code</a> section.</li>
+<li>This tutorial draws from the full Notepad application included in the
+<code>samples/</code> directory of the SDK, though it does not match it exactly. 
+When you are done with the tutorial,
+it is highly recommended that you take a closer look at this version of the Notepad
+application, 
+as it demonstrates a variety of interesting additions for your application, 
+such as:</li>
+  <ul>
+    <li>Setting up a custom striped list for the list of notes.</li>
+    <li>Creating a custom text edit view that overrides the <code>draw()</code>
+    method to make it look like a lined notepad.</li>
+    <li>Implementing a full <code>ContentProvider</code> for notes.</li>
+    <li>Reverting and discarding edits instead of just automatically saving
+    them.</li>
+  </ul>
+</ul>
diff --git a/docs/html/guide/tutorials/notepad/notepad-ex1.jd b/docs/html/guide/tutorials/notepad/notepad-ex1.jd
new file mode 100644
index 0000000..b7f42bf
--- /dev/null
+++ b/docs/html/guide/tutorials/notepad/notepad-ex1.jd
@@ -0,0 +1,589 @@
+page.title=Notepad Exercise 1
+parent.title=Notepad Tutorial
+parent.link=index.html
+@jd:body
+
+
+<p><em>In this exercise, you will construct a simple notes list that lets the
+user add new notes but not edit them. The exercise demonstrates:</em></p>
+<ul>
+<li><em>The basics of <code>ListActivities</code> and creating and handling menu
+options. </em></li>
+<li><em>How to use a SQLite database to store the notes.</em></li>
+<li><em>How to bind data from a database cursor into a ListView using a
+SimpleCursorAdapter.</em></li>
+<li><em>The basics of screen layouts, including how to lay out a list view, how
+you can add items to the activity menu, and how the activity handles those menu
+selections. </em></li>
+</ul>
+
+<div style="float:right;white-space:nowrap">
+<span style="color:#BBB;">
+	[<a href="notepad-ex1.html" style="color:#BBB;">Exercise 1</a>]</span>
+	[<a href="notepad-ex2.html">Exercise 2</a>]
+	[<a href="notepad-ex3.html">Exercise 3</a>]
+	[<a href="notepad-extra-credit.html">Extra Credit</a>]
+</div>
+
+
+
+<h2>Step 1</h2>
+
+	<p>Open up the <code>Notepadv1</code> project in Eclipse.</p>
+    
+    <p><code>Notepadv1</code> is a project that is provided as a starting point. It
+    takes care of some of the boilerplate work that you have already seen if you
+    followed the <a href="{@docRoot}guide/tutorials/hello-world.html">Hello,
+    World</a> tutorial.</p>
+    
+  <ol>
+    <li>
+      Start a new Android Project by clicking <strong>File</strong> > 
+      <strong>New</strong> > <strong>Android Project</strong>.</li>
+    <li>
+      In the New Android Project dialog, select <strong>Create project from existing source</strong>.</li>
+    <li>
+      Click <strong>Browse</strong> and navigate to where you copied the <code>NotepadCodeLab</code> 
+      (downloaded during <a href="{@docRoot}guide/tutorials/notepad/index.html#preparing">setup</a>). Select 
+      <code>Notepadv1</code> and click <strong>Choose</strong>.</li>
+    <li>
+      You should see <code>Notepadv1</code> in the <em>Project name</em> and also see the <em>Location</em>
+      filled in with the path you selected.</li>
+    <li>
+      Click <strong>Finish</strong>. The <code>Notepadv1</code> project should open and be 
+      visible in your Eclipse package explorer.</li>
+  </ol>
+  
+    <p>If you see an error about <code>AndroidManifest.xml</code>, or some
+      problems related to an Android zip file, right click on the project and
+      select <strong>Android Tools</strong> > <strong>Fix Project Properties</strong>.
+      (The project is looking in the wrong location for the library file,
+      this will fix it for you.)</p>
+
+  <h2>Step 2</h2>
+
+  <div class="sidebox" style="border:2px solid #FFFFDD;float:right;
+      background-color:#FFFFEE;margin-right:0px;
+      margin-bottom:.5em;margin-top:1em;padding:0em;width:240px;">
+    <h2 style="border:0;font-size:12px;padding:.5em .5em .5em 1em;margin:0;
+      background-color:#FFFFDD;">Accessing and modifying data</h2>
+    <p style="padding-left:.5em;font-size:12px;margin:0; padding:.0em .5em .5em 1em;">For this
+    exercise, we are using a SQLite database to store our data. This is useful
+    if only <em>your</em> application will need to access or modify the data. If you wish for
+    other activities to access or modify the data, you have to expose the data using a 
+    {@link android.content.ContentProvider ContentProvider}.</p>
+    <p style="padding-left:.5em;font-size:12px;margin:0; 
+     padding:.0em .5em .5em 1em;">If you are interested, you can find out more about 
+    <a href="{@docRoot}guide/topics/providers/content-providers.html">content providers</a> or the whole 
+    subject of <a href="{@docRoot}guide/topics/data/data-storage.html">Data Storage</a>.
+    The NotePad sample in the <code>samples/</code> folder of the SDK also has an example of how
+    to create a ContentProvider.</p>
+  </div>
+
+    <p>Take a look at the <code>NotesDbAdapter</code> class &mdash; this class is provided to
+    encapsulate data access to a SQLite database that will hold our notes data
+    and allow us to update it.</p>
+    <p>At the top of the class are some constant definitions that will be used in the application
+    to look up data from the proper field names in the database. There is also a database creation
+    string defined, which is used to create a new database schema if one doesn't exist already.</p>
+    <p>Our database will have the name <code>data</code>, and have a single table called 
+    <code>notes</code>, which in turn has three fields: <code>_id</code>, <code>title</code> and 
+    <code>body</code>. The <code>_id</code> is named with an underscore convention used in a number of
+    places inside the Android SDK and helps keep a track of state. The <code>_id</code>
+    usually has to be specified when querying or updating the database (in the column projections
+    and so on). The other two fields are simple text fields that will store data.
+    </p>
+    <p>The constructor for <code>NotesDbAdapter</code> takes a Context, which allows it to communicate with aspects
+    of the Android operating system. This is quite common for classes that need to touch the
+    Android system in some way. The Activity class implements the Context class, so usually you will just pass
+    <code>this</code> from your Activity, when needing a Context.</p>
+    <p>The <code>open()</code> method calls up an instance of DatabaseHelper, which is our local
+    implementation of the SQLiteOpenHelper class. It calls <code>getWritableDatabase()</code>, 
+    which handles creating/opening a database for us.</p>
+    <p><code>close()</code> just closes the database, releasing resources related to the 
+    connection.</p>
+    <p><code>createNote()</code> takes strings for the title and body of a new note,
+    then creates that note in the database. Assuming the new note is created successfully, the
+    method also returns the row <code>_id</code> value for the newly created note.</p>
+    <p><code>deleteNote()</code> takes a <var>rowId</var> for a particular note, and deletes that note from
+    the database.</p>
+
+    <p><code>fetchAllNotes()</code> issues a query to return a {@link android.database.Cursor} over all notes in the
+    database. The <code>query()</code> call is worth examination and understanding. The first field is the 
+    name of the database table to query (in this case <code>DATABASE_TABLE</code> is "notes").
+    The next is the list of columns we want returned, in this case we want the <code>_id</code>, 
+    <code>title</code> and <code>body</code> columns so these are specified in the String array.
+    The remaining fields are, in order: <code>selection</code>, 
+    <code>selectionArgs</code>, <code>groupBy</code>, <code>having</code> and <code>orderBy</code>.
+    Having these all <code>null</code> means we want all data, need no grouping, and will take the default
+    order. See {@link android.database.sqlite.SQLiteDatabase SQLiteDatabase} for more details.</p>
+    <p class="note"><b>Note:</b> A Cursor is returned rather than a collection of rows. This allows
+    Android to use resources efficiently -- instead of putting lots of data straight into memory
+    the cursor will retrieve and release data as it is needed, which is much more efficient for
+    tables with lots of rows.</p>
+
+    <p><code>fetchNote()</code> is similar to <code>fetchAllNotes()</code> but just gets one note
+    with the <var>rowId</var> we specify. It uses a slightly different version of the 
+    {@link android.database.sqlite.SQLiteDatabase} <code>query()</code> method. 
+    The first parameter (set <em>true</em>) indicates that we are interested
+    in one distinct result. The <var>selection</var> parameter (the fourth parameter) has been specified to search
+    only for the row "where _id =" the <var>rowId</var> we passed in. So we are returned a Cursor on
+    the one row.</p>
+    <p>And finally, <code>updateNote()</code> takes a <var>rowId</var>, <var>title</var> and <var>body</var>, and uses a
+    {@link android.content.ContentValues ContentValues} instance to update the note of the given
+    <var>rowId</var>.</p>
+   
+<h2 style="clear:right;">Step 3</h2>
+
+	<div class="sidebox" style="border:2px solid #FFFFDD;float:right;
+      background-color:#FFFFEE;margin-right:0px;
+      margin-bottom:.5em;margin-top:1em;padding:0em;width:240px;">
+    <h2 style="border:0;font-size:12px;padding:.5em .5em .5em 1em;margin:0;
+      background-color:#FFFFDD;">Layouts and activities</h2>
+      <p style="padding-left:.5em;font-size:12px;margin:0; 
+     padding:.0em .5em .5em 1em;">Most Activity classes will have a layout associated with them. The layout
+    will be the "face" of the Activity to the user. In this case our layout will
+    take over the whole screen and provide a list of notes.</p>
+    <p style="padding-left:.5em;font-size:12px;margin:0; 
+     padding:.0em .5em .5em 1em;">Full screen layouts are not the only option for an Activity however. You
+    might also want to use a <a
+href="{@docRoot}guide/appendix/faq/commontasks.html#floatingorfull">floating 
+    layout</a> (for example, a <a
+href="{@docRoot}guide/appendix/faq/commontasks.html#dialogsandalerts">dialog
+    or alert</a>), 
+    or perhaps you don't need a layout at all (the Activity will be invisible 
+    to the user unless you specify some kind of layout for it to use).</p>
+    </div>
+    
+    <p>Open the <code>notepad_list.xml</code> file in <code>res/layout</code>
+and 
+    take a look at it. (You may have to
+    hit the <em>xml</em> tab, at the bottom, in order to view the XML markup.)</p>
+     
+    <p>This is a mostly-empty layout definition file. Here are some
+    things you should know about a layout file:</p>
+
+   
+  <ul>
+    <li>
+      All Android layout files must start with the XML header line:
+      <code>&lt;?xml version="1.0" encoding="utf-8"?&gt;</code>.    </li>
+    <li>
+      The next definition will often (but not always) be a layout
+      definition of some kind, in this case a <code>LinearLayout</code>.    </li>
+    <li>
+      The XML namespace of Android should always be defined in
+      the top level component or layout in the XML so that <code>android:</code> tags can
+      be used through the rest of the file:
+      <p><code>xmlns:android="http://schemas.android.com/apk/res/android"</code></p>
+    </li>
+  </ul>
+
+  <h2 style="clear:right;">Step 4</h2>
+    <p>We need to create the layout to hold our list. Add code inside
+    of the <code>LinearLayout</code> element so the whole file looks like this: </p>
+    <pre>
+&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
+&lt;LinearLayout xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;
+    android:layout_width=&quot;wrap_content&quot;
+    android:layout_height=&quot;wrap_content&quot;&gt;
+
+  &lt;ListView android:id=&quot;@android:id/list&quot;
+        android:layout_width=&quot;wrap_content&quot;
+        android:layout_height=&quot;wrap_content&quot;/&gt;
+  &lt;TextView android:id=&quot;@android:id/empty&quot;
+        android:layout_width=&quot;wrap_content&quot;
+        android:layout_height=&quot;wrap_content&quot;
+        android:text=&quot;@string/no_notes&quot;/&gt;
+
+&lt;/LinearLayout&gt;
+</pre>
+  <ul>
+    <li>
+      The <strong>&#64;</strong> symbol in the id strings of the <code>ListView</code> and 
+      <code>TextView</code> tags means 
+      that the XML parser should parse and expand the rest of
+      the id string and use an ID resource.</li>
+    <li>
+      The <code>ListView</code> and <code>TextView</code> can be
+      thought as two alternative views, only one of which will be displayed at once.
+      ListView will be used when there are notes to be shown, while the TextView
+      (which has a default value of "No Notes Yet!" defined as a string
+      resource in <code>res/values/strings.xml</code>) will be displayed if there 
+      aren't any notes to display.</li>
+    <li>The <code>list</code> and <code>empty</code> IDs are
+      provided for us by the Android platform, so, we must 
+      prefix the <code>id</code> with <code>android:</code> (e.g., <code>@android:id/list</code>).</li>
+    <li>The View with the <code>empty</code> id is used 
+      automatically when the {@link android.widget.ListAdapter} has no data for the ListView. The 
+      ListAdapter knows to look for this name by default. Alternatively, you could change the      
+      default empty view by using {@link android.widget.AdapterView#setEmptyView(View)}
+      on the ListView.
+      <p>
+      More broadly, the <code>android.R</code> class is a set of predefined 
+      resources provided for you by the platform, while your project's 
+      <code>R</code> class is the set of resources your project has defined.
+      Resources found in the <code>android.R</code> resource class can be
+      used in the XML files by using the <code>android:</code> name space prefix      
+      (as we see here).</p>
+    </li>
+  </ul>
+
+  <h2 style="clear:right;">Step 5</h2>
+
+	  <div class="sidebox" style="border:2px solid #FFFFDD;float:right;
+      background-color:#FFFFEE;margin-right:0px;
+      margin-bottom:.5em;margin-top:1em;padding:0em;width:240px;">
+    <h2 style="border:0;font-size:12px;padding:.5em .5em .5em 1em;margin:0;
+      background-color:#FFFFDD;">Resources and the R class</h2>
+    <p style="padding-left:.5em;font-size:12px;margin:0; 
+     padding:.0em .5em .5em 1em;">The folders under res/ in the Eclipse project are for resources. 
+     There is a <a href="{@docRoot}guide/appendix/faq/commontasks.html#filelist">specific structure</a> to the
+     folders and files under res/.</p>
+    <p style="padding-left:.5em;font-size:12px;
+margin:0; padding:.0em .5em .5em 1em;">Resources defined in these folders and files will have
+    corresponding entries in the R class allowing them to be easily accessed
+    and used from your application. The R class is automatically generated using the contents
+    of the res/ folder by the eclipse plugin (or by aapt if you use the command line tools).
+    Furthermore, they will be bundled and deployed for you as part of the application.</p>
+    </p>
+  </div>
+    <p>To make the list of notes in the ListView, we also need to define a View for each row:</p>
+  <ol>
+    <li>
+      Create a new file under <code>res/layout</code> called 
+      <code>notes_row.xml</code>.    </li>
+    <li>
+      Add the following contents (note: again the XML header is used, and the
+      first node defines the Android XML namespace)<br>
+      <pre style="overflow:auto">
+&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
+&lt;TextView android:id=&quot;&#64;+id/text1&quot;
+    xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;
+    android:layout_width=&quot;wrap_content&quot;
+    android:layout_height=&quot;wrap_content&quot;/&gt;</pre>
+    <p>
+      This is the View that will be used for each notes title row &mdash; it has only
+      one text field in it.    </p>
+    <p>In this case we create a new id called <code>text1</code>. The
+      <strong>+</strong> after the <strong>@</strong> in the id string indicates that the id should
+      be automatically created as a resource if it does not already exist, so we are defining
+      <code>text1</code> on the fly and then using it.</p>
+    </li>
+    <li>Save the file.</li>
+  </ol>
+      <p>Open the <code>R.java</code> class in the
+      project and look at it, you should see new definitions for
+      <code>notes_row</code> and <code>text1</code> (our new definitions)
+      meaning we can now gain access to these from the our code. </p>
+
+  <h2 style="clear:right;">Step 6</h2>
+<p>Next, open the <code>Notepadv1</code> class in the source. In the following steps, we are going to
+    alter this class to become a list adapter and display our notes, and also
+    allow us to add new notes.</p>
+
+<p><code>Notepadv1</code> will inherit from a subclass
+    of <code>Activity</code> called a <code>ListActivity</code>, 
+    which has extra functionality to accommodate the kinds of 
+    things you might want to do with a list, for
+    example: displaying an arbitrary number of list items in rows on the screen,
+    moving through the list items, and allowing them to be selected.</p>
+
+<p>Take a look through the existing code in <code>Notepadv1</code> class.
+    There is a currently an unused private field called <code>mNoteNumber</code> that
+    we will use to create numbered note titles.</p>
+    <p>There are also three override methods defined:
+    <code>onCreate</code>, <code>onCreateOptionsMenu</code> and
+    <code>onOptionsItemSelected</code>; we need to fill these
+    out:</p>
+    <ul>
+      <li><code>onCreate()</code> is called when the activity is
+      started &mdash; it is a little like the "main" method for an Activity. We use
+      this to set up resources and state for the activity when it is
+      running.</li>
+     <li><code>onCreateOptionsMenu()</code> is used to populate the
+      menu for the Activity. This is shown when the user hits the menu button,
+and
+      has a list of options they can select (like "Create
+      Note"). </li>
+     <li><code>onOptionsItemSelected()</code> is the other half of the
+      menu equation, it is used to handle events generated from the menu (e.g.,
+      when the user selects the "Create Note" item).
+      </li>
+    </ul>
+    
+  <h2>Step 7</h2>
+    <p>Change the inheritance of <code>Notepadv1</code> from
+<code>Activity</code>
+    to <code>ListActivity</code>:</p> 
+    <pre>public class Notepadv1 extends ListActivity</pre>
+    <p>Note: you will have to import <code>ListActivity</code> into the
+Notepadv1
+    class using Eclipse, <strong>ctrl-shift-O</strong> on Windows or Linux, or
+    <strong>cmd-shift-O</strong> on the Mac (organize imports) will do this for you
+    after you've written the above change.</p>
+
+  <h2>Step 8</h2>
+    <p>Fill out the body of the <code>onCreate()</code> method.</p>
+    <p>Here we will set the title for the Activity (shown at the top of the
+    screen), use the <code>notepad_list</code> layout we created in XML, 
+    set up the <code>NotesDbAdapter</code> instance that will
+    access notes data, and populate the list with the available note
+    titles:</p>
+    <ol>
+    <li>
+      In the <code>onCreate</code> method, call <code>super.onCreate()</code> with the 
+      <code>savedInstanceState</code> parameter that's passed in.</li>
+    <li>
+      Call <code>setContentView()</code> and pass <code>R.layout.notepad_list</code>.</li>
+    <li>
+      At the top of the class, create a new private class field called <code>mDbHelper</code> of class
+      <code>NotesDbAdapter</code>.
+    </li>
+    <li>
+      Back in the <code>onCreate</code> method, construct a new
+<code>NotesDbAdapter</code>
+      instance and assign it to the <code>mDbHelper</code> field (pass
+      <code>this</code> into the constructor for <code>DBHelper</code>)
+    </li>
+    <li>
+      Call the <code>open()</code> method on <code>mDbHelper</code> to open (or create) the
+      database.
+    </li>
+    <li>
+      Finally, call a new method <code>fillData()</code>, which will get the data and
+      populate the ListView using the helper &mdash; we haven't defined this method yet.    </li>
+  </ol>
+    <p>
+      <code>onCreate()</code> should now look like this:</p>
+      <pre>
+    &#64;Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.notepad_list);
+        mDbHelper = new NotesDbAdapter(this);
+        mDbHelper.open();
+        fillData();
+    }</pre>
+      <p>And be sure you have the <code>mDbHelper</code> field definition (right
+      under the mNoteNumber definition): </p>
+      <pre>    private NotesDbAdapter mDbHelper;</pre>
+
+  <h2>Step 9</h2>
+
+      <div class="sidebox" style="border:2px solid #FFFFDD;float:right;
+      background-color:#FFFFEE;margin-right:0px;
+      margin-bottom:.5em;margin-top:1em;padding:0em;width:240px;">
+    <h2 style="border:0;font-size:12px;padding:.5em .5em .5em 1em;margin:0;
+      background-color:#FFFFDD;">More on menus</h2>
+    <p style="padding-left:.5em;font-size:12px;margin:0; 
+     padding:.0em .5em .5em 1em;">The notepad application we are constructing only scratches the 
+     surface with <a href="{@docRoot}guide/appendix/faq/commontasks.html#addmenuitems">menus</a>. </p>
+    <p style="padding-left:.5em;font-size:12px;margin:0; 
+     padding:.0em .5em .5em 1em;">You can also <a href="{@docRoot}guide/appendix/faq/commontasks.html#menukeyshortcuts">add
+shortcut keys for menu items</a>, <a href="{@docRoot}guide/appendix/faq/commontasks.html#menukeyshortcuts">create
+submenus</a> and even <a href="{@docRoot}guide/appendix/faq/commontasks.html#addingtoothermenus">add
+menu items to other applications!</a>. </p>
+  </div>
+
+<p>Fill out the body of the <code>onCreateOptionsMenu()</code> method.</p>
+
+<p>We will now create the "Add Item" button that can be accessed by pressing the menu
+button on the device. We'll specify that it occupy the first position in the menu.</p>
+
+  <ol>
+    <li>
+      In <code>strings.xml</code> resource (under <code>res/values</code>), add
+      a new string named "menu_insert" with its value set to <code>Add Item</code>:
+     <pre>&lt;string name="menu_insert"&gt;Add Item&lt;/string&gt;</pre>
+      <p>Then save the file and return to <code>Notepadv1</code>.</p>
+    </li>
+    <li>Create a menu position constant at the top of the  class:
+      <pre>public static final int INSERT_ID = Menu.FIRST;</pre>
+    </li>
+    <li>In the <code>onCreateOptionsMenu()</code> method, change the 
+    <code>super</code> call so we capture the boolean return as <code>result</code>. We'll return this value at the end.</li>
+    <li>Then add the menu item with <code>menu.add()</code>.</li>
+  </ol>
+  <p>The whole method should now look like this: 
+      <pre>
+    &#64;Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        boolean result = super.onCreateOptionsMenu(menu);
+        menu.add(0, INSERT_ID, 0, R.string.menu_insert);
+        return result;
+    }</pre>
+  <p>The arguments passed to <code>add()</code> indicate: a group identifier for this menu (none,
+  in this case), a unique ID (defined above), the order of the item (zero indicates no preference),
+  and the resource of the string to use for the item.</p>
+
+<h2 style="clear:right;">Step 10</h2>
+    <p>Fill out the body of the <code>onOptionsItemSelected()</code> method:</p>
+    <p>This is going
+    to handle our new "Add Note" menu item.  When this is selected, the
+    <code>onOptionsItemSelected()</code> method will be called with the
+    <code>item.getId()</code> set to <code>INSERT_ID</code> (the constant we
+    used to identify the menu item). We can detect this, and take the
+    appropriate actions:</p>
+  <ol>
+    <li>
+      The <code>super.onOptionsItemSelected(item)</code> method call goes at the
+      end of this method &mdash; we want to catch our events first!    </li>
+    <li>
+      Write a switch statement on <code>item.getItemId()</code>.   
+      <p>In the case of <var>INSERT_ID</var>, call a new method, <code>createNote()</code>,
+      and return true, because we have handled this event and do not want to
+      propagate it through the system.</p>
+    </li>
+    <li>Return the result of the superclass' <code>onOptionsItemSelected()</code>
+    method at the end.</li>
+   </ol>
+    <p>
+      The whole <code>onOptionsItemSelect()</code> method should now look like
+      this:</p>
+      <pre>
+    &#64;Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+        case INSERT_ID:
+            createNote();
+            return true;
+        }
+       
+        return super.onOptionsItemSelected(item);
+    }</pre>
+
+<h2>Step 11</h2>
+    <p>Add a new <code>createNote()</code> method:</p>
+    <p>In this first version of
+    our application, <code>createNote()</code> is not going to be very useful.
+We will simply
+    create a new note with a title assigned to it based on a counter ("Note 1",
+    "Note 2"...) and with an empty body. At present we have no way of editing
+    the contents of a note, so for now we will have to be content making one
+    with some default values:</p>
+  <ol>
+    <li>Construct the name using "Note" and the counter we defined in the class: <code>
+      String noteName = "Note " + mNoteNumber++</code></li>
+    <li>
+      Call <code>mDbHelper.createNote()</code> using <code>noteName</code> as the
+      title and <code>""</code> for the body 
+    </li>
+    <li>
+      Call <code>fillData()</code> to populate the list of notes (inefficient but
+      simple) &mdash; we'll create this method next.</li>
+  </ol>
+    <p>
+      The whole <code>createNote()</code> method should look like this: </p>
+      <pre>
+    private void createNote() {
+        String noteName = &quot;Note &quot; + mNoteNumber++;
+        mDbHelper.createNote(noteName, &quot;&quot;);
+        fillData();
+    }</pre>
+
+
+<h2>Step 12</h2>
+      <div class="sidebox" style="border:2px solid #FFFFDD;float:right;
+      background-color:#FFFFEE;margin-right:0px;
+      margin-bottom:.5em;margin-top:1em;padding:0em;width:240px;">
+    <h2 style="border:0;font-size:12px;padding:.5em .5em .5em 1em;margin:0;
+      background-color:#FFFFDD;">List adapters</h2>
+    <p style="padding-left:.5em;font-size:12px;margin:0; 
+     padding:.0em .5em .5em 1em;">Our example uses a {@link android.widget.SimpleCursorAdapter 
+     SimpleCursorAdapter} to bind a database {@link android.database.Cursor Cursor}
+     into a ListView, and this is a common way to use a {@link android.widget.ListAdapter 
+     ListAdapter}. Other options exist like {@link android.widget.ArrayAdapter ArrayAdapter} which 
+     can be used to take a List or Array of in-memory data and bind it in to
+     a list as well.</p>
+  </div>
+  
+  <p>Define the <code>fillData()</code> method:</p>
+   <p>This
+    method uses <code>SimpleCursorAdapter,</code> which takes a database <code>Cursor</code> 
+    and binds it to fields provided in the layout. These fields define the row elements of our list 
+    (in this case we use the <code>text1</code> field in our
+    <code>notes_row.xml</code> layout), so this allows us to easily populate the list with
+    entries from our database.</p>
+    <p>To do this we have to provide a mapping from the <code>title</code> field in the returned Cursor, to
+    our <code>text1</code> TextView, which is done by defining two arrays: the first a string array
+    with the list of columns to map <em>from</em> (just "title" in this case, from the constant 
+    <code>NotesDbAdapter.KEY_TITLE</code>) and, the second, an int array
+    containing references to the views that we'll bind the data <em>into</em> 
+    (the <code>R.id.text1</code> TextView).</p>
+    <p>This is a bigger chunk of code, so let's first take a look at it:</p>
+
+    <pre>
+    private void fillData() {
+        // Get all of the notes from the database and create the item list
+        Cursor c = mDbHelper.fetchAllNotes();
+        startManagingCursor(c);
+
+        String[] from = new String[] { NotesDbAdapter.KEY_TITLE };
+        int[] to = new int[] { R.id.text1 };
+        
+        // Now create an array adapter and set it to display using our row
+        SimpleCursorAdapter notes =
+            new SimpleCursorAdapter(this, R.layout.notes_row, c, from, to);
+        setListAdapter(notes);
+    }</pre>
+    
+  <p>Here's what we've done:</p>
+  <ol>
+    <li>
+      After obtaining the Cursor from <code>mDbHelper.fetchAllNotes()</code>, we 
+      use an Activity method called
+      <code>startManagingCursor()</code> that allows Android to take care of the
+      Cursor lifecycle instead of us needing to worry about it. (We will cover the implications
+      of the lifecycle in exercise 3, but for now just know that this allows Android to do some
+      of our resource management work for us.)</li>
+    <li>
+      Then we create a string array in which we declare the column(s) we want 
+      (just the title, in this case), and an int array that defines the View(s)
+      to which we'd like to bind the columns (these should be in order, respective to 
+      the string array, but here we only have one for each).</li>
+    <li>
+      Next is the SimpleCursorAdapter instantiation. 
+      Like many classes in Android, the SimpleCursorAdapter needs a Context in order to do its
+      work, so we pass in <code>this</code> for the context (since subclasses of Activity 
+      implement Context). We pass the <code>notes_row</code> View we created as the receptacle
+      for the data, the Cursor we just created, and then our arrays.</li>
+   </ol>
+    <p>
+      In the future, remember that the mapping between the <strong>from</strong> columns and <strong>to</strong> resources
+      is done using the respective ordering of the two arrays. If we had more columns we wanted
+      to bind, and more Views to bind them in to, we would specify them in order, for example we
+      might use <code>{ NotesDbAdapter.KEY_TITLE, NotesDbAdapter.KEY_BODY }</code> and
+      <code>{ R.id.text1, R.id.text2 }</code> to bind two fields into the row (and we would also need
+      to define text2 in the notes_row.xml, for the body text). This is how you can bind multiple fields
+      into a single row (and get a custom row layout as well).</p>
+    <p>
+      If you get compiler errors about classes not being found, ctrl-shift-O or
+      (cmd-shift-O on the mac) to organize imports. 
+    </p>
+    
+<h2 style="clear:right;">Step 13</h2>
+    <p>Run it!
+  <ol>
+    <li>
+      Right click on the <code>Notepadv1</code> project.</li>
+    <li>
+      From the popup menu, select <strong>Run As</strong> &gt; 
+      <strong>Android Application</strong>.</li>
+    <li>
+      If you see a dialog come up, select Android Launcher as the way of running
+      the application (you can also use the link near the top of the dialog to
+      set this as your default for the workspace; this is recommended as it will
+      stop the plugin from asking you this every time).</li>
+    <li>Add new notes by hitting the menu button and selecting <em>Add
+    Item</em> from the menu.</li>
+  </ol>
+
+<h2 style="clear:right;">Solution and Next Steps</h2>
+    <p>You can see the solution to this class in <code>Notepadv1Solution</code>
+from
+the zip file to compare with your own.</p>
+
+<p>Once you are ready, move on to <a href="notepad-ex2.html">Tutorial
+Exercise 2</a> to add the ability to create, edit and delete notes.</p>
+
diff --git a/docs/html/guide/tutorials/notepad/notepad-ex2.jd b/docs/html/guide/tutorials/notepad/notepad-ex2.jd
new file mode 100644
index 0000000..3b8fa0b
--- /dev/null
+++ b/docs/html/guide/tutorials/notepad/notepad-ex2.jd
@@ -0,0 +1,647 @@
+page.title=Notepad Exercise 2
+parent.title=Notepad Tutorial
+parent.link=index.html
+@jd:body
+
+
+<p><em>In this exercise, you will add a second Activity to your notepad application, to let the user
+create and edit notes. You will also allow the user to delete existing notes through a context menu. 
+The new Activity assumes responsibility for creating new notes by
+collecting user input and packing it into a return Bundle provided by the intent. This exercise
+demonstrates:</em></p>
+<ul>
+<li><em>Constructing a new Activity and adding it to the Android manifest</em></li>
+<li><em>Invoking another Activity asynchronously using <code>startActivityForResult()</code></em></li>
+<li><em>Passing data between Activity in Bundle objects</em></li>
+<li><em>How to use a more advanced screen layout</em></li>
+<li><em>How to create a context menu</em></li>
+</ul>
+
+<div style="float:right;white-space:nowrap">
+	[<a href="notepad-ex1.html">Exercise 1</a>]
+	<span style="color:#BBB;">
+		[<a href="notepad-ex2.html" style="color:#DDD;">Exercise 2</a>]
+	</span>
+	[<a href="notepad-ex3.html">Exercise 3</a>]
+	[<a href="notepad-extra-credit.html">Extra Credit</a>]
+</div>
+
+<h2>Step 1</h2>
+
+<p>Create a new Android project using the sources from <code>Notepadv2</code> under the
+<code>NotepadCodeLab</code> folder, just like you did for the first exercise. If you see an error about
+<code>AndroidManifest.xml</code>, or some problems related to an
+<code>android.zip</code> file, right click on the project and select <strong>Android
+Tools</strong> &gt; <strong>Fix Project Properties</strong>.</p>
+
+<p>Open the <code>Notepadv2</code> project and take a look around:</p>
+<ul>
+    <li>
+      Open and look at the <code>strings.xml</code> file under
+      <code>res/values</code> &mdash; there are several new strings which we will use
+      for our new functionality
+    </li>
+    <li>
+      Also, open and take a look at the top of the <code>Notepadv2</code> class,
+      you will notice several new constants have been defined along with a new <code>mNotesCursor</code>
+      field used to hold the cursor we are using.
+    </li>
+    <li>
+      Note also that the <code>fillData()</code> method has a few more comments and now uses
+      the new field to store the notes Cursor. The <code>onCreate()</code> method is
+      unchanged from the first exercise. Also notice that the member field used to store the
+      notes Cursor is now called <code>mNotesCursor</code>. The <code>m</code> denotes a member
+      field and is part of the Android coding style standards.
+    </li>
+    <li>
+      There are also a couple of new overridden methods
+      (<code>onCreateContextMenu()</code>, <code>onContextItemSelected()</code>, 
+      <code>onListItemClick()</code> and <code>onActivityResult()</code>)
+      which we will be filling in below.
+    </li>
+</ul>
+
+
+<h2>Step 2</h2>
+
+<div class="sidebox">
+<p>Context menus should always be used when performing actions upon specific elements in the UI.
+When you register a View to a context menu, the context menu is revealed by performing a "long-click"
+on the UI component (press and hold the touchscreen or highlight and hold down the selection key for about two seconds).</p>
+</div>
+
+<p>First, let's create the context menu that will allow users to delete individual notes.
+Open the Notepadv2 class.</p>
+
+<ol>
+    <li>In order for each list item in the ListView to register for the context menu, we call
+    <code>registerForContextMenu()</code> and pass it our ListView. So, at the very end of 
+    the <code>onCreate()</code> method add this line:
+    <pre>registerForContextMenu(getListView());</pre>
+    <p>Because our Activity extends the ListActivity class, <code>getListView()</code> will return us
+    the local ListView object for the Activity. Now, each list item in this ListView will activate the
+    context menu.
+    <li>
+      Now fill in the <code>onCreateContextMenu()</code> method. This callback is similar to the other
+    menu callback used for the options menu. Here, we add just one line, which will add a menu item
+    to delete a note. Call <code>menu.add()</code> like so:
+      <pre>
+public boolean onCreateContextMenu(Menu menu, View v
+        ContextMenuInfo menuInfo) {
+    super.onCreateContextMenu(menu, v, menuInfo);
+    menu.add(0, DELETE_ID, 0, R.string.menu_delete);
+}</pre>
+    <p>The <code>onCreateContextMenu()</code> callback some passes other information in addition to the Menu object, 
+    such as the View that has been triggered for the menu and
+    an extra object that may contain additional information about the object selected. However, we don't care about
+    these here, because we only have one kind of object in the Activity that uses context menus. In the next
+    step, we'll handle the menu item selection.</p>
+    </li>
+</ol>
+
+<h2>Step 3</h2>
+  <p>Now that the we've registered our ListView for a context menu and defined our context menu item, we need
+  to handle the callback when it is selected. For this, we need to identify the list ID of the
+  selected item, then delete it. So fill in the 
+  <code>onContextItemSelected()</code> method like this:</p>
+<pre>
+public boolean onContextItemSelected(MenuItem item) {
+    switch(item.getItemId()) {
+    case DELETE_ID:
+        AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();
+        mDbHelper.deleteNote(info.id);
+        fillData();
+        return true;
+    }
+    return super.onContextItemSelected(item);
+}</pre>
+<p>Here, we retrieve the {@link android.widget.AdapterView.AdapterContextMenuInfo AdapterContextMenuInfo}
+with {@link android.view.MenuItem#getMenuInfo()}. The <var>id</var> field of this object tells us
+the position of the item in the ListView. We then pass this to the <code>deleteNote()</code>
+method of our NotesDbAdapter and the note is deleted. That's it for the context menu &mdash; notes
+can now be deleted.</p>
+
+<h2 style="clear:right;">Step 4</h2>
+<div class="sidebox" style="border:2px solid #FFFFDD;float:right;
+     background-color:#FFFFEE;margin-right:0px;
+     margin-bottom:.5em;margin-top:1em;padding:0em;width:240px;">
+    <h2 style="border:0;font-size:12px;padding:.5em .5em .5em 1em;margin:0;
+      background-color:#FFFFDD;">Starting Other Activities</h2>
+    <p style="padding-left:.5em;font-size:12px;margin:0; 
+     padding:.0em .5em .5em 1em;">In this example our Intent uses a class name specifically.
+     As well as 
+     <a href="{@docRoot}guide/appendix/faq/commontasks.html#intentexamples">starting intents</a> in 
+    classes we already know about, be they in our own application or another 
+    application, we can also create Intents without knowing exactly which 
+    application will handle it.</p>
+    <p style="padding-left:.5em;font-size:12px;margin:0; 
+     padding:.0em .5em .5em 1em;">For example, we might want to open a page in a 
+    browser, and for this we still use
+    an Intent. But instead of specifying a class to handle it, we use
+    a predefined Intent constant, and a content URI that describes what we
+    want to do. See {@link android.content.Intent
+    android.content.Intent} for more information.</p>
+</div>
+
+	<p>Fill in the body of the <code>createNote()</code> method:
+    <p>Create a new <code>Intent</code> to create a note
+    (<code>ACTIVITY_CREATE</code>) using the <code>NoteEdit</code> class.
+    Then fire the Intent using the <code>startActivityForResult()</code> method
+    call:</p>
+    <pre style="overflow:auto">
+Intent i = new Intent(this, NoteEdit.class);
+startActivityForResult(i, ACTIVITY_CREATE);</pre>
+      <p>This form of the Intent call targets a specific class in our Activity, in this case
+      <code>NoteEdit</code>. Since the Intent class will need to communicate with the Android
+      operating system to route requests, we also have to provide a Context (<code>this</code>).</p>
+      <p>The <code>startActivityForResult()</code> method fires the Intent in a way that causes a method
+      in our Activity to be called when the new Activity is completed. The method in our Activity 
+      that receives the callback is called
+      <code>onActivityResult()</code> and we will implement it in a later step. The other way
+      to call an Activity is using <code>startActivity()</code> but this is a "fire-and-forget" way
+      of calling it &mdash; in this manner, our Activity is not informed when the Activity is completed, and there is
+      no way to return result information from the called Activity with <code>startActivity()</code>.
+      <p>Don't worry about the fact that <code>NoteEdit</code> doesn't exist yet,
+      we will fix that soon. </p>
+  </li>
+  
+
+<h2>Step 5</h2>
+
+	<p>Fill in the body of the <code>onListItemClick()</code> override.</p>
+    <p><code>onListItemClick()</code> is a callback method that we'll override. It is called when
+    the user selects an item from the list. It is passed four parameters: the
+    <code>ListView</code> object it was invoked from, the <code>View</code>
+    inside the <code>ListView</code> that was clicked on, the
+    <code>position</code> in the list that was clicked, and the
+    <code>mRowId</code> of the item that was clicked. In this instance we can
+    ignore the first two parameters (we only have one <code>ListView</code> it
+    could be), and we ignore the <code>mRowId</code> as well. All we are
+    interested in is the <code>position</code> that the user selected. We use
+    this to get the data from the correct row, and bundle it up to send to
+    the <code>NoteEdit</code> Activity.</p>
+   <p>In our implementation of the callback, the method creates an 
+    <code>Intent</code> to edit the note using
+    the <code>NoteEdit</code> class. It then adds data into the extras Bundle of
+    the Intent, which will be passed to the called Activity. We use it
+    to pass in the title and body text, and the <code>mRowId</code> for the note we are
+    editing. Finally, it will fire the Intent using the
+    <code>startActivityForResult()</code> method call. Here's the code that
+    belongs in <code>onListItemClick()</code>:</p>
+    <pre>
+super.onListItemClick(l, v, position, id);
+Cursor c = mNotesCursor;
+c.moveToPosition(position);
+Intent i = new Intent(this, NoteEdit.class);
+i.putExtra(NotesDbAdapter.KEY_ROWID, id);
+i.putExtra(NotesDbAdapter.KEY_TITLE, c.getString(
+        c.getColumnIndexOrThrow(NotesDbAdapter.KEY_TITLE)));
+i.putExtra(NotesDbAdapter.KEY_BODY, c.getString(
+        c.getColumnIndexOrThrow(NotesDbAdapter.KEY_BODY)));
+startActivityForResult(i, ACTIVITY_EDIT);</pre>
+  <ul>
+    <li>
+      <code>putExtra()</code> is the method to add items into the extras Bundle
+      to pass in to intent invocations. Here, we are
+      using the Bundle to pass in the title, body and mRowId of the note we want to edit.
+    </li>
+    <li>
+      The details of the note are pulled out from our query Cursor, which we move to the
+      proper position for the element that was selected in the list, with 
+      the <code>moveToPosition()</code> method.</li>
+    <li>With the extras added to the Intent, we invoke the Intent on the
+      <code>NoteEdit</code> class by passing <code>startActivityForResult()</code>
+      the Intent and the request code. (The request code will be
+      returned to <code>onActivityResult</code> as the <code>requestCode</code> parameter.)</li>
+  </ul>
+    <p class="note"><b>Note:</b> We assign the mNotesCursor field to a local variable at the
+    start of the method. This is done as an optimization of the Android code. Accessing a local
+    variable is much more efficient than accessing a field in the Dalvik VM, so by doing this
+    we make only one access to the field, and five accesses to the local variable, making the
+    routine much more efficient. It is recommended that you use this optimization when possible.</p>
+    
+
+<h2>Step 6</h2>
+
+<p>The above <code>createNote()</code> and <code>onListItemClick()</code>
+    methods use an asynchronous Intent invocation. We need a handler for the callback, so here we fill
+    in the body of the <code>onActivityResult()</code>. </p>
+<p><code>onActivityResult()</code> is the overridden method
+    which will be called when an Activity returns with a result. (Remember, an Activity
+    will only return a result if launched with <code>startActivityForResult</code>.) The parameters provided
+    to the callback are: </p>
+  <ul>
+    <li><code>requestCode</code> &mdash; the original request code
+    specified in the Intent invocation (either <code>ACTIVITY_CREATE</code> or
+    <code>ACTIVITY_EDIT</code> for us).
+    </li>
+    <li><code>resultCode</code> &mdash; the result (or error code) of the call, this
+    should be zero if everything was OK, but may have a non-zero code indicating
+    that something failed. There are standard result codes available, and you
+    can also create your own constants to indicate specific problems.
+    </li>
+    <li><code>intent</code> &mdash; this is an Intent created by the Activity returning
+    results. It can be used to return data in the Intent "extras."
+    </li>
+  </ul> 
+  <p>The combination of <code>startActivityForResult()</code> and
+  <code>onActivityResult()</code> can be thought of as an asynchronous RPC
+  (remote procedure call) and forms the recommended way for an Activity to invoke
+  another and share services.</p>
+  <p>Here's the code that belongs in your <code>onActivityResult()</code>:</p>
+    <pre>
+super.onActivityResult(requestCode, resultCode, intent);
+Bundle extras = intent.getExtras();
+
+switch(requestCode) {
+case ACTIVITY_CREATE:
+    String title = extras.getString(NotesDbAdapter.KEY_TITLE);
+    String body = extras.getString(NotesDbAdapter.KEY_BODY);
+    mDbHelper.createNote(title, body);
+    fillData();
+    break;
+case ACTIVITY_EDIT:
+    Long mRowId = extras.getLong(NotesDbAdapter.KEY_ROWID);
+    if (mRowId != null) {
+        String editTitle = extras.getString(NotesDbAdapter.KEY_TITLE);
+        String editBody = extras.getString(NotesDbAdapter.KEY_BODY);
+        mDbHelper.updateNote(mRowId, editTitle, editBody);
+    }
+    fillData();
+    break;
+}</pre>
+
+  <ul>
+    <li>
+      We are handling both the <code>ACTIVITY_CREATE</code> and
+      <code>ACTIVITY_EDIT</code> activity results in this method.
+    </li>
+    <li>
+      In the case of a create, we pull the title and body from the extras (retrieved from the 
+      returned Intent) and use them to create a new note.
+    </li>
+    <li>
+      In the case of an edit, we pull the mRowId as well, and use that to update
+      the note in the database.
+    </li>
+    <li>
+      <code>fillData()</code> at the end ensures everything is up to date .
+    </li>
+  </ul>
+  
+
+<h2>Step 7</h2>
+
+  <div class="sidebox" style="border:2px solid #FFFFDD;float:right;
+      background-color:#FFFFEE;margin-right:0px;
+      margin-bottom:.5em;margin-top:1em;padding:0em;width:240px;">
+    <h2 style="border:0;font-size:12px;padding:.5em .5em .5em 1em;margin:0;
+      background-color:#FFFFDD;">The Art of Layout</h2>
+    <p style="padding-left:.5em;font-size:12px;margin:0; padding:.0em .5em .5em 1em;">The provided
+    note_edit.xml layout file is the most sophisticated one in the application we will be building,
+    but that doesn't mean it is even close to the kind of sophistication you will be likely to want
+    in real Android applications.</p>
+    <p style="padding-left:.5em;font-size:12px;margin:0; padding:.0em .5em .5em 1em;">Creating a
+    good UI is part art and part science, and the rest is work. Mastery of <a
+    href="{@docRoot}guide/topics/ui/declaring-layout.html">Declaring Layout</a> is an essential part of creating
+    a good looking Android application.</p>
+    <p style="padding-left:.5em;font-size:12px;margin:0; 
+     padding:.0em .5em .5em 1em;">Take a look at the 
+    <a href="{@docRoot}guide/tutorials/views/index.html">Hello Views</a>
+    for some example layouts and how to use them. The ApiDemos sample project is also a
+    great resource from which to learn how to create different layouts.</p>
+  </div>
+
+<p>Open the file <code>note_edit.xml</code> that has been provided and take a
+    look at it. This is the UI code for the Note Editor.</p>
+    <p>This is the most
+    sophisticated UI we have dealt with yet. The file is given to you to avoid
+    problems that may sneak in when typing the code. (The XML is very strict
+    about case sensitivity and structure, mistakes in these are the usual cause
+    of problems with layout.)</p>
+    <p>There is a new parameter used
+    here that we haven't seen before: <code>android:layout_weight</code> (in
+    this case set to use the value 1 in each case).</p>
+    <p><code>layout_weight</code> is used in LinearLayouts
+    to assign "importance" to Views within the layout. All Views have a default
+    <code>layout_weight</code> of zero, meaning they take up only as much room
+    on the screen as they need to be displayed. Assigning a value higher than
+    zero will split up the rest of the available space in the parent View, according
+    to the value of each View's <code>layout_weight</code> and its ratio to the
+    overall <code>layout_weight</code> specified in the current layout for this
+    and other View elements.</p>
+    <p>To give an example: let's say we have a text label
+    and two text edit elements in a horizontal row. The label has no
+    <code>layout_weight</code> specified, so it takes up the minimum space
+    required to render. If the <code>layout_weight</code> of each of the two
+    text edit elements is set to 1, the remaining width in the parent layout will
+    be split equally between them (because we claim they are equally important). 
+    If the first one has a <code>layout_weight</code> of 1
+    and the second has a <code>layout_weight</code> of 2, then one third of the
+    remaining space will be given to the first, and two thirds to the
+    second (because we claim the second one is more important).</p>
+    <p>This layout also demonstrates how to nest multiple layouts
+    inside each other to achieve a more complex and pleasant layout. In this
+    example, a horizontal linear layout is nested inside the vertical one to
+    allow the title label and text field to be alongside each other,
+    horizontally.</p>
+
+
+<h2 style="clear:right;">Step 8</h2>
+
+	<p>Create a <code>NoteEdit</code> class that extends
+    <code>android.app.Activity</code>.</p>
+    <p>This is the first time we will have
+    created an Activity without the Android Eclipse plugin doing it for us. When
+    you do so, the <code>onCreate()</code> method is not automatically
+    overridden for you. It is hard to imagine an Activity that doesn't override
+    the <code>onCreate()</code> method, so this should be the first thing you do.</p>
+  <ol>
+    <li>Right click on the <code>com.android.demo.notepad2</code> package
+    in the Package Explorer, and select <strong>New</strong> &gt; <strong>Class</strong> from the popup
+    menu.</li>
+    <li>Fill in <code>NoteEdit</code> for the <code>Name:</code> field in the
+    dialog.</li>
+    <li>In the <code>Superclass:</code> field, enter
+    <code>android.app.Activity</code> (you can also just type Activity and hit
+    Ctrl-Space on Windows and Linux or Cmd-Space on the Mac, to invoke code
+    assist and find the right package and class).</li>
+    <li>Click <strong>Finish</strong>.</li>
+    <li>In the resulting <code>NoteEdit</code> class, right click in the editor
+    window and select <strong>Source</strong> &gt; <strong>Override/Implement Methods...</strong></li>
+    <li>Scroll down through the checklist in the dialog until you see
+    <code>onCreate(Bundle)</code> &mdash; and check the box next to it.</li>
+    <li>Click <strong>OK</strong>.<p>The method should now appear in your class.</p></li>
+  </ol>
+  
+<h2>Step 9</h2>
+
+<p>Fill in the body of the <code>onCreate()</code> method for <code>NoteEdit</code>.</p>
+
+<p>This will set the title of our new Activity to say "Edit Note" (one
+    of the strings defined in <code>strings.xml</code>). It will also set the
+    content view to use our <code>note_edit.xml</code> layout file. We can then
+    grab handles to the title and body text edit views, and the confirm button,
+    so that our class can use them to set and get the note title and body,
+    and attach an event to the confirm button for when it is pressed by the
+    user.</p>
+    <p>We can then unbundle the values that were passed in to the Activity
+    with the extras Bundle attached to the calling Intent. We'll use them to pre-populate
+    the title and body text edit views so that the user can edit them.
+    Then we will grab and store the <code>mRowId</code> so we can keep 
+    track of what note the user is editing.</p>
+
+  <ol>
+    <li>
+      Inside <code>onCreate()</code>, set up the layout:<br>
+      <pre>setContentView(R.layout.note_edit);</pre>
+    </li>
+    <li>
+      Find the edit and button components we need:
+      <p>These are found by the
+      IDs associated to them in the R class, and need to be cast to the right
+      type of <code>View</code> (<code>EditText</code> for the two text views,
+      and <code>Button</code> for the confirm button):</p>
+      <pre>
+mTitleText = (EditText) findViewById(R.id.title);
+mBodyText = (EditText) findViewById(R.id.body);
+Button confirmButton = (Button) findViewById(R.id.confirm);</pre>
+      <p>Note that <code>mTitleText</code> and <code>mBodyText</code> are member 
+      fields (you need to declare them at the top of the class definition).</p>
+    </li>
+    <li>At the top of the class, declare a <code>Long mRowId</code> private field to store
+      the current <code>mRowId</code> being edited (if any).
+    </li>
+    <li>Continuing inside <code>onCreate()</code>, 
+      add code to initialize the <code>title</code>, <code>body</code> and 
+      <code>mRowId</code> from the extras Bundle in
+      the Intent (if it is present):<br>
+      <pre>
+mRowId = null;
+Bundle extras = getIntent().getExtras();
+if (extras != null) {
+    String title = extras.getString(NotesDbAdapter.KEY_TITLE);
+    String body = extras.getString(NotesDbAdapter.KEY_BODY);
+    mRowId = extras.getLong(NotesDbAdapter.KEY_ROWID);
+           
+    if (title != null) {
+        mTitleText.setText(title);
+    }
+    if (body != null) {
+        mBodyText.setText(body);
+    }
+}</pre>
+     <ul>
+      <li>
+        We are pulling the <code>title</code> and
+        <code>body</code> out of the
+        <code>extras</code> Bundle that was set from the
+        Intent invocation.
+      </li><li>
+        We also null-protect the text field setting (i.e., we don't want to set
+        the text fields to null accidentally).</li>
+     </ul>
+    </li>
+    <li>
+      Create an <code>onClickListener()</code> for the button:
+      <p>Listeners can be one of the more confusing aspects of UI
+      implementation, but
+      what we are trying to achieve in this case is simple. We want an
+      <code>onClick()</code> method to be called when the user presses the
+      confirm button, and use that to do some work and return the values
+      of the edited note to the Intent caller. We do this using something called
+      an anonymous inner class. This is a bit confusing to look at unless you
+      have seen them before, but all you really need to take away from this is
+      that you can refer to this code in the future to see how to create a
+      listener and attach it to a button. (Listeners are a common idiom
+      in Java development, particularly for user interfaces.) Here's the empty listener:<br>
+      <pre>
+confirmButton.setOnClickListener(new View.OnClickListener() {
+
+    public void onClick(View view) {
+               
+    }
+           
+});</pre>
+    </li>
+  </ol>
+<h2>Step 10</h2>
+
+<p>Fill in the body of the <code>onClick()</code> method of the <code>OnClickListener</code> created in the last step.</p>
+    
+    <p>This is the code that will be run when the user clicks on the
+    confirm button. We want this to grab the title and body text from the edit
+    text fields, and put them into the return Bundle so that they can be passed
+    back to the Activity that invoked this <code>NoteEdit</code> Activity. If the
+    operation is an edit rather than a create, we also want to put the
+    <code>mRowId</code> into the Bundle so that the
+    <code>Notepadv2</code> class can save the changes back to the correct
+    note.</p>
+  <ol>
+    <li>
+      Create a <code>Bundle</code> and put the title and body text into it using the
+      constants defined in Notepadv2 as keys:<br>
+      <pre>
+Bundle bundle = new Bundle();
+      
+bundle.putString(NotesDbAdapter.KEY_TITLE, mTitleText.getText().toString());
+bundle.putString(NotesDbAdapter.KEY_BODY, mBodyText.getText().toString());
+if (mRowId != null) {
+    bundle.putLong(NotesDbAdapter.KEY_ROWID, mRowId);
+}</pre>
+    </li>
+    <li>
+      Set the result information (the Bundle) in a new Intent and finish the Activity:
+      <pre>
+Intent mIntent = new Intent();
+mIntent.putExtras(bundle);
+setResult(RESULT_OK, mIntent);
+finish();</pre>
+      <ul>
+      <li>The Intent is simply our data carrier that carries our Bundle 
+      (with the title, body and mRowId).</li>
+      <li>The <code>setResult()</code> method is used to set the result
+      code and return Intent to be passed back to the
+      Intent caller. In this case everything worked, so we return RESULT_OK for the
+      result code.</li>
+      <li>The <code>finish()</code> call is used to signal that the Activity
+      is done (like a return call). Anything set in the Result will then be
+      returned to the caller, along with execution control.</li>
+      </ul>
+    </li>
+   </ol>
+   <p>The full <code>onCreate()</code> method (plus supporting class fields) should
+      now look like this:</p>
+      <pre>
+private EditText mTitleText;
+private EditText mBodyText;
+private Long mRowId;
+
+&#64;Override
+protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.note_edit);
+   
+    mTitleText = (EditText) findViewById(R.id.title);
+    mBodyText = (EditText) findViewById(R.id.body);
+  
+    Button confirmButton = (Button) findViewById(R.id.confirm);
+   
+    mRowId = null;
+    Bundle extras = getIntent().getExtras();
+    if (extras != null) {
+        String title = extras.getString(NotesDbAdapter.KEY_TITLE);
+        String body = extras.getString(NotesDbAdapter.KEY_BODY);
+        mRowId = extras.getLong(NotesDbAdapter.KEY_ROWID);
+      
+        if (title != null) {
+            mTitleText.setText(title);
+        }
+        if (body != null) {
+            mBodyText.setText(body);
+        }
+    }
+   
+    confirmButton.setOnClickListener(new View.OnClickListener() {
+
+        public void onClick(View view) {
+            Bundle bundle = new Bundle();
+           
+            bundle.putString(NotesDbAdapter.KEY_TITLE, mTitleText.getText().toString());
+            bundle.putString(NotesDbAdapter.KEY_BODY, mBodyText.getText().toString());
+            if (mRowId != null) {
+                bundle.putLong(NotesDbAdapter.KEY_ROWID, mRowId);
+            }
+
+            Intent mIntent = new Intent();
+            mIntent.putExtras(bundle);
+            setResult(RESULT_OK, mIntent);
+            finish();
+        }
+    });
+}</pre>
+    </li>
+  </ol>
+  
+<h2>Step 11</h2>
+
+<div class="sidebox" style="border:2px solid #FFFFDD;float:right;
+      background-color:#FFFFEE;margin-right:0px;
+      margin-bottom:.5em;margin-top:1em;padding:0em;width:240px;">
+    <h2 style="border:0;font-size:12px;padding:.5em .5em .5em 1em;margin:0;
+      background-color:#FFFFDD;">The All-Important Android Manifest File</h2>
+  <p style="padding-left:.5em;font-size:12px;margin:0; 
+     padding:.0em .5em .5em 1em;">The AndroidManifest.xml file is the way in which Android sees your 
+    application. This file defines the category of the application, where
+    it shows up (or even if it shows up) in the launcher or settings, what
+    activities, services, and content providers it defines, what intents it can
+    receive, and more. </p>
+    <p style="padding-left:.5em;font-size:12px;margin:0; 
+     padding:.0em .5em .5em 1em;">For more information, see the reference document 
+    <a href="{@docRoot}guide/topics/manifest/manifest-intro.html">The AndroidManifest.xml File</a></p>
+  </div>  
+
+<p>Finally, the new Activity has to be defined in the manifest file:</p>
+    <p>Before the new Activity can be seen by Android, it needs its own
+    Activity entry in the <code>AndroidManifest.xml</code> file. This is to let
+    the system know that it is there and can be called. We could also specify
+    which IntentFilters the activity implements here, but we are going to skip
+    this for now and just let Android know that the Activity is
+    defined.</p>
+    <p>There is a Manifest editor included in the Eclipse plugin that makes it much easier
+    to edit the AndroidManifest file, and we will use this. If you prefer to edit the file directly
+    or are not using the Eclipse plugin, see the box at the end for information on how to do this
+    without using the new Manifest editor.<p>
+    <ol>
+    <li>Double click on the <code>AndroidManifest.xml</code> file in the package explorer to open it.
+    </li>
+    <li>Click the <strong>Application</strong> tab at the bottom of the Manifest editor.</li>
+    <li>Click <strong>Add...</strong> in the Application Nodes section.
+      <p>If you see a dialog with radiobuttons at the top, select the top radio button: 
+      "Create a new element at the top level, in Application".</p></li>
+    <li>Make sure "(A) Activity" is selected in the selection pane of the dialog, and click <strong>OK</strong>.</li>
+    <li>Click on the new "Activity" node, in the Application Nodes section, then 
+    type <code>.NoteEdit</code> into the <em>Name*</em>
+    field to the right. Press Return/Enter.</li>
+    </ol>
+    <p>The Android Manifest editor helps you add more complex entries into the AndroidManifest.xml
+    file, have a look around at some of the other options available (but be careful not to select
+    them otherwise they will be added to your Manifest). This editor should help you understand
+    and alter the AndroidManifest.xml file as you move on to more advanced Android applications.</p>
+    
+    <p class="note">If you prefer to edit this file directly, simply open the
+    <code>AndroidManifest.xml</code> file and look at the source (use the
+    <code>AndroidManifest.xml</code> tab in the eclipse editor to see the source code directly).
+    Then edit the file as follows:<br>
+    <code>&lt;activity android:name=".NoteEdit"&gt;&lt;/activity&gt;</code><br><br>
+    This should be placed just below the line that reads:<br>
+    <code>&lt;/activity&gt;</code> for the <code>.Notepadv2</code> activity.</p>
+
+<h2 style="clear:right;">Step 12</h2>
+
+<p>Now Run it!</p>
+<p>You should now be able to add real notes from 
+the menu, as well as delete an existing one. Notice that in order to delete, you must 
+first use the directional controls on the device to highlight the note.
+Furthermore, selecting a note title from the list should bring up the note 
+editor to let you edit it. Press confirm when finished to save the changes 
+back to the database.
+
+<h2>Solution and Next Steps</h2>
+
+<p>You can see the solution to this exercise in  <code>Notepadv2Solution</code> 
+from the zip file to compare with your own.</p>
+<p>Now try editing a note, and then hitting the back button on the emulator
+instead of the confirm button (the back button is below the menu button). You
+will see an error come up. Clearly our application still has some problems.
+Worse still, if you did make some changes and hit the back button, when you go
+back into the notepad to look at the note you changed, you will find that all
+your changes have been lost. In the next exercise we will fix these
+problems.</p>
+
+<p>
+Once you are ready, move on to <a href="notepad-ex3.html">Tutorial
+Exercise 3</a> where you will fix the problems with the back button and lost
+edits by introducing a proper life cycle into the NoteEdit Activity.</p>
+
+
diff --git a/docs/html/guide/tutorials/notepad/notepad-ex3.jd b/docs/html/guide/tutorials/notepad/notepad-ex3.jd
new file mode 100644
index 0000000..8737280
--- /dev/null
+++ b/docs/html/guide/tutorials/notepad/notepad-ex3.jd
@@ -0,0 +1,358 @@
+page.title=Notepad Exercise 3
+parent.title=Notepad Tutorial
+parent.link=index.html
+@jd:body
+
+
+<p><em>In this exercise, you will use life-cycle event callbacks to store and
+retrieve application state data. This exercise demonstrates:</em></p>
+<ul>
+<li><em>Life-cycle events and how your application can use them</em></li>
+<li><em>Techniques for maintaining application state</em></li>
+</ul>
+
+<div style="float:right;white-space:nowrap">
+	[<a href="notepad-ex1.html">Exercise 1</a>]
+	[<a href="notepad-ex2.html">Exercise 2</a>]
+	<span style="color:#BBB;">
+		[<a href="notepad-ex3.html" style="color:#BBB;">Exercise 3</a>]
+	</span>
+	[<a href="notepad-extra-credit.html">Extra Credit</a>]
+</div>
+
+<h2>Step 1</h2>
+
+<p>Import <code>Notepadv3</code> into Eclipse. If you see an error about
+<code>AndroidManifest.xml,</code> or some problems related to an Android zip
+file, right click on the project and select <strong>Android Tools</strong> &gt;
+<strong>Fix Project Properties</strong> from the popup menu. The starting point for this exercise is
+exactly where we left off at the end of the Notepadv2. </p>
+<p>The current application has some problems &mdash; hitting the back button when editing
+causes a crash, and anything else that happens during editing will cause the
+edits to be lost.</p>
+<p>To fix this, we will move most of the functionality for creating and editing
+the note into the NoteEdit class, and introduce a full life cycle for editing
+notes.</p>
+
+  <ol>
+    <li>Remove the code in <code>NoteEdit</code> that parses the title and body
+    from the extras Bundle. 
+    <p>Instead, we are going to use the <code>DBHelper</code> class
+    to access the notes from the database directly. All we need passed into the
+    NoteEdit Activity is a <code>mRowId</code> (but only if we are editing, if creating we pass
+    nothing). Remove these lines:</p>
+      <pre>
+String title = extras.getString(NotesDbAdapter.KEY_TITLE);
+String body = extras.getString(NotesDbAdapter.KEY_BODY);</pre>
+    </li>
+    <li>We will also get rid of the properties that were being passed in
+    the <code>extras</code> Bundle, which we were using to set the title
+    and body text edit values in the UI. So delete:
+    <pre>
+if (title != null) {
+    mTitleText.setText(title);
+}
+if (body != null) {
+    mBodyText.setText(body);
+}</pre>
+    </li>
+  </ol>
+  
+<h2>Step 2</h2>
+
+<p>Create a class field for a <code>NotesDbAdapter</code> at the top of the NoteEdit class:</p>
+    <pre>&nbsp;&nbsp;&nbsp; private NotesDbAdapter mDbHelper;</pre>
+<p>Also add an instance of <code>NotesDbAdapter</code> in the
+    <code>onCreate()</code> method (right below the <code>super.onCreate()</code> call):</p>
+    <pre>
+&nbsp;&nbsp;&nbsp; mDbHelper = new NotesDbAdapter(this);<br>
+&nbsp;&nbsp;&nbsp; mDbHelper.open();</pre>
+    
+<h2>Step 3</h2>
+
+<p>In <code>NoteEdit</code>, we need to check the <var>savedInstanceState</var> for the
+<code>mRowId</code>, in case the note 
+    editing contains a saved state in the Bundle, which we should recover (this would happen
+  if our Activity lost focus and then restarted).</p>
+  <ol>
+    <li>
+      Replace the code that currently initializes the <code>mRowId</code>:<br>
+      <pre>
+        mRowId = null;
+
+        Bundle extras = getIntent().getExtras();
+        if (extras != null) {
+            mRowId = extras.getLong(NotesDbAdapter.KEY_ROWID);
+        }
+        </pre>
+        with this:
+        <pre>
+        mRowId = savedInstanceState != null ? savedInstanceState.getLong(NotesDbAdapter.KEY_ROWID) 
+                                            : null;
+        if (mRowId == null) {
+            Bundle extras = getIntent().getExtras();            
+            mRowId = extras != null ? extras.getLong(NotesDbAdapter.KEY_ROWID) 
+                                    : null;
+        }
+        </pre>
+    </li>
+    <li>
+      Note the null check for <code>savedInstanceState</code>, and we still need to load up
+      <code>mRowId</code> from the <code>extras</code> Bundle if it is not
+      provided by the <code>savedInstanceState</code>. This is a ternary operator shorthand
+      to safely either use the value or null if it is not present.	
+    </li>
+  </ol>
+  
+<h2>Step 4</h2>
+
+<p>Next, we need to populate the fields based on the <code>mRowId</code> if we
+    have it:</p>
+    <pre>populateFields();</pre>
+    <p>This goes before the <code>confirmButton.setOnClickListener()</code> line.
+    We'll define this method in a moment.</p>
+
+<h2>Step 5</h2>
+
+<p>Get rid of the Bundle creation and Bundle value settings from the
+    <code>onClick()</code> handler method. The Activity no longer needs to
+    return any extra information to the caller. And because we no longer have
+    an Intent to return, we'll use the shorter version
+    of <code>setResult()</code>:</p>
+    <pre>
+public void onClick(View view) {
+    setResult(RESULT_OK);
+    finish();
+}</pre>
+    <p>We will take care of storing the updates or new notes in the database
+    ourselves, using the life-cycle methods.</p>
+    
+    <p>The whole <code>onCreate()</code> method should now look like this:</p>
+    <pre>
+super.onCreate(savedInstanceState);
+ 
+mDbHelper = new NotesDbAdapter(this);
+mDbHelper.open();
+ 
+setContentView(R.layout.note_edit);
+ 
+mTitleText = (EditText) findViewById(R.id.title);
+mBodyText = (EditText) findViewById(R.id.body);
+ 
+Button confirmButton = (Button) findViewById(R.id.confirm);
+ 
+mRowId = savedInstanceState != null ? savedInstanceState.getLong(NotesDbAdapter.KEY_ROWID) 
+                                    : null;
+if (mRowId == null) {
+    Bundle extras = getIntent().getExtras();
+    mRowId = extras != null ? extras.getLong(NotesDbAdapter.KEY_ROWID) 
+                            : null;
+}
+ 
+populateFields();
+ 
+confirmButton.setOnClickListener(new View.OnClickListener() {
+
+    public void onClick(View view) {
+        setResult(RESULT_OK);
+        finish();
+    }
+     
+});</pre>
+
+<h2>Step 6</h2>
+
+<p>Define the <code>populateFields()</code> method.</p>
+    <pre>
+private void populateFields() {
+    if (mRowId != null) {
+        Cursor note = mDbHelper.fetchNote(mRowId);
+        startManagingCursor(note);
+        mTitleText.setText(note.getString(
+	            note.getColumnIndexOrThrow(NotesDbAdapter.KEY_TITLE)));
+        mBodyText.setText(note.getString(
+                note.getColumnIndexOrThrow(NotesDbAdapter.KEY_BODY)));
+    }
+}</pre>
+<p>This method uses the <code>NotesDbAdapter.fetchNote()</code> method to find the right note to
+edit, then it calls <code>startManagingCursor()</code> from the <code>Activity</code> class, which
+is an Android convenience method provided to take care of the Cursor life-cycle. This will release
+and re-create resources as dictated by the Activity life-cycle, so we don't need to worry about
+doing that ourselves. After that, we just look up the title and body values from the Cursor
+and populate the View elements with them.</p>
+ 
+
+<h2>Step 7</h2>
+
+    <div class="sidebox" style="border:2px solid #FFFFDD;float:right;
+      background-color:#FFFFEE;margin-right:0px;margin-bottom:.5em;
+      margin-top:1em;padding:0em;width:240px;">
+      <h2 style="border:0;font-size:12px;padding:.5em .5em .5em 1em;margin:0;
+      background-color:#FFFFDD;">Why handling life-cycle events is important</h2>
+      <p style="padding-left:.5em;font-size:12px;margin:0; 
+     padding:.0em .5em .5em 1em;">If you are used to always having control in your applications, you
+      might not understand why all this life-cycle work is necessary. The reason
+      is that in Android, you are not in control of your Activity, the 
+      operating system is!</p>
+      <p style="padding-left:.5em;font-size:12px;margin:0; 
+     padding:.0em .5em .5em 1em;">As we have already seen, the Android model is based around activities
+      calling each other. When one Activity calls another, the current Activity
+      is paused at the very least, and may be killed altogether if the
+      system starts to run low on resources. If this happens, your Activity will
+      have to store enough state to come back up later, preferably in the same
+      state it was in when it was killed.</p>
+      <p style="padding-left:.5em;font-size:12px;margin:0;padding:.0em .5em .5em 1em;">
+      Android has a <a href="{@docRoot}guide/topics/fundamentals.html#lcycles">well-defined life cycle</a>.
+      Lifecycle events can happen even if you are not handing off control to
+      another Activity explicitly. For example, perhaps a call comes in to the
+      handset. If this happens, and your Activity is running, it will be swapped
+      out while the call Activity takes over.</p>
+    </div>
+
+<p>Still in the <code>NoteEdit</code> class, we now override the methods 
+   <code>onSaveInstanceState()</code>, <code>onPause()</code> and 
+   <code>onResume()</code>. These are our life-cycle methods 
+   (along with <code>onCreate()</code> which we already have).</p>
+
+<p><code>onSaveInstanceState()</code> is called by Android if the
+    Activity is being stopped and <strong>may be killed before it is
+    resumed!</strong> This means it should store any state necessary to
+    re-initialize to the same condition when the Activity is restarted. It is
+    the counterpart to the <code>onCreate()</code> method, and in fact the
+    <code>savedInstanceState</code> Bundle passed in to <code>onCreate()</code> is the same
+    Bundle that you construct as <code>outState</code> in the
+    <code>onSaveInstanceState()</code> method.</p>
+
+<p><code>onPause()</code> and <code>onResume()</code> are also
+    complimentary methods. <code>onPause()</code> is always called when the
+    Activity ends, even if we instigated that (with a <code>finish()</code> call for example).
+    We will use this to save the current note back to the database. Good
+    practice is to release any resources that can be released during an
+    <code>onPause()</code> as well, to take up less resources when in the
+    passive state. <code>onResume()</code> will call our <code>populateFields()</code> method
+    to read the note out of the database again and populate the fields.</p>
+
+<p>So, add some space after the <code>populateFields()</code> method
+  and add the following life-cycle methods:</p>
+  <ol type="a">
+    <li><code>
+      onSaveInstanceState()</code>:
+      <pre>
+    &#64;Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putLong(NotesDbAdapter.KEY_ROWID, mRowId);
+    }</pre>
+    </li>
+    <li><code>
+      onPause()</code>:
+      <pre>
+    &#64;Override
+    protected void onPause() {
+        super.onPause();
+        saveState();
+    }</pre>
+    <p>We'll define <code>saveState()</code> next.</p>
+    </li>
+    <li><code>
+      onResume()</code>:
+      <pre>
+    &#64;Override
+    protected void onResume() {
+        super.onResume();
+        populateFields();
+    }</pre>
+    </li>
+  </ol>
+
+
+<h2 style="clear:right;">Step 8</h2>
+
+<p>Define the <code>saveState()</code> method to put the data out to the
+database.</p>
+    <pre>
+     private void saveState() {
+        String title = mTitleText.getText().toString();
+        String body = mBodyText.getText().toString();
+
+        if (mRowId == null) {
+            long id = mDbHelper.createNote(title, body);
+            if (id > 0) {
+                mRowId = id;
+            }
+        } else {
+            mDbHelper.updateNote(mRowId, title, body);
+        }
+    }</pre>
+  <p>Note that we capture the return value from <code>createNote()</code> and if a valid row ID is
+  returned, we store it in the <code>mRowId</code> field so that we can update the note in future
+  rather than create a new one (which otherwise might happen if the life-cycle events are
+  triggered).</p>
+
+
+<h2 style="clear:right;">Step 9</h2>
+
+<p>Now pull out the previous handling code from the
+    <code>onActivityResult()</code> method in the <code>Notepadv3</code>
+    class.</p>
+<p>All of the note retrieval and updating now happens within the
+    <code>NoteEdit</code> life cycle, so all the <code>onActivityResult()</code>
+    method needs to do is update its view of the data, no other work is
+    necessary. The resulting method should look like this:</p>
+<pre>
+&#64;Override
+protected void onActivityResult(int requestCode, int resultCode, 
+                                Intent intent) {
+    super.onActivityResult(requestCode, resultCode, intent);
+    fillData();
+}</pre>
+
+<p>Because the other class now does the work, all this has to do is refresh
+      the data.</p>
+ 
+<h2>Step 10</h2>
+
+<p>Also remove the lines which set the title and body from the
+    <code>onListItemClick()</code> method (again they are no longer needed, 
+    only the <code>mRowId</code> is):</p>
+<pre>
+    Cursor c = mNotesCursor;
+    c.moveToPosition(position);</pre>
+<br>
+and also remove:
+<br>
+<pre>
+    i.putExtra(NotesDbAdapter.KEY_TITLE, c.getString(
+                    c.getColumnIndex(NotesDbAdapter.KEY_TITLE)));
+    i.putExtra(NotesDbAdapter.KEY_BODY, c.getString(
+                    c.getColumnIndex(NotesDbAdapter.KEY_BODY)));</pre>
+<br>
+so that all that should be left in that method is:
+<br>
+<pre>
+    super.onListItemClick(l, v, position, id);
+    Intent i = new Intent(this, NoteEdit.class);
+    i.putExtra(NotesDbAdapter.KEY_ROWID, id);
+    startActivityForResult(i, ACTIVITY_EDIT);</pre>
+
+  <p>You can also now remove the mNotesCursor field from the class, and set it back to using
+  a local variable in the <code>fillData()</code> method:
+<br><pre>
+    Cursor notesCursor = mDbHelper.fetchAllNotes();</pre></p>
+  <p>Note that the <code>m</code> in <code>mNotesCursor</code> denotes a member field, so when we
+  make <code>notesCursor</code> a local variable, we drop the <code>m</code>. Remember to rename the
+  other occurrences of <code>mNotesCursor</code> in your <code>fillData()</code> method.
+</ol>
+<p>
+Run it! (use <em>Run As -&gt; Android Application</em> on the project right 
+click menu again)</p>
+
+<h2>Solution and Next Steps</h2>
+
+<p>You can see the solution to this exercise in <code>Notepadv3Solution</code>
+from 
+the zip file to compare with your own.</p>
+<p>
+When you are ready, move on to the <a href="notepad-extra-credit.html">Tutorial
+Extra Credit</a> exercise, where you can use the Eclipse debugger to
+examine the life-cycle events as they happen.</p>
diff --git a/docs/html/guide/tutorials/notepad/notepad-extra-credit.jd b/docs/html/guide/tutorials/notepad/notepad-extra-credit.jd
new file mode 100644
index 0000000..0d59b56
--- /dev/null
+++ b/docs/html/guide/tutorials/notepad/notepad-extra-credit.jd
@@ -0,0 +1,70 @@
+page.title=Notepad Extra Credit
+parent.title=Notepad Tutorial
+parent.link=index.html
+@jd:body
+
+
+<p><em>In this exercise, you will use the debugger to look at the work you did
+in Exercise 3. This exercise demonstrates:</em></p>
+<ul>
+<li><em>How to set breakpoints to observe execution</em> </li>
+<li><em>How to run your application in debug mode</code></em></li>
+</ul>
+
+<div style="float:right;white-space:nowrap">
+
+	[<a href="notepad-ex1.html">Exercise 1</a>]
+	[<a href="notepad-ex2.html">Exercise 2</a>]
+	[<a href="notepad-ex3.html">Exercise 3</a>]
+	<span style="color:#BBB;">
+		[<a href="notepad-extra-credit.html" style="color:#BBB;">Extra Credit</a>]
+	</span>
+</div>
+
+<h2>Step 1</h2>
+
+<p>Using the working <code>Notepadv3</code>, put breakpoints in the code at the
+    beginning of the <code>onCreate()</code>, <code>onPause()</code>,
+    <code>onSaveInstanceState()</code> and <code>onResume()</code> methods in the
+    <code>NoteEdit</code> class (if you are not familiar with Eclipse, just
+    right click in the narrow grey border on the left of the edit window at the
+    line you want a breakpoint, and select <em>Toggle Breakpoint</em>, you
+should see a blue dot appear).</p>
+ 
+<h2>Step 2</h2>
+
+<p>Now start the notepad demo in debug mode:</p>
+
+<ol type="a">
+    <li>
+      Right click on the <code>Notepadv3</code> project and from the Debug menu
+      select <em>Debug As -&gt; Android Application.</em></li>
+    <li>
+      The Android emulator should say <em>"waiting for debugger to connect"</em>
+      briefly and then run the application.</li>
+  <li>
+      If it gets stuck on the waiting... screen, quit the emulator and Eclipse,
+      from the command line do an <code>adb kill-server</code>, and then restart
+Eclipse and try again.</li></ol>
+      
+      <h2>Step 3</h2>
+
+<p>When you edit or create a new note you should see the breakpoints getting
+    hit and the execution stopping.</p>
+    
+    <h2>Step 4</h2>
+
+<p>Hit the Resume button to let execution continue (yellow rectangle with a
+green triangle to its right in the Eclipse toolbars near the top).</p>
+
+<h2>Step 5</h2>
+
+<p>Experiment a bit with the confirm and back buttons, and try pressing Home and
+    making other mode changes. Watch what life-cycle events are generated and
+when.</p>
+
+<p>The Android Eclipse plugin not only offers excellent debugging support for
+your application development, but also superb profiling support. You can also
+try using <a href="{@docRoot}guide/developing/tools/traceview.html">Traceview</a> to profile your application. If your application is running too slow, this can help you 
+find the bottlenecks and fix them.</p>
+
diff --git a/docs/html/guide/tutorials/notepad/notepad-index.jd b/docs/html/guide/tutorials/notepad/notepad-index.jd
new file mode 100644
index 0000000..151c50d
--- /dev/null
+++ b/docs/html/guide/tutorials/notepad/notepad-index.jd
@@ -0,0 +1,143 @@
+page.title=Notepad Tutorial
+@jd:body
+
+
+<p>The  tutorial in this section gives you a &quot;hands-on&quot; introduction
+to the Android framework and the  tools you use to build  applications on it.
+Starting from a preconfigured project file, it guides you through the process of
+developing a simple notepad application and provides concrete examples of how to
+set up the project,  develop the application logic and user interface, and then
+compile and run the application. </p>
+
+<p>The tutorial presents the notepad application development as a set of 
+exercises (see below), each consisting of several steps. You can follow along 
+with the steps in each exercise and gradually build up and refine your  
+application. The exercises explain each step in detail and provide all the 
+sample code you need to complete the application. </p>
+
+<p>When you are finished with the tutorial, you will have created a functioning
+Android application and learned in depth about many of the most important
+concepts in Android development. If you want to add more complex features to
+your application, you can examine the code in an alternative implementation
+of a notepad application, in the 
+<a href="{@docRoot}samples/NotePad/index.html">Sample Code</a> documentation. </p>
+
+
+<a name="who"></a>
+<h2>Who Should Use this Tutorial</h2>
+
+<p>This tutorial is designed for  experienced developers, especially those with 
+knowledge of the Java programming language. If you haven't written Java
+applications before, you can still use the tutorial, but you might need to work
+at a slower pace. </p>
+
+<p>The tutorial  assumes that you have some familiarity with the basic Android
+application concepts and terminology. If you aren't yet familiar with those, you
+should read <a href="{@docRoot}intro/anatomy.html">Overview of an Android 
+Application</a> before continuing. </p>
+
+<p>Also note that this tutorial uses
+the Eclipse development environment, with the Android plugin installed. If you
+are not using Eclipse, you can  follow  the exercises and build the application,
+but you will need to determine how to accomplish the Eclipse-specific
+steps in your environment. </p>
+
+<a name="preparing"></a>
+<h2>Preparing for the Exercises</h2>
+
+<p>This tutorial builds on the information provided in the <a
+href="{@docRoot}intro/installing.html">Installing the SDK</a> and <a 
+href="{@docRoot}intro/hello-android.html">Hello Android</a>
+documents, which explain in detail how to set up your development environment
+for building Android applications. Before you start this tutorial, you should
+read both these documents, have the SDK installed, and your work environment set up.</p>
+
+<p>To prepare for this lesson:</p>
+
+<ol>
+  <li>Download the <a href="codelab/NotepadCodeLab.zip">project
+      exercises archive (.zip)</a></li>
+  <li>Unpack the archive file to a suitable location on your machine</li>
+  <li>Open the <code>NotepadCodeLab</code> folder</li>
+</ol>
+
+<p>Inside the <code>NotepadCodeLab</code> folder, you should see six project
+files: <code>Notepadv1</code>,
+    <code>Notepadv2</code>, <code>Notepadv3</code>,
+    <code>Notepadv1Solution</code>, <code>Notepadv2Solution</code>
+    and <code>Notepadv3Solution</code>. The <code>Notepadv#</code> projects are
+the starting points for each of the exercises, while the
+<code>Notepadv#Solution</code> projects are the exercise
+    solutions. If you are having trouble with a particular exercise, you
+    can compare your current work against the exercise solution.</p>
+
+<a name="exercises"></a>
+<h2> Exercises</h2>
+
+  <p>The table below lists the tutorial exercises and describes the development
+areas that each covers. Each exercise assumes that you have completed any
+previous exercises.</p>
+
+  <table border="0" style="padding:4px;spacing:2px;" summary="This
+table lists the
+tutorial examples and describes what each covers. ">
+    <tr>
+      <th width="120"><a href="{@docRoot}intro/tutorial-ex1.html">Exercise
+1</a></th>
+      <td>Start here. Construct a simple notes list that lets the user add new notes but not
+edit them. Demonstrates the basics of <code>ListActivity</code> and creating
+and handling
+      menu options. Uses a SQLite database to store the notes.</td>
+    </tr>
+    <tr>
+      <th><a href="{@docRoot}intro/tutorial-ex2.html">Exercise 2</a></th>
+      <td>Add a second Activity to the
+application. Demonstrates constructing a
+new Activity, adding it to the Android manifest, passing data between the
+activities, and using more advanced screen layout. Also shows how to
+invoke another Activity to return a result, using
+<code>startActivityForResult()</code>.</td>
+    </tr>
+    <tr>
+      <th><a href="{@docRoot}intro/tutorial-ex3.html">Exercise 3</a></th>
+      <td>Add handling of life-cycle events to
+the application, to let it
+maintain application state across the life cycle. </td>
+    </tr>
+    <tr>
+    <th><a href="{@docRoot}intro/tutorial-extra-credit.html">Extra
+Credit</a></th>
+    <td>Demonstrates how to use the Eclipse
+debugger and how you can use it to
+view life-cycle events as they are generated. This section is optional but
+highly recommended.</td>
+    </tr>
+</table>
+
+
+<a name="other"></a>
+<h2>Other Resources and Further Learning</h2>
+<ul>
+<li>For a lighter but broader introduction to concepts not covered in the
+tutorial,
+take a look at <a href="{@docRoot}kb/commontasks.html">Common Android Tasks</a>.</li>
+<li>The Android SDK includes a variety of fully functioning sample applications
+that make excellent opportunities for further learning. You can find the sample
+applications in the <code>samples/</code> directory of your downloaded SDK.</li>
+<li>This tutorial draws from the full Notepad application included in the
+<code>samples/</code> directory of the SDK, though it does not match it exactly. 
+When you are done with the tutorial,
+it is highly recommended that you take a closer look at this version of the Notepad
+application, 
+as it demonstrates a variety of interesting additions for your application, 
+such as:</li>
+  <ul>
+  <li>Setting up a custom striped list for the list of notes.</li>
+  <li>Creating a custom text edit view that overrides the <code>draw()</code>
+method to
+    make it look like a lined notepad.</li>
+  <li>Implementing a full <code>ContentProvider</code> for notes.</li>
+  <li>Reverting and discarding edits instead of just automatically saving
+them.</li>
+</ul>
+</ul>
diff --git a/docs/html/guide/tutorials/views/hello-autocomplete.jd b/docs/html/guide/tutorials/views/hello-autocomplete.jd
new file mode 100644
index 0000000..fba1ad8
--- /dev/null
+++ b/docs/html/guide/tutorials/views/hello-autocomplete.jd
@@ -0,0 +1,116 @@
+page.title=Hello, AutoCompleteTextView
+parent.title=Hello, Views
+parent.link=index.html
+@jd:body
+
+<p>{@link android.widget.AutoCompleteTextView} is an implementation of the EditText widget that will provide 
+auto-complete suggestions as the user types. The suggestions are extracted from a collection of strings.</p>
+
+
+<ol>
+  <li>Start a new project/Activity called HelloAutoComplete.</li>
+  <li>Open the layout file.
+    Make it like so:
+<pre>
+&lt;?xml version="1.0" encoding="utf-8"?>
+&lt;LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 
+    android:orientation="horizontal"
+    android:layout_width="fill_parent" 
+    android:layout_height="wrap_content">
+
+    &lt;TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Country" />
+
+    &lt;AutoCompleteTextView android:id="@+id/edit"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"/>
+
+&lt;/LinearLayout>
+</pre>
+</li>
+
+<li>Open HelloAutoComplete.java and insert the following as the <code>onCreate</code> method:
+<pre>
+&#64;Override
+protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.main);
+
+    AutoCompleteTextView textView = (AutoCompleteTextView) findViewById(R.id.edit);
+    ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,
+            android.R.layout.simple_dropdown_item_1line, COUNTRIES);
+    textView.setAdapter(adapter);
+}
+</pre>
+	<p>Here, we create an AutoComplteteTextView from our layout. We then 
+	create an {@link android.widget.ArrayAdapter} that binds a <code>simple_dropdown_item_1line</code>
+	layout item to each entry in the <code>COUNTRIES</code> array (which we'll add next).
+	The last part sets the ArrayAdapter to associate with our AutoCompleteTextView.</p>
+</li>
+
+<li>After the <code>onCreate()</code> method, add the String array:
+<pre>
+static final String[] COUNTRIES = new String[] {
+  "Afghanistan", "Albania", "Algeria", "American Samoa", "Andorra",
+  "Angola", "Anguilla", "Antarctica", "Antigua and Barbuda", "Argentina",
+  "Armenia", "Aruba", "Australia", "Austria", "Azerbaijan",
+  "Bahrain", "Bangladesh", "Barbados", "Belarus", "Belgium",
+  "Belize", "Benin", "Bermuda", "Bhutan", "Bolivia",
+  "Bosnia and Herzegovina", "Botswana", "Bouvet Island", "Brazil", "British Indian Ocean Territory",
+  "British Virgin Islands", "Brunei", "Bulgaria", "Burkina Faso", "Burundi",
+  "Cote d'Ivoire", "Cambodia", "Cameroon", "Canada", "Cape Verde",
+  "Cayman Islands", "Central African Republic", "Chad", "Chile", "China",
+  "Christmas Island", "Cocos (Keeling) Islands", "Colombia", "Comoros", "Congo",
+  "Cook Islands", "Costa Rica", "Croatia", "Cuba", "Cyprus", "Czech Republic",
+  "Democratic Republic of the Congo", "Denmark", "Djibouti", "Dominica", "Dominican Republic",
+  "East Timor", "Ecuador", "Egypt", "El Salvador", "Equatorial Guinea", "Eritrea",
+  "Estonia", "Ethiopia", "Faeroe Islands", "Falkland Islands", "Fiji", "Finland",
+  "Former Yugoslav Republic of Macedonia", "France", "French Guiana", "French Polynesia",
+  "French Southern Territories", "Gabon", "Georgia", "Germany", "Ghana", "Gibraltar",
+  "Greece", "Greenland", "Grenada", "Guadeloupe", "Guam", "Guatemala", "Guinea", "Guinea-Bissau",
+  "Guyana", "Haiti", "Heard Island and McDonald Islands", "Honduras", "Hong Kong", "Hungary",
+  "Iceland", "India", "Indonesia", "Iran", "Iraq", "Ireland", "Israel", "Italy", "Jamaica",
+  "Japan", "Jordan", "Kazakhstan", "Kenya", "Kiribati", "Kuwait", "Kyrgyzstan", "Laos",
+  "Latvia", "Lebanon", "Lesotho", "Liberia", "Libya", "Liechtenstein", "Lithuania", "Luxembourg",
+  "Macau", "Madagascar", "Malawi", "Malaysia", "Maldives", "Mali", "Malta", "Marshall Islands",
+  "Martinique", "Mauritania", "Mauritius", "Mayotte", "Mexico", "Micronesia", "Moldova",
+  "Monaco", "Mongolia", "Montserrat", "Morocco", "Mozambique", "Myanmar", "Namibia",
+  "Nauru", "Nepal", "Netherlands", "Netherlands Antilles", "New Caledonia", "New Zealand",
+  "Nicaragua", "Niger", "Nigeria", "Niue", "Norfolk Island", "North Korea", "Northern Marianas",
+  "Norway", "Oman", "Pakistan", "Palau", "Panama", "Papua New Guinea", "Paraguay", "Peru",
+  "Philippines", "Pitcairn Islands", "Poland", "Portugal", "Puerto Rico", "Qatar",
+  "Reunion", "Romania", "Russia", "Rwanda", "Sqo Tome and Principe", "Saint Helena",
+  "Saint Kitts and Nevis", "Saint Lucia", "Saint Pierre and Miquelon",
+  "Saint Vincent and the Grenadines", "Samoa", "San Marino", "Saudi Arabia", "Senegal",
+  "Seychelles", "Sierra Leone", "Singapore", "Slovakia", "Slovenia", "Solomon Islands",
+  "Somalia", "South Africa", "South Georgia and the South Sandwich Islands", "South Korea",
+  "Spain", "Sri Lanka", "Sudan", "Suriname", "Svalbard and Jan Mayen", "Swaziland", "Sweden",
+  "Switzerland", "Syria", "Taiwan", "Tajikistan", "Tanzania", "Thailand", "The Bahamas",
+  "The Gambia", "Togo", "Tokelau", "Tonga", "Trinidad and Tobago", "Tunisia", "Turkey",
+  "Turkmenistan", "Turks and Caicos Islands", "Tuvalu", "Virgin Islands", "Uganda",
+  "Ukraine", "United Arab Emirates", "United Kingdom",
+  "United States", "United States Minor Outlying Islands", "Uruguay", "Uzbekistan",
+  "Vanuatu", "Vatican City", "Venezuela", "Vietnam", "Wallis and Futuna", "Western Sahara",
+  "Yemen", "Yugoslavia", "Zambia", "Zimbabwe"
+};
+</pre>
+	<p>This is the list of suggestions that will be offered as the user types into the 
+	AutoCompleteTextView.</p>
+</li>
+
+<li>Now run it.</li>
+</ol>
+<p>As you type, you should see something like this:</p>
+<img src="images/hello-autocomplete.png" width="150px" />
+
+
+<h3>References</h3>
+<ul>
+	<li>{@link android.R.layout}</li>
+	<li>{@link android.widget.ArrayAdapter}</li>
+	<li>{@link android.widget.AutoCompleteTextView}</li>
+</ul>
+
+
diff --git a/docs/html/guide/tutorials/views/hello-datepicker.jd b/docs/html/guide/tutorials/views/hello-datepicker.jd
new file mode 100644
index 0000000..fcd43f3
--- /dev/null
+++ b/docs/html/guide/tutorials/views/hello-datepicker.jd
@@ -0,0 +1,151 @@
+page.title=Hello, DatePicker
+parent.title=Hello, Views
+parent.link=index.html
+@jd:body
+
+<p>A {@link android.widget.DatePicker} is a widget that allows the user to select a month, day and year.</p>
+
+
+<ol>
+  <li>Start a new project/Activity called HelloDatePicker.</li>
+  <li>Open the layout file and make it like so:
+    <pre>
+&lt;?xml version="1.0" encoding="utf-8"?>
+&lt;LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    &lt;TextView android:id="@+id/dateDisplay"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=""/>
+
+    &lt;Button android:id="@+id/pickDate"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Change the date"/>
+
+&lt;/LinearLayout>
+</pre>
+	<p>For the layout, we're using a vertical LinearLayout, with a {@link android.widget.TextView} that
+	will display the date and a {@link android.widget.Button} that will initiate the DatePicker dialog.
+	With this layout, the TextView will sit above the Button.
+	The text value in the TextView is set empty, as it will be filled 
+	with the current date when our Activity runs.</p>
+    </li> 
+
+  <li>Open HelloDatePicker.java. Insert the following to the HelloDatePicker class:
+<pre>
+    private TextView mDateDisplay;
+    private Button mPickDate;
+
+    private int mYear;
+    private int mMonth;
+    private int mDay;
+
+    static final int DATE_DIALOG_ID = 0;
+
+    &#64;Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.main);
+
+        // capture our View elements
+        mDateDisplay = (TextView) findViewById(R.id.dateDisplay);
+        mPickDate = (Button) findViewById(R.id.pickDate);
+
+        // add a click listener to the button
+        mPickDate.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+                showDialog(DATE_DIALOG_ID);
+            }
+        });
+
+        // get the current date
+        final Calendar c = Calendar.getInstance();
+        mYear = c.get(Calendar.YEAR);
+        mMonth = c.get(Calendar.MONTH);
+        mDay = c.get(Calendar.DAY_OF_MONTH);
+
+        // display the current date
+        updateDisplay();
+    }
+</pre>
+<p class="note"><strong>Tip:</strong> Press Ctrl(or Cmd) + Shift + O to import all needed packages.</p>
+	<p>We start by instantiating variables for our Views and date fields.
+	The <code>DATE_DIALOG_ID</code> is a static integer that uniquely identifies the Dialog. In the
+	<code>onCreate()</code> method, we get prepared by setting the layout and capturing the View elements. 
+	Then we create an on-click listener for the Button, so that when it is clicked it will
+	show our DatePicker dialog. The <code>showDialog()</code> method  will pop-up the date picker dialog
+        by calling the <code>onCreateDialog()</code> callback method 
+        (which we'll define in the next section). We then create an
+	instance of {@link java.util.Calendar} and get the current year, month and day. Finally, we call 
+	<code>updateDisplay()</code>&mdash;our own method (defined later) that will fill the TextView.</p>
+</li>
+
+<li>After the <code>onCreate()</code> method, add the <code>onCreateDialog()</code> callback method 
+(which is called by <code>showDialog()</code>)
+<pre>
+&#64;Override
+protected Dialog onCreateDialog(int id) {
+    switch (id) {
+    case DATE_DIALOG_ID:
+        return new DatePickerDialog(this,
+                    mDateSetListener,
+                    mYear, mMonth, mDay);
+    }
+    return null;
+}
+</pre>
+	<p>This method is passed the identifier we gave <code>showDialog()</code> and initializes
+	the DatePicker to the date we retrieved from our Calendar instance.</p>
+</li>
+
+<li>Following that, add the <code>updateDisplay()</code> method:
+<pre>
+    // updates the date we display in the TextView
+    private void updateDisplay() {
+        mDateDisplay.setText(
+            new StringBuilder()
+                    // Month is 0 based so add 1
+                    .append(mMonth + 1).append("-")
+                    .append(mDay).append("-")
+                    .append(mYear).append(" "));
+    }
+</pre>
+<p>This uses the member date values to write the date to our TextView.</p>
+</li>
+<li>Finally, add a listener that will be called when the user sets a new date:
+<pre>
+    // the callback received when the user "sets" the date in the dialog
+    private DatePickerDialog.OnDateSetListener mDateSetListener =
+            new DatePickerDialog.OnDateSetListener() {
+
+                public void onDateSet(DatePicker view, int year, 
+                                      int monthOfYear, int dayOfMonth) {
+                    mYear = year;
+                    mMonth = monthOfYear;
+                    mDay = dayOfMonth;
+                    updateDisplay();
+                }
+            };
+</pre>
+	<p>This <code>OnDateSetListener</code> method listens for when the user is done setting the date
+        (clicks the "Set" button). At that time, this fires and we update our member fields with
+	the new date defined by the user and update our TextView by calling <code>updateDisplay()</code>.</p>
+</li>
+
+<li>Now run it.</li>
+</ol>
+<p>When you press the "Change the date" button, you should see the following:</p>
+<img src="images/hello-datepicker.png" width="150px" />
+
+<h3>References</h3>
+<ul>
+<li>{@link android.widget.DatePicker}</li>
+<li>{@link android.widget.Button}</li>
+<li>{@link android.widget.TextView}</li>
+<li>{@link java.util.Calendar}</li>
+</ul>
+
diff --git a/docs/html/guide/tutorials/views/hello-formstuff.jd b/docs/html/guide/tutorials/views/hello-formstuff.jd
new file mode 100644
index 0000000..da4289c
--- /dev/null
+++ b/docs/html/guide/tutorials/views/hello-formstuff.jd
@@ -0,0 +1,262 @@
+page.title=Hello, Form Stuff
+parent.title=Hello, Views
+parent.link=index.html
+@jd:body
+
+<p>This page introduces a variety of widgets, like image buttons,
+text fields, checkboxes and radio buttons.</p>
+
+
+<ol>
+  <li>Start a new project/Activity called HelloFormStuff.</li>
+  <li>Your layout file should have a basic LinearLayout:
+    <pre>
+&lt;?xml version="1.0" encoding="utf-8"?>
+&lt;LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent" >
+    	
+&lt;/LinearLayout>
+</pre>
+    <p>For each widget you want to add, just put the respective View inside here.</p>
+</li>
+</ol>
+<p class="note"><strong>Tip:</strong> As you add new Android code, press Ctrl(or Cmd) + Shift + O 
+to import all needed packages.</p>
+
+
+<h2>ImageButton</h2>
+<p>A button with a custom image on it. 
+We'll make it display a message when pressed.</p>
+<ol>
+  <li><img src="images/android.png" align="right"/>
+	Drag the Android image on the right (or your own image) into the
+	res/drawable/ directory of your project. 
+        We'll use this for the button.</li>
+  <li>Open the layout file and, inside the LinearLayout, add the {@link android.widget.ImageButton} element:
+<pre>
+&lt;ImageButton
+    android:id="@+id/android_button"
+    android:layout_width="100dip"
+    android:layout_height="wrap_content"
+    android:src="@drawable/android" />	
+</pre>
+	<p>The source of the button
+	is from the res/drawable/ directory, where we've placed the android.png.</p>
+        <p class="note"><strong>Tip:</strong> You can also reference some of the many built-in
+        images from the Android {@link android.R.drawable} resources, 
+        like <code>ic_media_play</code>, for a "play" button image. To do so, change the source
+        attribute to <code>android:src="@android:drawable/ic_media_play"</code>.</p>
+</li>
+<li>To make the button to actually do something, add the following
+code at the end of the <code>onCreate()</code> method:
+<pre>
+final ImageButton button = (ImageButton) findViewById(R.id.android_button);
+button.setOnClickListener(new OnClickListener() {
+    public void onClick(View v) {
+        // Perform action on clicks
+        Toast.makeText(HelloFormStuff.this, "Beep Bop", Toast.LENGTH_SHORT).show();
+    }
+});
+</pre>
+<p>This captures our ImageButton from the layout, then adds an on-click listener to it.
+The {@link android.view.View.OnClickListener} must define the <code>onClick()</code> method, which
+defines the action to be made when the button is clicked. Here, we show a 
+{@link android.widget.Toast} message when clicked.</p>
+</li>
+<li>Run it.</li>
+</ol>
+
+
+<h2>EditText</h2>
+<p>A text field for user input. We'll make it display the text entered so far when the "Enter" key is pressed.</p>
+
+<ol>
+  <li>Open the layout file and, inside the LinearLayout, add the {@link android.widget.EditText} element:
+<pre>
+&lt;EditText
+    android:id="@+id/edittext"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"/>
+</pre>
+</li>
+<li>To do something with the text that the user enters, add the following code
+to the end of the <code>onCreate()</code> method:
+<pre>
+final EditText edittext = (EditText) findViewById(R.id.edittext);
+edittext.setOnKeyListener(new OnKeyListener() {
+    public boolean onKey(View v, int keyCode, KeyEvent event) {
+        if ((event.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER)) {
+          // Perform action on key press
+          Toast.makeText(HelloFormStuff.this, edittext.getText(), Toast.LENGTH_SHORT).show();
+          return true;
+        }
+        return false;
+    }
+});
+</pre>
+<p>This captures our EditText element from the layout, then adds an on-key listener to it.
+The {@link android.view.View.OnKeyListener} must define the <code>onKey()</code> method, which
+defines the action to be made when a key is pressed. In this case, we want to listen for the
+Enter key (when pressed down), then pop up a {@link android.widget.Toast} message with the 
+text from the EditText field. Be sure to return <var>true</var> after the event is handled, 
+so that the event doesn't bubble-up and get handled by the View (which would result in a
+carriage return in the text field).</p>
+<li>Run it.</li>
+</ol>
+
+
+<h2>CheckBox</h2>
+<p>A checkbox for selecting items. We'll make it display the the current state when pressed.</p>
+
+<ol>
+  <li>Open the layout file and, inside the LinearLayout, add the {@link android.widget.CheckBox} element:
+<pre>
+&lt;CheckBox android:id="@+id/checkbox"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text="check it out" />
+</pre>
+</li>
+<li>To do something when the state is changed, add the following code
+to the end of the <code>onCreate()</code> method:
+<pre>
+final CheckBox checkbox = (CheckBox) findViewById(R.id.checkbox);
+checkbox.setOnClickListener(new OnClickListener() {
+    public void onClick(View v) {
+        // Perform action on clicks
+        if (checkbox.isChecked()) {
+            Toast.makeText(HelloFormStuff.this, "Selected", Toast.LENGTH_SHORT).show();
+        } else {
+            Toast.makeText(HelloFormStuff.this, "Not selected", Toast.LENGTH_SHORT).show();
+        }
+    }
+});
+</pre>
+<p>This captures our CheckBox element from the layout, then adds an on-click listener to it.
+The {@link android.view.View.OnClickListener} must define the <code>onClick()</code> method, which
+defines the action to be made when the checkbox is clicked. Here, we query the current state of the
+checkbox, then pop up a {@link android.widget.Toast} message that displays the current state. 
+Notice that the CheckBox handles its own state change between checked and un-checked, so we just
+ask which it currently is.</p>
+<li>Run it.</li>
+</ol>
+<p class="note"><strong>Tip:</strong> If you find that you need to change the state
+in another way (such as when loading a saved {@link android.preference.CheckBoxPreference}),
+use <code>setChecked(true)</code> or <code>toggle()</code>.</p>
+
+
+<h2>RadioButton</h2>
+<p>Two mutually-exclusive radio buttons&mdash;enabling one disables the other. 
+When each is pressed, we'll pop up a message.</p>
+
+<ol>
+  <li>Open the layout file and, inside the LinearLayout, add two {@link android.widget.RadioButton}s,
+inside a {@link android.widget.RadioGroup}:
+<pre>
+&lt;RadioGroup
+  android:layout_width="fill_parent"
+  android:layout_height="wrap_content"
+  android:orientation="vertical">
+  
+  &lt;RadioButton android:id="@+id/radio_red"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="Red" />
+  
+  &lt;RadioButton android:id="@+id/radio_blue"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="Blue" />
+  
+&lt;/RadioGroup>
+</pre>
+</li>
+<li>To do something when each is selected, we'll need an OnClickListener. Unlike the other 
+listeners we've created, instead of creating this one as an anonymous inner class, 
+we'll create it as a new object. This way, we can re-use the OnClickLIstener for 
+both RadioButtons. So, add the following code in the HelloFormStuff Activity
+(<em>outside</em> the <code>onCreate()</code> method):
+<pre>
+OnClickListener radio_listener = new OnClickListener() {
+    public void onClick(View v) {
+        // Perform action on clicks
+        RadioButton rb = (RadioButton) v;
+        Toast.makeText(HelloFormStuff.this, rb.getText(), Toast.LENGTH_SHORT).show();
+    }
+};
+</pre>
+<p>Our <code>onClick()</code> method will be handed the View clicked, so the first thing to do
+is cast it into a RadioButton. Then we pop up a 
+{@link android.widget.Toast} message that displays the selection.</p>
+<li>Now, at the bottom of the <code>onCreate()</code> method, add the following:
+<pre>
+  final RadioButton radio_red = (RadioButton) findViewById(R.id.radio_red);
+  final RadioButton radio_blue = (RadioButton) findViewById(R.id.radio_blue);
+  radio_red.setOnClickListener(radio_listener);
+  radio_blue.setOnClickListener(radio_listener);
+</pre>
+<p>This captures each of the RadioButtons from our layout and adds the newly-created 
+OnClickListener to each.</p>
+<li>Run it.</li>
+</ol>
+<p class="note"><strong>Tip:</strong> If you find that you need to change the state of a
+RadioButton in another way (such as when loading a saved {@link android.preference.CheckBoxPreference}),
+use <code>setChecked(true)</code> or <code>toggle()</code>.</p>
+
+
+<h2>ToggleButton</h2>
+<p>A button used specifically for toggling something on and off.</p>
+
+<ol>
+  <li>Open the layout file and, inside the LinearLayout, add the {@link android.widget.ToggleButton} element:
+<pre>
+&lt;ToggleButton android:id="@+id/togglebutton"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content" />
+</pre>
+</li>
+<li>To do something when the state is changed, add the following code
+to the end of the <code>onCreate()</code> method:
+<pre>
+final ToggleButton togglebutton = (ToggleButton) findViewById(R.id.togglebutton);
+togglebutton.setOnClickListener(new OnClickListener() {
+    public void onClick(View v) {
+        // Perform action on clicks
+        if (togglebutton.isChecked()) {
+            Toast.makeText(HelloFormStuff.this, "ON", Toast.LENGTH_SHORT).show();
+        } else {
+            Toast.makeText(HelloFormStuff.this, "OFF", Toast.LENGTH_SHORT).show();
+        }
+    }
+});
+</pre>
+<p>This captures our ToggleButton element from the layout, then adds an on-click listener to it.
+The {@link android.view.View.OnClickListener} must define the <code>onClick()</code> method, which
+defines the action to be made when the button is clicked. Here, we query the current state of the
+ToggleButton, then pop up a {@link android.widget.Toast} message that displays the current state. 
+Notice that the ToggleButton handles its own state change between checked and un-checked, so we just
+ask which it is.</p>
+<li>Run it.</li>
+</ol>
+
+<p class="note"><strong>Tip:</strong> By default, the text on the button is "ON" and "OFF", but 
+you can change each of these with <code>setTextOn(<var>CharSequence</var>)</code> and 
+<code>setTextOff(<var>CharSequence</var>)</code>. And, if you find that you need to change the state
+in another way (such as when loading a saved {@link android.preference.CheckBoxPreference}),
+use <code>setChecked(true)</code> or <code>toggle()</code>. </p>
+
+
+<p>If you've added all the form items above, your application should look something like this:</p>
+<img src="images/hello-formstuff.png" width="150px" />
+
+<h3>References</h3>
+<ul>
+	<li>{@link android.widget.ImageButton}</li>
+	<li>{@link android.widget.EditText}</li>
+	<li>{@link android.widget.CheckBox}</li>
+	<li>{@link android.widget.RadioButton}</li>
+	<li>{@link android.widget.ToggleButton}</li>
+</ul>
+
diff --git a/docs/html/guide/tutorials/views/hello-gallery.jd b/docs/html/guide/tutorials/views/hello-gallery.jd
new file mode 100644
index 0000000..084f912
--- /dev/null
+++ b/docs/html/guide/tutorials/views/hello-gallery.jd
@@ -0,0 +1,135 @@
+page.title=Hello, Gallery
+parent.title=Hello, Views
+parent.link=index.html
+@jd:body
+
+<p>A {@link android.widget.Gallery} is a View commonly used to display items in a horizontally scrolling list
+that locks the current selection at the center. When one is selected, we'll show a message.</p>
+
+
+<ol>
+  <li>Start a new project/Activity called HelloGallery.</li>
+  <li>Add some images to your res/drawable/ directory.</li>
+  <li>Open the layout file and make it like so:
+<pre>
+&lt;?xml version="1.0" encoding="utf-8"?>
+&lt;Gallery xmlns:android="http://schemas.android.com/apk/res/android" 
+    android:id="@+id/gallery"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+/>
+</pre>
+</li>
+
+
+<li>Open the HelloGallery.java file. Insert the following for the <code>onCreate()</code> method:
+<pre>
+&#64;Override
+public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.main);
+
+    Gallery g = (Gallery) findViewById(R.id.gallery);
+    g.setAdapter(new ImageAdapter(this));
+
+    g.setOnItemClickListener(new OnItemClickListener() {
+        public void onItemClick(AdapterView parent, View v, int position, long id) {
+            Toast.makeText(HelloGallery.this, "" + position, Toast.LENGTH_SHORT).show();
+        }
+    });
+}
+</pre>
+	<p>We start as usual: set the layout and capture the View we want (our Gallery). 
+We then set an Adapter, called ImageAdapter for the Gallery&mdash;this is a new class that
+we'll create next. Then we create an item click listener for the Gallery. This is like a normal
+on-click listener (which you might be familiar with for buttons), but it listens to each item
+that we've added to the Gallery. The <code>onItemClick()</code> callback method 
+receives the AdapterView where the click occurred, the specific View that received the click, the 
+position of the View clicked (zero-based), and the row id of the item clicked (if applicable). All
+that we care about is the position, so that we can pop up a {@link android.widget.Toast} message that 
+tells us the index position of the item clicked. We do this with <code>Toast.makeText().show()</code>.
+</p>
+</li>
+
+<li>After the <code>onCreate()</code> method, add the <code>ImageAdapter</code> class:
+<pre>
+public class ImageAdapter extends BaseAdapter {
+    int mGalleryItemBackground;
+    private Context mContext;
+
+    private Integer[] mImageIds = {
+            R.drawable.sample_1,
+            R.drawable.sample_2,
+            R.drawable.sample_3,
+            R.drawable.sample_4,
+            R.drawable.sample_5,
+            R.drawable.sample_6,
+            R.drawable.sample_7
+    };
+
+    public ImageAdapter(Context c) {
+        mContext = c;
+        TypedArray a = obtainStyledAttributes(android.R.styleable.Theme);
+        mGalleryItemBackground = a.getResourceId(
+                android.R.styleable.Theme_galleryItemBackground, 0);
+        a.recycle();
+    }
+
+    public int getCount() {
+        return mImageIds.length;
+    }
+
+    public Object getItem(int position) {
+        return position;
+    }
+
+    public long getItemId(int position) {
+        return position;
+    }
+
+    public View getView(int position, View convertView, ViewGroup parent) {
+        ImageView i = new ImageView(mContext);
+
+        i.setImageResource(mImageIds[position]);
+        i.setLayoutParams(new Gallery.LayoutParams(150, 100));
+        i.setScaleType(ImageView.ScaleType.FIT_XY);
+        i.setBackgroundResource(mGalleryItemBackground);
+
+        return i;
+    }
+}
+</pre>
+<p>First, there are a few member variables, including an array of IDs that reference
+the images we placed in our drawable resources directory.</p>
+<p>Next is the constructor, where we define the member Context. The rest of the constructor
+sets up a reference for our Gallery them, which adds the nice framing for each Gallery item.
+Once we have our <code>mGalleryItemBackground</code>, it's important to recycle the 
+StyledAttribute for later re-use.</p>
+<p>The next three methods are required for basic member queries. 
+But then we have the <code>getView()</code> method, which is called
+for each item read by our ImageAdapter, when the Gallery is being built. Here, we 
+use our member Context to create a new {@link android.widget.ImageView}. We then define
+the image resource with the current position of the Gallery items (corresponding to our
+array of drawables), set the dimensions for the ImageView, 
+set the image scaling to fit the ImageView dimensions, then finally set the 
+background theme for the ImageView.</p>
+
+<p>See {@link android.widget.ImageView.ScaleType}
+for other image scaling options, in case you want to avoid stretching images that don't 
+exactly match the ImageView dimensions.</p>
+
+<li>Now run it.</li>
+</ol>
+<p>You should see something like this:</p>
+<img src="images/hello-gallery.png" width="150px" />
+
+
+<h3>References</h3>
+<ul>
+	<li>{@link android.widget.BaseAdapter}</li>
+	<li>{@link android.widget.Gallery}</li>
+	<li>{@link android.widget.ImageView}</li>
+	<li>{@link android.widget.Toast}</li>
+</ul>
+
+
diff --git a/docs/html/guide/tutorials/views/hello-gridview.jd b/docs/html/guide/tutorials/views/hello-gridview.jd
new file mode 100644
index 0000000..ffb6c93
--- /dev/null
+++ b/docs/html/guide/tutorials/views/hello-gridview.jd
@@ -0,0 +1,129 @@
+page.title=Hello, GridView
+parent.title=Hello, Views
+parent.link=index.html
+@jd:body
+
+<p>A {@link android.widget.GridView} displays items in a two-dimensional, scrolling grid. The items
+are acquired from a {@link android.widget.ListAdapter}.</p>
+
+
+<ol>
+  <li>Start a new project/Activity called HelloGridView.</li>
+  <li>Find some photos you'd like to use, or copy some from the SDK samples res/drawable/ 
+    folder of your project.</li>
+  <li>Open the layout and make it like so:
+<pre>
+&lt;?xml version="1.0" encoding="utf-8"?>
+&lt;GridView xmlns:android="http://schemas.android.com/apk/res/android" 
+    android:id="@+id/gridview"
+    android:layout_width="fill_parent" 
+    android:layout_height="fill_parent"
+    android:numColumns="auto_fit"
+    android:verticalSpacing="10dp"
+    android:horizontalSpacing="10dp"
+    android:columnWidth="90dp"
+    android:stretchMode="columnWidth"
+    android:gravity="center"
+/>
+</pre>
+</li>
+  <li>Open the HelloGridView Java file. Insert the following for the <code>onCreate()</code> method:
+<pre>
+public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.main);
+
+    GridView gridview = (GridView) findViewById(R.id.gridview);
+    gridview.setAdapter(new ImageAdapter(this));
+}
+</pre>
+    <p>Here, we get a handle on our GridView, from the layout, and give it an Adapter.
+    We're actually going to create our own Adapter called ImageAdapter.</p>
+</li>
+<li>Create a new class (nested or otherwise), called ImageAdapter, which extends {@link android.widget.BaseAdapter}:
+<pre>
+public class ImageAdapter extends BaseAdapter {
+    private Context mContext;
+
+    public ImageAdapter(Context c) {
+        mContext = c;
+    }
+
+    public int getCount() {
+        return mThumbIds.length;
+    }
+
+    public Object getItem(int position) {
+        return null;
+    }
+
+    public long getItemId(int position) {
+        return 0;
+    }
+
+    // create a new ImageView for each item referenced by the Adapter
+    public View getView(int position, View convertView, ViewGroup parent) {
+        ImageView imageView;
+        if (convertView == null) {  // if it's not recycled, initialize some attributes
+            imageView = new ImageView(mContext);
+            imageView.setLayoutParams(new GridView.LayoutParams(85, 85));
+            imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
+            imageView.setPadding(8, 8, 8, 8);
+        } else {
+            imageView = (ImageView) convertView;
+        }
+
+        imageView.setImageResource(mThumbIds[position]);
+        return imageView;
+    }
+
+    // references to our images
+    private Integer[] mThumbIds = {
+            R.drawable.sample_2, R.drawable.sample_3,
+            R.drawable.sample_4, R.drawable.sample_5,
+            R.drawable.sample_6, R.drawable.sample_7,
+            R.drawable.sample_0, R.drawable.sample_1,
+            R.drawable.sample_2, R.drawable.sample_3,
+            R.drawable.sample_4, R.drawable.sample_5,
+            R.drawable.sample_6, R.drawable.sample_7,
+            R.drawable.sample_0, R.drawable.sample_1,
+            R.drawable.sample_2, R.drawable.sample_3,
+            R.drawable.sample_4, R.drawable.sample_5,
+            R.drawable.sample_6, R.drawable.sample_7
+    };
+}
+</pre>
+    <p>First we take care of some required methods inherited from BaseAdapter.
+    The constructor and <code>getCount()</code> are self-explanitory. Normally, <code>getItem()</code>
+    should return the actual object at the specified position in our Adapter, but for this Hello World,
+    we're not going to bother. Likewise, <code>getItemId()</code> should return the row id of
+    the item, but right now we don't care.</p>
+    <p>However, <code>getView()</code> is the method we care about. This one creates a new View for each image that we
+    put in our ImageAdapter. So we're going to create an ImageView each time. When this is called, we're
+    going to receive a View, which is likely a recycled View object (at least after the first call), so we
+    check for this&mdash;if it's null, we initialize the ImageView and setup all the properties we want.
+    The <code>LayoutParams()</code> initialization sets the height and width of the View&mdash;this ensures
+    that no matter the drawable size, each image is resized and cropped to fit in the ImageView (if necessary).
+    With <code>setScaleType()</code>, we say that images should be cropped toward the center (if necessary).
+    And finally, we set the padding within the ImageView. (Note that, if the images have various aspect-ratios, 
+    as they do in this demo, then less padding will cause for more cropping of the image, if it does not match
+    the dimensions given to the ImageView.) At the end of <code>getView()</code> we set the image resource and 
+    return the ImageView.</p>
+    <p>All that's left is our array or drawable resources at the bottom.</p>
+</li>
+<li>Run it.</li>
+</ol>
+<p>Your grid layout should look something like this:</p>
+<img src="images/hello-gridview.png" width="150px" />
+
+<p>Try experimenting with the behaviors of the GridView and ImageView by adjusting their properties. For example,
+  instead of setting the ImageView LayoutParams, you can try using
+  {@link android.widget.ImageView#setAdjustViewBounds(boolean)}. </p>
+
+<h3>References</h3>
+<ul>
+	<li>{@link android.widget.GridView}</li>
+	<li>{@link android.widget.ImageView}</li>
+	<li>{@link android.widget.BaseAdapter}</li>
+</ul>
+
diff --git a/docs/html/guide/tutorials/views/hello-linearlayout.jd b/docs/html/guide/tutorials/views/hello-linearlayout.jd
new file mode 100644
index 0000000..0e8947c
--- /dev/null
+++ b/docs/html/guide/tutorials/views/hello-linearlayout.jd
@@ -0,0 +1,130 @@
+page.title=Hello, LinearLayout
+parent.title=Hello, Views
+parent.link=index.html
+@jd:body
+
+<p>A {@link android.widget.LinearLayout} is a GroupView that will lay child View elements
+vertically or horizontally.</p>
+
+
+<ol>
+  <li>Start a new project/Activity called HelloLinearLayout.</li>
+  <li>Open the layout file.
+    Make it like so:
+<pre>
+&lt;?xml version="1.0" encoding="utf-8"?>
+&lt;LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+
+    &lt;LinearLayout
+	android:orientation="horizontal"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	android:layout_weight="1">
+	
+	&lt;TextView
+	    android:text="red"
+	    android:gravity="center_horizontal"
+	    android:background="#aa0000"
+	    android:layout_width="wrap_content"
+	    android:layout_height="fill_parent"
+	    android:layout_weight="1"/>
+	
+	&lt;TextView
+	    android:text="green"
+	    android:gravity="center_horizontal"
+	    android:background="#00aa00"
+	    android:layout_width="wrap_content"
+	    android:layout_height="fill_parent"
+	    android:layout_weight="1"/>
+	
+	&lt;TextView
+	    android:text="blue"
+	    android:gravity="center_horizontal"
+	    android:background="#0000aa"
+	    android:layout_width="wrap_content"
+	    android:layout_height="fill_parent"
+	    android:layout_weight="1"/>
+	
+	&lt;TextView
+	    android:text="yellow"
+	    android:gravity="center_horizontal"
+	    android:background="#aaaa00"
+	    android:layout_width="wrap_content"
+	    android:layout_height="fill_parent"
+	    android:layout_weight="1"/>
+		
+    &lt;/LinearLayout>
+	
+    &lt;LinearLayout
+	android:orientation="vertical"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	android:layout_weight="1">
+	
+	&lt;TextView
+	    android:text="row one"
+	    android:textSize="15pt"
+	    android:layout_width="fill_parent"
+	    android:layout_height="wrap_content"
+	    android:layout_weight="1"/>
+	
+	&lt;TextView
+	    android:text="row two"
+	    android:textSize="15pt"
+	    android:layout_width="fill_parent"
+	    android:layout_height="wrap_content"
+	    android:layout_weight="1"/>
+	
+	&lt;TextView
+	    android:text="row three"
+	    android:textSize="15pt"
+	    android:layout_width="fill_parent"
+	    android:layout_height="wrap_content"
+	    android:layout_weight="1"/>
+	
+	&lt;TextView
+	    android:text="row four"
+	    android:textSize="15pt"
+	    android:layout_width="fill_parent"
+	    android:layout_height="wrap_content"
+	    android:layout_weight="1"/>
+        
+    &lt;/LinearLayout>
+        
+&lt;/LinearLayout>
+</pre>
+        <p>Carefully inspect the XML. You'll notice how this layout works a lot like
+        an HTML layout. There is one parent LinearLayout that is defined to lay
+        its child elements vertically. The first child is another LinearLayout that uses a horizontal layout
+        and the second uses a vertical layout. Each LinearLayout contains several {@link android.widget.TextView}
+        elements.</p>
+</li>
+<li>Now open the HelloLinearLayout Activity and be sure it loads this layout in the <code>onCreate()</code> method:</p>
+<pre>
+public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.main);
+}
+</pre>
+<p><code>R.layout.main</code> refers to the <code>main.xml</code> layout file.</p>
+</li>
+<li>Run it.</li>
+</ol>
+<p>You should see the following:</p>
+<img src="images/hello-linearlayout.png" width="150px" />
+
+<p>Notice how the various XML attributes define the View's behavior.
+Pay attention to the effect of the <code>layout_weight</code>. Try 
+	experimenting with different values to see how the screen real estate is 
+	distributed based on the weight of each element.</p>
+
+<h3>References</h3>
+<ul>
+	<li>{@link android.widget.LinearLayout}</li>
+<li>{@link android.widget.TextView}</li>
+</ul>
+
+
diff --git a/docs/html/guide/tutorials/views/hello-listview.jd b/docs/html/guide/tutorials/views/hello-listview.jd
new file mode 100644
index 0000000..d90005b
--- /dev/null
+++ b/docs/html/guide/tutorials/views/hello-listview.jd
@@ -0,0 +1,90 @@
+page.title=Hello, ListView
+parent.title=Hello, Views
+parent.link=index.html
+@jd:body
+
+<p>A {@link android.widget.ListView} is a View that shows items in a vertically scrolling list. The items are
+ acquired from a {@link android.widget.ListAdapter}.</p>
+
+
+<ol>
+  <li>Start a new project/ListActivity called HelloListView.</li>
+  <li>Open the HelloListView Java file. Make the class extend ListActivity (instead of Activity).
+	<pre>public class HelloListView extends ListActivity {</pre>
+  </li>
+  <li>Insert the following for the <code>onCreate()</code> method:
+<pre>
+&#64;Override
+public void onCreate(Bundle savedInstanceState) {
+  super.onCreate(savedInstanceState);
+  
+  setListAdapter(new ArrayAdapter&lt;String>(this,
+          android.R.layout.simple_list_item_1, COUNTRIES));
+  getListView().setTextFilterEnabled(true);
+}
+</pre>
+	<p>Notice that we don't need to load a layout (at least, not in this case, because we're using
+	the whole screen for our list). Instead, we just call <code>setListAdapter()</code> (which automatically
+	adds a ListView to the ListActivity), and provide it with an ArrayAdapter that binds a 
+	<code>simple_list_item_1</code> layout item to each entry in the <code>COUNTRIES</code> 
+	array (added next). The next line of code adds a text filter to the ListView, so that when the user
+	begins typing, the list will filter the entire view to display only the items that match the entry.</p>
+  </li>
+  <li>Following the <code>onCreate()</code> method, add the String array:
+<pre>
+  static final String[] COUNTRIES = new String[] {
+    "Afghanistan", "Albania", "Algeria", "American Samoa", "Andorra",
+    "Angola", "Anguilla", "Antarctica", "Antigua and Barbuda", "Argentina",
+    "Armenia", "Aruba", "Australia", "Austria", "Azerbaijan",
+    "Bahrain", "Bangladesh", "Barbados", "Belarus", "Belgium",
+    "Belize", "Benin", "Bermuda", "Bhutan", "Bolivia",
+    "Bosnia and Herzegovina", "Botswana", "Bouvet Island", "Brazil", "British Indian Ocean Territory",
+    "British Virgin Islands", "Brunei", "Bulgaria", "Burkina Faso", "Burundi",
+    "Cote d'Ivoire", "Cambodia", "Cameroon", "Canada", "Cape Verde",
+    "Cayman Islands", "Central African Republic", "Chad", "Chile", "China",
+    "Christmas Island", "Cocos (Keeling) Islands", "Colombia", "Comoros", "Congo",
+    "Cook Islands", "Costa Rica", "Croatia", "Cuba", "Cyprus", "Czech Republic",
+    "Democratic Republic of the Congo", "Denmark", "Djibouti", "Dominica", "Dominican Republic",
+    "East Timor", "Ecuador", "Egypt", "El Salvador", "Equatorial Guinea", "Eritrea",
+    "Estonia", "Ethiopia", "Faeroe Islands", "Falkland Islands", "Fiji", "Finland",
+    "Former Yugoslav Republic of Macedonia", "France", "French Guiana", "French Polynesia",
+    "French Southern Territories", "Gabon", "Georgia", "Germany", "Ghana", "Gibraltar",
+    "Greece", "Greenland", "Grenada", "Guadeloupe", "Guam", "Guatemala", "Guinea", "Guinea-Bissau",
+    "Guyana", "Haiti", "Heard Island and McDonald Islands", "Honduras", "Hong Kong", "Hungary",
+    "Iceland", "India", "Indonesia", "Iran", "Iraq", "Ireland", "Israel", "Italy", "Jamaica",
+    "Japan", "Jordan", "Kazakhstan", "Kenya", "Kiribati", "Kuwait", "Kyrgyzstan", "Laos",
+    "Latvia", "Lebanon", "Lesotho", "Liberia", "Libya", "Liechtenstein", "Lithuania", "Luxembourg",
+    "Macau", "Madagascar", "Malawi", "Malaysia", "Maldives", "Mali", "Malta", "Marshall Islands",
+    "Martinique", "Mauritania", "Mauritius", "Mayotte", "Mexico", "Micronesia", "Moldova",
+    "Monaco", "Mongolia", "Montserrat", "Morocco", "Mozambique", "Myanmar", "Namibia",
+    "Nauru", "Nepal", "Netherlands", "Netherlands Antilles", "New Caledonia", "New Zealand",
+    "Nicaragua", "Niger", "Nigeria", "Niue", "Norfolk Island", "North Korea", "Northern Marianas",
+    "Norway", "Oman", "Pakistan", "Palau", "Panama", "Papua New Guinea", "Paraguay", "Peru",
+    "Philippines", "Pitcairn Islands", "Poland", "Portugal", "Puerto Rico", "Qatar",
+    "Reunion", "Romania", "Russia", "Rwanda", "Sqo Tome and Principe", "Saint Helena",
+    "Saint Kitts and Nevis", "Saint Lucia", "Saint Pierre and Miquelon",
+    "Saint Vincent and the Grenadines", "Samoa", "San Marino", "Saudi Arabia", "Senegal",
+    "Seychelles", "Sierra Leone", "Singapore", "Slovakia", "Slovenia", "Solomon Islands",
+    "Somalia", "South Africa", "South Georgia and the South Sandwich Islands", "South Korea",
+    "Spain", "Sri Lanka", "Sudan", "Suriname", "Svalbard and Jan Mayen", "Swaziland", "Sweden",
+    "Switzerland", "Syria", "Taiwan", "Tajikistan", "Tanzania", "Thailand", "The Bahamas",
+    "The Gambia", "Togo", "Tokelau", "Tonga", "Trinidad and Tobago", "Tunisia", "Turkey",
+    "Turkmenistan", "Turks and Caicos Islands", "Tuvalu", "Virgin Islands", "Uganda",
+    "Ukraine", "United Arab Emirates", "United Kingdom",
+    "United States", "United States Minor Outlying Islands", "Uruguay", "Uzbekistan",
+    "Vanuatu", "Vatican City", "Venezuela", "Vietnam", "Wallis and Futuna", "Western Sahara",
+    "Yemen", "Yugoslavia", "Zambia", "Zimbabwe"
+  };
+</pre>
+</li>
+<li> Run it.</li>
+</ol>
+<p>You can scroll the list, or type to filter it. You should see something like this:</p>
+<img src="images/hello-listview.png" width="150px" />
+
+<h3>References</h3>
+<ul>
+	<li>{@link android.widget.ListView}</li>
+	<li>{@link android.widget.ListAdapter}</li>
+</ul>
+
diff --git a/docs/html/guide/tutorials/views/hello-mapview.jd b/docs/html/guide/tutorials/views/hello-mapview.jd
new file mode 100644
index 0000000..976b8ab
--- /dev/null
+++ b/docs/html/guide/tutorials/views/hello-mapview.jd
@@ -0,0 +1,247 @@
+page.title=Hello, MapView 
+parent.title=Hello, Views
+parent.link=index.html
+@jd:body
+
+<p>A MapView allows you to create your own map-viewing Activity. 
+First, we'll create a simple Activity that can view and navigate a map. Then we will add some overlay items.</p>
+
+<ol>
+  <li>Start a new project/Activity called HelloMapView.
+
+   <li>Because we're using the Google Maps library, 
+   which is not a part of the standard Android library, we need to 
+   declare it in the Android Manifest. Open the AndroidManifest.xml 
+   file and add the following as a child of the <code>&lt;application></code> element:
+
+    <pre>&lt;uses-library android:name="com.google.android.maps" /></pre>
+      </li>
+   <li>We also need access to the internet in order to retrieve the Google Maps tiles,
+    so the application must request the {@link android.Manifest.permission#INTERNET INTERNET} permissions.
+    In the manifest file, add the following as a child of the <code>&lt;manifest></code> element:
+    <pre>&lt;uses-permission android:name="android.permission.INTERNET" /></pre>
+   </li>
+   <li>Now open the main layout file for your project. Define a layout with a com.google.android.maps.MapView 
+    inside a android.widget.RelativeLayout:
+
+<pre>
+&lt;?xml version="1.0" encoding="utf-8"?>
+&lt;RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/mainlayout"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent" >
+
+    &lt;com.google.android.maps.MapView
+        android:id="@+id/mapview"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:clickable="true"
+        android:apiKey="<em>Your Maps API Key</em>"
+    />
+
+&lt;/RelativeLayout>
+</pre>
+      <p>The <code>clickable</code> attribute defines whether you want to allow user-interaction with the map.
+      In this case, we set it "true" so that the user can navigate.</p>
+
+      <p>The <code>apiKey</code> attribute holds the Google Maps API Key that proves your application and signer
+      certificate has been registered with the Google Maps service. Because MapView uses Google Maps data, this key is required
+      in order to receive the map data, even while you are developing. Registration is free and it only takes a couple
+      minutes to register your certificate and receive a Maps API Key. For instructions on getting a key, read
+      <a href="{@docRoot}guide/topics/location/geo/mapkey.html">Obtaining a Maps API Key</a>.
+      (For the purpose of this tutorial, you should register with the fingerprint of the SDK debug certificate.)
+      Once you've acquired the Maps API Key, insert it for the <code>apiKey</code> value.</p></li>
+
+   <li>Now open the HelloMapView.java file. For this Activity, we're going to extend the special sub-class of 
+      Activity called MapActivity, so change the class declaration to extend 
+      MapActicity, instead of Activity:</p>
+
+      <pre>public class HelloMapView extends MapActivity {</pre>
+
+   <li>The <code>isRouteDisplayed()</code> method is required, so add it inside the class:
+<pre>
+&#64;Override
+protected boolean isRouteDisplayed() {
+    return false;
+}
+</pre>
+<p>You can actually run this now, but all it does is allow you to pan around the map.</p>
+<p>Android provides a handy {@link android.widget.ZoomControls} widget for zooming in and out of a View. 
+MapView can automatically hook one for us by requesting it with the <code>getZoomControls()</code>
+method. Let's do this.</p>
+
+<li>Go back to the layout file. We need a new ViewGroup element, in which we'll 
+   place the ZoomControls. Just below the MapView element (but inside the RelativeLayout), add this element:
+<pre>
+&lt;LinearLayout
+    android:id="@+id/zoomview"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_alignBottom="@id/mapview"
+    android:layout_centerHorizontal="true"
+/></pre>
+
+      <p>It doesn't really matter what kind of ViewGroup we use, because we just want a 
+      container that we can position within our root RelativeLayout.</p>
+
+      <p>The last two attributes are available only to an element that's a child of a 
+      RelativeLayout. <code>layout_alignBottom</code> aligns the bottom of this element to the bottom of 
+      the element identified with a resource tag (which must be a sibling to this element). 
+      <code>layout_centerHorizontal</code> centers this on the horizontal plane.</p></li>
+
+   <li>Now go back to the HelloMapView class. We'll now retrieve the ZoomControls object from 
+   the MapView and add it to our new layout element. First, at the top of the HelloMapView, 
+   instantiate handles for the MapView and LinearLayout, plus a ZoomControl object:
+<pre>
+LinearLayout linearLayout;
+MapView mapView;
+ZoomControls mZoom;</pre></li>
+
+   <li>Then initialize each of these in <code>onCreate()</code>. We'll capture the LinearLayout and 
+   MapView through their layout resources. Then get the ZoomControls from the MapView::
+<pre>
+linearLayout = (LinearLayout) findViewById(R.id.zoomview);
+mapView = (MapView) findViewById(R.id.mapview);
+mZoom = (ZoomControls) mapView.getZoomControls();</pre>
+
+      <p>By using the ZoomControls object provided by MapView, we don't have to do any of the work
+      required to actually perform the zoom operations. The ZoomControls widget that MapView 
+      returns for us is already hooked into the MapView and works as soon as we add it to the 
+      layout. The controls will appear whenever the user touches the map, then dissapear after 
+      a few moments of inactivity.</p></li>
+
+   <li>Now just plug our ZoomControls into the LinearLayout we added:
+
+      <pre>linearLayout.addView(mZoom);</pre></li>
+
+   <li>Run it.</li>
+</ol>
+
+<hr/>
+
+<p>So, we now have full interaction controls. All well and good, but what we really want our map 
+for is custom markers and layovers. Let's add some Overlay 
+objects to our map. To do this, we're going to 
+implement the ItemizedOverlay
+class, which can manage a whole set of Overlay items for us.</p>
+
+<ol>   
+  <li>Create a new Java class named HelloItemizedOverlay that implements ItemizedOverlay.
+
+      <p>When using Eclipse, right-click the package name in the Eclipse Package Explorer, and select New > Class. Fill-in 
+      the Name field as <em>HelloItemizedOverlay</em>. For the Superclass, enter 
+      <em>com.google.android.maps.ItemizedOverlay</em>. Click the checkbox for <em>Constructors from 
+      superclass</em>. Click Finish.</p></li>
+
+  <li> First thing, we need an OverlayItem ArrayList, in which we'll put each of the OverlayItem 
+   objects we want on our map. Add this at the top of the HelloItemizedOverlay class:
+
+      <pre>private ArrayList&lt;OverlayItem> mOverlays = new ArrayList&lt;OverlayItem>();</pre></li>
+
+   <li>All the constructor does is define the default marker to be used on each of the OverlayItems. 
+   In order for the Drawable to actually get drawn, it must have its bounds defined. And we want the 
+   center-point at the bottom of the image to be the point at which it's attached to the map 
+   coordinates. We handle all this with the boundCenterBottom() method. Wrap this around our 
+   defaultMarker, so the super constructor call looks like this:
+
+      <pre>super(boundCenterBottom(defaultMarker));</pre></li>
+
+   <li>In order to add new OverlayItems to our ArrayList, we need a new public method. We'll handle 
+   this with the following method:
+
+<pre>
+public void addOverlay(OverlayItem overlay) {
+    mOverlays.add(overlay);
+    populate();
+}</pre>
+
+      <p>Each time we add a new OverlayItem, we must call <code>populate()</code>, which will read each of out 
+      OverlayItems and prepare them to be drawn.</p></li>
+
+   <li>In order for the <code>populate()</code> method to read each OverlayItem, it will make a request to 
+   <code>createItem(int)</code>. We must define this method to properly read from our ArrayList. Replace the 
+   existing contents of the createItem method with a <code>get()</code> call to our ArrayList:
+
+<pre>
+&#64;Override
+protected OverlayItem createItem(int i) {
+  return mOverlays.get(i);
+}
+</pre></li>
+
+   <li>We're also required to override the <code>size()</code> method. Replace the existing contents of the 
+   method with a size request to our ArrayList:
+
+      <pre>return mOverlays.size();</pre></li>
+</ol>
+
+
+<p>That's it for the HelloItemizedOverlay class. We're now ready to use it.</p>
+
+<hr/>
+<p>Go back to the HelloMapView 
+class. We'll start by creating one OverlayItem, adding to an instance of our HelloItemizedOverlay, 
+and then adding this to the MapView.</p>
+
+<img src="images/androidmarker.png" align="right" />
+<p>First, we need the image that we'll use for our map overlay. Here, we'll use the Android on the 
+right as our marker. Drag this image (or your own) to the res/drawable/ directory of your project workspace.</p>
+
+<p>Now we're ready to work in the HelloMapView:</p>
+
+<ol>
+   <li>First we need some more types. Add the following at the top of the HelloMapView class:
+
+<pre>
+List&lt;Overlay> mapOverlays;
+Drawable drawable;
+HelloItemizedOverlay itemizedOverlay;</pre></li>
+
+   <li>Now pick up where we left off in the <code>onCreate()</code> method. Instantiate the 
+   new fields:
+
+<pre>
+mapOverlays = mapView.getOverlays();
+drawable = this.getResources().getDrawable(R.drawable.androidmarker);
+itemizedoverlay = new HelloItemizedOverlay(drawable);</pre>
+
+      <p>All overlay elements on a map are held by the MapView, so when we want to add some, we must 
+      first retrieve the List with <code>getOverlays()</code> methods. We instantiate the Drawable, which will 
+      be used as our map marker, by using our Context resources to get the Drawable we placed in 
+      the res/drawable/ directory (androidmarker.png). Our HelloItemizedOverlay takes the Drawable in order to set the 
+      default marker.</p></li>
+
+   <li>Now let's make our first OverlayItem by creating a GeoPoint
+    that defines our map coordinates, then pass it to a new OverlayItem:
+
+<pre>
+GeoPoint point = new GeoPoint(19240000,-99120000);
+OverlayItem overlayitem = new OverlayItem(point, "", "");</pre>
+
+      <p>GeoPoint coordinates are based in microdegrees (degrees * 1e6). The OverlayItem takes this 
+      GeoPoint and two strings. Here, we won't concern ourselves with the strings, which can display 
+      text when we click our marker, because we haven't yet written the click handler for the OverlayItem.</p></li>
+
+   <li>All that's left is for us to add this OverlayItem to our collection in the HelloItemizedOverlay, 
+   and add this to the List of Overlay objects retrieved from the MapView:
+
+<pre>
+itemizedoverlay.addOverlay(overlayitem);
+mapOverlays.add(itemizedoverlay);</pre></li>
+
+   <li>Run it!</li>
+</ol>
+
+<p>We've sent our droid to Mexico City. Hola, Mundo!</p>
+<p>You should see the following:</p>
+<img src="images/hello-mapview.png" width="150px" />
+
+<p>Because we created our ItemizedOverlay class with an ArrayList, we can continue adding new
+OverlayItems. Try adding another one. Before the <code>addOverlay()</code> method is called, add these lines:</p>
+<pre>
+GeoPoint point2 = new GeoPoint(35410000, 139460000);
+OverlayItem overlayitem2 = new OverlayItem(point2, "", "");
+</pre>
+<p>Run it again... We've sent a new droid to Tokyo. Sekai, konichiwa!</p>
+
diff --git a/docs/html/guide/tutorials/views/hello-relativelayout.jd b/docs/html/guide/tutorials/views/hello-relativelayout.jd
new file mode 100644
index 0000000..1b91537
--- /dev/null
+++ b/docs/html/guide/tutorials/views/hello-relativelayout.jd
@@ -0,0 +1,75 @@
+page.title=Hello, RelativeLayout
+parent.title=Hello, Views
+parent.link=index.html
+@jd:body
+
+<p>A {@link android.widget.RelativeLayout} is a ViewGroup that allows you to layout child elements
+in positions relative to the parent or siblings elements.</p>
+
+<ol>
+  <li>Start a new project/Activity called HelloRelativeLayout.</li>
+  <li>Open the layout file. Make it like so:
+<pre>
+&lt;?xml version="1.0" encoding="utf-8"?>
+&lt;RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+
+    &lt;TextView
+        android:id="@+id/label"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="Type here:"/>
+
+    &lt;EditText
+        android:id="@+id/entry"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:drawable/editbox_background"
+        android:layout_below="@id/label"/>
+
+    &lt;Button
+        android:id="@+id/ok"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/entry"
+        android:layout_alignParentRight="true"
+        android:layout_marginLeft="10dip"
+        android:text="OK" />
+
+    &lt;Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toLeftOf="@id/ok"
+        android:layout_alignTop="@id/ok"
+        android:text="Cancel" />
+
+&lt;/RelativeLayout>
+</pre>
+<p>Pay attention to each of the additional <code>layout_*</code> attributes (besides the 
+usual width and height, which are required for all elements). When using relative layout,
+we use attributes like <code>layout_below</code> and <code>layout_toLeftOf</code> to describe
+how we'd like to position each View. Naturally, these are different relative positions, and the
+value of the attribute is the id of the element we want the position relative to.</p>
+</li>
+<li>Make sure your Activity loads this layout in the <code>onCreate()</code> method:</p>
+<pre>
+public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.main);
+}
+</pre>
+<p><code>R.layout.main</code> refers to the <code>main.xml</code> layout file.</p>
+</li>
+<li>Run it.</li>
+</ol>
+<p>You should see the following:</p>
+<img src="images/hello-relativelayout.png" width="150px" />
+
+<h3>Resources</h3>
+<ul>
+  <li>{@link android.widget.RelativeLayout}</li>
+  <li>{@link android.widget.TextView}</li>
+  <li>{@link android.widget.EditText}</li>
+  <li>{@link android.widget.Button}</li>
+</ul>
diff --git a/docs/html/guide/tutorials/views/hello-spinner.jd b/docs/html/guide/tutorials/views/hello-spinner.jd
new file mode 100644
index 0000000..3a04214
--- /dev/null
+++ b/docs/html/guide/tutorials/views/hello-spinner.jd
@@ -0,0 +1,106 @@
+page.title=Hello, Spinner
+parent.title=Hello, Views
+parent.link=index.html
+@jd:body
+
+<p>A {@link android.widget.Spinner} is a widget that allows the user to select an item from a group.
+It is similar to a dropdown list and will allow scrolling when the 
+list exceeds the available vertical space on the screen.</p>
+
+
+<ol>
+  <li>Start a new project/Activity called HelloSpinner.</li>
+  <li>Open the layout file.
+    Make it like so:
+<pre>
+&lt;?xml version="1.0" encoding="utf-8"?>
+&lt;LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:padding="10dip"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content">
+
+    &lt;TextView
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dip"
+        android:text="Please select a planet:"
+    />
+
+    &lt;Spinner 
+        android:id="@+id/spinner"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:drawSelectorOnTop="true"
+        android:prompt="@string/planet_prompt"
+    />
+
+&lt;/LinearLayout>
+</pre>
+	<p>Notice that the Spinner's <code>android:prompt</code> is a string resource. In
+        this case, Android does not allow it to be a string, it must be a reference to a resource. 
+        So...</p>
+</li>
+
+<li>Open the strings.xml file in res/values/ and add the following <code>&lt;string></code> 
+element inside the <code>&lt;resources></code> element:
+<pre>
+&lt;string name="planet_prompt">Choose a planet&lt;/string>
+</pre>
+</li>
+
+<li>Create a new XML file in res/values/ called arrays.xml. Insert the following:
+<pre>
+&lt;resources>
+
+    &lt;string-array name="planets">
+        &lt;item>Mercury&lt;/item>
+        &lt;item>Venus&lt;/item>
+        &lt;item>Earth&lt;/item>
+        &lt;item>Mars&lt;/item>
+        &lt;item>Jupiter&lt;/item>
+        &lt;item>Saturn&lt;/item>
+        &lt;item>Uranus&lt;/item>
+        &lt;item>Neptune&lt;/item>
+    &lt;/string-array>
+    
+&lt;/resources>
+</pre>
+	<p>This is the list of items (planets) that the user can select from in the Spinner widget.</p>
+</li>
+
+<li>Now open the HelloSpinner.java file. Insert the following code into the HelloSpinner class:
+<pre>
+&#64;Override
+public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.main);
+
+    Spinner s = (Spinner) findViewById(R.id.spinner);
+    ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(
+            this, R.array.planets, android.R.layout.simple_spinner_item);
+    adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+    s.setAdapter(adapter);
+}
+</pre>
+	<p>That's it. We start by creating a Spinner from our layout. We then create an {@link android.widget.ArrayAdapter} 
+	that binds each element of our string array to a layout view&mdash;we pass <code>createFromResource</code> our Context, 
+	the array of selectable items and the type of layout we'd like each one bound to. We then call
+	<code>setDropDownViewResource()</code> to define the type of layout in which to present the 
+	entire collection. Finally, we set this Adapter to associate with our Spinner, 
+        so the string items have a place to go.</p>
+</li>
+
+<li>Now run it.</li>
+</ol>
+<p>It should look like this:</p>
+<img src="images/hello-spinner.png" width="150px" />
+
+
+<h3>Resources</h3>
+<ul>
+	<li>{@link android.R.layout}</li>
+	<li>{@link android.widget.ArrayAdapter}</li>
+	<li>{@link android.widget.Spinner}</li>
+</ul>
+
diff --git a/docs/html/guide/tutorials/views/hello-tablelayout.jd b/docs/html/guide/tutorials/views/hello-tablelayout.jd
new file mode 100644
index 0000000..83d6f5d
--- /dev/null
+++ b/docs/html/guide/tutorials/views/hello-tablelayout.jd
@@ -0,0 +1,118 @@
+page.title=Hello, TableLayout
+parent.title=Hello, Views
+parent.link=index.html
+@jd:body
+
+<p>A {@link android.widget.TableLayout} is a ViewGroup that 
+will lay child View elements into rows and columns.</p>
+
+
+<ol>
+  <li>Start a new project/Activity called HelloTableLayout.</li>
+  <li>Open the layout file.
+    Make it like so:
+<pre>
+&lt;?xml version="1.0" encoding="utf-8"?>
+&lt;TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:stretchColumns="1">
+
+    &lt;TableRow>
+        &lt;TextView
+            android:layout_column="1"
+            android:text="Open..."
+            android:padding="3dip" />
+        &lt;TextView
+            android:text="Ctrl-O"
+            android:gravity="right"
+            android:padding="3dip" />
+    &lt;/TableRow>
+
+    &lt;TableRow>
+        &lt;TextView
+            android:layout_column="1"
+            android:text="Save..."
+            android:padding="3dip" />
+        &lt;TextView
+            android:text="Ctrl-S"
+            android:gravity="right"
+            android:padding="3dip" />
+    &lt;/TableRow>
+
+    &lt;TableRow>
+        &lt;TextView
+            android:layout_column="1"
+            android:text="Save As..."
+            android:padding="3dip" />
+        &lt;TextView
+            android:text="Ctrl-Shift-S"
+            android:gravity="right"
+            android:padding="3dip" />
+    &lt;/TableRow>
+
+    &lt;View
+        android:layout_height="2dip"
+        android:background="#FF909090" />
+
+    &lt;TableRow>
+        &lt;TextView
+            android:text="X"
+            android:padding="3dip" />
+        &lt;TextView
+            android:text="Import..."
+            android:padding="3dip" />
+    &lt;/TableRow>
+
+    &lt;TableRow>
+        &lt;TextView
+            android:text="X"
+            android:padding="3dip" />
+        &lt;TextView
+            android:text="Export..."
+            android:padding="3dip" />
+        &lt;TextView
+            android:text="Ctrl-E"
+            android:gravity="right"
+            android:padding="3dip" />
+    &lt;/TableRow>
+
+    &lt;View
+        android:layout_height="2dip"
+        android:background="#FF909090" />
+
+    &lt;TableRow>
+        &lt;TextView
+            android:layout_column="1"
+            android:text="Quit"
+            android:padding="3dip" />
+    &lt;/TableRow>
+&lt;/TableLayout>
+</pre>
+<p>Notice how this resembles the structure of an HTML table. <code>TableLayout</code> is like the
+<code>table</code> element; <code>TableRow</code> is like a <code>tr</code> element; but for our cells like
+the html <code>td</code> element, we can use any kind of View. Here, we use <code>TextView</code> for the cells.</p>
+
+</li>
+<li>Make sure your Activity loads this layout in the <code>onCreate()</code> method:
+<pre>
+public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.main);
+}
+</pre>
+<p><code>R.layout.main</code> refers to the <code>main.xml</code> layout file.</p>
+</li>
+<li>Run it.</li>
+</ol>
+<p>You should see the following:</p>
+<img src="images/hello-tablelayout.png" width="150px" />
+
+<h3>References</h3>
+<ul>
+  <li>{@link android.widget.TableLayout}</li>
+  <li>{@link android.widget.TableRow}</li>
+  <li>{@link android.widget.TextView}</li>
+</ul>
+
+
diff --git a/docs/html/guide/tutorials/views/hello-tabwidget.jd b/docs/html/guide/tutorials/views/hello-tabwidget.jd
new file mode 100644
index 0000000..8424616
--- /dev/null
+++ b/docs/html/guide/tutorials/views/hello-tabwidget.jd
@@ -0,0 +1,124 @@
+page.title=Hello, TabWidget
+parent.title=Hello, Views
+parent.link=index.html
+@jd:body
+
+<p>A {@link android.widget.TabWidget} offers the ability to easily draw an interface that uses
+tabs to navigate between different views.</p>
+
+<ol>
+  <li>Start a new project/Activity called HelloTabWidget.</li>
+  <li>Open the layout file and make it like so:</li>
+  <pre>
+&lt;?xml version="1.0" encoding="utf-8"?>
+&lt;TabHost xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/tabhost"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+    &lt;LinearLayout
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent">
+        &lt;TabWidget
+            android:id="@android:id/tabs"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content" />
+        &lt;FrameLayout
+            android:id="@android:id/tabcontent"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent">
+            &lt;TextView 
+                android:id="@+id/textview1"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent" 
+                android:text="this is a tab" />
+            &lt;TextView 
+                android:id="@+id/textview2"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent" 
+                android:text="this is another tab" />
+            &lt;TextView 
+                android:id="@+id/textview3"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent" 
+                android:text="this is a third tab" />
+    	&lt;/FrameLayout>
+    &lt;/LinearLayout>
+&lt;/TabHost>
+</pre>
+    <p>Here, we've created a {@link android.widget.TabHost} that contains the entire layout of the Activity.
+    A TabHost requires two descendant elements: a {@link android.widget.TabWidget} and a {@link android.widget.FrameLayout}.
+    In order to properly layout these elements, we've put them inside a vertical {@link android.widget.LinearLayout}.
+    The FrameLayout is where we keep the content that will change with each tab. Each child in the FrameLayout will
+    be associated with a different tab.
+    In this case, each tab simply shows a different {@link android.widget.TextView} with some text. </p>
+    <p>Notice that the TabWidget and the FrameLayout elements have specific <code>android</code> namespace IDs. These are necessary
+    so that the TabHost can automatically retireve references to them, populate the TabWidget with the tabs that we'll define
+    in our code, and swap the views in the FrameLayout. We've also defined our own IDs for each TextView, which we'll use to 
+    associate each tab with the view that it should reveal.</p>
+    <p>Of course, you can 
+    make these child views as large as complex as you'd like &mdash; instead of the TextView elements, 
+    you could start with other layout views and build a unique layout hierarchy for each tab.</p>
+  </li>
+  <li>Now we'll add our code. Open HelloTabWidget.java and make it a <code>TabActivity</code>.
+    <p>By default, Eclipse creates a class that extends <code>Activity</code>. Change it to 
+    extend <code>TabActivity</code>:</p>
+    <pre>
+public class HelloTabWidget extends TabActivity {
+</pre>  
+  </li>
+  <li>Now fill in the the <code>onCreate</code> method like this:
+  <pre>
+public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.main);
+
+    mTabHost = getTabHost();
+    
+    mTabHost.addTab(mTabHost.newTabSpec("tab_test1").setIndicator("TAB 1").setContent(R.id.textview1));
+    mTabHost.addTab(mTabHost.newTabSpec("tab_test2").setIndicator("TAB 2").setContent(R.id.textview2));
+    mTabHost.addTab(mTabHost.newTabSpec("tab_test3").setIndicator("TAB 3").setContent(R.id.textview3));
+    
+    mTabHost.setCurrentTab(0);
+}
+</pre>
+    <p>As usual, we start by setting our layout.</p>
+    <p>We then call the TabActivity method <code>getTabHost()</code>,
+    which returns us a reference to the TabHost we created in our layout. Upon our TabHost, we call <code>addTab()</code>
+    for each of the tabs that we want to add to the TabWidget. Each time we call this, we pass a 
+    {@link android.widget.TabHost.TabSpec} that we build on the fly, and with it, chain together two necessary methods:
+    <code>setIndicator()</code> to set the text for the tab button, and <code>setContent()</code> to define
+    which View we want to associate with the tab and reveal when pressed. Our indicator is just a text string and 
+    our content is an ID reference to the TextView elements we inserted in the FrameLayout.</p>
+    <p>At the end, we call <code>setCurrentTab()</code> to define which tab should be opened by default. The tabs
+    are saved like a zero-based array, so to open the first tab, we pass zero (<var>0</var>).</p>
+  </li>
+  <li>To clean-up the presentation a bit more, let's remove the window title that appears at the top of the layout.
+  Android includes a theme that removes that title for us. To add it, open the Android Manifest file and add
+  the <var>NoTitleBar</var> theme to the <code>&lt;application></code> tag. It should end up like this:
+    <pre>
+&lt;application android:icon="&#64;drawable/icon" android:theme="&#64;android:style/Theme.NoTitleBar">
+</pre>
+  </li>
+  <li>That's it. Run your application.</li>
+
+</ol>
+
+
+<p>Your application should look like this:</p>
+<img src="images/hello-tabwidget.png" width="150px" />
+
+<div class="special"><p>You can include icons in your tabs by passing a 
+{@link android.graphics.drawable.Drawable} when you call <code>setIndicator()</code>. Here's an example
+that uses a Drawable created from an image in the project resources:</p>
+<pre>setIndicator("TAB 1", getResources().getDrawable(R.drawable.tab_icon))</pre>
+</div>
+
+<h3>References</h3>
+<ul>
+<li>{@link android.widget.TabWidget}</li>
+<li>{@link android.widget.TabHost}</li>
+<li>{@link android.widget.TabHost.TabSpec}</li>
+<li>{@link android.widget.FrameLayout}</li>
+</ul>
+
diff --git a/docs/html/guide/tutorials/views/hello-timepicker.jd b/docs/html/guide/tutorials/views/hello-timepicker.jd
new file mode 100644
index 0000000..1a6c8f9
--- /dev/null
+++ b/docs/html/guide/tutorials/views/hello-timepicker.jd
@@ -0,0 +1,159 @@
+page.title=Hello, TimePicker
+parent.title=Hello, Views
+parent.link=index.html
+@jd:body
+
+<p>A {@link android.widget.TimePicker} is a widget that allows the 
+user to select the time by hour, minute and AM or PM.</p>
+
+
+<ol>
+  <li>Start a new project/Activity called HelloTimePicker.</li>
+  <li>Open the layout file and make it like so:
+    <pre>
+&lt;?xml version="1.0" encoding="utf-8"?>
+&lt;LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    &lt;TextView android:id="@+id/timeDisplay"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text=""/>
+
+    &lt;Button android:id="@+id/pickTime"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Change the time"/>
+
+&lt;/LinearLayout>
+</pre>
+	<p>For the layout, we're using a vertical LinearLayout, with a {@link android.widget.TextView} that
+	will display the time and a {@link android.widget.Button} that will initiate the 
+        {@link android.widget.TimePicker} dialog.
+	With this layout, the TextView will sit above the Button.
+	The text value in the TextView is set empty, as it will be filled by our Activity
+	with the current time.</p>
+    </li> 
+
+  <li>Open HelloTimePicker.java. Insert the following to the HelloTimePicker class:
+<pre>
+private TextView mTimeDisplay;
+private Button mPickTime;
+
+private int mHour;
+private int mMinute;
+
+static final int TIME_DIALOG_ID = 0;
+
+&#64;Override
+protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.main);
+    
+    // capture our View elements
+    mTimeDisplay = (TextView) findViewById(R.id.timeDisplay);
+    mPickTime = (Button) findViewById(R.id.pickTime);
+
+    // add a click listener to the button
+    mPickTime.setOnClickListener(new View.OnClickListener() {
+        public void onClick(View v) {
+            showDialog(TIME_DIALOG_ID);
+        }
+    });
+
+    // get the current time
+    final Calendar c = Calendar.getInstance();
+    mHour = c.get(Calendar.HOUR_OF_DAY);
+    mMinute = c.get(Calendar.MINUTE);
+
+    // display the current date
+    updateDisplay();
+}
+</pre>
+<p class="note"><strong>Tip:</strong> Press Ctrl(or Cmd) + Shift + O to import all needed packages.</p>
+        <p>We start by instantiating variables for our View elements and time fields.
+	The <code>TIME_DIALOG_ID</code> is a static integer that uniquely identifies the dialog. In the
+	<code>onCreate()</code> method, we get prepared by setting the layout and capturing the View elements. 
+	We then set an on-click listener for the Button, so that when it is clicked, it will
+	show our TimePicker dialog. The <code>showDialog()</code> method will perform a callback
+	to our Activity. (We'll define this callback in the next section.) We then create an
+	instance of {@link java.util.Calendar} and get the current hour and minute. Finally, we call 
+	<code>updateDisplay()</code>&mdash;our own method that will fill the TextView with the time.</p>
+</li>
+
+<li>After the <code>onCreate()</code> method, add the <code>onCreateDialog()</code> callback method:
+<pre>
+&#64;Override
+protected Dialog onCreateDialog(int id) {
+    switch (id) {
+    case TIME_DIALOG_ID:
+        return new TimePickerDialog(this,
+                mTimeSetListener, mHour, mMinute, false);
+    }
+    return null;
+}
+</pre>
+	<p>This is passed the identifier we gave <code>showDialog()</code> and initializes
+	the TimePicker to the time we retrieved from our Calendar instance. It will be called by 
+        <code>showDialog()</code>.</p>
+</li>
+
+<li>Now add our <code>updateDisplay()</code> method:
+<pre>
+// updates the time we display in the TextView
+private void updateDisplay() {
+    mTimeDisplay.setText(
+        new StringBuilder()
+                .append(pad(mHour)).append(":")
+                .append(pad(mMinute)));
+}
+</pre>
+	<p>This simply takes our member fields for the time and inserts them in 
+	the <code>mTimeDisplay</code> TextView. Note that we call a new method, <code>pad()</code>,
+	on the hour and minute. (We'll create this method in the last step.)</p>
+</li>
+
+<li>Next, add a listener to be called when the time is reset:
+<pre>
+// the callback received when the user "sets" the time in the dialog
+private TimePickerDialog.OnTimeSetListener mTimeSetListener =
+    new TimePickerDialog.OnTimeSetListener() {
+        public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
+            mHour = hourOfDay;
+            mMinute = minute;
+            updateDisplay();
+        }
+    };
+</pre>
+	<p>Now when the user is done setting the time (clicks the "Set" button), we update our member fields with
+	the new time and update our TextView.</p>
+</li>
+<li>Finally, add the <code>pad()</code> method that we called from the <code>updateDisplay()</code>:
+<pre>
+private static String pad(int c) {
+    if (c >= 10)
+        return String.valueOf(c);
+    else
+        return "0" + String.valueOf(c);
+}
+</pre>
+	<p>This method returns the appropriate String representation of the hour or minute.
+	It will prefix a zero to the number if it's a single digit.
+  	</p>
+</li>
+
+<li>Now run it.</li>
+</ol>
+<p>When you press the "Change the time" button, you should see the following:</p>
+<img src="images/hello-timepicker.png" width="150px" />
+
+<h3>References</h3>
+<ol>
+  <li>{@link android.widget.TimePicker}</li>
+  <li>{@link android.widget.Button}</li>
+  <li>{@link android.widget.TextView}</li>
+  <li>{@link java.util.Calendar}</li>
+</ol>
+
diff --git a/docs/html/guide/tutorials/views/hello-webview.jd b/docs/html/guide/tutorials/views/hello-webview.jd
new file mode 100644
index 0000000..c4388ea
--- /dev/null
+++ b/docs/html/guide/tutorials/views/hello-webview.jd
@@ -0,0 +1,118 @@
+page.title=Hello, WebView 
+parent.title=Hello, Views
+parent.link=index.html
+@jd:body
+
+<p>A {@link android.webkit.WebView} allows you to create your own web browser Activity. In this tutorial, 
+we'll create a simple Activity that can view web pages.</p>
+
+<ol>
+   <li>Create a new project/Activity called HelloWebView.</li>
+   <li>Open the layout file. Insert a WebView so it looks like so:
+<pre>
+&lt;?xml version="1.0" encoding="utf-8"?>
+&lt;LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    &lt;WebView 
+        android:id="@+id/webview"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+    />
+
+&lt;/LinearLayout>
+</pre></li>
+
+   <li>Now open the HelloWebView.java file.
+      At the top of the class, instantiate a WebView object:
+<pre>WebView webview;</pre>
+  <p> Then add the following  at the end of the <code>onCreate()</code> method:</p>
+<pre>
+webview = (WebView) findViewById(R.id.webview);
+webview.getSettings().setJavaScriptEnabled(true);
+webview.loadUrl("http://www.google.com");
+</pre>
+
+      <p>This captures the WebView we created in our layout, then requests a 
+	{@link android.webkit.WebSettings} object and enables JavaScript.
+	Then we load a URL.</p></li>
+
+   <li>Because we're accessing the internet, we need to add the appropriate 
+   permissions to the Android manifest file. So open the AndroidManifest.xml file 
+   and, add the following as a child of the <code>&lt;manifest></code> element:
+
+      <pre>&lt;uses-permission android:name="android.permission.INTERNET" /></pre></li>
+
+   <li>Now run it.</li>
+</ol>
+<p> You now have the world's simplest web page viewer.
+   It's not quite a browser yet. It only loads the page we've requested.</p>
+
+<hr/>
+
+<p>We can load a page, but as soon as we click a link, the default Android web browser 
+handles the Intent, instead of our own WebView handling the action. So now we'll 
+override the {@link android.webkit.WebViewClient} to enable us to handle our own URL loading.</p>
+
+<ol>
+   <li>In the HelloAndroid Activity, add this nested private class:
+<pre>
+private class HelloWebViewClient extends WebViewClient {
+    &#64;Override
+    public boolean shouldOverrideUrlLoading(WebView view, String url) {
+        view.loadUrl(url);
+        return true;
+    }
+}</pre></li>
+
+   <li>Now, in the <code>onCreate()</code> method, set an instance of the <code>HelloWebViewClient</code>
+   as our WebViewClient:
+      <pre>webview.setWebViewClient(new WebViewClientDemo());</pre>
+
+      <p>This line should immediately follow the initialization of our WebView object.</p>
+      <p>What we've done is create a WebViewClient that will load any URL selected in our
+WebView in the same WebView. You can see this in the <code>shouldOverrideUrlLoading()</code>
+method, above&mdash;it is passed the current WebView and the URL, so all we do
+is load the URL in the given view. Returning <var>true</var> says that we've handled the URL
+ourselves and the event should not bubble-up.</p>
+      <p>If you try it again, new pages will now load in the HelloWebView Activity. However, you'll notice that 
+we can't navigate back. We need to handle the back button 
+on the device, so that it will return to the previous page, rather than exit the application.</p>
+    </li>
+
+   <li>To handle the back button key press, add the following method inside the HelloWebView 
+Activity:
+<pre> 
+&#64;Override
+public boolean onKeyDown(int keyCode, KeyEvent event) {
+    if ((keyCode == KeyEvent.KEYCODE_BACK) && webview.canGoBack()) {
+        webview.goBack();
+        return true;
+    }
+    return super.onKeyDown(keyCode, event);
+}</pre>
+      <p>The condition uses a {@link android.view.KeyEvent} to check
+      whether the key pressed is the BACK button and whether the 
+      WebView is actually capable of navigating back (if it has a history). If both are 
+      <em>not</em> true, then we send the event up the chain (and the Activity will close). 
+      But if both <em>are</em> true, then we call <code>goBack()</code>, 
+      which will navigate back one step in the history. We then return true to indicate 
+      that we've handled the event.</p>
+</li>
+</ol>
+<p>When you open the application, it should look like this:</p>
+<img src="images/hello-webview.png" width="150px" />
+
+<h3>Resource</h3>
+<ul>
+<li>{@link android.webkit.WebView}</li>
+<li>{@link android.webkit.WebViewClient}</li>
+<li>{@link android.view.KeyEvent}</li>
+</ul>
+
+      
+
+
+
diff --git a/docs/html/guide/tutorials/views/images/android.png b/docs/html/guide/tutorials/views/images/android.png
new file mode 100755
index 0000000..39a1ac7
--- /dev/null
+++ b/docs/html/guide/tutorials/views/images/android.png
Binary files differ
diff --git a/docs/html/guide/tutorials/views/images/androidmarker.png b/docs/html/guide/tutorials/views/images/androidmarker.png
new file mode 100755
index 0000000..8c43d46
--- /dev/null
+++ b/docs/html/guide/tutorials/views/images/androidmarker.png
Binary files differ
diff --git a/docs/html/guide/tutorials/views/images/hello-autocomplete.png b/docs/html/guide/tutorials/views/images/hello-autocomplete.png
new file mode 100755
index 0000000..e1fd80d
--- /dev/null
+++ b/docs/html/guide/tutorials/views/images/hello-autocomplete.png
Binary files differ
diff --git a/docs/html/guide/tutorials/views/images/hello-datepicker.png b/docs/html/guide/tutorials/views/images/hello-datepicker.png
new file mode 100755
index 0000000..2075066
--- /dev/null
+++ b/docs/html/guide/tutorials/views/images/hello-datepicker.png
Binary files differ
diff --git a/docs/html/guide/tutorials/views/images/hello-formstuff.png b/docs/html/guide/tutorials/views/images/hello-formstuff.png
new file mode 100755
index 0000000..3b4bf54
--- /dev/null
+++ b/docs/html/guide/tutorials/views/images/hello-formstuff.png
Binary files differ
diff --git a/docs/html/guide/tutorials/views/images/hello-gallery.png b/docs/html/guide/tutorials/views/images/hello-gallery.png
new file mode 100755
index 0000000..22d1eaf
--- /dev/null
+++ b/docs/html/guide/tutorials/views/images/hello-gallery.png
Binary files differ
diff --git a/docs/html/guide/tutorials/views/images/hello-gridview.png b/docs/html/guide/tutorials/views/images/hello-gridview.png
new file mode 100755
index 0000000..2def0df
--- /dev/null
+++ b/docs/html/guide/tutorials/views/images/hello-gridview.png
Binary files differ
diff --git a/docs/html/guide/tutorials/views/images/hello-linearlayout.png b/docs/html/guide/tutorials/views/images/hello-linearlayout.png
new file mode 100755
index 0000000..dfef819
--- /dev/null
+++ b/docs/html/guide/tutorials/views/images/hello-linearlayout.png
Binary files differ
diff --git a/docs/html/guide/tutorials/views/images/hello-listview.png b/docs/html/guide/tutorials/views/images/hello-listview.png
new file mode 100755
index 0000000..a1cf7aa
--- /dev/null
+++ b/docs/html/guide/tutorials/views/images/hello-listview.png
Binary files differ
diff --git a/docs/html/guide/tutorials/views/images/hello-mapview.png b/docs/html/guide/tutorials/views/images/hello-mapview.png
new file mode 100755
index 0000000..0956760
--- /dev/null
+++ b/docs/html/guide/tutorials/views/images/hello-mapview.png
Binary files differ
diff --git a/docs/html/guide/tutorials/views/images/hello-relativelayout.png b/docs/html/guide/tutorials/views/images/hello-relativelayout.png
new file mode 100755
index 0000000..ec4d9d4
--- /dev/null
+++ b/docs/html/guide/tutorials/views/images/hello-relativelayout.png
Binary files differ
diff --git a/docs/html/guide/tutorials/views/images/hello-spinner.png b/docs/html/guide/tutorials/views/images/hello-spinner.png
new file mode 100755
index 0000000..42e2a91
--- /dev/null
+++ b/docs/html/guide/tutorials/views/images/hello-spinner.png
Binary files differ
diff --git a/docs/html/guide/tutorials/views/images/hello-tablelayout.png b/docs/html/guide/tutorials/views/images/hello-tablelayout.png
new file mode 100755
index 0000000..3d80e7f
--- /dev/null
+++ b/docs/html/guide/tutorials/views/images/hello-tablelayout.png
Binary files differ
diff --git a/docs/html/guide/tutorials/views/images/hello-tabwidget.png b/docs/html/guide/tutorials/views/images/hello-tabwidget.png
new file mode 100644
index 0000000..6a52356
--- /dev/null
+++ b/docs/html/guide/tutorials/views/images/hello-tabwidget.png
Binary files differ
diff --git a/docs/html/guide/tutorials/views/images/hello-timepicker.png b/docs/html/guide/tutorials/views/images/hello-timepicker.png
new file mode 100755
index 0000000..bd5a1ee
--- /dev/null
+++ b/docs/html/guide/tutorials/views/images/hello-timepicker.png
Binary files differ
diff --git a/docs/html/guide/tutorials/views/images/hello-webview.png b/docs/html/guide/tutorials/views/images/hello-webview.png
new file mode 100755
index 0000000..283ce7d
--- /dev/null
+++ b/docs/html/guide/tutorials/views/images/hello-webview.png
Binary files differ
diff --git a/docs/html/guide/tutorials/views/index.jd b/docs/html/guide/tutorials/views/index.jd
new file mode 100644
index 0000000..2248c68
--- /dev/null
+++ b/docs/html/guide/tutorials/views/index.jd
@@ -0,0 +1,118 @@
+page.title=Hello, Views
+@jd:body
+
+<style>
+.view {float:left; margin:10px; font-size:120%; font-weight:bold;}
+.view img {border:1px solid black; margin:5px 0 0; padding:5px;}
+</style>
+
+<p>This collection of "Hello World"-style tutorials is designed
+to get you quickly started with common Android Views and widgets. The aim is to let you copy and paste
+these kinds of boring bits so you can focus on developing the code that makes your Android application rock.
+Of course, we'll discuss some of the given code so that it all makes sense.</p>
+
+<p>Note that a certain amount of knowledge is assumed for these tutorials. If you haven't
+completed the <a href="{@docRoot}guide/tutorials/hello-world.html">Hello, World</a> tutorial, 
+please do so&mdash;it will teach you many things you should know about basic 
+Android development and Eclipse features. More specifically, you should know:</p>
+<ul>
+  <li>How to create a new Android project.</li>
+  <li>The basic structure of an Android project (resource files, layout files, etc.).</li>
+  <li>The essential components of an {@link android.app.Activity}.</li>
+  <li>How to build and run a project.</li>
+</ul>
+<p>Please, also notice that, in order to make these tutorials simple, some may
+not convey the better Android coding practices. In particular, many of them
+use hard-coded strings in the layout files&mdash;the better practice is to reference strings from
+your strings.xml file.</p>
+<p>With this knowledge, you're ready to begin, so take your pick.</p>
+
+<div>
+
+<div class="view">
+<a href="hello-linearlayout.html">LinearLayout</a><br/>
+<a href="hello-linearlayout.html"><img src="images/hello-linearlayout.png" height="285" width="200" /></a>
+</div>
+<div class="view">
+<a href="hello-relativelayout.html">RelativeLayout</a><br/>
+<a href="hello-relativelayout.html"><img src="images/hello-relativelayout.png" height="285" width="200" /></a>
+</div>
+<div class="view">
+<a href="hello-tablelayout.html">TableLayout</a><br/>
+<a href="hello-tablelayout.html"><img src="images/hello-tablelayout.png" height="285" width="200" /></a>
+</div>
+
+<div class="view">
+<a href="hello-datepicker.html">DatePicker</a><br/>
+<a href="hello-datepicker.html"><img src="images/hello-datepicker.png" height="285" width="200" /></a>
+</div>
+
+<div class="view">
+<a href="hello-timepicker.html">TimePicker</a><br/>
+<a href="hello-timepicker.html"><img src="images/hello-timepicker.png" height="285" width="200" /></a>
+</div>
+<div class="view">
+<a href="hello-formstuff.html">Form Stuff</a><br/>
+<a href="hello-formstuff.html"><img src="images/hello-formstuff.png" height="285" width="200" /></a>
+</div>
+<div class="view">
+<a href="hello-spinner.html">Spinner</a><br/>
+<a href="hello-spinner.html"><img src="images/hello-spinner.png" height="285" width="200" /></a>
+</div>
+
+<div class="view">
+<a href="hello-autocomplete.html">AutoComplete</a><br/>
+<a href="hello-autocomplete.html"><img src="images/hello-autocomplete.png" height="285" width="200" /></a>
+</div>
+<div class="view">
+<a href="hello-listview.html">ListView</a><br/>
+<a href="hello-listview.html"><img src="images/hello-listview.png" height="285" width="200" /></a>
+</div>
+<div class="view">
+<a href="hello-gridview.html">GridView</a><br/>
+<a href="hello-gridview.html"><img src="images/hello-gridview.png" height="285" width="200" /></a>
+</div>
+
+<div class="view">
+<a href="hello-gallery.html">Gallery</a><br/>
+<a href="hello-gallery.html"><img src="images/hello-gallery.png" height="285" width="200" /></a>
+</div>
+
+<div class="view">
+<a href="hello-tabwidget.html">TabWidget</a><br/>
+<a href="hello-tabwidget.html"><img src="images/hello-tabwidget.png" height="285" width="200" /></a>
+</div>
+
+<div class="view">
+<a href="hello-mapview.html">MapView</a><br/>
+<a href="hello-mapview.html"><img src="images/hello-mapview.png" height="285" width="200" /></a>
+</div>
+
+<div class="view">
+<a href="hello-webview.html">WebView</a><br/>
+<a href="hello-webview.html"><img src="images/hello-webview.png" height="285" width="200" /></a>
+</div>
+
+<!--
+TODO
+
+<div class="view">
+<a href="hello-popupwindow.html">PopupWindow<br/>
+<img src="images/hello-popupwindow.png" height="285" width="200" /></a>
+</div>
+<div class="view">
+<a href="hello-tabhost.html">TabHost / TabWidget<br/>
+<img src="images/hello-tabhost.png" height="285" width="200" /></a>
+</div>
+ProgressBar; RatingBar; FrameLayout
+
+-->
+
+<p class="note" style="clear:left">
+There are plenty more Views and widgets available. See the {@link android.view.View} class
+for more on View layouts, and the {@link android.widget widget package}
+for more useful widgets. And for more raw code samples, visit the 
+<a href="{@docRoot}guide/samples/ApiDemos/src/com/example/android/apis/view/index.html">Api Demos</a>.
+These can also be found offline, in <code>/&lt;sdk&gt;/samples/ApiDemos</code>.</p>
+</div>
+
diff --git a/docs/html/images/activity_lifecycle.png b/docs/html/images/activity_lifecycle.png
new file mode 100644
index 0000000..aafe493
--- /dev/null
+++ b/docs/html/images/activity_lifecycle.png
Binary files differ
diff --git a/docs/html/images/android_adc.gif b/docs/html/images/android_adc.gif
new file mode 100644
index 0000000..469a73a
--- /dev/null
+++ b/docs/html/images/android_adc.gif
Binary files differ
diff --git a/docs/html/images/android_icon_125.png b/docs/html/images/android_icon_125.png
new file mode 100644
index 0000000..f526193
--- /dev/null
+++ b/docs/html/images/android_icon_125.png
Binary files differ
diff --git a/docs/html/images/anr.png b/docs/html/images/anr.png
new file mode 100644
index 0000000..f6e16ef
--- /dev/null
+++ b/docs/html/images/anr.png
Binary files differ
diff --git a/docs/html/images/binder_rpc.png b/docs/html/images/binder_rpc.png
new file mode 100644
index 0000000..1021109
--- /dev/null
+++ b/docs/html/images/binder_rpc.png
Binary files differ
diff --git a/docs/html/images/content_uri.png b/docs/html/images/content_uri.png
new file mode 100644
index 0000000..1fb6d09
--- /dev/null
+++ b/docs/html/images/content_uri.png
Binary files differ
diff --git a/docs/html/images/designing_ui_layout_example.png b/docs/html/images/designing_ui_layout_example.png
new file mode 100644
index 0000000..7d90b31
--- /dev/null
+++ b/docs/html/images/designing_ui_layout_example.png
Binary files differ
diff --git a/docs/html/images/designing_ui_relative_layout.png b/docs/html/images/designing_ui_relative_layout.png
new file mode 100644
index 0000000..8e373a5
--- /dev/null
+++ b/docs/html/images/designing_ui_relative_layout.png
Binary files differ
diff --git a/docs/html/images/draw9patch-bad.png b/docs/html/images/draw9patch-bad.png
new file mode 100644
index 0000000..186d9ce
--- /dev/null
+++ b/docs/html/images/draw9patch-bad.png
Binary files differ
diff --git a/docs/html/images/draw9patch-norm.png b/docs/html/images/draw9patch-norm.png
new file mode 100644
index 0000000..0cba944
--- /dev/null
+++ b/docs/html/images/draw9patch-norm.png
Binary files differ
diff --git a/docs/html/images/e-mini-hvga-l.png b/docs/html/images/e-mini-hvga-l.png
new file mode 100644
index 0000000..f68853f
--- /dev/null
+++ b/docs/html/images/e-mini-hvga-l.png
Binary files differ
diff --git a/docs/html/images/e-mini-hvga-p.png b/docs/html/images/e-mini-hvga-p.png
new file mode 100644
index 0000000..3cf0db9
--- /dev/null
+++ b/docs/html/images/e-mini-hvga-p.png
Binary files differ
diff --git a/docs/html/images/e-mini-qvga-l.png b/docs/html/images/e-mini-qvga-l.png
new file mode 100644
index 0000000..3138b9f
--- /dev/null
+++ b/docs/html/images/e-mini-qvga-l.png
Binary files differ
diff --git a/docs/html/images/e-mini-qvga-p.png b/docs/html/images/e-mini-qvga-p.png
new file mode 100644
index 0000000..54f2cc1
--- /dev/null
+++ b/docs/html/images/e-mini-qvga-p.png
Binary files differ
diff --git a/docs/html/images/emulator-hvga-p.png b/docs/html/images/emulator-hvga-p.png
new file mode 100644
index 0000000..f3b8900
--- /dev/null
+++ b/docs/html/images/emulator-hvga-p.png
Binary files differ
diff --git a/docs/html/images/emulator.png b/docs/html/images/emulator.png
new file mode 100644
index 0000000..9c6860a
--- /dev/null
+++ b/docs/html/images/emulator.png
Binary files differ
diff --git a/docs/html/images/gradient_drawable.png b/docs/html/images/gradient_drawable.png
new file mode 100644
index 0000000..4ea846a
--- /dev/null
+++ b/docs/html/images/gradient_drawable.png
Binary files differ
diff --git a/docs/html/images/hello_world_0.png b/docs/html/images/hello_world_0.png
new file mode 100644
index 0000000..c174fba
--- /dev/null
+++ b/docs/html/images/hello_world_0.png
Binary files differ
diff --git a/docs/html/images/hello_world_1.png b/docs/html/images/hello_world_1.png
new file mode 100644
index 0000000..f08438a
--- /dev/null
+++ b/docs/html/images/hello_world_1.png
Binary files differ
diff --git a/docs/html/images/hello_world_2.png b/docs/html/images/hello_world_2.png
new file mode 100644
index 0000000..58f5703
--- /dev/null
+++ b/docs/html/images/hello_world_2.png
Binary files differ
diff --git a/docs/html/images/hello_world_3.png b/docs/html/images/hello_world_3.png
new file mode 100644
index 0000000..d2d2ff6
--- /dev/null
+++ b/docs/html/images/hello_world_3.png
Binary files differ
diff --git a/docs/html/images/hello_world_4.png b/docs/html/images/hello_world_4.png
new file mode 100644
index 0000000..5c41e80
--- /dev/null
+++ b/docs/html/images/hello_world_4.png
Binary files differ
diff --git a/docs/html/images/hello_world_5.png b/docs/html/images/hello_world_5.png
new file mode 100644
index 0000000..96b830a
--- /dev/null
+++ b/docs/html/images/hello_world_5.png
Binary files differ
diff --git a/docs/html/images/hello_world_8.png b/docs/html/images/hello_world_8.png
new file mode 100644
index 0000000..07db360
--- /dev/null
+++ b/docs/html/images/hello_world_8.png
Binary files differ
diff --git a/docs/html/images/hello_world_9.png b/docs/html/images/hello_world_9.png
new file mode 100644
index 0000000..3cb4436
--- /dev/null
+++ b/docs/html/images/hello_world_9.png
Binary files differ
diff --git a/docs/html/images/hierarchyviewer-layout.png b/docs/html/images/hierarchyviewer-layout.png
new file mode 100644
index 0000000..217f058
--- /dev/null
+++ b/docs/html/images/hierarchyviewer-layout.png
Binary files differ
diff --git a/docs/html/images/hierarchyviewer-pixelperfect.png b/docs/html/images/hierarchyviewer-pixelperfect.png
new file mode 100644
index 0000000..bce3673
--- /dev/null
+++ b/docs/html/images/hierarchyviewer-pixelperfect.png
Binary files differ
diff --git a/docs/html/images/icon_barriers.png b/docs/html/images/icon_barriers.png
new file mode 100644
index 0000000..73345ef
--- /dev/null
+++ b/docs/html/images/icon_barriers.png
Binary files differ
diff --git a/docs/html/images/icon_equal.png b/docs/html/images/icon_equal.png
new file mode 100644
index 0000000..5548de1
--- /dev/null
+++ b/docs/html/images/icon_equal.png
Binary files differ
diff --git a/docs/html/images/icon_fast.png b/docs/html/images/icon_fast.png
new file mode 100644
index 0000000..4962db9
--- /dev/null
+++ b/docs/html/images/icon_fast.png
Binary files differ
diff --git a/docs/html/images/icon_open.png b/docs/html/images/icon_open.png
new file mode 100644
index 0000000..0db4e8e
--- /dev/null
+++ b/docs/html/images/icon_open.png
Binary files differ
diff --git a/docs/html/images/layoutparams.png b/docs/html/images/layoutparams.png
new file mode 100644
index 0000000..7473dcc
--- /dev/null
+++ b/docs/html/images/layoutparams.png
Binary files differ
diff --git a/docs/html/images/like_thumb1.png b/docs/html/images/like_thumb1.png
new file mode 100644
index 0000000..098cfaf
--- /dev/null
+++ b/docs/html/images/like_thumb1.png
Binary files differ
diff --git a/docs/html/images/like_thumb2.png b/docs/html/images/like_thumb2.png
new file mode 100644
index 0000000..ef9d2d2
--- /dev/null
+++ b/docs/html/images/like_thumb2.png
Binary files differ
diff --git a/docs/html/images/like_thumb3.png b/docs/html/images/like_thumb3.png
new file mode 100644
index 0000000..543f2de
--- /dev/null
+++ b/docs/html/images/like_thumb3.png
Binary files differ
diff --git a/docs/html/images/like_thumb4.png b/docs/html/images/like_thumb4.png
new file mode 100644
index 0000000..1f5e7e4
--- /dev/null
+++ b/docs/html/images/like_thumb4.png
Binary files differ
diff --git a/docs/html/images/linearlayout.png b/docs/html/images/linearlayout.png
new file mode 100644
index 0000000..a1feb5c
--- /dev/null
+++ b/docs/html/images/linearlayout.png
Binary files differ
diff --git a/docs/html/images/logo_android.gif b/docs/html/images/logo_android.gif
new file mode 100644
index 0000000..0a84d1b
--- /dev/null
+++ b/docs/html/images/logo_android.gif
Binary files differ
diff --git a/docs/html/images/mediaplayer_state_diagram.gif b/docs/html/images/mediaplayer_state_diagram.gif
new file mode 100644
index 0000000..f1dcfb5
--- /dev/null
+++ b/docs/html/images/mediaplayer_state_diagram.gif
Binary files differ
diff --git a/docs/html/images/mediarecorder_state_diagram.gif b/docs/html/images/mediarecorder_state_diagram.gif
new file mode 100644
index 0000000..f2a08a7
--- /dev/null
+++ b/docs/html/images/mediarecorder_state_diagram.gif
Binary files differ
diff --git a/docs/html/images/ninepatch_examples.png b/docs/html/images/ninepatch_examples.png
new file mode 100644
index 0000000..bd64bfd
--- /dev/null
+++ b/docs/html/images/ninepatch_examples.png
Binary files differ
diff --git a/docs/html/images/ninepatch_raw.png b/docs/html/images/ninepatch_raw.png
new file mode 100644
index 0000000..80d8b69
--- /dev/null
+++ b/docs/html/images/ninepatch_raw.png
Binary files differ
diff --git a/docs/html/images/no_scrollview.png b/docs/html/images/no_scrollview.png
new file mode 100644
index 0000000..d1b4ee0
--- /dev/null
+++ b/docs/html/images/no_scrollview.png
Binary files differ
diff --git a/docs/html/images/notepad.png b/docs/html/images/notepad.png
new file mode 100644
index 0000000..01b0f6d
--- /dev/null
+++ b/docs/html/images/notepad.png
Binary files differ
diff --git a/docs/html/images/options_menu.png b/docs/html/images/options_menu.png
new file mode 100755
index 0000000..ecb9394
--- /dev/null
+++ b/docs/html/images/options_menu.png
Binary files differ
diff --git a/docs/html/images/padding_margins.png b/docs/html/images/padding_margins.png
new file mode 100644
index 0000000..4b2a576
--- /dev/null
+++ b/docs/html/images/padding_margins.png
Binary files differ
diff --git a/docs/html/images/radio_buttons.png b/docs/html/images/radio_buttons.png
new file mode 100755
index 0000000..b755e42
--- /dev/null
+++ b/docs/html/images/radio_buttons.png
Binary files differ
diff --git a/docs/html/images/service_lifecycle.png b/docs/html/images/service_lifecycle.png
new file mode 100644
index 0000000..0748db2
--- /dev/null
+++ b/docs/html/images/service_lifecycle.png
Binary files differ
diff --git a/docs/html/images/setting_width_and_height.png b/docs/html/images/setting_width_and_height.png
new file mode 100644
index 0000000..ac9e6b8
--- /dev/null
+++ b/docs/html/images/setting_width_and_height.png
Binary files differ
diff --git a/docs/html/images/system-architecture.jpg b/docs/html/images/system-architecture.jpg
new file mode 100644
index 0000000..8831483
--- /dev/null
+++ b/docs/html/images/system-architecture.jpg
Binary files differ
diff --git a/docs/html/images/table_layout.png b/docs/html/images/table_layout.png
new file mode 100644
index 0000000..e7fae2d
--- /dev/null
+++ b/docs/html/images/table_layout.png
Binary files differ
diff --git a/docs/html/images/tracedump.png b/docs/html/images/tracedump.png
new file mode 100644
index 0000000..53036ae
--- /dev/null
+++ b/docs/html/images/tracedump.png
Binary files differ
diff --git a/docs/html/images/traceview_profile.png b/docs/html/images/traceview_profile.png
new file mode 100644
index 0000000..fbb4d68
--- /dev/null
+++ b/docs/html/images/traceview_profile.png
Binary files differ
diff --git a/docs/html/images/traceview_timeline.png b/docs/html/images/traceview_timeline.png
new file mode 100644
index 0000000..8ebcaba
--- /dev/null
+++ b/docs/html/images/traceview_timeline.png
Binary files differ
diff --git a/docs/html/images/video_thumb_dan.png b/docs/html/images/video_thumb_dan.png
new file mode 100644
index 0000000..85231d7
--- /dev/null
+++ b/docs/html/images/video_thumb_dan.png
Binary files differ
diff --git a/docs/html/images/video_thumb_mike.png b/docs/html/images/video_thumb_mike.png
new file mode 100644
index 0000000..87daf21
--- /dev/null
+++ b/docs/html/images/video_thumb_mike.png
Binary files differ
diff --git a/docs/html/images/viewgroup.png b/docs/html/images/viewgroup.png
new file mode 100644
index 0000000..a4c2518
--- /dev/null
+++ b/docs/html/images/viewgroup.png
Binary files differ
diff --git a/docs/html/images/views_autocomplete.png b/docs/html/images/views_autocomplete.png
new file mode 100644
index 0000000..9e9b69c
--- /dev/null
+++ b/docs/html/images/views_autocomplete.png
Binary files differ
diff --git a/docs/html/images/views_controls_example2.png b/docs/html/images/views_controls_example2.png
new file mode 100644
index 0000000..198d848
--- /dev/null
+++ b/docs/html/images/views_controls_example2.png
Binary files differ
diff --git a/docs/html/images/views_datewidgets_example1_pickdate.png b/docs/html/images/views_datewidgets_example1_pickdate.png
new file mode 100644
index 0000000..581a80f
--- /dev/null
+++ b/docs/html/images/views_datewidgets_example1_pickdate.png
Binary files differ
diff --git a/docs/html/images/views_datewidgets_example1_picktime.png b/docs/html/images/views_datewidgets_example1_picktime.png
new file mode 100644
index 0000000..7d91665
--- /dev/null
+++ b/docs/html/images/views_datewidgets_example1_picktime.png
Binary files differ
diff --git a/docs/html/images/views_gallery_example1.png b/docs/html/images/views_gallery_example1.png
new file mode 100644
index 0000000..103fad8
--- /dev/null
+++ b/docs/html/images/views_gallery_example1.png
Binary files differ
diff --git a/docs/html/images/views_grid_example2.png b/docs/html/images/views_grid_example2.png
new file mode 100644
index 0000000..16590b7
--- /dev/null
+++ b/docs/html/images/views_grid_example2.png
Binary files differ
diff --git a/docs/html/images/views_image_switcher.png b/docs/html/images/views_image_switcher.png
new file mode 100644
index 0000000..601e123
--- /dev/null
+++ b/docs/html/images/views_image_switcher.png
Binary files differ
diff --git a/docs/html/images/views_imagebutton_example1.png b/docs/html/images/views_imagebutton_example1.png
new file mode 100644
index 0000000..a6bb81b
--- /dev/null
+++ b/docs/html/images/views_imagebutton_example1.png
Binary files differ
diff --git a/docs/html/images/views_layouts_linearlayout_example1.png b/docs/html/images/views_layouts_linearlayout_example1.png
new file mode 100644
index 0000000..2c201f6
--- /dev/null
+++ b/docs/html/images/views_layouts_linearlayout_example1.png
Binary files differ
diff --git a/docs/html/images/views_layouts_linearlayout_example7.png b/docs/html/images/views_layouts_linearlayout_example7.png
new file mode 100644
index 0000000..f8e4770
--- /dev/null
+++ b/docs/html/images/views_layouts_linearlayout_example7.png
Binary files differ
diff --git a/docs/html/images/views_layouts_relativelayout_example2.png b/docs/html/images/views_layouts_relativelayout_example2.png
new file mode 100644
index 0000000..395ecb9
--- /dev/null
+++ b/docs/html/images/views_layouts_relativelayout_example2.png
Binary files differ
diff --git a/docs/html/images/views_layouts_tablelayout_example10.png b/docs/html/images/views_layouts_tablelayout_example10.png
new file mode 100644
index 0000000..2f96fa2
--- /dev/null
+++ b/docs/html/images/views_layouts_tablelayout_example10.png
Binary files differ
diff --git a/docs/html/images/views_layouts_tablelayout_spanning.png b/docs/html/images/views_layouts_tablelayout_spanning.png
new file mode 100644
index 0000000..143ce34
--- /dev/null
+++ b/docs/html/images/views_layouts_tablelayout_spanning.png
Binary files differ
diff --git a/docs/html/images/views_lists_example1.png b/docs/html/images/views_lists_example1.png
new file mode 100644
index 0000000..067d247
--- /dev/null
+++ b/docs/html/images/views_lists_example1.png
Binary files differ
diff --git a/docs/html/images/views_spinner.png b/docs/html/images/views_spinner.png
new file mode 100644
index 0000000..99513a3
--- /dev/null
+++ b/docs/html/images/views_spinner.png
Binary files differ
diff --git a/docs/html/images/zippy_bullet.gif b/docs/html/images/zippy_bullet.gif
new file mode 100644
index 0000000..e06601f
--- /dev/null
+++ b/docs/html/images/zippy_bullet.gif
Binary files differ
diff --git a/docs/html/images/zippy_closed.gif b/docs/html/images/zippy_closed.gif
new file mode 100644
index 0000000..7f25fcd
--- /dev/null
+++ b/docs/html/images/zippy_closed.gif
Binary files differ
diff --git a/docs/html/images/zippy_open.gif b/docs/html/images/zippy_open.gif
new file mode 100644
index 0000000..e14f0f9
--- /dev/null
+++ b/docs/html/images/zippy_open.gif
Binary files differ
diff --git a/docs/html/index.jd b/docs/html/index.jd
new file mode 100644
index 0000000..bd681e2
--- /dev/null
+++ b/docs/html/index.jd
@@ -0,0 +1,157 @@
+home=true
+@jd:body
+
+
+	<div id="mainBodyFixed">
+              <div id="mainBodyLeft">			
+                    <div id="homeMiddle">
+                        <div id="homeTitle">
+                            <h2>Developer Announcements</h2>
+                        </div><!-- end homeTitle -->
+                        <div id="announcement-block">
+                        <!-- total max width is 520px -->
+                            <img src="{@docRoot}assets/images/home/IO-logo.png" alt="Google I/O Developer Conference 2009" width="242px" />
+                            <div id="announcement" style="width:270px">
+                              <p>Google I/O is a two-day developer event that will take place May 27-28 at Moscone Center, San Francisco.</p>
+                              <p><a href="http://code.google.com/events/io/">Learn more &raquo;</a></p>
+                            </div> <!-- end annoucement -->
+                        </div> <!-- end annoucement-block -->
+                        <div id="carouselMain">
+                            <div id="bulletinImg"></div>
+                            <div id="bulletinDesc"></div>
+                        </div>
+                        <div class="clearer"></div>
+                        <div class="app-list-container" align="center"> 
+                            <a href="javascript:{}" id="arrow-left" onclick="" class="arrow-left-off"></a>
+                            <div id="list-clip">
+                                <div style="left: 0px;" id="app-list">
+                                  <!-- populated by buildCarousel() -->
+                                </div>
+                            </div><!-- end list-clip -->
+                            <a href="javascript:page_right()" id="arrow-right" onclick="" class="arrow-right-on"></a>
+                            <div class="clearer"></div>
+                        </div><!-- end app-list container -->
+                    </div><!-- end homeMiddle -->
+
+                    <div style="clear:both">&nbsp;</div>
+              </div><!-- end mainBodyLeft -->
+
+              <div id="mainBodyRight">
+                      <table id="rightColumn">
+                              <tr>
+                                      <td class="imageCell"><a href="{@docRoot}sdk/index.html"><img src="{@docRoot}assets/images/icon_download.jpg" style="padding:0" /></a></td>
+                                      <td>
+                                              <h2 class="green">Download</h2>
+                                              <p>The Android SDK has the tools, sample code, and docs you need to create great apps.  </p>
+                                              <p><a href="{@docRoot}sdk/1.1_r1/index.html">Learn more &raquo;</a></p>
+                                      </td>
+                              </tr>
+                              <tr>
+                                      <td colspan="2"><div class="seperator">&nbsp;</div></td>
+                              </tr>
+                              <tr>
+                                      <td class="imageCell"><a href="http://www.android.com/market.html"><img src="{@docRoot}assets/images/icon_market.jpg" style="padding:0" /></a></td>
+                                      <td>
+                                              <h2 class="green">Publish</h2>
+                                              <p>Android Market is an open service that lets you distribute your apps to handsets.</p>
+                                              <p><a href="http://www.android.com/market.html">Learn more &raquo;</a></p>
+                                      </td>
+                              </tr>
+                              <tr>
+                                      <td colspan="2"><div class="seperator">&nbsp;</div></td>
+                              </tr>
+                              <tr>
+                                      <td class="imageCell"><a href="http://source.android.com"><img src="{@docRoot}assets/images/icon_contribute.jpg" style="padding:0" /></a></td>
+                                      <td>
+                                              <h2 class="green">Contribute</h2>
+                                              <p>Android Open Source Project gives you access to the entire platform source.</p>
+                                              <p><a href="http://source.android.com">Learn more &raquo;</a></p>
+                                      </td>
+                              </tr>
+                              <tr>
+                                      <td colspan="2"><div class="seperator">&nbsp;</div></td>
+                              </tr>
+                              <tr>
+                                      <td class="imageCell"><a href="http://www.youtube.com/user/androiddevelopers"><img src="{@docRoot}assets/images/video-droid.png" style="padding:0" /></a></td>
+                                      <td>
+                                              <h2 class="green">Watch</h2>
+                                              <object width="150" height="140"><param name="movie" value="http://www.youtube.com/v/x1ZZ-R3p_w8&hl=en&fs=1"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="http://www.youtube.com/v/x1ZZ-R3p_w8&hl=en&fs=1" type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true" width="150" height="140"></embed></object>
+                                              <p style="margin-top:1em"><a href="http://www.youtube.com/user/androiddevelopers">More Android videos &raquo;</a></p>
+                                      </td>
+                              </tr>
+
+                      </table>
+              </div>
+	</div>
+
+<!--[if lte IE 6]>
+  <style>
+    #arrow-left {
+      margin:0 0 0 5px;
+    }
+    #arrow-right {
+      margin-left:0;
+    }
+    .app-list-container {
+      margin: 37px 0 0 23px;
+    }
+    div#list-clip { 
+      width:468px;
+    }
+  </style>
+<![endif]-->
+
+<script type="text/javascript">
+
+// * -- carousel dictionary -- * //
+  /* layout:  imgLeft, imgRight, imgTop
+     icon:    image for carousel entry. cropped (height:70px, width:90px)
+     name:    string for carousel entry
+     img:     image for bulletin post. cropped (height: 170, width:230px)
+     title:   header for bulletin (optional, insert "" value to skip
+     desc:    the bulletin post. must include html tags. 
+  */
+
+  var droidList = {
+    'sdk': {
+      'layout':"imgLeft",
+      'icon':"sdk-small.png",
+      'name':"SDK 1.1 r1",
+      'img':"sdk-large.png",
+      'title':"Android 1.1 SDK r1",
+      'desc': "<p>A new Android SDK is available for download. The new SDK includes minor API changes, new UI localizations, bug fixes and some new application features.</p><p><a href='{@docRoot}sdk/1.1_r1/index.html'>Download Android 1.1 SDK r1</a></p>"
+    },
+
+    'mapskey': {
+      'layout':"imgLeft",
+      'icon':"maps-small.png",
+      'name':"Maps API Key",
+      'img':"maps-large.png",
+      'title':"Maps API Key",
+      'desc':"<p>If you're writing an Android application that uses Google Maps (with MapView), you must register your application to obtain a Maps API Key. Without the key, your maps application will not work on Android devices. Obtaining a key requires just a couple of steps.</p><p><a href='{@docRoot}guide/topics/location/geo/mapkey.html'>Learn how to get a Maps API Key</a></p>"
+    },
+
+    'market': {
+      'layout':"imgTop",
+      'icon':"market-small.png",
+      'name':"Android Market",
+      'img':"market-large.png",
+      'title':"",
+      'desc': "<p>Android Market helps you get your applications into the hands of users. The beta version of Market is now open and you can begin sharing your applications with users of the first Android-powered phone, the T-Mobile G1.</p><p><a href='http://market.android.com/publish/'>Publish your Android app on Market &raquo;</a></p>"
+    },
+
+    'devphone': {
+      'layout':"imgLeft",
+      'icon':"devphone-small.png",
+      'name':"Dev Phone 1",
+      'img':"devphone-large.png",
+      'title':"Android Dev Phone 1",
+      'desc': "<p>Run and debug your Android applications directly on this device. Modify and rebuild the Android operating system, and flash it onto the phone. The Android Dev Phone 1 is carrier independent, and available for purchase by any developer registered with <a href='http://market.android.com/publish'>Android Market</a>.</p><p><a href='/guide/developing/device.html#dev-phone-1'>Learn more about the Android Dev Phone 1 &raquo;</a></p>"
+    }
+
+  }
+</script>
+<script type="text/javascript" src="{@docRoot}assets/carousel.js"></script>
+<script type="text/javascript">
+  initCarousel("sdk");
+</script>
diff --git a/docs/html/license.jd b/docs/html/license.jd
new file mode 100644
index 0000000..88932b6
--- /dev/null
+++ b/docs/html/license.jd
@@ -0,0 +1,143 @@
+page.title=Content License
+hide_license_footer=true
+@jd:body
+
+<div id="mainBodyFluid">
+<h1>Content License</h1>
+
+<p>For the purposes of licensing, the content of this site is divided
+into two categories:</p>
+<ul>
+  <li>Documentation content, found under the "Dev Guide" and "Reference"
+  tabs, including both static content and content extracted from source 
+  code modules, as well as sample code, and </li>
+<li>All other site content</li>
+</ul>
+
+<p>The documentation content on this site is made available to
+you as part of the <a href="http://source.android.com">Android Open
+Source Project</a>. This documentation, including any code shown in it,
+is licensed under the <a
+href="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0
+license</a>, the preferred license for all parts of the of the Android
+Open Source Project.</p>
+
+<p>Apache 2.0 is a commercial and open-source-friendly software
+license. The majority of the Android platform and documentation is
+licensed under the Apache 2.0 license. While the project strives to
+adhere to the preferred license, there may be exceptions, such as for
+documentation (code comments) extracted from a source code module that
+is licensed under GPLv2 or other license. In those cases, the license
+covering the source code module will apply to the documentation
+extracted from it. </p>
+
+<p>All other content on this site, except the license documents themselves
+and as otherwise noted, is licensed under the <a
+href="http://creativecommons.org/licenses/by/2.5/">Creative Commons
+Attribution 2.5</a> license. </p>
+
+<p>You may use the content of this site in any way that is consistent
+with the specific license that applies to the content, as described
+above. For content licensed under Creative Commons Attribution 2.5, we
+ask that you give proper <a href="#attribution">attribution</a>. </p>
+
+
+<h3 id="terms">Terms of Use</h3>
+
+<p>We are pleased to license the Android documentation and sample code under
+terms that encourage you to take, modify, reuse, re-purpose, and remix the
+content as you see fit. Except as noted in the Restrictions section below, you
+are free to use the documentation content in your own creations. For example,
+you could quote the text in a book, cut-and-paste sections to your blog, record
+it as an audiobook for the visually impaired, or even translate it. </p>
+
+
+<h3 id="restrictions">Restrictions</h3>
+
+<ul>
+<li>While the documentation itself is available to you under the Apache 2.0
+license, note that proprietary trademarks and brand features are not
+included in that license.</li>
+
+<li>Google's trademarks and other brand features (including the 	
+ANDROID stylized typeface logo) are not included in the license.
+Please see <a href="http://www.google.com/permissions/guidelines.html">
+Guidelines for Third Party Use of Google Brand Features</a> for
+information about this usage. </li>
+
+<li>In some cases, a page may include content, such as an image, that is not 
+covered by the license. In that case, we will label the content that is not licensed. </li>
+
+<li>In addition, content linked from a page on this site is not covered
+by the license unless specifically noted. For example, pages may link to videos or
+slide decks that are not covered.</li>
+
+<li>The use of sample source code provided in the SDK or shown in this
+documentation is subject to the conditions detailed in the <a
+href="{@docRoot}sdk/terms.html">SDK Terms and Conditions</a>.</li>
+</ul>
+</h3>
+
+<h3 id="attribution">Attribution</h3>
+<p>
+Proper attribution is required when you reuse or create modified
+versions of content that appears on a page made available under the
+terms of the Creative Commons Attribution license. On this site, the
+requirement for attribution applies only to the non-documentation
+content, as described earlier in this document. The complete 
+requirements for attribution can be found in section 4b of the 
+<a href="http://creativecommons.org/licenses/by/2.5/legalcode">
+Creative Commons legal code</a>.
+</p>
+<p>
+ In practice we ask that you provide attribution to the Android Open
+ Source project to the best of the ability of the medium in which you 
+ are producing the work. There are several typical ways in which this 
+ might apply:
+</p>
+<h4>Exact Reproductions</h4>
+<p>
+ If your online work <em>exactly reproduces</em> text or images from this
+ site, in whole or in part, please include a paragraph at the bottom
+ of your page that reads: 
+</p>
+<blockquote>
+ Portions of this page are reproduced from work created and <a
+ href="http://code.google.com/policies.html">shared by the Android Open Source Project</a>
+ and used according to terms described in the <a
+ href="http://creativecommons.org/licenses/by/2.5/">Creative Commons
+ 2.5 Attribution License</a>.
+
+</blockquote>
+<p>
+ Also, please link back to the original source page so that readers can
+ refer there for more information.
+</p>
+<h4>Modified Versions</h4>
+<p>
+ If your online work shows <em>modified</em> text or images based on
+ the content from this site, please include a paragraph at the bottom of
+ your page that reads:
+</p>
+<blockquote>
+ Portions of this page are modifications based on work created and <a
+ href="http://code.google.com/policies.html">shared by the Android Open
+ Source Project</a> and used according to terms described in the <a
+ href="http://creativecommons.org/licenses/by/2.5/">Creative Commons
+ 2.5 Attribution License</a>.
+</blockquote>
+<p>
+ Again, please link back to the original source page so that readers can
+ refer there for more information. This is even more important when
+ the content has been modified.
+</p>
+<h4>Other Media</h4>
+<p>
+ If you produce non-hypertext works, such as books, audio, or
+ video, we ask that you make a best effort to include a spoken or
+ written attribution in the spirit of the messages above.
+</p>
+
+</div>	
+
+
diff --git a/docs/html/maps-api-signup.html b/docs/html/maps-api-signup.html
new file mode 100644
index 0000000..a604b2a
--- /dev/null
+++ b/docs/html/maps-api-signup.html
@@ -0,0 +1,369 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+  <head>
+    
+<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
+<title>Sign Up for the Android Maps API - Android Maps API - Google Code</title>
+<link href="http://code.google.com/css/codesite.pack.01312008.css" type="text/css" rel="stylesheet"></link>
+<script src="http://code.google.com//js/codesite.pack.01312008.js" type="text/javascript"></script>
+<link rel="search" type="application/opensearchdescription+xml" title="Google Code" href="/osd.xml" />
+
+<!--[if IE]><link rel="stylesheet" type="text/css" href="/css/iehacks.css" /><![endif]-->
+
+
+<script type="text/javascript">
+//<![CDATA[
+
+function CheckForm(form) {
+  if (!form["agreeTerms"].checked) {
+    alert("To get an Android Maps API key, " + 
+        "you must agree to the API terms by checking the checkbox.");
+  } else {
+    var fp = form["fp"].value;
+    if (fp.length < 32) {
+      alert("Please enter the MD5 fingerprint of the certificate you will use to sign your Android Application.");
+      form["fp"].focus();
+    } else {
+      top.location = "http://www.google.com/glm/mmap/a/api?fp=" +
+                     encodeURIComponent(fp);
+    }
+  }
+  return false;
+}
+
+//]]>
+</script>
+  </head>
+
+  <body class="gc-documentation">
+    <div id="gc-container">
+<a name="top"></a>
+<div id="skipto">
+  
+  
+</div>
+<div id="gc-header">
+  <div id="logo"><a href="/">
+  
+     <img src="/images/cleardot.gif" height="1px" width="1px" alt="Google Code Home Page" id="gc-logo-img"/>
+  
+  </a></div>
+  <div id="search">
+    <div id="searchForm" class="searchForm" style="display:none">
+      <form action="" accept-charset="utf-8" class="gsc-search-box" onsubmit="executeGSearch(document.getElementById('gsearchInput').value); return false;">
+        <table class="gsc-search-box" cellpadding="0" cellspacing="0">
+          <tbody>
+            <tr>
+              <td class="gsc-input">
+                <input id="gsearchInput" type="text" name="q" maxlength="2048" class="gsc-input" autocomplete="off" title="Google Code Search" style="width:345px"/>
+              </td>
+              <td class="gsc-search-button">
+                <div id='cs-searchresults' onclick='event.cancelBubble = true;'></div>
+                <input title="Search" id="gsearchButton" class="gsc-search-button" value="Search" type="submit"/>
+              </td>
+            </tr>
+            <tr>
+              <td class="greytext">e.g. "ajax apis" or "open source"</td>
+            </tr>
+          </tbody>
+        </table>
+      </form>
+    </div> <!-- end searchForm -->
+    <div id="searchForm2" class="searchForm2" style="display:block">
+      <form id="cse" action="http://www.google.com/cse">
+        <input type="hidden" name="cref" value="http://code.google.com/cse/googlecode-context.xml" />
+        <input type="text" name="q" maxlength="2048" autocomplete="off" title="Google Code Search" style="width:345px"/>
+        <input type="submit" name="sa" value="Search" title="Search"/><br/>
+        <div class="greytext">e.g. "ajax apis" or "open source"</div>
+      </form>
+    </div> <!-- end searchForm2 -->
+  </div> <!-- end search -->
+</div> <!-- end gc-header -->
+
+
+<div id="codesiteContent">
+
+<a name="gc-topnav-anchor"></a>
+<div id="gc-topnav">
+  <h1>Android Maps API Key Signup</h1>
+  <ul id="docs" class="gc-topnav-tabs">
+    <li id="home_link">
+      <a href="/android/" title="Android Developer Site">Home</a>
+    </li>
+  
+    <li id="docs_link">
+      <a href="/android/toolbox/apis/lbs.html" title="Android Maps API Documentation">Docs</a>
+    </li>
+  
+    <li>
+      <a href="http://googlegeodevelopers.blogspot.com/" title="Official Google Maps API blog">Maps Blog</a>
+    </li>
+  
+    <li>
+      <a href="http://android-developers.blogspot.com/" title="Official Android Developers Blog">Android Blog</a>
+    </li>
+  </ul>
+</div> <!-- end gc-topnav -->
+
+
+<div>
+<!--
+    <div class="g-section g-tpl-170">
+
+      <a name="gc-toc-anchor"></a>  
+      <div class="g-unit g-first" id="gc-toc">
+        <ul>
+          <li>Add some sidebar content?</li>
+        </ul>
+        <div class="line"></div>
+      </div>
+-->
+      
+      <a name="gc-pagecontent-anchor"></a>   
+      <div class="g-unit" id="gc-pagecontent">
+        <h1 class="page_title">Sign Up for the Android Maps API</h1>
+
+<p>The Android Maps API lets you embed
+<a href="/android/reference/com/google/android/maps/MapView.html">Google
+Maps</a> in your own Android applications.  A single Maps API key is
+valid for all applications signed by a single certificate.  See
+this <a href="/android/intro/develop-and-debug.html#signing">documentation
+page</a> for more information about application signing.  To get a
+Maps API key for your certificate, you will need to provide its the certificate's
+fingerprint.  This can be obtained using Keytool.  For example, on
+Linux or Mac OSX, you would examine your debug keystore like this:
+<pre class="prettyprint">$ keytool -list -keystore ~/.android/debug.keystore
+...
+Certificate fingerprint (MD5): 94:1E:43:49:87:73:BB:E6:A6:88:D7:20:F1:8E:B5:98
+</pre>
+
+<p>If you use different keys for signing development builds and
+release builds, you will need to obtain a separate Maps API key for
+each certificate.  Each key will only work in applications signed by
+the corresponding certificate.</p>
+
+<p>You also need a <a href="http://www.google.com/accounts/">Google Account</a> 
+to get a Maps API key, and your API key will be connected to your Google Account.</p>
+<br/>
+<div id="termsbox" style="margin-left: 2em">
+<textarea rows="15" cols="70" readonly="readonly" onfocus="this.blur()">
+Android Maps APIs Terms of Service 
+
+Last Updated: October 13, 2008
+
+Thanks for your interest in the Android Maps APIs.  The Android Maps APIs are a collection of services (including, but not limited to, the "com.google.android.maps.MapView" and "android.location.Geocoder" classes) that allow you to include maps, geocoding, and other content from Google and its content providers in your Android applications.  The Android Maps APIs explicitly do not include any driving directions data or local search data that may be owned or licensed by Google.   
+
+
+1.  Your relationship with Google.   
+    1.1. Your use of any of the Android Maps APIs (referred to in this document as the "Maps API(s)" or the "Service") is subject to the terms of a legal agreement between you and Google Inc., whose principal place of business is at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States ("Google").  This legal agreement is referred to as the "Terms."
+    1.2. Unless otherwise agreed in writing with Google, the Terms will include the following:  1) the terms and conditions set forth in this document (the "Maps APIs Terms"); 2) the Legal Notices (http://www.google.com/intl/en-us/help/legalnotices_maps.html); and 3) the Privacy Policy (http://www.google.com/privacy.html).  Before you use the Maps APIs, you should read each of the documents comprising the Terms, and print or save a local copy for your records.  
+    1.3. If you use the Maps APIs in conjunction with any other Google products or services, including any other Google API, (collectively, the "Services"), your agreement with Google will also include the terms applicable to those Services. All of these are referred to as the "Additional Terms."  If Additional Terms apply, they will be accessible to you either within or through your use of that Service.  If there is any contradiction between what any Additional Terms say and what the Maps APIs Terms say, then the Maps APIs Terms will take precedence only as it relates to the Maps APIs, and not to any other Services.
+    1.4. Google reserves the right to make changes to the Terms from time to time. When these changes are made, Google will make a new copy of the Terms available at http://code.google.com/android/maps-api-tos.pdf.  You understand and agree that if you use the Service after the date on which the Terms have changed, Google will treat your use as acceptance of the updated Terms.  If a modification is unacceptable to you, you may terminate the agreement by ceasing use of the Maps APIs as well distribution of any applications that use the Maps APIs.
+    1.5. Definitions
+        (a) "Content" means any content provided through the Service, including map and terrain data, photographic imagery, traffic data, or any other content.
+        (b) "Maps API Implementation" means a software application that uses the Maps APIs to obtain and display Content in conjunction with Your Content, according to these Terms.
+        (c)  "Your Content" means any content that you provide in your Maps API Implementation, including data, images, video, or software.  Your Content does not include the Content.
+
+
+2. Accepting the Terms
+    2.1. In order to use the Maps APIs you must agree to the Terms.  You can accept the Terms by: (a) clicking to accept or agree to the Terms, where this option is made available to you by Google in the user interface for the Service; or (b) using the Maps APIs.  In this case, you understand and agree that Google will treat your use of the Maps APIs as acceptance of the Terms from that point onwards.
+    2.2. You may not use the Maps APIs and may not accept the Terms if you are a person barred from using the Service under the laws of the United States or the country in which you are resident or from which you use the Service. 
+    2.3. You represent that you have full power, capacity and authority to accept these Terms.  If you are accepting on behalf of your employer or another entity, you represent that you have full legal authority to bind your employer or such entity to these Terms.  If you don't have the legal authority to bind, please ensure that an authorized person from your entity consents to and accepts these Terms.
+
+
+3. Privacy and Personal Information
+    3.1. For information about Google's data protection practices, please read Google's Privacy Policy at http://www.google.com/privacy.html.  This policy explains how Google treats your personal information and protects your privacy when you use the Service.
+    3.2. You agree to the use of your data in accordance with Google's Privacy Policy.
+
+
+4. Provision of Service by Google
+    4.1. Google has subsidiaries and affiliated legal entities around the world ("Subsidiaries and Affiliates").  Sometimes, these companies will be providing the Service to you on behalf of Google itself.  You acknowledge and agree that Subsidiaries and Affiliates will be entitled to provide the Service to you.
+    4.2. Google is constantly innovating in order to provide the best possible experience for its users.  You acknowledge and agree that the form and nature of the Service that Google provides may change from time to time without prior notice to you.  As part of this continuing innovation, you acknowledge and agree that Google may stop (temporarily or permanently) providing the Service (or any features within the Service) to you or to users generally at Google's sole discretion, without prior notice to you.  Google reserves the right to refuse or discontinue the Service to anyone, and to disable users' access to the Service, including the Maps APIs or any Content, at any time in its sole discretion with or without notice.
+    4.3. You acknowledge and agree that Google may impose or adjust the limit on the number of transactions you may send or receive through the Service; such fixed upper limits may be set by Google at any time, at Google's discretion.  
+    4.4. Google reserves the right to release subsequent versions of the Maps APIs and to require you to obtain and use the most recent version.
+    4.5. The Service currently does not include advertising in the Content.  However, Google reserves the right to include advertising in the Content provided to you through the Service, but will provide you with sixty (60) days notice prior to the commencement of advertising.  Such notice may be provided on relevant Google websites, including but not limited to theÿGoogle Maps API Blog (http://googlemapsapi.blogspot.com) and theÿGoogle Maps API Groupÿ(http://groups.google.com/group/Google-Maps-API) or such successor URLs that Google may designate from time to time.  During that 60 day period, you may terminate your use of the Service, or provide notice of your refusal to accept advertising in accordance with Google's policies and procedures for providing such notice (which Google may make available from time to time in its sole discretion).
+
+
+5. Use of the Service by You
+    5.1. In order to access the Service, you must have a Google Account.  You agree that any information you give to Google in connection with your Google Account or your continued use of the Service will always be accurate, correct and up to date.
+    5.2. After supplying Google with your account information and the MD5 fingerprint for the certificate used to sign your application, and accepting the Terms, you will be issued an alphanumeric key assigned to you by Google that is uniquely associated with your Google Account and the application certificate.  Your Maps API implementation?s MapView must include this alphanumeric key, either using the "android:apiKey" XML attribute or using the appropriate MapView constructor, as described in the Android MapView documentation (http://code.google.com/android/reference/com/google/android/maps/MapView.html).  
+    5.3. There is currently no limit to the number of keys you may obtain in this manner provided that you use a different certificate for each key you obtain and that you use the same Google Account for every key you obtain.  You agree that each key is only valid for applications signed with the corresponding certificate.  You agree that Google may, in its sole discretion, impose a limit on the number of keys that may be obtained in the future.  You agree that your continued use of any of the keys assigned by Google or distribution of any applications using such keys constitutes your continued agreement to these Terms.
+    5.4. Subject to these Terms, you may develop, display and/or distribute your Maps API Implementation as part of a commercial or non-commercial enterprise. 
+    5.5. Your Maps API Implementation and Your Content must not violate Google's Software Principles available at http://www.google.com/intl/en/corporate/software_principles.html (or such successor URL as Google may provide) and any other policies as Google may develop from time to time and make available to you.
+    5.6. You agree to use the Service only for purposes that are permitted by: (1) the Terms; (2) any applicable third-party contract, law, or regulation; and (3) any applicable policies or guidelines made available by Google.  By way of example, and not as a limitation, you agree that when using the Service, you will not
+        a. defame, abuse, harass, stalk, threaten or otherwise violate the legal rights (such as rights of privacy and publicity) of others;
+        b. upload, post, transmit or otherwise make available any inappropriate, defamatory, obscene, or unlawful content;
+        c. upload, post, transmit or otherwise make available any content that infringes any patent, trademark, copyright, trade secret or other proprietary right of any party, unless you are the owner of the rights, or have the permission of the owner or other legal justification to use such content;
+        d. upload, post, transmit or otherwise make available messages that promote pyramid schemes, chain letters, or disruptive commercial messages or advertisements;
+        e. download any file posted by another that you know, or reasonably should know, cannot legally be distributed in such manner;
+        f. impersonate another person or entity, or falsify or delete any author attributions or labels of the origin or source of Content, or other material;
+        g. restrict or inhibit any other users from using and enjoying the Service;
+        h. remove, obscure, or fail to display the Terms of Use link as presented through the Service or described in the Service documentation;
+        i. remove, alter, or obscure any copyright, trademark or other proprietary rights notices or labels of origin or proprietary rights designation contained in or on Google Services or Content;
+        j. delete, obscure, or in any manner alter any warning, notice (not limited to any copyright or other proprietary rights notice), or link which appears in the Service or the Content
+        k. interfere with or disrupt Google Services or servers or networks connected to Google Services, or disobey any requirements, procedures, policies or regulations of networks connected to Google Services;
+        l. use any robot, spider, site search/retrieval application, or other device to retrieve or index any portion of the Service or Content or collect information about users for any unauthorized purpose;
+        m. display content in your Maps API Implementation that falsely expresses or implies that such content is sponsored or endorsed by Google;
+        n. create user accounts by automated means or under false or fraudulent pretenses, or obtain or attempt to obtain keys for the Service using multiple Google Accounts;
+        o. promote or provide instructional information about illegal activities;
+        p. promote physical harm or injury against any group or individual; or
+        q. transmit any viruses, worms, defects, Trojan horses, or any items of a destructive nature.
+    5.7. You agree that if you use the Service to develop a Maps API Implementation for use by other users, you will protect the privacy and legal rights of those users. If your Maps API Implementation provides you or another party with information about users, including but not limited to personally identifiable information or non-personally identifiable usage information, you must make the users aware that the information will be available to you or another party, and you must provide legally adequate privacy notice and protection for those users. If your application stores information submitted by users, it must do so securely. If your Maps API Implementation allows a user to provide you with Google Account information, you may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so.
+    5.8. You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the Terms or any applicable law or regulation, and for the consequences (including any loss or damage which Google may suffer) of any such breach.
+
+
+6. Google?s Proprietary Rights
+    6.1. Ownership.  You acknowledge and agree that Google (or Google's licensors and their suppliers, as applicable) own all legal right, title and interest in and to the Service and Content, including any intellectual property rights that subsist in the Service and Content (whether those rights happen to be registered or not, and wherever in the world those rights may exist).
+    6.2. Brand Feature License.  For purposes of these Terms, "Brand Features" will mean the trade names, trademarks, service marks, logos, domain names, and other distinctive brand features of each party, respectively, as secured by such party from time to time.  Google grants to you a nontransferable, nonsublicenseable, nonexclusive license during the Term to display Google's Brand Features for the purpose of promoting or advertising that you use the Service in accordance with this Section 6.2 and for the purpose of fulfilling your obligations under Section 6.5 below.  You grant to Google a nontransferable, nonexclusive license during the Term to use Your Brand Features to advertise that you are using the Service.  In using Google Brand Features, you will not:
+        a. display a Google Brand Feature in any manner that implies a relationship or affiliation with, sponsorship, or endorsement by Google, other than your use of the Service, or that can be reasonably interpreted to suggest editorial content has been authored by, or represents the views or opinions of Google or Google personnel;
+        b. use Google Brand Features to disparage Google, its products or Services;
+        c. display a Google Brand Feature on your site if it contains or displays adult content or promotes illegal activities, gambling, or the sale of tobacco or alcohol to persons under twenty-one (21) years of age;
+        d. have the Google logo as the largest logo in your application (except as displayed in the map image itself);
+        e. display a Google Brand Feature as the most prominent element in any part of your application;
+        f. display a Google Brand Feature in a manner that is misleading, defamatory, infringing, libelous, disparaging, obscene or otherwise objectionable to Google;
+        g. display a Google Brand Feature on a site that violates any law or regulation; or
+        h. remove, distort or alter any element of a Google Brand Feature (this includes squeezing, stretching, inverting, discoloring, etc.).
+    6.3. You understand and agree that Google has the sole discretion to determine whether your use of Google brand features is in accordance with the above restrictions.
+    6.4. Except as set forth in this Section 6, nothing in the Terms will grant or will be deemed to grant to one party any right, title or interest in or to the other party's Brand Features.  All use by you of Google's Brand Features (including any goodwill associated therewith) will inure to the benefit of Google.  At no time during or after the Term will you challenge or assist others to challenge the Brand Features of Google (except to the extent such restriction is prohibited by law) or the registration thereof by Google, nor will you attempt to register any Brand Features (including domain names) that are confusingly similar in any way (including but not limited to, sound, appearance and spelling) to those of Google.
+    6.5.  You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices, Terms of Use links, or Brand Features) that may be affixed to or provided through the Service.  Where such notices are not affixed within the Service, you agree to display such notices according to the Service documentation if so specified.
+
+
+7. License from Google
+    7.1. Service.  Google gives you a personal, worldwide, royalty-free, non-assignable and non-exclusive license to use the Service as provided by Google, in the manner permitted by the Terms.  
+    7.2. Content.  Google gives you a personal, worldwide, royalty-free, non-assignable and non-exclusive license to access, use, publicly perform and publicly display the Content in your Maps API Implementation, as the Content is provided in the Service, and in the manner permitted by the Terms.  Specifically, you understand the following:
+        a.  Content, not limited to map data, traffic, and directions, is provided for planning purposes only.  You may find that weather conditions, construction projects, closures, or other events may cause road conditions or directions to differ from the results depicted in the Content.  You should exercise judgment in your use of the Content.
+        b.  Certain Content is provided under license from third parties (http://www.google.com/intl/en_us/help/legalnotices_maps.html), including Tele Atlas B.V. ("Tele Atlas"), and is subject to copyright and other intellectual property rights owned by or licensed to Tele Atlas and/or such third parties. You may be held liable for any unauthorized copying or disclosure of this content.  Your use of Tele Atlas map data is subject to additional restrictions located in the Legal Notices (http://www.google.com/intl/en_us/help/legalnotices_maps.html) page.
+    7.3. In addition to the license granted here, you may use certain Content according to the terms set forth in our Permission Guidelines for Google Maps and Google Earth (http://www.google.com/permissions/geoguidelines.html).
+    7.4. U.S. Government Restricted Rights.  If the Service is being used or accessed by or on behalf of the United States government, such use is subject to additional terms located in the "Government End Users" section of our Legal Notices (http://www.google.com/intl/en_us/help/legalnotices_maps.html) page.  
+    7.5. Google reserves the sole right and discretion to determine whether your use of the Service and Content is in conformance with these Terms.
+
+
+8. License Restrictions.  Except as expressly permitted under the Terms, or unless you have received prior written authorization from Google (or, as applicable, from the provider of particular Content), the license granted to you in Section 7 is conditioned on your adherence to all of the restrictions in this Section 8.  Under this Section 8, you must not (nor may you permit anyone else to):
+    8.1.  access or use the Service or any Content through any technology or means other than those provided in the Service, or through other explicitly authorized means Google may designate;
+    8.2.  copy, translate, modify, create a derivative work of, pre-fetch, cache, or publicly display any Content or any part thereof.
+    8.3.  redistribute, sublicense, rent, publish, sell, assign, lease, market, transfer, or otherwise make the Service or Content available to third parties;
+    8.4.  reverse engineer, decompile or otherwise attempt to extract the source code of the Service or any part thereof, unless this is expressly permitted or required by applicable law;
+    8.5.  use the Service in a manner that gives your or any other person access to mass downloads or bulk feeds of any Content, including but not limited to numerical latitude or longitude coordinates;
+    8.6.  delete, obscure, or in any manner alter any warning, notice (including but not limited to any copyright or other proprietary rights notice), or link that appears in the Service or the Content;
+    8.7.  use the Service or Content with any products, systems, or applications for or in connection with (a) real time navigation or route guidance based on position input from a sensor (including but not limited to any visual or audible turn-by-turn route guidance); or (b) any systems or functions for automatic or autonomous control of vehicle behavior; or (c) dispatch, fleet management, business asset tracking, or similar enterprise applications (for avoidance of doubt, you are permitted to use the Service to create Maps API Implementations to track people or assets equipped with a sensor, where the tracking of the people or assets is not critical to the core business or service of the application user.  For example, you are permitted to use the Maps APIs to create "Friend Finder" applications that allow consumers to track the locations of their friends? mobile devices, but you are not permitted to use the Maps APIs to create "Business Asset Tracking" applications that track or locate business or government users? field sales or field service personnel, vehicles or other assets that are critical (not incidental) to the core business or service of the application user);
+    8.8 print more than 5,000 copies of sales collateral materials containing a screenshot with Tele Atlas Content for commercial sales lead generation ("Direct Marketing"); (if you desire (a) to use Tele Atlas Content for Direct Marketing in excess of the above amount, or (b) to incorporate Tele Atlas Content as a core part of printed matter (such as printed maps or guide books) that you redistribute for a fee, you must contact Tele Atlas to obtain a license to do so); or
+    8.9 offer a professional batch geocoding service that uses the Content contained in any Google Services.
+
+
+9. Content License from You
+    9.1. You retain copyright and any other rights you already hold in Your Content.  If you decide to submit or post Your Content to Google, you give Google a perpetual, irrevocable, worldwide, royalty-free, and non-exclusive license to reproduce, adapt, modify, translate, publish, publicly perform, publicly display and distribute Your Content.  This license is solely for the purpose of enabling Google to display, distribute and promote the Service.
+    9.2. You agree that this license includes a right for Google to make such Content available to other companies, organizations or individuals with whom Google has relationships for the provision of syndicated services, and to use such Content in connection with the provision of those services.
+    9.3. You understand that Google, in performing the required technical steps to provide the Service to our users, may (a) transmit or distribute your Content over various public networks and in various media; and (b) make such changes to your Content as are necessary to conform and adapt that Content to the technical requirements of connecting networks, devices, services or media.  You agree that this license will permit Google to take these actions.
+    9.4. You confirm and warrant to Google that you have all the rights, power and authority necessary to grant the above license.
+
+
+10. Your Passwords and Account Security
+    10.1. You agree and understand that you are responsible for maintaining the confidentiality of passwords or developer keys associated with any account you use to access the Service.  Accordingly, you agree that you will be solely responsible to Google for your use of the Service including, but not limited to, activities that occur under your account or developer key.  If you become aware of any unauthorized use of your password or of your account, you agree to notify Google immediately.
+
+
+11. Terminating this Agreement
+    11.1. The Terms will continue to apply until terminated by either you or Google as set out below.
+    11.2. You may terminate your legal agreement with Google by discontinuing your use of the Service at any time, removing the Maps API code from your Maps API Implementation, and ceasing the distribution of any Maps API Implementation that uses the Maps API.  You do not need to specifically inform Google when you stop using the Service.
+    11.3. Google may, at any time, terminate its legal agreement with you at its discretion without prior notice to you.
+    11.4. Nothing in this Section will affect Google's rights regarding provision of the Service under Section 4 of the Terms.
+    11.5. When this legal agreement comes to an end, those Terms that by their nature are intended to continue indefinitely will continue to apply, including but not limited to Sections 6.1, 6.3 and 6.4 (Google?s Proprietary Rights);  11.4 and 11.5 (Terminating this Agreement); 12 (Exclusion of Warranties); 13 (Limitation of Liability); 14 (Indemnity); and 18 (General Legal Terms).
+
+
+12. EXCLUSION OF WARRANTIES
+    12.1. NOTHING IN THESE TERMS, INCLUDING SECTIONS 12 AND 13, WILL EXCLUDE OR LIMIT GOOGLE'S WARRANTY OR LIABILITY FOR LOSSES WHICH MAY NOT BE LAWFULLY EXCLUDED OR LIMITED BY APPLICABLE LAW.  SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF CERTAIN WARRANTIES OR CONDITIONS OR THE LIMITATION OR EXCLUSION OF LIABILITY FOR CERTAIN TYPES OF LOSS OR DAMAGES. ACCORDINGLY, ONLY THE LIMITATIONS THAT ARE LAWFUL IN YOUR JURISDICTION WILL APPLY TO YOU, AND GOOGLE?S LIABILITY WILL BE LIMITED TO THE MAXIMUM EXTENT PERMITTED BY LAW.
+    12.2. YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SERVICE AND THE CONTENT IS AT YOUR SOLE RISK AND THAT THE SERVICE AND THE CONTENT ARE PROVIDED "AS IS" AND "AS AVAILABLE."  IN PARTICULAR, GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS AND THEIR SUPPLIERS, DO NOT REPRESENT OR WARRANT TO YOU THAT:
+        a.  YOUR USE OF THE SERVICE WILL MEET YOUR REQUIREMENTS;
+        b.  YOUR USE OF THE SERVICE WILL BE UNINTERRUPTED, TIMELY, SECURE OR FREE FROM ERROR;
+        c.  ANY INFORMATION OBTAINED BY YOU AS A RESULT OF YOUR USE OF THE SERVICES WILL BE ACCURATE OR RELIABLE; AND
+        d.  THAT DEFECTS IN THE OPERATION OR FUNCTIONALITY OF ANY SOFTWARE PROVIDED TO YOU AS PART OF THE SERVICES WILL BE CORRECTED.
+    12.3. ANY CONTENT OBTAINED THROUGH THE USE OF THE SERVICES IS DONE AT YOUR OWN DISCRETION AND RISK AND YOU WILL BE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE, LOSS OF DATA, OR ANY OTHER DAMAGE OR INJURY THAT RESULTS FROM THE DOWNLOAD OR USE OF ANY SUCH CONTENT.
+    12.4. NO ADVICE OR INFORMATION, WHETHER ORAL OR WRITTEN, OBTAINED BY YOU FROM GOOGLE, OR THROUGH OR FROM THE SERVICE OR CONTENT, WILL CREATE ANY WARRANTY NOT EXPRESSLY STATED IN THE TERMS.
+    12.5. GOOGLE, ITS LICENSORS AND THEIR SUPPLIERS FURTHER EXPRESSLY DISCLAIM ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+
+
+13. LIMITATION OF LIABILITY
+    13.1. EXCEPT AS EXPRESSLY PROVIDED IN THE INDEMNITY PROVISION (SECTION 14) AND SUBJECT TO SECTION 12.1, YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND GOOGLE?S LICENSORS AND THEIR SUPPLIERS, WILL NOT BE LIABLE TO YOU FOR:
+        a.  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, HOWEVER CAUSED AND UNDER ANY THEORY OF LIABILITY (INCLUDING, BUT NOT BE LIMITED TO, ANY LOSS OF PROFIT (WHETHER INCURRED DIRECTLY OR INDIRECTLY), ANY LOSS OF GOODWILL OR BUSINESS REPUTATION, ANY LOSS OF DATA, COST OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR OTHER INTANGIBLE LOSS);
+        b.  ANY LOSS OR DAMAGE AS A RESULT OF:
+            i.  ANY RELIANCE PLACED BY YOU ON THE COMPLETENESS, ACCURACY OR EXISTENCE OF ANY ADVERTISING, OR AS A RESULT OF ANY RELATIONSHIP OR TRANSACTION BETWEEN YOU AND ANY ADVERTISER OR SPONSOR WHOSE ADVERTISING APPEARS ON THE SERVICES;
+            ii. ANY CHANGES THAT GOOGLE MAY MAKE TO THE SERVICES, OR ANY PERMANENT OR TEMPORARY CESSATION IN THE PROVISION OF THE SERVICES (OR ANY FEATURES WITHIN THE SERVICES);
+            iii.  THE DELETION OF, CORRUPTION OF, OR FAILURE TO STORE, ANY CONTENT AND OTHER COMMUNICATIONS DATA MAINTAINED OR TRANSMITTED BY OR THROUGH YOUR USE OF THE SERVICES;
+            iv. YOUR FAILURE TO PROVIDE GOOGLE WITH ACCURATE ACCOUNT INFORMATION; OR
+            v.  YOUR FAILURE TO KEEP YOUR PASSWORD OR ACCOUNT DETAILS SECURE AND CONFIDENTIAL.
+    13.2. THE LIMITATIONS ON GOOGLE'S LIABILITY TO YOU IN SECTION 13.1 ABOVE WILL APPLY WHETHER OR NOT GOOGLE, ITS AFFILIATES, LICENSORS OR THEIR SUPPLIERS HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES OR DAMAGES.
+
+
+14. Indemnity
+    14.1. You hereby agree to indemnify, defend and hold Google, its strategic partners, officers, directors, agents, affiliates, licensors and their suppliers ("the Indemnified Parties") harmless from and against any claim or liability arising out of: (a) your use of the Maps APIs in breach of the Terms or applicable policies; (b) your Maps API Implementation; (c) any use by users of your Maps API Implementation; (d) any breach of or noncompliance with any representation, warranty or obligation in these Terms or applicable policies; and (e) any claim that your Maps API Implementation or Your Content violates any applicable law, including but not limited to any claim that your Maps API Implementation infringes the rights of a third party.  You will cooperate as fully as reasonably required in the defense of any claim.  Google reserves the right, at its own expense, to assume the exclusive defense and control of any matter subject to indemnification by you.  You acknowledge that damages for improper use of the Maps APIs may be irreparable; therefore, Google is entitled to seek equitable relief, including but not limited to preliminary injunction and injunction, in addition to all other remedies. 
+
+
+15. Copyright Policies
+    15.1. It is Google's policy to respond to notices of alleged copyright infringement that comply with applicable international intellectual property law (including, in the United States, the Digital Millennium Copyright Act) and to terminate the accounts of repeat infringers.  Details of Google's policy can be found at http://www.google.com/igoogle_dmca.html.
+
+
+16. Other Content
+    16.1. The Service may include hyperlinks to other web sites or content or resources.  Google has no control over any web sites or resources that are provided by companies or persons other than Google.  You acknowledge and agree that Google is not responsible for the availability of any such external sites or resources, and does not endorse any advertising, products or other materials on or available from such web sites or resources.
+    16.2. You acknowledge and agree that Google is not liable for any loss or damage that may be incurred by you as a result of the availability of those external sites or resources, or as a result of any reliance placed by you on the completeness, accuracy or existence of any advertising, products, or other materials on, or available from, such web sites or resources.
+
+
+17. Language of the Terms
+    17.1. Where Google has provided you with a translation of the English language version of the Terms, you agree that the translation is provided for your convenience only and that the English language version of the Terms will govern your relationship with Google.
+    17.2. If there is any contradiction between the English language version of the Terms and a translation of the Terms, the English language version will take precedence.
+
+
+18. General Legal Terms
+    18.1. The Terms constitute the whole legal agreement between you and Google and govern your use of the Service and Content, and completely replace and supersede any prior agreements between you and Google, written or oral, in relation to the Service and Content.  The Terms may be assigned by Google and will inure to the benefit of Google, its successors and assigns.
+    18.2. You agree that Google may provide you with notices, including those regarding changes to the Terms, by email, regular mail, or postings on the Service.
+    18.3. You agree that if Google does not exercise or enforce any legal right or remedy contained in the Terms (or that Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.  Any waiver of any provision of these Terms will be effective only if Google expressly states in a signed writing that it is waiving a specified Term.
+    18.4. If any court of law that has jurisdiction rules that any provision of these Terms is invalid, then that provision will be removed from the Terms without affecting the rest of the Terms.  The remaining provisions of the Terms will continue to be valid and enforceable.
+    18.5. You acknowledge and agree that each member of the group of companies of which Google is the parent will be third party beneficiaries to the Terms and that such other companies will be entitled to directly enforce, and rely upon, any provision of the Terms that confers a benefit on (or rights in favor of) them.  Other than this, no other person or company will be a third party beneficiary to the Terms.
+    18.6. The Terms, and your relationship with Google under the Terms, will be governed by the laws of the State of California, USA, without regard to its conflict of laws provisions.  You and Google agree to submit to the exclusive jurisdiction of the courts located in the County of Santa Clara, California, USA, to resolve any legal matter arising from the Terms.  Notwithstanding this, you agree that Google will be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
+</textarea>
+</div>
+
+<form action="signup.html" method="get" onsubmit="return CheckForm(this)">
+  <div class="terms">
+    <table style="width:95%">
+      <tr>
+        <td style="width:1em"><input type="checkbox" name="agreeTerms" value="1"/></td>
+        <td>I have read and agree with the terms and conditions <span class="printable">(<a href="maps-api-tos.pdf">printable version</a>)</span></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>
+          My certificate's MD5 fingerprint:
+          <input type="text" name="fp" size="47" value=""/>
+        </td>
+      </tr>
+      <tr>
+        <td></td>
+        <td><input type="submit" value="Generate API Key"/></td>
+      </tr>
+    </table>
+  </div>
+</form>
+
+        <!-- end body text -->
+
+   
+      </div><!-- end gc-pagecontent -->
+   </div><!-- end gooey wrapper -->
+
+    </div> <!-- end codesite content -->
+
+<div id="gc-footer" dir="ltr"> 
+  <div class="text">
+    
+    &copy;2008 Google -
+    <a href="/">Code Home</a> -
+    <a href="http://www.google.com/accounts/TOS">Site Terms of Service</a> -
+    <a href="http://www.google.com/privacy.html">Privacy Policy</a> -
+    <a href="/more/">Site Directory</a>
+     <br />
+     <br />
+    <!-- end gc-footer -->
+  </div>
+</div><!-- end gc-containter -->
+  </body>
+</html>
+
diff --git a/docs/html/maps-api-tos.pdf b/docs/html/maps-api-tos.pdf
new file mode 100644
index 0000000..80c2836
--- /dev/null
+++ b/docs/html/maps-api-tos.pdf
Binary files differ
diff --git a/docs/html/offline.jd b/docs/html/offline.jd
new file mode 100644
index 0000000..d41459b
--- /dev/null
+++ b/docs/html/offline.jd
@@ -0,0 +1,36 @@
+home=true
+page.title=Welcome
+@jd:body
+
+<div id="mainBodyFluid">
+
+<h1>Welcome to the Android SDK!</h1>
+
+<img src="{@docRoot}images/android_icon_125.png" style="float:right; margin:1em 6em 6em;" />
+
+<p>If you've just downloaded the SDK, then continue with  
+<a href="{@docRoot}sdk/1.1_r1/installing.html">Installing the Android SDK</a>.</p>
+
+<p>If you're upgrading from a previously installed version, then refer to the 
+<a href="{@docRoot}sdk/1.1_r1/upgrading.html">Upgrading</a> guide.</p>
+
+<p>Once you've completed the SDK installation, you can start learning about
+development on the Android framework by reading the <a
+href="{@docRoot}guide/index.html">Developer's Guide</a>. The SDK package
+also includes a wide variety of very helpful <a
+href="{@docRoot}samples/index.html">code samples</a>.</p>
+
+<p>Please note that you are currently viewing a local, offline version of the
+Android developer documentation. The offline documentation offers the same
+content and features as the online documentation, but since the search
+capability is network-based, it will not work while you are offline.
+Autocompletion for API packages and classes, also offered from the search box,
+is available both online and offline and loads the reference documentation for
+the item you select.</p>
+
+<p>For the most current, fully searchable documentation, please visit</p>
+
+<p style="margin-left:2em;"><a href="http://developer.android.com/index.html">
+http://developer.android.com</a>.</p>
+
+</div>
diff --git a/docs/html/publish/index.jd b/docs/html/publish/index.jd
new file mode 100644
index 0000000..63f2e68
--- /dev/null
+++ b/docs/html/publish/index.jd
@@ -0,0 +1,5 @@
+publish=true
+page.title=Publish Your Application
+@jd:body
+
+FIXME
diff --git a/docs/html/publish/publish_toc.cs b/docs/html/publish/publish_toc.cs
new file mode 100644
index 0000000..c6f5c65
--- /dev/null
+++ b/docs/html/publish/publish_toc.cs
Binary files differ
diff --git a/docs/html/reference/index.html b/docs/html/reference/index.html
new file mode 100644
index 0000000..8d516b1
--- /dev/null
+++ b/docs/html/reference/index.html
@@ -0,0 +1,8 @@
+<html>
+<head>
+<title>Redirecting...</title>
+<meta http-equiv="refresh" content="0;url=packages.html">
+</head>
+<body>
+</body>
+</html>
diff --git a/docs/html/reference/reference_toc.cs b/docs/html/reference/reference_toc.cs
new file mode 100644
index 0000000..60e9d5f
--- /dev/null
+++ b/docs/html/reference/reference_toc.cs
Binary files differ
diff --git a/docs/html/robots.txt b/docs/html/robots.txt
new file mode 100644
index 0000000..a872944
--- /dev/null
+++ b/docs/html/robots.txt
@@ -0,0 +1,6 @@
+User-Agent: *

+Allow: /

+Disallow: /gae_shell/

+Disallow: /assets/

+Disallow: /images/

+Sitemap: http://developer.android.com/sitemap.txt

diff --git a/docs/html/samples/index.jd b/docs/html/samples/index.jd
new file mode 100644
index 0000000..c5c0b71
--- /dev/null
+++ b/docs/html/samples/index.jd
@@ -0,0 +1,23 @@
+page.title=Android SDK
+page.onlyfortemplate=codesite
+@jd:body
+<h1>Sample Code</h1>
+
+<p>The Android SDK ships with several sample projects. They are:</p>
+
+<dl>
+    <dt><a href="{@docRoot}samples/ApiDemos/index.html">API Demos</a></dt>
+    <dd>A demonstration of many of the Android APIs.</dd>
+    
+    <dt><a href="{@docRoot}samples/LunarLander/index.html">Lunar Lander</a></dt>
+    <dd>Your objective: to land on the moon.</dd>
+
+    <dt><a href="{@docRoot}samples/NotePad/index.html">Note Pad</a></dt>
+    <dd>A simple note pad application.</dd>    
+</dl>
+
+<p>To run these samples, you should <a
+href="{@docRoot}guide/developing/eclipse-adt.html#creatingaproject">import them into
+Eclipse</a> or <a href="{@docRoot}guide/developing/other-ide.html">use
+activitycreator.py</a>, as described in the <a
+href="{@docRoot}sdk/1.1_r1/installing.html">Installing the SDK</a>.</p>
diff --git a/docs/html/sdk/1.0_r1/index.jd b/docs/html/sdk/1.0_r1/index.jd
new file mode 100644
index 0000000..b6e0e9f
--- /dev/null
+++ b/docs/html/sdk/1.0_r1/index.jd
@@ -0,0 +1,65 @@
+page.title=Android 1.0 SDK, release 1
+
+sdk.not_latest_version=true
+
+sdk.version=1.0_r1
+sdk.date=September 23, 2008
+
+sdk.win_download=android-sdk-windows-1.0_r1.zip
+sdk.win_bytes=89.7 MB
+sdk.win_checksum=d69f4ee93d4010f726c04302662fd999
+
+sdk.mac_download=android-sdk-mac_x86-1.0_r1.zip
+sdk.mac_bytes=87.5 MB
+sdk.mac_checksum=564876ada22872e50c2866806de9fc5c
+
+sdk.linux_download=android-sdk-linux_x86-1.0_r1.zip
+sdk.linux_bytes=87.8 MB
+sdk.linux_checksum=2660b4029039b7d714e59827e9a9a11d
+
+
+@jd:body
+
+<h2>Included in this SDK</h2>
+
+<h4>Development tools</h4>
+
+<p>The SDK includes a variety of tools for developing and debugging application code and designing 
+an application UI. You can read about the tools in the documentation included with the SDK. 
+You can access the tools in the <code>&lt;sdk&gt;/tools/</code> directory.</p>
+
+<h4 id="system_images">System Images</h4>
+
+<p>The Android system images listed below are included in this SDK.</p>
+
+<table style="margin-right:1em;" width="80%">
+<tr>
+<th><nobr>System Image</nobr></th><th><nobr>API Level</nobr></th><th>Notes</th><th>Description</th>
+</tr>
+
+<tr>
+<td width="5%"><nobr>Android 1.0</nobr></td>
+<td  width="5%">1</td>
+<td  width="5%"><nobr>N/A</nobr></td>
+<td>Includes the {@code com.google.android.maps} external library and a set of standard development 
+applications. </td>
+
+</tr>
+
+</table>
+
+<h4>Sample Code and Applications</h4>
+
+<p>You can look at a variety of tutorials and samples in the 
+documentation included with the SDK and access the sample code itself
+in the <code>&lt;sdk&gt;/samples/</code> directory of the SDK package.</p>
+
+<h4>Documentation</h4>
+
+<p>The SDK package provides a full set of local documentation, including installation and upgrade 
+instructions. To view it, open the <code>&lt;sdk&gt;/documentation.html</code> file in a web browser. 
+If you are developing in an IDE such as Eclipse, you can also view the reference documentation 
+directly in the IDE. </p>
+
+
+
diff --git a/docs/html/sdk/1.0_r1/installing.jd b/docs/html/sdk/1.0_r1/installing.jd
new file mode 100644
index 0000000..8ac524c
--- /dev/null
+++ b/docs/html/sdk/1.0_r1/installing.jd
@@ -0,0 +1,221 @@
+page.title=Installing the SDK
+sdk.version=1.0_r1
+@jd:body
+
+<p>For the current SDK release, see the links under <strong>Current SDK Release</strong> in the side navigation.</p>
+
+<p>This page describes how to install the Android 1.0 SDK, Release 1, and set up your development environment. 
+If you haven't downloaded the SDK yet, you can so from the <a href="{@docRoot}sdk/1.0_r1/index.html">Download</a> page.</p>
+
+<p>Before you begin, be sure that your development environment meets the SDK
+<a href="{@docRoot}sdk/1.0_r1/requirements.html">System Requirements</a>. If you encounter any problems during installation,
+see the <a href="#installnotes">Installation Notes</a> at the bottom of this page.</p>
+
+<h4 style="margin-top">Upgrading?</h4>
+<p>If you have already developed applications using an earlier version of the 
+SDK, please skip this page and read the 
+<a href="{@docRoot}sdk/1.0_r1/upgrading.html"><strong>Upgrading the SDK</strong></a></b> document instead.
+</p>
+
+<a name="installingsdk"></a>
+<a name="setup"></a>
+<h2>Installing the SDK</h2>
+
+	<p>After downloading the SDK, unpack the .zip archive to a suitable location on your machine. By default, the SDK files are unpacked into a directory named  <code>android_sdk_<em>&lt;platform</em>&gt;_<em>&lt;release&gt;</em>_<em>&lt;build&gt;</em></code>. The directory contains a link to a local copy of the documentation and the subdirectories <code>tools/</code>, <code>samples/</code>, and others. </p>
+	
+	<p>Make a note of the name and location of the unpacked SDK directory on your system &mdash; you will need to refer to the SDK directory later, when setting up the Android plugin or using SDK tools. </p>
+
+        <p>Optionally, you can add the path to the SDK <code>tools</code> directory to your path. As mentioned above, the <code>tools/</code> directory is located in the SDK directory. </p>
+     <ul>
+          <li>On Linux, edit your ~/.bash_profile or ~/.bashrc file. Look
+          for a line that sets the PATH environment variable and add the
+          full path to the <code>tools/</code> directory to it. If you don't 
+          see a line setting the path, you can add one:</li>
+
+          <ul><code>export PATH=${PATH}:<em>&lt;your_sdk_dir&gt;</em>/tools</code></ul>
+
+          <li>On a Mac, look in your home directory for .bash_profile and
+          proceed as for Linux. You can create the .bash_profile, if 
+          you haven't already set one up on your machine. </li>
+
+          <li>On Windows, right click on My Computer, and select Properties.  
+        Under the Advanced tab, hit the Environment Variables button, and in the
+        dialog that comes up, double-click on Path under System Variables. Add  the full path to the <code>tools/</code> directory to the path. </li>
+        </ul>
+
+        <p>Adding <code>tools</code> to your path lets you run Android Debug Bridge (adb) and the other command line <a href="{@docRoot}guide/developing/tools/index.html">tools</a> without needing to supply the full path to the tools directory. Note that, if you update your SDK, you should remember to update your PATH settings to point to the new location, if different.</p>
+
+
+<p>If you will be using the Eclipse IDE as your environment for developing Android applications, continue reading the next
+section in order to install the Android Development Tools plugin and setup Eclipse. If you choose not to use Eclipse, you can 
+develop Android applications using other tools &mdash; read the guide to developing 
+<a href="{@docRoot}guide/developing/other-ide.html">In other IDEs</a>.</p>
+
+
+<h2>Setting up Eclipse</h2>
+
+<p>First, you should install a custom plugin called Android Development Tools (ADT), which adds integrated support for Android projects and tools. The ADT plugin includes a variety of powerful extensions that make creating, running, and debugging Android applications faster and easier. Developing in ADT/Eclipse is highly recommended for Eclipse users and those new to Android.</p>
+
+<p>To download and install the ADT plugin, follow the steps below for your respective Eclipse version. </p>
+
+<table style="font-size:100%">
+<tr><th>Eclipse 3.3 (Europa)</th><th>Eclipse 3.4 (Ganymede)</th></tr>
+<tr>
+<td width="45%">
+<ol>
+    <li>Start Eclipse, then select <strong>Help</strong> &gt; <strong>Software Updates</strong> &gt; <strong>Find
+            and Install...</strong>. </li>
+
+    <li>In the dialog that appears, select <strong>Search for new features to install</strong> and click <strong>Next</strong>. </li>
+    <li>Click <strong>New Remote Site</strong>. </li>
+    <li>In the resulting dialog box, enter a name for the remote site (e.g. Android Plugin) and enter this as its URL:
+        <pre>https://dl-ssl.google.com/android/eclipse/</pre>
+        <p>Alternatively, you can use http in the Location URL, if you are having 
+         trouble with https (https is preferred for security reasons).</p>
+        <pre>http://dl-ssl.google.com/android/eclipse/</pre>
+        <p>Click <strong>OK</strong>.</p> </li>
+    <li>You should now see the new site added to the search list (and checked).
+        Click <strong>Finish</strong>. </li>
+    <li>In the subsequent Search Results dialog box, select the checkbox for
+    <strong>Android Plugin</strong> &gt; <strong>Developer Tools</strong>.
+    This will check both features:  "Android Developer Tools", and "Android
+    Editors". The Android Editors feature is optional, but recommended.  If
+    you choose to install it, you need the WST plugin mentioned earlier in this
+    page. Click <strong>Next</strong>. </li>
+    <li>Read the license agreement and then select <strong>Accept terms of the license agreement</strong>. 
+     Click <strong>Next</strong>. </li>
+    <li>Click <strong>Finish</strong>. </li>
+
+    <li>The ADT plugin is not signed; you can accept the installation anyway
+        by clicking <strong>Install All</strong>. </li>
+    <li>Restart Eclipse. </li>
+</ol>
+
+</td>
+<td>
+
+<ol>
+    <li>Start Eclipse, then select <strong>Help</strong> &gt; <strong>Software Updates...</strong>.
+    </li>
+    <li>In the dialog that appears, click the <strong>Available Software</strong> tab.
+    </li>
+    <li>Click <strong>Add Site...</strong>
+    </li>
+    <li>Enter this as the Location:
+      <pre>https://dl-ssl.google.com/android/eclipse/</pre>
+      <p>Alternatively, you can use http in the Location URL, if you are having 
+         trouble with https (https is preferred for security reasons).</p>
+      <pre>http://dl-ssl.google.com/android/eclipse/</pre>
+      <p>Click <strong>OK</strong>.</p></li>
+    <li>Back in the Available Software view, you should see the plugin. Select the checkbox next to 
+      <em>Developer Tools</em>  and click <strong>Install...</strong>
+    </li>
+    <li>On the subsequent Install window, "Android Developer Tools", and "Android Editors" should both be checked. 
+    The Android Editors feature is optional, but recommended.  If
+    you choose to install it, you need the WST plugin mentioned earlier in this
+    page. Click <strong>Next</strong>.
+     </li>
+    <li>Accept the license agreement and click <strong>Finish</strong>.</li>
+    <li>Restart Eclipse. </li>
+</ol>
+
+</td>
+</tr>
+</table>
+
+
+<p>Now, you just need to modify your Eclipse preferences to point to the Android SDK directory:</p>
+<ol>
+    <li>Select <strong>Window</strong> &gt; <strong>Preferences...</strong> to open the Preferences
+        panel. (Mac OS X: <strong>Eclipse</strong> &gt; <strong>Preferences</strong>) </li>
+    <li>Select <strong>Android</strong> from the left panel. </li>
+    <li>For the SDK Location in the main panel, click <strong>Browse...</strong> and locate the SDK directory. </li>
+    <li>Click <strong>Apply</strong>, then <strong>OK</strong>.</li>
+</ol>
+
+<p>Done! If you haven't encountered any problems, then you're ready to begin developing Android applications.
+We recommend you begin with the <a href="{@docRoot}guide/tutorials/hello-world.html">Hello World</a> tutorial,
+which will teach you some basics about Android applications and how to create projects using Eclipse.</p>
+
+
+<h3 id="troubleshooting">Troubleshooting ADT Installation</h3>
+<p> 
+If you are having trouble downloading the ADT plugin after following the steps above, here are some suggestions: </p>
+
+<ul>
+	<li>If Eclipse can not find the remote update site containing the ADT plugin, try changing the remote site URL to use http, rather than https. That is, set the Location for the remote site to:
+        <pre>http://dl-ssl.google.com/android/eclipse/</pre></li>
+	<li>If you are behind a firewall (such as a corporate firewall), make
+        sure that you have properly configured your proxy settings in Eclipse.
+        In Eclipse 3.3/3.4, you can configure proxy information from the main
+        Eclipse menu in <strong>Window</strong> (on Mac, <strong>Eclipse</strong>) &gt; <strong>Preferences</strong> &gt; <strong>General</strong> &gt; <strong>Network Connections</strong>.</li>
+</ul>
+<p> 
+If you are still unable to use Eclipse to download the ADT plugin as a remote update site, you can download the ADT files to your local machine using a browser and the install the files in Eclipse from there:
+</p>
+<ol>
+<li><a href="{@docRoot}sdk/adt_download.html">Download the ADT zip file</a> (do not unpack it).
+<li>Follow steps 1 and 2 in the default install instructions (above).
+<li>In Eclipse 3.3, click <strong>New Archive Site...</strong>. <br/>
+    In Eclipse 3.4, click <strong>Add Site...</strong>, then <strong>Archive...</strong>
+<li>Browse and select the downloaded the zip file.
+<li>Follow the remaining procedures, above, starting from steps 5.
+</ol>
+<p> 
+Note that to update your plugin, you will have to follow these steps again instead of the default update instructions.</p>
+
+<p>Note that the "Android Editors" feature of ADT requires several optional 
+Eclipse components (for example, WST). If you encounter an error when 
+installing ADT, your Eclipse installion might not include those components. 
+For information about how to quickly add the necessary components to your 
+Eclipse installation, see the troubleshooting topic 
+<a href="{@docRoot}guide/appendix/faq/troubleshooting.html#installeclipsecomponents">ADT Installation Error: "requires plug-in org.eclipse.wst.sse.ui"</a>.</p>
+
+<h4>For Linux users</h4>
+<p>If you encounter this error when installing the ADT Plugin for Eclipse: 
+<pre>
+An error occurred during provisioning.
+Cannot connect to keystore.
+JKS</pre>
+<p>
+...then your development machine lacks a suitable Java VM. Installing Sun
+Java 6 will resolve this issue and you can then reinstall the ADT
+Plugin.</p>
+
+<a name="installnotes"></a>
+<h2>Installation Notes</h2>
+<h4>Ubuntu Linux Notes</h4>
+<ul>
+    <li>If you need help installing and configuring Java on your
+development machine, you might find these resources helpful: 
+        <ul>
+           <li><a href="https://help.ubuntu.com/community/Java">https://help.ubuntu.com/community/Java </a></li>
+           <li><a href="https://help.ubuntu.com/community/Java">https://help.ubuntu.com/community/JavaInstallation </a></li>
+       </ul>
+   </li>
+<li>Here are the steps to install Java and Eclipse, prior to installing
+the Android SDK and ADT Plugin.
+<ol>
+    <li>If you are running a 64-bit distribution on your development
+machine, you need to install the <code>ia32-libs</code> package using
+<code>apt-get:</code>:
+        <pre>apt-get install ia32-libs</pre></li>
+    <li>Next, install Java:
+        <pre>apt-get install sun-java6-bin</pre></li>
+    <li>The Ubuntu package manager does not currently offer an Eclipse 3.3
+    version for download, so we recommend that you download Eclipse from
+eclipse.org (<a
+href="http://www.eclipse.org/downloads/">http://www.eclipse.org/
+downloads/</a>). A Java or RCP version of Eclipse is recommended.</li>
+<li>Follow the steps given in previous sections to install the SDK 
+and the ADT plugin. </li>
+</ol>
+</ul>
+<h4>Other Linux Notes</h4>
+<ul>
+    <li>If JDK is already installed on your development computer, please
+take a moment to make sure that it meets the version requirements listed
+at the top of this page. In particular, note that some Linux
+distributions may include JDK 1.4 or Gnu Compiler for Java, both of
+which are not supported for Android development.</li>
+</ul>
diff --git a/docs/html/sdk/1.0_r1/upgrading.jd b/docs/html/sdk/1.0_r1/upgrading.jd
new file mode 100644
index 0000000..480bff3
--- /dev/null
+++ b/docs/html/sdk/1.0_r1/upgrading.jd
@@ -0,0 +1,148 @@
+page.title=Upgrading the SDK
+sdk.version=1.0_r1
+@jd:body
+
+<p>For the current SDK release, see the links under <strong>Current SDK Release</strong> in the side navigation.</p>
+
+<p>This guide will help you migrate your development environment and applications
+to <strong>version 1.0, release 1</strong>, of the Android SDK. Use this guide if you've been developing applications
+on a different version of the Android SDK.</p>
+
+<p>To ensure that your applications are compliant with the Android 1.0 system available 
+on mobile devices, you need to install the new SDK and port your existing Android 
+applications to the updated API. The sections below guide you through the process.</p>
+
+<h2 id="install-new">Install the new SDK</h2>
+
+<p>After unpacking the SDK, you should:</p>
+
+<ul>
+  <li>Wipe your emulator data. <p>Some data formats have changed since the last
+  SDK release, so any previously saved data in your emulator must be removed. Open a console/terminal
+  and navigate to the <code>/tools</code> directory of your SDK. Launch the 
+  emulator with the <code>-wipe-data</code> option. </p>
+  <p>Windows: <code>emulator -wipe-data</code><br/>
+   Mac/Linux: <code>./emulator -wipe-data</code></p>
+  </li>
+  <li>Update your PATH variable (Mac/Linux; optional). <p>If you had previously setup your 
+  PATH variable to point to the SDK tools directory, then you'll need to update it to 
+  point to the new SDK. E.g., for a <code>.bashrc</code> or <code>.bash_profile</code> file:
+  <code>export PATH=$PATH:<em>&lt;your_new_sdk_dir></em>/tools</code></p>
+  </li>
+</ul>
+
+<h2 id="update-plugin">Update your ADT Eclipse Plugin</h2>
+
+<p>If you develop on Eclipse and are using the ADT plugin, follow these steps to install the
+plugin that's required for this version of the SDK.</p>
+
+<table style="font-size:100%">
+<tr><th>Eclipse 3.3 (Europa)</th><th>Eclipse 3.4 (Ganymede)</th></tr>
+<tr>
+<td width="45%">
+<ol>
+    <li><a href="http://dl-ssl.google.com/android/ADT-0.8.0.zip">Download the ADT v0.8.0 zip 
+      file</a> (do not unpack it).</li>
+    <li>Start Eclipse, then select <strong>Help</strong> &gt; <strong>Software Updates</strong> &gt; <strong>Find
+            and Install...</strong>. </li>
+    <li>In the dialog that appears, select <strong>Search for new features to install</strong> and click 
+      <strong>Next</strong>. </li>
+    <li>Click <strong>New Archive Site...</strong></li>
+    <li>Browse and select the downloaded the zip file.</li>
+    <li>You should now see the new site added to the search list (and checked).
+        Click <strong>Finish</strong>. </li>
+    <li>In the subsequent Search Results dialog box, select the checkbox for
+    <strong>Android Plugin</strong> &gt; <strong>Developer Tools</strong>.
+    This will check both features:  "Android Developer Tools", and "Android
+    Editors". The Android Editors feature is optional, but recommended.  If
+    you choose to install it, you need the WST plugin mentioned earlier in this
+    page. Click <strong>Next</strong>. </li>
+    <li>Read the license agreement and then select <strong>Accept terms of the license agreement</strong>. 
+     Click <strong>Next</strong>. </li>
+    <li>Click <strong>Finish</strong>. </li>
+    <li>The ADT plugin is not signed; you can accept the installation anyway
+        by clicking <strong>Install All</strong>. </li>
+    <li>Restart Eclipse. </li>
+</ol>
+
+</td>
+<td>
+
+<ol>
+    <li><a href="http://dl-ssl.google.com/android/ADT-0.8.0.zip">Download the ADT v0.8.0 zip 
+      file</a> (do not unpack it).</li>
+    <li>Start Eclipse, then select <strong>Help</strong> &gt; <strong>Software Updates...</strong>.</li>
+    <li>In the dialog that appears, click the <strong>Available Software</strong> tab.</li>
+    <li>Click <strong>Add Site...</strong>, then <strong>Archive...</strong>.</li>
+    <li>Browse and select the downloaded the zip file.</li>
+    <li>Back in the Available Software view, you should see the plugin. Select the checkbox next to 
+      <em>Developer Tools</em>  and click <strong>Install...</strong></li>
+    <li>On the subsequent Install window, "Android Developer Tools", and "Android Editors" should both be checked. 
+    The Android Editors feature is optional, but recommended.  If
+    you choose to install it, you need the WST plugin mentioned earlier in this
+    page. Click <strong>Next</strong>.</li>
+    <li>Accept the license agreement and click <strong>Finish</strong>.</li>
+    <li>Restart Eclipse. </li>
+</ol>
+
+</td>
+</tr>
+</table>
+
+<p>After restart, update your Eclipse preferences to point to the SDK directory:</p>
+    <ol>
+      <li>Select <strong>Window</strong> > <strong>Preferences...</strong> to open the Preferences panel. (Mac OSX: <strong>Eclipse</strong> > <strong>Preferences</strong>)</li>
+      <li>Select <strong>Android</strong> from the left panel.</li>
+      <li>For the SDK Location in the main panel, click <strong>Browse...</strong> and locate the SDK directory.</li>
+      <li>Click <strong>Apply</strong>, then <strong>OK</strong>.</li>
+    </ol>
+
+<h2 id="sign">Set Up Application Signing</h2>
+
+<p>All applications must now be signed before you can install them on the emulator. Both 
+the ADT plugin and the Ant-based build tools support this requirement by signing compiled 
+.apk files with a debug key. To do so, the build tools use the Keytool utility included 
+in the JDK to to create a keystore and a key with a known alias and password. For more 
+information, see "Signing and Publishing Your App" in the documentation included with the SDK.
+
+<p>To support signing, you should first make sure that Keytool is available to the SDK build 
+tools. In most cases, you can tell the SDK build tools how to find Keytool by making sure that 
+your JAVA_HOME environment variable is set and that it references a suitable JDK. Alternatively, 
+you can add the JDK version of Keytool to your PATH variable.</p>
+
+<p>If you are developing on a version of Linux that originally came with Gnu Compiler for Java, 
+make sure that the system is using the JDK version of Keytool, rather than the gcj version. 
+If keytool is already in your PATH, it might be pointing to a symlink at /usr/bin/keytool. 
+In this case, check the symlink target to make sure that it points to the keytool in the JDK.</p>
+
+<p>If you use Ant to build your .apk files (rather than ADT for Eclipse), you must regenerate 
+your build.xml file. To do that, follow these steps:</p>
+<ol>
+  <li>In your Android application project directory, locate and delete the current build.xml file.</li>
+  <li>Run activitycreator, directing output to the folder containing your application project.
+
+<pre>- exec activitycreator --out &lt;project folder&gt; your.activity.YourActivity</pre>
+
+  </li>
+</ol>
+
+<p>Run in this way, activitycreator will not erase or create new Java files (or manifest files), 
+provided the activity and package already exists. It is important that the package and the activity 
+are real. The tool creates a new build.xml file, as well as a new directory called "libs" in which 
+to place 3rd jar files, which are now automatically handled by the Ant script.</p>
+
+<h2 id="migrate">Migrate your applications</h2>
+
+<p>After updating your SDK, you will likely encounter breakages in your code, due to 
+framework and API changes. You'll need to update your code to match changes in the Android APIs.</p>
+
+<p>One way to start is to open your project in Eclipse and see where the ADT
+identifies errors in your application.</p>
+
+<p>If you have additional trouble updating your code, visit the 
+<a href="http://groups.google.com/group/android-developers">Android Developers Group</a>
+to seek help from other Android developers.</p>
+
+<p>If you have modified one of the ApiDemos applications and would like to migrate it 
+to the new SDK, note that you will need to uninstall the version of ApiDemos that comes 
+preinstalled in the emulator.</p>
diff --git a/docs/html/sdk/1.0_r2/index.jd b/docs/html/sdk/1.0_r2/index.jd
new file mode 100644
index 0000000..2446c09
--- /dev/null
+++ b/docs/html/sdk/1.0_r2/index.jd
@@ -0,0 +1,65 @@
+page.title=Android 1.0 SDK, release 2
+
+sdk.not_latest_version=true
+
+sdk.version=1.0_r2
+sdk.date=November 2008
+
+sdk.win_download=android-sdk-windows-1.0_r2.zip
+sdk.win_bytes=98360564
+sdk.win_checksum=a5e1af8ac145946b4a9627516ad4a711
+
+sdk.mac_download=android-sdk-mac_x86-1.0_r2.zip
+sdk.mac_bytes=93771410
+sdk.mac_checksum=87b99d5e9f59b78363a63200c11498e8
+
+sdk.linux_download=android-sdk-linux_x86-1.0_r2.zip
+sdk.linux_bytes=94186463
+sdk.linux_checksum=a1f3b6d854596f850f5008856d0f380e
+
+
+@jd:body
+
+<h2>Included in this SDK</h2>
+
+<h4>Development tools</h4>
+
+<p>The SDK includes a variety of tools for developing and debugging application code and designing 
+an application UI. You can read about the tools in the documentation included with the SDK. 
+You can access the tools in the <code>&lt;sdk&gt;/tools/</code> directory.</p>
+
+<h4 id="system_images">System Images</h4>
+
+<p>The Android system images listed below are included in this SDK.</p>
+
+<table style="margin-right:1em;" width="80%">
+<tr>
+<th><nobr>System Image</nobr></th><th><nobr>API Level</nobr></th><th>Notes</th><th>Description</th>
+</tr>
+
+<tr>
+<td width="5%"><nobr>Android 1.0</nobr></td>
+<td  width="5%">1</td>
+<td  width="5%"><nobr>N/A</nobr></td>
+<td>Includes the {@code com.google.android.maps} external library and a set of standard development 
+applications. </td>
+
+</tr>
+
+</table>
+
+<h4>Sample Code and Applications</h4>
+
+<p>You can look at a variety of tutorials and samples in the 
+documentation included with the SDK and access the sample code itself
+in the <code>&lt;sdk&gt;/samples/</code> directory of the SDK package.</p>
+
+<h4>Documentation</h4>
+
+<p>The SDK package provides a full set of local documentation, including installation and upgrade 
+instructions. To view it, open the <code>&lt;sdk&gt;/documentation.html</code> file in a web browser. 
+If you are developing in an IDE such as Eclipse, you can also view the reference documentation 
+directly in the IDE. </p>
+
+
+
diff --git a/docs/html/sdk/1.0_r2/installing.jd b/docs/html/sdk/1.0_r2/installing.jd
new file mode 100644
index 0000000..2c58dfd
--- /dev/null
+++ b/docs/html/sdk/1.0_r2/installing.jd
@@ -0,0 +1,221 @@
+page.title=Installing the SDK
+sdk.version=1.0_r2
+@jd:body
+
+<p>For the current SDK release, see the links under <strong>Current SDK Release</strong> in the side navigation.</p>
+
+<p>This page describes how to install the Android 1.0 SDK, Release 2, and set up your development environment. 
+If you haven't downloaded the SDK yet, you can so from the <a href="{@docRoot}sdk/1.0_r2/index.html">Download</a> page.</p>
+
+<p>Before you begin, be sure that your development environment meets the SDK
+<a href="{@docRoot}sdk/1.0_r2/requirements.html">System Requirements</a>. If you encounter any problems during installation,
+see the <a href="#installnotes">Installation Notes</a> at the bottom of this page.</p>
+
+<h4 style="margin-top">Upgrading?</h4>
+<p>If you have already developed applications using an earlier version of the 
+SDK, please skip this page and read the 
+<a href="{@docRoot}sdk/1.0_r2/upgrading.html"><strong>Upgrading the SDK</strong></a></b> document instead.
+</p>
+
+<a name="installingsdk"></a>
+<a name="setup"></a>
+<h2>Installing the SDK</h2>
+
+	<p>After downloading the SDK, unpack the .zip archive to a suitable location on your machine. By default, the SDK files are unpacked into a directory named  <code>android_sdk_<em>&lt;platform</em>&gt;_<em>&lt;release&gt;</em>_<em>&lt;build&gt;</em></code>. The directory contains a link to a local copy of the documentation and the subdirectories <code>tools/</code>, <code>samples/</code>, and others. </p>
+	
+	<p>Make a note of the name and location of the unpacked SDK directory on your system &mdash; you will need to refer to the SDK directory later, when setting up the Android plugin or using SDK tools. </p>
+
+        <p>Optionally, you can add the path to the SDK <code>tools</code> directory to your path. As mentioned above, the <code>tools/</code> directory is located in the SDK directory. </p>
+     <ul>
+          <li>On Linux, edit your ~/.bash_profile or ~/.bashrc file. Look
+          for a line that sets the PATH environment variable and add the
+          full path to the <code>tools/</code> directory to it. If you don't 
+          see a line setting the path, you can add one:</li>
+
+          <ul><code>export PATH=${PATH}:<em>&lt;your_sdk_dir&gt;</em>/tools</code></ul>
+
+          <li>On a Mac, look in your home directory for .bash_profile and
+          proceed as for Linux. You can create the .bash_profile, if 
+          you haven't already set one up on your machine. </li>
+
+          <li>On Windows, right click on My Computer, and select Properties.  
+        Under the Advanced tab, hit the Environment Variables button, and in the
+        dialog that comes up, double-click on Path under System Variables. Add  the full path to the <code>tools/</code> directory to the path. </li>
+        </ul>
+
+        <p>Adding <code>tools</code> to your path lets you run Android Debug Bridge (adb) and the other command line <a href="{@docRoot}guide/developing/tools/index.html">tools</a> without needing to supply the full path to the tools directory. Note that, if you update your SDK, you should remember to update your PATH settings to point to the new location, if different.</p>
+
+
+<p>If you will be using the Eclipse IDE as your environment for developing Android applications, continue reading the next
+section in order to install the Android Development Tools plugin and setup Eclipse. If you choose not to use Eclipse, you can 
+develop Android applications using other tools &mdash; read the guide to developing 
+<a href="{@docRoot}guide/developing/other-ide.html">In other IDEs</a>.</p>
+
+
+<h2>Setting up Eclipse</h2>
+
+<p>First, you should install a custom plugin called Android Development Tools (ADT), which adds integrated support for Android projects and tools. The ADT plugin includes a variety of powerful extensions that make creating, running, and debugging Android applications faster and easier. Developing in ADT/Eclipse is highly recommended for Eclipse users and those new to Android.</p>
+
+<p>To download and install the ADT plugin, follow the steps below for your respective Eclipse version. </p>
+
+<table style="font-size:100%">
+<tr><th>Eclipse 3.3 (Europa)</th><th>Eclipse 3.4 (Ganymede)</th></tr>
+<tr>
+<td width="45%">
+<ol>
+    <li>Start Eclipse, then select <strong>Help</strong> &gt; <strong>Software Updates</strong> &gt; <strong>Find
+            and Install...</strong>. </li>
+
+    <li>In the dialog that appears, select <strong>Search for new features to install</strong> and click <strong>Next</strong>. </li>
+    <li>Click <strong>New Remote Site</strong>. </li>
+    <li>In the resulting dialog box, enter a name for the remote site (e.g. Android Plugin) and enter this as its URL:
+        <pre>https://dl-ssl.google.com/android/eclipse/</pre>
+        <p>Alternatively, you can use http in the Location URL, if you are having 
+         trouble with https (https is preferred for security reasons).</p>
+        <pre>http://dl-ssl.google.com/android/eclipse/</pre>
+        <p>Click <strong>OK</strong>.</p> </li>
+    <li>You should now see the new site added to the search list (and checked).
+        Click <strong>Finish</strong>. </li>
+    <li>In the subsequent Search Results dialog box, select the checkbox for
+    <strong>Android Plugin</strong> &gt; <strong>Developer Tools</strong>.
+    This will check both features:  "Android Developer Tools", and "Android
+    Editors". The Android Editors feature is optional, but recommended.  If
+    you choose to install it, you need the WST plugin mentioned earlier in this
+    page. Click <strong>Next</strong>. </li>
+    <li>Read the license agreement and then select <strong>Accept terms of the license agreement</strong>. 
+     Click <strong>Next</strong>. </li>
+    <li>Click <strong>Finish</strong>. </li>
+
+    <li>The ADT plugin is not signed; you can accept the installation anyway
+        by clicking <strong>Install All</strong>. </li>
+    <li>Restart Eclipse. </li>
+</ol>
+
+</td>
+<td>
+
+<ol>
+    <li>Start Eclipse, then select <strong>Help</strong> &gt; <strong>Software Updates...</strong>.
+    </li>
+    <li>In the dialog that appears, click the <strong>Available Software</strong> tab.
+    </li>
+    <li>Click <strong>Add Site...</strong>
+    </li>
+    <li>Enter this as the Location:
+      <pre>https://dl-ssl.google.com/android/eclipse/</pre>
+      <p>Alternatively, you can use http in the Location URL, if you are having 
+         trouble with https (https is preferred for security reasons).</p>
+      <pre>http://dl-ssl.google.com/android/eclipse/</pre>
+      <p>Click <strong>OK</strong>.</p></li>
+    <li>Back in the Available Software view, you should see the plugin. Select the checkbox next to 
+      <em>Developer Tools</em>  and click <strong>Install...</strong>
+    </li>
+    <li>On the subsequent Install window, "Android Developer Tools", and "Android Editors" should both be checked. 
+    The Android Editors feature is optional, but recommended.  If
+    you choose to install it, you need the WST plugin mentioned earlier in this
+    page. Click <strong>Next</strong>.
+     </li>
+    <li>Accept the license agreement and click <strong>Finish</strong>.</li>
+    <li>Restart Eclipse. </li>
+</ol>
+
+</td>
+</tr>
+</table>
+
+
+<p>Now, you just need to modify your Eclipse preferences to point to the Android SDK directory:</p>
+<ol>
+    <li>Select <strong>Window</strong> &gt; <strong>Preferences...</strong> to open the Preferences
+        panel. (Mac OS X: <strong>Eclipse</strong> &gt; <strong>Preferences</strong>) </li>
+    <li>Select <strong>Android</strong> from the left panel. </li>
+    <li>For the SDK Location in the main panel, click <strong>Browse...</strong> and locate the SDK directory. </li>
+    <li>Click <strong>Apply</strong>, then <strong>OK</strong>.</li>
+</ol>
+
+<p>Done! If you haven't encountered any problems, then you're ready to begin developing Android applications.
+We recommend you begin with the <a href="{@docRoot}guide/tutorials/hello-world.html">Hello World</a> tutorial,
+which will teach you some basics about Android applications and how to create projects using Eclipse.</p>
+
+
+<h3 id="troubleshooting">Troubleshooting ADT Installation</h3>
+<p> 
+If you are having trouble downloading the ADT plugin after following the steps above, here are some suggestions: </p>
+
+<ul>
+	<li>If Eclipse can not find the remote update site containing the ADT plugin, try changing the remote site URL to use http, rather than https. That is, set the Location for the remote site to:
+        <pre>http://dl-ssl.google.com/android/eclipse/</pre></li>
+	<li>If you are behind a firewall (such as a corporate firewall), make
+        sure that you have properly configured your proxy settings in Eclipse.
+        In Eclipse 3.3/3.4, you can configure proxy information from the main
+        Eclipse menu in <strong>Window</strong> (on Mac, <strong>Eclipse</strong>) &gt; <strong>Preferences</strong> &gt; <strong>General</strong> &gt; <strong>Network Connections</strong>.</li>
+</ul>
+<p> 
+If you are still unable to use Eclipse to download the ADT plugin as a remote update site, you can download the ADT files to your local machine using a browser and the install the files in Eclipse from there:
+</p>
+<ol>
+<li><a href="{@docRoot}sdk/adt_download.html">Download the ADT zip file</a> (do not unpack it).
+<li>Follow steps 1 and 2 in the default install instructions (above).
+<li>In Eclipse 3.3, click <strong>New Archive Site...</strong>. <br/>
+    In Eclipse 3.4, click <strong>Add Site...</strong>, then <strong>Archive...</strong>
+<li>Browse and select the downloaded the zip file.
+<li>Follow the remaining procedures, above, starting from steps 5.
+</ol>
+<p> 
+Note that to update your plugin, you will have to follow these steps again instead of the default update instructions.</p>
+
+<p>Note that the "Android Editors" feature of ADT requires several optional 
+Eclipse components (for example, WST). If you encounter an error when 
+installing ADT, your Eclipse installion might not include those components. 
+For information about how to quickly add the necessary components to your 
+Eclipse installation, see the troubleshooting topic 
+<a href="{@docRoot}guide/appendix/faq/troubleshooting.html#installeclipsecomponents">ADT Installation Error: "requires plug-in org.eclipse.wst.sse.ui"</a>.</p>
+
+<h4>For Linux users</h4>
+<p>If you encounter this error when installing the ADT Plugin for Eclipse: 
+<pre>
+An error occurred during provisioning.
+Cannot connect to keystore.
+JKS</pre>
+<p>
+...then your development machine lacks a suitable Java VM. Installing Sun
+Java 6 will resolve this issue and you can then reinstall the ADT
+Plugin.</p>
+
+<a name="installnotes"></a>
+<h2>Installation Notes</h2>
+<h4>Ubuntu Linux Notes</h4>
+<ul>
+    <li>If you need help installing and configuring Java on your
+development machine, you might find these resources helpful: 
+        <ul>
+           <li><a href="https://help.ubuntu.com/community/Java">https://help.ubuntu.com/community/Java </a></li>
+           <li><a href="https://help.ubuntu.com/community/Java">https://help.ubuntu.com/community/JavaInstallation </a></li>
+       </ul>
+   </li>
+<li>Here are the steps to install Java and Eclipse, prior to installing
+the Android SDK and ADT Plugin.
+<ol>
+    <li>If you are running a 64-bit distribution on your development
+machine, you need to install the <code>ia32-libs</code> package using
+<code>apt-get:</code>:
+        <pre>apt-get install ia32-libs</pre></li>
+    <li>Next, install Java:
+        <pre>apt-get install sun-java6-bin</pre></li>
+    <li>The Ubuntu package manager does not currently offer an Eclipse 3.3
+    version for download, so we recommend that you download Eclipse from
+eclipse.org (<a
+href="http://www.eclipse.org/downloads/">http://www.eclipse.org/
+downloads/</a>). A Java or RCP version of Eclipse is recommended.</li>
+<li>Follow the steps given in previous sections to install the SDK 
+and the ADT plugin. </li>
+</ol>
+</ul>
+<h4>Other Linux Notes</h4>
+<ul>
+    <li>If JDK is already installed on your development computer, please
+take a moment to make sure that it meets the version requirements listed
+at the top of this page. In particular, note that some Linux
+distributions may include JDK 1.4 or Gnu Compiler for Java, both of
+which are not supported for Android development.</li>
+</ul>
diff --git a/docs/html/sdk/1.0_r2/requirements.jd b/docs/html/sdk/1.0_r2/requirements.jd
new file mode 100644
index 0000000..74d90ef
--- /dev/null
+++ b/docs/html/sdk/1.0_r2/requirements.jd
@@ -0,0 +1,44 @@
+page.title=System Requirements
+sdk.version=1.0_r2
+
+
+@jd:body
+
+<p>The sections below describe the system and software requirements for developing Android applications using the Android SDK tools included in Android 1.0 SDK, Release 2. </p>
+
+<h2>System and Software Requirements</h2>
+<p>The following systems and development environments are supported by this SDK.</p>
+
+<h4>Supported Operating Systems:</h4>
+<ul>
+  <li>Windows XP or Vista</li>
+  <li>Mac OS X 10.4.8 or later (x86 only)</li>
+  <li>Linux (tested on Linux Ubuntu Dapper Drake)</li>
+</ul>
+
+<h4>Supported Development Environments:</h4>
+<ul>
+  <li>Eclipse IDE
+    <ul>
+      <li><a href="http://www.eclipse.org/downloads/">Eclipse</a> 3.3 (Europa), 3.4 (Ganymede)
+        <ul>
+        <li>Eclipse <a href="http://www.eclipse.org/jdt">JDT</a> plugin (included in most Eclipse IDE packages) </li>
+        <li><a href="http://www.eclipse.org/webtools">WST</a> (optional, but needed for the Android Editors feature; included in <a href="http://www.eclipse.org/downloads/moreinfo/compare.php">most Eclipse IDE packages</a>)</li>
+        </ul>
+      </li>     
+      <li><a href="http://java.sun.com/javase/downloads/index.jsp">JDK 5 or JDK 6</a> (JRE alone is not sufficient)</li>
+      <li><a href="installing.html#installingplugin">Android Development Tools plugin</a> (optional)</li>
+      <li><strong>Not</strong> compatible with Gnu Compiler for Java (gcj)</li>
+    </ul>
+  </li>
+  <li>Other development environments or IDEs
+    <ul>
+      <li><a href="http://java.sun.com/javase/downloads/index.jsp">JDK 5 or JDK 6</a> (JRE alone is not sufficient)</li>
+      <li><a href="http://ant.apache.org/">Apache Ant</a> 1.6.5 or later for Linux and Mac, 1.7 or later for Windows</li>
+      <li><strong>Not</strong> compatible with Gnu Compiler for Java (gcj)</li>
+    </ul>
+  </li>
+</ul>
+
+<p class="note"><strong>Note:</strong> If JDK is already installed on your development computer, please take a moment to make sure that it meets the version requirements listed above. In
+particular, note that some Linux distributions may include JDK 1.4 or Gnu Compiler for Java, both of which are not supported for Android development. </p>
\ No newline at end of file
diff --git a/docs/html/sdk/1.0_r2/upgrading.jd b/docs/html/sdk/1.0_r2/upgrading.jd
new file mode 100644
index 0000000..df9b657
--- /dev/null
+++ b/docs/html/sdk/1.0_r2/upgrading.jd
@@ -0,0 +1,148 @@
+page.title=Upgrading the SDK
+sdk.version=1.0_r2
+@jd:body
+
+<p>For the current SDK release, see the links under <strong>Current SDK Release</strong> in the side navigation.</p>
+
+<p>This guide will help you migrate your development environment and applications
+to <strong>version 1.0, release 2</strong>, of the Android SDK. Use this guide if you've been developing applications
+on a different version of the Android SDK.</p>
+
+<p>To ensure that your applications are compliant with the Android 1.0 system available 
+on mobile devices, you need to install the new SDK and port your existing Android 
+applications to the updated API. The sections below guide you through the process.</p>
+
+<h2 id="install-new">Install the new SDK</h2>
+
+<p>After unpacking the SDK, you should:</p>
+
+<ul>
+  <li>Wipe your emulator data. <p>Some data formats have changed since the last
+  SDK release, so any previously saved data in your emulator must be removed. Open a console/terminal
+  and navigate to the <code>/tools</code> directory of your SDK. Launch the 
+  emulator with the <code>-wipe-data</code> option. </p>
+  <p>Windows: <code>emulator -wipe-data</code><br/>
+   Mac/Linux: <code>./emulator -wipe-data</code></p>
+  </li>
+  <li>Update your PATH variable (Mac/Linux; optional). <p>If you had previously setup your 
+  PATH variable to point to the SDK tools directory, then you'll need to update it to 
+  point to the new SDK. E.g., for a <code>.bashrc</code> or <code>.bash_profile</code> file:
+  <code>export PATH=$PATH:<em>&lt;your_new_sdk_dir></em>/tools</code></p>
+  </li>
+</ul>
+
+<h2 id="update-plugin">Update your ADT Eclipse Plugin</h2>
+
+<p>If you develop on Eclipse and are using the ADT plugin, follow these steps to install the
+plugin that's required for this version of the SDK.</p>
+
+<table style="font-size:100%">
+<tr><th>Eclipse 3.3 (Europa)</th><th>Eclipse 3.4 (Ganymede)</th></tr>
+<tr>
+<td width="45%">
+<ol>
+    <li><a href="http://dl-ssl.google.com/android/ADT-0.8.0.zip">Download the ADT v0.8.0 zip 
+      file</a> (do not unpack it).</li>
+    <li>Start Eclipse, then select <strong>Help</strong> &gt; <strong>Software Updates</strong> &gt; <strong>Find
+            and Install...</strong>. </li>
+    <li>In the dialog that appears, select <strong>Search for new features to install</strong> and click 
+      <strong>Next</strong>. </li>
+    <li>Click <strong>New Archive Site...</strong></li>
+    <li>Browse and select the downloaded the zip file.</li>
+    <li>You should now see the new site added to the search list (and checked).
+        Click <strong>Finish</strong>. </li>
+    <li>In the subsequent Search Results dialog box, select the checkbox for
+    <strong>Android Plugin</strong> &gt; <strong>Developer Tools</strong>.
+    This will check both features:  "Android Developer Tools", and "Android
+    Editors". The Android Editors feature is optional, but recommended.  If
+    you choose to install it, you need the WST plugin mentioned earlier in this
+    page. Click <strong>Next</strong>. </li>
+    <li>Read the license agreement and then select <strong>Accept terms of the license agreement</strong>. 
+     Click <strong>Next</strong>. </li>
+    <li>Click <strong>Finish</strong>. </li>
+    <li>The ADT plugin is not signed; you can accept the installation anyway
+        by clicking <strong>Install All</strong>. </li>
+    <li>Restart Eclipse. </li>
+</ol>
+
+</td>
+<td>
+
+<ol>
+    <li><a href="http://dl-ssl.google.com/android/ADT-0.8.0.zip">Download the ADT v0.8.0 zip 
+      file</a> (do not unpack it).</li>
+    <li>Start Eclipse, then select <strong>Help</strong> &gt; <strong>Software Updates...</strong>.</li>
+    <li>In the dialog that appears, click the <strong>Available Software</strong> tab.</li>
+    <li>Click <strong>Add Site...</strong>, then <strong>Archive...</strong>.</li>
+    <li>Browse and select the downloaded the zip file.</li>
+    <li>Back in the Available Software view, you should see the plugin. Select the checkbox next to 
+      <em>Developer Tools</em>  and click <strong>Install...</strong></li>
+    <li>On the subsequent Install window, "Android Developer Tools", and "Android Editors" should both be checked. 
+    The Android Editors feature is optional, but recommended.  If
+    you choose to install it, you need the WST plugin mentioned earlier in this
+    page. Click <strong>Next</strong>.</li>
+    <li>Accept the license agreement and click <strong>Finish</strong>.</li>
+    <li>Restart Eclipse. </li>
+</ol>
+
+</td>
+</tr>
+</table>
+
+<p>After restart, update your Eclipse preferences to point to the SDK directory:</p>
+    <ol>
+      <li>Select <strong>Window</strong> > <strong>Preferences...</strong> to open the Preferences panel. (Mac OSX: <strong>Eclipse</strong> > <strong>Preferences</strong>)</li>
+      <li>Select <strong>Android</strong> from the left panel.</li>
+      <li>For the SDK Location in the main panel, click <strong>Browse...</strong> and locate the SDK directory.</li>
+      <li>Click <strong>Apply</strong>, then <strong>OK</strong>.</li>
+    </ol>
+
+<h2 id="sign">Set Up Application Signing</h2>
+
+<p>All applications must now be signed before you can install them on the emulator. Both 
+the ADT plugin and the Ant-based build tools support this requirement by signing compiled 
+.apk files with a debug key. To do so, the build tools use the Keytool utility included 
+in the JDK to to create a keystore and a key with a known alias and password. For more 
+information, see "Signing and Publishing Your App" in the documentation included with the SDK.
+
+<p>To support signing, you should first make sure that Keytool is available to the SDK build 
+tools. In most cases, you can tell the SDK build tools how to find Keytool by making sure that 
+your JAVA_HOME environment variable is set and that it references a suitable JDK. Alternatively, 
+you can add the JDK version of Keytool to your PATH variable.</p>
+
+<p>If you are developing on a version of Linux that originally came with Gnu Compiler for Java, 
+make sure that the system is using the JDK version of Keytool, rather than the gcj version. 
+If keytool is already in your PATH, it might be pointing to a symlink at /usr/bin/keytool. 
+In this case, check the symlink target to make sure that it points to the keytool in the JDK.</p>
+
+<p>If you use Ant to build your .apk files (rather than ADT for Eclipse), you must regenerate 
+your build.xml file. To do that, follow these steps:</p>
+<ol>
+  <li>In your Android application project directory, locate and delete the current build.xml file.</li>
+  <li>Run activitycreator, directing output to the folder containing your application project.
+
+<pre>- exec activitycreator --out &lt;project folder&gt; your.activity.YourActivity</pre>
+
+  </li>
+</ol>
+
+<p>Run in this way, activitycreator will not erase or create new Java files (or manifest files), 
+provided the activity and package already exists. It is important that the package and the activity 
+are real. The tool creates a new build.xml file, as well as a new directory called "libs" in which 
+to place 3rd jar files, which are now automatically handled by the Ant script.</p>
+
+<h2 id="migrate">Migrate your applications</h2>
+
+<p>After updating your SDK, you will likely encounter breakages in your code, due to 
+framework and API changes. You'll need to update your code to match changes in the Android APIs.</p>
+
+<p>One way to start is to open your project in Eclipse and see where the ADT
+identifies errors in your application.</p>
+
+<p>If you have additional trouble updating your code, visit the 
+<a href="http://groups.google.com/group/android-developers">Android Developers Group</a>
+to seek help from other Android developers.</p>
+
+<p>If you have modified one of the ApiDemos applications and would like to migrate it 
+to the new SDK, note that you will need to uninstall the version of ApiDemos that comes 
+preinstalled in the emulator.</p>
diff --git a/docs/html/sdk/1.1_r1/index.jd b/docs/html/sdk/1.1_r1/index.jd
new file mode 100644
index 0000000..c4a9bf0
--- /dev/null
+++ b/docs/html/sdk/1.1_r1/index.jd
@@ -0,0 +1,62 @@
+page.title=Android 1.1 SDK, Release 1
+
+sdk.version=1.1_r1
+sdk.date=February 2009
+
+sdk.win_download=android-sdk-windows-1.1_r1.zip
+sdk.win_bytes=86038515
+sdk.win_checksum=8c4b9080b430025370689e03d20842f3
+
+sdk.mac_download=android-sdk-mac_x86-1.1_r1.zip
+sdk.mac_bytes=79046151
+sdk.mac_checksum=becf0f1763d61eedce15d2a903d6c1dd
+
+sdk.linux_download=android-sdk-linux_x86-1.1_r1.zip
+sdk.linux_bytes=79345522
+sdk.linux_checksum=ebcb16b0cd4aef198b4dd9a1418efbf1
+
+
+@jd:body
+
+<h2>SDK Contents</h2>
+
+<h4>Development tools</h4>
+
+<p>The SDK includes a variety of tools for developing and debugging application code and designing an application UI. You can read about the tools in the  
+<a href="{@docRoot}guide/developing/tools/index.html">Dev Guide</a> and access them in the <code>&lt;sdk&gt;/tools/</code> directory. 
+
+<p>The tools package included in this SDK is the same as that included in the Android 1.0, Release 2 SDK. </p>
+
+<h4 id="system_images">System Images</h4>
+
+<p>The Android system images listed below are included in this SDK. For more information about a system image &mdash; features, applications included, localizations, API changes, and so on &mdash; see its Version Notes. </p>
+
+<table style="margin-right:1em;" width="80%">
+<tr>
+<th><nobr>System Image</nobr></th><th><nobr>API Level</nobr></th><th>Notes</th><th>Description</th>
+</tr>
+
+<tr>
+<td width="5%"><nobr>Android 1.1</nobr></td>
+<td  width="5%">2</td>
+<td  width="5%"><nobr><a href="{@docRoot}sdk/android-1.1.html">Version Notes</a></nobr></td>
+<td>Includes com.google.android.maps external library and a set of standard development applications. </td>
+
+</tr>
+
+</table>
+
+<h4>Sample Code and Applications</h4>
+
+<p>You can look at a variety of tutorials and samples in the <a href="{@docRoot}guide/samples/index.html">Dev Guide</a> and access the sample code itself
+in the <code>&lt;sdk&gt;/samples/</code> directory of the SDK package.</p>
+
+<h4>Documentation</h4>
+
+<p>The SDK package includes a full set of local documentation. To view it, open the <code>&lt;sdk&gt;/documentation.html</code> file in a web browser. If you are developing in an IDE such as Eclipse, you can also view the reference documentation directly in the IDE. </p>
+
+<p>The most current documentation is always available on the Android Developers site:</p>
+
+<p style="margin-left:2em;"><a href="http://developer.android.com/index.html">http://developer.android.com/</a></p>
+
+
diff --git a/docs/html/sdk/1.1_r1/installing.jd b/docs/html/sdk/1.1_r1/installing.jd
new file mode 100644
index 0000000..d5a7106
--- /dev/null
+++ b/docs/html/sdk/1.1_r1/installing.jd
@@ -0,0 +1,312 @@
+page.title=Installing the Android SDK
+sdk.version=1.1_r1
+
+@jd:body
+
+
+<p>This page describes how to install the Android SDK and set up your
+development environment. If you haven't downloaded the SDK, you can
+do so from the 
+<a href="{@docRoot}sdk/1.1_r1/index.html">Download</a> page.</p>
+
+<p>If you encounter any problems during installation, see the 
+<a href="#installnotes">Installation Notes</a> at the bottom of
+this page.</p>
+
+<h4 style="margin-top">Upgrading?</h4>
+<p>If you have already developed applications using an earlier version
+of the SDK, please skip this page and read the 
+<a href="{@docRoot}sdk/1.1_r1/upgrading.html"><strong>Upgrading the
+SDK</strong></a></b> document instead.
+</p>
+
+
+<h2 id="setup">Preparing for Installation</h2>
+
+<p>Before you get started with the Android SDK, take a moment to confirm
+that your development machine meets the <a
+href="{@docRoot}sdk/1.1_r1/requirements.html">system requirements</a>.
+</p>
+
+<p>If you will be developing on Eclipse with the Android Development
+Tools (ADT) Plugin &mdash; the recommended path if you are new to
+Android &mdash; make sure that you have a suitable version of Eclipse
+installed on your computer. If you need to install Eclipse, you can
+download it from this location: </p>
+
+<p style="margin-left:2em;"><a href=
+"http://www.eclipse.org/downloads/">http://www.eclipse.org/downloads/</a
+></p>
+
+<p>A Java or RCP version of Eclipse is recommended. </p>
+
+<h2 id="installingsdk">Installing the SDK</h2>
+
+	<p>After downloading the SDK, unpack the .zip archive to a suitable location on your machine. By default, the SDK files are unpacked into a directory named  <code>android_sdk_<em>&lt;platform</em>&gt;_<em>&lt;release&gt;</em>_<em>&lt;build&gt;</em></code>. The directory contains a link to a local copy of the documentation and the subdirectories <code>tools/</code>, <code>samples/</code>, and others. </p>
+	
+	<p>Make a note of the name and location of the unpacked SDK directory on your system &mdash; you will need to refer to the SDK directory later, when setting up the Android plugin or using SDK tools. </p>
+
+        <p>Optionally, you can add the path to the SDK <code>tools</code> directory to your path. As mentioned above, the <code>tools/</code> directory is located in the SDK directory. </p>
+     <ul>
+          <li>On Linux, edit your ~/.bash_profile or ~/.bashrc file. Look
+          for a line that sets the PATH environment variable and add the
+          full path to the <code>tools/</code> directory to it. If you don't 
+          see a line setting the path, you can add one:</li>
+
+          <ul><code>export PATH=${PATH}:<em>&lt;your_sdk_dir&gt;</em>/tools</code></ul>
+
+          <li>On a Mac, look in your home directory for .bash_profile and
+          proceed as for Linux. You can create the .bash_profile, if 
+          you haven't already set one up on your machine. </li>
+
+          <li>On Windows, right click on My Computer, and select Properties.  
+        Under the Advanced tab, hit the Environment Variables button, and in the
+        dialog that comes up, double-click on Path under System Variables. Add  the full path to the <code>tools/</code> directory to the path. </li>
+        </ul>
+
+        <p>Adding <code>tools</code> to your path lets you run Android Debug Bridge (adb) and the other command line <a href="{@docRoot}guide/developing/tools/index.html">tools</a> without needing to supply the full path to the tools directory. Note that, if you update your SDK, you should remember to update your PATH settings to point to the new location, if different.</p>
+
+
+<p>If you will be using the Eclipse IDE as your environment for developing Android applications, continue reading the next
+section in order to install the Android Development Tools plugin and set up Eclipse. If you choose not to use Eclipse, you can 
+develop Android applications using other tools &mdash; read the guide to developing 
+<a href="{@docRoot}guide/developing/other-ide.html">in other IDEs</a>.</p>
+
+
+<h2 id="installingplugin">Installing the ADT Plugin for Eclipse</h2>
+
+<p>Android offers a custom plugin for the Eclipse IDE, called Android
+Development Tools (ADT), that is designed to give you a powerful,
+integrated environment in which to build Android applications. It
+extends the capabilites of Eclipse to let you quickly set up new Android
+projects, create an application UI, add components based on the Android
+Framework API, and debug using the Android SDK tools.</p>
+
+<p>If you are new to Android or want to develop using the Eclipse IDE,
+the ADT plugin will be an essential part of your development
+environment. In general, using Eclipse with ADT is a highly recommended
+approach and is the fastest way to get started. This section describes
+how to install ADT into your Eclipse environment. 
+
+<p>If you prefer to work in a development environment other than Eclipse,
+you do not need to install Eclipse or the ADT Plugin. Instead, you can 
+access the SDK tools directly to build and debug your application. </p>
+
+<p>Once you have Eclipse installed, as described in <a href="#setup">
+Preparing for Installation</a>, follow the steps below to
+download the ADT plugin and install it in your respective Eclipse
+environment. </p>
+
+<table style="font-size:100%">
+<tr><th>Eclipse 3.3 (Europa)</th><th>Eclipse 3.4 (Ganymede)</th></tr>
+<tr>
+<td width="45%">
+<ol>
+    <li>Start Eclipse, then select <strong>Help</strong> &gt; <strong>Software Updates</strong> &gt; <strong>Find
+            and Install...</strong>. </li>
+
+    <li>In the dialog that appears, select <strong>Search for new features to install</strong> and click <strong>Next</strong>. </li>
+    <li>Click <strong>New Remote Site</strong>. </li>
+    <li>In the resulting dialog box, enter a name for the remote site (e.g. Android Plugin) and enter this as its URL:
+        <pre>https://dl-ssl.google.com/android/eclipse/</pre>
+        <p>Alternatively, you can use http in the Location URL, if you are having 
+         trouble with https (https is preferred for security reasons).</p>
+        <pre>http://dl-ssl.google.com/android/eclipse/</pre>
+        <p>Click <strong>OK</strong>.</p> </li>
+    <li>You should now see the new site added to the search list (and checked).
+        Click <strong>Finish</strong>. </li>
+    <li>In the subsequent Search Results dialog box, select the checkbox for
+    <strong>Android Plugin</strong> &gt; <strong>Developer Tools</strong>.
+    This will check both features:  "Android Developer Tools", and "Android
+    Editors". The Android Editors feature is optional, but recommended.  If
+    you choose to install it, you need the WST plugin mentioned earlier in this
+    page. Click <strong>Next</strong>. </li>
+    <li>Read the license agreement and then select <strong>Accept terms of the license agreement</strong>. 
+     Click <strong>Next</strong>. </li>
+    <li>Click <strong>Finish</strong>. </li>
+
+    <li>The ADT plugin is not signed; you can accept the installation anyway
+        by clicking <strong>Install All</strong>. </li>
+    <li>Restart Eclipse. </li>
+</ol>
+
+</td>
+<td>
+
+<ol>
+    <li>Start Eclipse, then select <strong>Help</strong> &gt; <strong>Software Updates...</strong>.
+    </li>
+    <li>In the dialog that appears, click the <strong>Available Software</strong> tab.
+    </li>
+    <li>Click <strong>Add Site...</strong>
+    </li>
+    <li>Enter this as the Location:
+      <pre>https://dl-ssl.google.com/android/eclipse/</pre>
+      <p>Alternatively, you can use http in the Location URL, if you are having 
+         trouble with https (https is preferred for security reasons).</p>
+      <pre>http://dl-ssl.google.com/android/eclipse/</pre>
+      <p>Click <strong>OK</strong>.</p></li>
+    <li>Back in the Available Software view, you should see the plugin. Select the checkbox next to 
+      <em>Developer Tools</em>  and click <strong>Install...</strong>
+    </li>
+    <li>On the subsequent Install window, "Android Developer Tools", and "Android Editors" should both be checked. 
+    The Android Editors feature is optional, but recommended.  If
+    you choose to install it, you need the WST plugin mentioned earlier in this
+    page. Click <strong>Next</strong>.
+     </li>
+    <li>Accept the license agreement and click <strong>Finish</strong>.</li>
+    <li>Restart Eclipse. </li>
+</ol>
+
+</td>
+</tr>
+</table>
+
+<p>Now, you just need to modify your Eclipse preferences to point to the Android SDK directory:</p>
+<ol>
+    <li>Select <strong>Window</strong> &gt; <strong>Preferences...</strong> to open the Preferences
+        panel. (Mac OS X: <strong>Eclipse</strong> &gt; <strong>Preferences</strong>) </li>
+    <li>Select <strong>Android</strong> from the left panel. </li>
+    <li>For the SDK Location in the main panel, click <strong>Browse...</strong> and locate the SDK directory. </li>
+    <li>Click <strong>Apply</strong>, then <strong>OK</strong>.</li>
+</ol>
+
+<p>Done! If you haven't encountered any problems, then you're ready to
+begin developing Android applications. See the <a href="#next">After 
+Installation: Next Steps</a> section for suggestions on how to start. </p>
+
+
+<h3 id="troubleshooting">Troubleshooting ADT Installation</h3>
+<p> 
+If you are having trouble downloading the ADT plugin after following the steps above, here are some suggestions: </p>
+
+<ul>
+	<li>If Eclipse can not find the remote update site containing the ADT plugin, try changing the remote site URL to use http, rather than https. That is, set the Location for the remote site to:
+        <pre>http://dl-ssl.google.com/android/eclipse/</pre></li>
+	<li>If you are behind a firewall (such as a corporate firewall), make
+        sure that you have properly configured your proxy settings in Eclipse.
+        In Eclipse 3.3/3.4, you can configure proxy information from the main
+        Eclipse menu in <strong>Window</strong> (on Mac, <strong>Eclipse</strong>) &gt; <strong>Preferences</strong> &gt; <strong>General</strong> &gt; <strong>Network Connections</strong>.</li>
+</ul>
+<p> 
+If you are still unable to use Eclipse to download the ADT plugin as a remote update site, you can download the ADT files to your local machine using a browser and the install the files in Eclipse from there:
+</p>
+<ol>
+<li><a href="{@docRoot}sdk/adt_download.html">Download the ADT zip file</a> (do not unpack it).
+<li>Follow steps 1 and 2 in the default install instructions (above).
+<li>In Eclipse 3.3, click <strong>New Archive Site...</strong>. <br/>
+    In Eclipse 3.4, click <strong>Add Site...</strong>, then <strong>Archive...</strong>
+<li>Browse and select the downloaded the zip file.
+<li>Follow the remaining procedures, above, starting from steps 5.
+</ol>
+<p> 
+Note that to update your plugin, you will have to follow these steps again instead of the default update instructions.</p>
+
+<p>Note that the "Android Editors" feature of ADT requires several optional 
+Eclipse components (for example, WST). If you encounter an error when 
+installing ADT, your Eclipse installion might not include those components. 
+For information about how to quickly add the necessary components to your 
+Eclipse installation, see the troubleshooting topic 
+<a href="{@docRoot}guide/appendix/faq/troubleshooting.html#installeclipsecomponents">ADT Installation Error: "requires plug-in org.eclipse.wst.sse.ui"</a>.</p>
+
+<h4>For Linux users</h4>
+<p>If you encounter this error when installing the ADT Plugin for Eclipse: 
+<pre>
+An error occurred during provisioning.
+Cannot connect to keystore.
+JKS</pre>
+<p>
+...then your development machine lacks a suitable Java VM. Installing Sun
+Java 6 will resolve this issue and you can then reinstall the ADT
+Plugin.</p>
+
+
+<h2 id="next">After Installation: Next Steps</h2>
+<p>Once you have installed the SDK and the ADT Plugin, you are ready to
+begin developing applications. Here are a few ways you can get started: </p>
+
+<p><strong>Learn about Android</strong></p>
+<ul>
+<li>Take a look at the <a href="{@docRoot}guide/index.html">Dev
+Guide</a> and the types of information it provides</li>
+<li>Read an introduction to Android as a platform in <a
+href="{@docRoot}guide/basics/what-is-android.html">What is
+Android?</a></li>
+<li>Learn about the Android framework and how applications run on it in
+<a href="{@docRoot}guide/topics/fundamentals.html">Application
+Fundamentals</a></li>
+<li>Take a look at the Android framework API specification in the <a
+href="{@docRoot}reference/index.html">Reference</a> tab</li>
+</ul>
+
+<p><strong>Explore the SDK</strong></p>
+<ul>
+<li>Get an overview of the <a
+href="{@docRoot}guide/development/tools/index.html">development
+tools</a> that are available to you</li>
+<li>Read the overviews of how to develop <a
+href="{@docRoot}guide/developing/eclipse-adt.html">in Eclipse/ADT</a> or
+<a href="{@docRoot}guide/developing/other-ide.html">in other IDEs</a>
+</li>
+</ul>
+
+<p><strong>Explore some code</strong></p>
+<ul>
+<li>Set up a <a href="{@docRoot}guide/tutorials/hello-world.html">Hello
+World application</a></li>
+<li>Follow the <a href="{@docRoot}guide/tutorials/notepad/index.html">
+Notepad Tutorial</a> to build a full Android application </li>
+<li>Create a new project for one of the other sample applications
+included in <code>&lt;sdk&gt;/samples</code>, then compile and run it in
+your development environment</li>
+</ul>
+
+<p><strong>Visit the Android developer groups</strong></p>
+<ul>
+<li>Take a look at the <a
+href="{@docRoot}community/index.html">Community</a> tab to see a list of
+Android developers groups. In particular, you might want to look at the
+<a href="http://groups.google.com/group/android-developers">Android
+Developers</a> group to get a sense for what the Android developer
+community is like.</li>
+</ul>
+
+
+<h2 id="installnotes">Installation Notes</h2>
+<h4>Ubuntu Linux Notes</h4>
+<ul>
+    <li>If you need help installing and configuring Java on your
+development machine, you might find these resources helpful: 
+        <ul>
+           <li><a href="https://help.ubuntu.com/community/Java">https://help.ubuntu.com/community/Java </a></li>
+           <li><a href="https://help.ubuntu.com/community/Java">https://help.ubuntu.com/community/JavaInstallation </a></li>
+       </ul>
+   </li>
+<li>Here are the steps to install Java and Eclipse, prior to installing
+the Android SDK and ADT Plugin.
+<ol>
+    <li>If you are running a 64-bit distribution on your development
+machine, you need to install the <code>ia32-libs</code> package using
+<code>apt-get:</code>:
+        <pre>apt-get install ia32-libs</pre></li>
+    <li>Next, install Java:
+        <pre>apt-get install sun-java6-bin</pre></li>
+    <li>The Ubuntu package manager does not currently offer an Eclipse 3.3
+    version for download, so we recommend that you download Eclipse from
+eclipse.org (<a
+href="http://www.eclipse.org/downloads/">http://www.eclipse.org/
+downloads/</a>). A Java or RCP version of Eclipse is recommended.</li>
+<li>Follow the steps given in previous sections to install the SDK 
+and the ADT plugin. </li>
+</ol>
+</ul>
+<h4>Other Linux Notes</h4>
+<ul>
+    <li>If JDK is already installed on your development computer, please
+take a moment to make sure that it meets the version requirements listed
+in the <a href="{@docRoot}sdk/1.1_r1/requirements.html">System Requirements</a>.
+In particular, note that some Linux distributions may include JDK 1.4 or Gnu
+Compiler for Java, both of which are not supported for Android development.</li>
+</ul>
+
+
diff --git a/docs/html/sdk/1.1_r1/requirements.jd b/docs/html/sdk/1.1_r1/requirements.jd
new file mode 100644
index 0000000..95b658b
--- /dev/null
+++ b/docs/html/sdk/1.1_r1/requirements.jd
@@ -0,0 +1,42 @@
+page.title=System Requirements
+
+sdk.version=1.1_r1
+sdk.date=February 2009
+
+@jd:body
+
+<p>The sections below describe the system and software requirements for developing Android applications using the Android SDK tools included in Android 1.1 SDK, Release 1. </p>
+
+<h3>Supported Operating Systems</h3>
+<ul>
+  <li>Windows XP (32-bit) or Vista (32- or 64-bit)</li>
+  <li>Mac OS X 10.4.8 or later (x86 only)</li>
+  <li>Linux (tested on Linux Ubuntu Dapper Drake)</li>
+</ul>
+
+<h3>Supported Development Environments</h3>
+<ul>
+  <li>Eclipse IDE
+    <ul>
+      <li><a href="http://www.eclipse.org/downloads/">Eclipse</a> 3.3 (Europa), 3.4 (Ganymede)
+        <ul>
+        <li>Eclipse <a href="http://www.eclipse.org/jdt">JDT</a> plugin (included in most Eclipse IDE packages) </li>
+        <li><a href="http://www.eclipse.org/webtools">WST</a> (optional, but needed for the Android Editors feature; included in <a href="http://www.eclipse.org/downloads/moreinfo/compare.php">most Eclipse IDE packages</a>)</li>
+        </ul>
+      </li>     
+      <li><a href="http://java.sun.com/javase/downloads/index.jsp">JDK 5 or JDK 6</a> (JRE alone is not sufficient)</li>
+      <li><a href="installing.html#installingplugin">Android Development Tools plugin</a> (optional)</li>
+      <li><strong>Not</strong> compatible with Gnu Compiler for Java (gcj)</li>
+    </ul>
+  </li>
+  <li>Other development environments or IDEs
+    <ul>
+      <li><a href="http://java.sun.com/javase/downloads/index.jsp">JDK 5 or JDK 6</a> (JRE alone is not sufficient)</li>
+      <li><a href="http://ant.apache.org/">Apache Ant</a> 1.6.5 or later for Linux and Mac, 1.7 or later for Windows</li>
+      <li><strong>Not</strong> compatible with Gnu Compiler for Java (gcj)</li>
+    </ul>
+  </li>
+</ul>
+
+<p class="note"><strong>Note:</strong> If JDK is already installed on your development computer, please take a moment to make sure that it meets the version requirements listed above. In
+particular, note that some Linux distributions may include JDK 1.4 or Gnu Compiler for Java, both of which are not supported for Android development. </p>
\ No newline at end of file
diff --git a/docs/html/sdk/1.1_r1/upgrading.jd b/docs/html/sdk/1.1_r1/upgrading.jd
new file mode 100644
index 0000000..2ad6757
--- /dev/null
+++ b/docs/html/sdk/1.1_r1/upgrading.jd
@@ -0,0 +1,150 @@
+page.title=Upgrading the SDK
+sdk.version=1.1_r1
+@jd:body
+
+<!--
+<div class="sidebox-wrapper">
+  <div class="sidebox-inner">
+
+     <h2>Useful Links</h2>
+
+      <ul class="noindent">
+        <li><a href="migrating/0.9-1.0/changes-overview.html">Overview of Changes</a>
+		      <p>A high-level look at what's changed in Android, with 
+		       discussion of how the changes may affect your apps.</p></li>
+
+        <li><a href="migrating/0.9-1.0/changes.html">API Diff Report</a> 
+                <p>A detailed report that lists all the specific changes in the latest SDK.</p></li>
+
+        <li><a href="RELEASENOTES.html">Release Notes</a> 
+                <p>Version details, known issues, and resolved issues. </p></li>
+
+        <li><a href="http://groups.google.com/group/android-developers">Android Developers Group</a> 
+            <p>A forum where you can discuss migration issues and learn from other Android developers. </p></li>
+ 
+        <li><a href="http://code.google.com/p/android/issues/list">Android Issue Tracker</a>
+            <p>If you think you may have found a bug, use the issue tracker to report it.</p></li>
+      </ul>
+
+   </div>
+</div>
+-->
+
+<p>This document describes how to move your development environment and existing
+Android applications from an Android 1.0 SDK to the Android 1.1, Release 1 SDK.
+If you are migrating applications from an earlier SDK, please read the upgrading
+document available in the Android 1.0 SDK package.
+</p>
+
+<p>To ensure that your applications are compliant with the Android 1.1 system available 
+on mobile devices, you need to install the Android 1.1 SDK and port your existing Android 
+applications to it. The sections below will guide you through the process.</p>
+
+<h2 id="install-new">Installing the Latest SDK</h2>
+
+<p><a href="{@docRoot}sdk/1.1_r1/index.html">Download the SDK</a> and unpack it into a safe location.</p>
+
+<p>After unpacking the new SDK and saving it an appropriate location, you should:</p>
+
+<ul>
+  <li>Wipe your emulator data. <p>Some data formats have changed since the last
+  SDK release, so any previously saved data in your emulator must be removed. Open a console/terminal
+  and navigate to the <code>/tools</code> directory of your new SDK. Launch the 
+  emulator with the <code>-wipe-data</code> option. 
+  <p>Windows: <code>emulator -wipe-data</code><br/>
+   Mac/Linux: <code>./emulator -wipe-data</code></p>
+  </li>
+  <li>Update your PATH variable (Mac/Linux; optional). <p>If you had previously setup your 
+  PATH variable to point to the SDK tools directory, then you'll need to update it to 
+  point to the new SDK. For example, for a <code>.bashrc</code> or <code>.bash_profile</code> file:
+  <code>export PATH=$PATH:<em>&lt;your_new_sdk_dir></em>/tools</code></p>
+  </li>
+  <li>If (and only if) you are developing using Ant, you will also need to modify 
+  your build.xml properties to point to the new SDK. 
+  <p>Open the <code>default.properties</code> file associated with your build.xml 
+  file (typically located in the same directory). In the default.properties
+  file, update the <code>sdk-folder</code> property with the full path to
+  the new SDK directory.</p></li>
+</ul>
+
+<a name="Updating_the_ADT_plugin" id="Updating_the_ADT_plugin"></a>
+<h2 id="update-plugin">Update your ADT Eclipse Plugin</h2>
+
+<p>If you develop on Eclipse and are migrating from an Android 1.0
+SDK, no update of the ADT plugin is needed &mdash; skip to <a href="#updateEclipsePrefs">Update your Eclipse SDK Preferences</a>. </p>
+
+<p>If you are migrating from an earlier version of the SDK, you will
+need to update the ADT plugin. <p>You may also want to upgrade your 
+ADT plugin when a new version becomes available for your existing version 
+of the SDK.</p>
+
+<p>The steps below describe how to update the ADT plugin to the latest
+version available. </p>
+
+<table style="font-size:100%">
+<tr><th>Eclipse 3.3 (Europa)</th><th>Eclipse 3.4 (Ganymede)</th></tr>
+<tr>
+<td width="50%">
+<ol>
+    <li> Select <strong>Help</strong> &gt; <strong>Software Updates</strong> &gt; <strong>Find and Install...</strong>. </li>
+    <li> Select <strong>Search for updates of the currently installed features</strong> and click <strong>Finish</strong>. </li>
+    <li> If any update for ADT is available, select and install. </li>
+    <li> Restart Eclipse.</li>
+</ol>
+<p> Alternatively, </p>
+<ol>
+    <li> Select <strong>Help</strong> &gt; <strong>Software Updates</strong> &gt; <strong>Manage Configuration</strong>. </li>
+
+    <li> Navigate down the tree and select <strong>Android Development Tools &lt;version&gt;</strong> </li>
+    <li> Select <strong>Scan for Updates</strong> under <strong>Available Tasks</strong>.</li>
+</ol>
+</td>
+<td>
+<ol>
+    <li>Select <strong>Help</strong> &gt; <strong>Software Updates...</strong></li>
+    <li>Select the <strong>Installed Software</strong> tab.</li>
+    <li>Click <strong>Update...</strong></li>
+    <li>If an update for ADT is available, select it and click <strong>Finish</strong>.</li>
+    <li>Restart Eclipse.</li>
+</ol>
+</td>
+</tr>
+</table>
+
+<h2 id="updateEclipsePrefs">Update your Eclipse SDK Preferences</h2>
+
+<p>The last step is to update your Eclipse preferences to point to the new SDK directory:</p>
+    <ol>
+      <li>Select <strong>Window</strong> > <strong>Preferences...</strong> to open the Preferences panel. (Mac OSX: <strong>Eclipse</strong> > <strong>Preferences</strong>)</li>
+      <li>Select <strong>Android</strong> from the left panel.</li>
+      <li>For the SDK Location in the main panel, click <strong>Browse...</strong> and locate the SDK directory.</li>
+      <li>Click <strong>Apply</strong>, then <strong>OK</strong>.</li>
+    </ol>
+
+<h2 id="migrate">Migrate Your Applications, if Necessary</h2>
+
+<p>If (and only if) you have written apps in an SDK released previous to
+the Android 1.0 SDK, you will need to migrate your applications. After
+installing the new SDK and updating the ADT Plugin (if applicable), you
+may encounter breakages in your application code, due to 
+framework and API changes. You'll need to update your code to match the
+latest APIs.</p>
+
+<p>One way to start is to open your project in Eclipse and see where the ADT
+identifies errors in your application. From there, you can lookup
+specific API changes in the Android 1.0 APIs in the 
+<a href="http://code.google.com/android/migrating/changes-overview.html">
+Overview of Changes</a> and <a href="http://code.google.com/android/migrating/changes.html">
+API Diffs Report</a>.</p>
+
+<p>If you have additional trouble updating your code, visit the 
+<a href="http://groups.google.com/group/android-developers">Android Developers Group</a>
+to seek help from other Android developers.</p>
+
+<p>If you have modified one of the ApiDemos applications and would like to migrate it 
+to the new SDK, note that you will need to uninstall the version of ApiDemos that comes 
+preinstalled in the emulator. For more information, or if you encounter an "reinstallation" 
+error when running or installing ApiDemos, see the troubleshooting topic 
+<a href="{@docRoot}guide/appendix/faq/troubleshooting.html#apidemosreinstall">I can't install ApiDemos 
+apps in my IDE because of a signing error</a> for information about how to solve the problem.</p>
+
diff --git a/docs/html/sdk/RELEASENOTES.jd b/docs/html/sdk/RELEASENOTES.jd
new file mode 100644
index 0000000..bad71a2
--- /dev/null
+++ b/docs/html/sdk/RELEASENOTES.jd
@@ -0,0 +1,327 @@
+page.title=SDK Release Notes
+@jd:body
+
+<p>This document provides version-specific information about Android SDK releases. For the latest known issues, please ensure that you're viewing this page at: <a href="http://developer.android.com/sdk/RELEASENOTES.html">http://developer.android.com/sdk/RELEASENOTES.html</a>.</p>
+
+<h2 id="1.1_r1">Android 1.1 SDK, Release 1</h2>
+
+<p>This SDK provides the development tools and Android system image you need to create applications for Android-powered devices. Applications developed on this SDK will be compatible with mobile devices running the Android 1.1 platform. </p>
+
+<p>This release provides an updated system image (Android 1.1), updated documentation, and the same set of development tools provided in the Android 1.0 r2 SDK. The updated system image includes bug fixes and some smaller features, as well as a few minor API changes from the 1.0 version. </p>
+
+<p>For details about the Android 1.1 system image included in the SDK &mdash; including bug fixes, features, and API changes &mdash; please read the <a href="{@docRoot}sdk/android-1.1.html">Android 1.1 Version Notes</a>.</p>
+
+<h3>App Versioning for Android 1.1</h3>
+
+<p>If you are using this SDK to build an application that is compatible <em>only</em> with Android-powered devices running the Android 1.1 platform, please note that you <strong>must</strong> set the the <code>android:minSdkVersion</code> attribute in the application's manifest to the API Level of Android 1.1 &mdash; "2".</p>
+
+<p>Specifically, you specify the <code>android:minSdkVersion</code> attribute in a <code>&lt;uses-sdk&gt;</code> element as a child of <code>&lt;manifest&gt;</code> in the manifest file. When set, the attribute looks like this: </p>
+
+<pre><code>&lt;manifest&gt;
+  ...
+  &lt;uses-sdk minSdkVersion="2" /&gt;
+  ...
+&lt;/manifest&gt;</code>
+</pre>
+
+<p>By setting <code>android:minSdkVersion</code> in this way, you ensure that users will only be able to install your application if their devices are running the Android 1.1 platform. In turn, this ensures that your application will function properly on their devices, especially if it uses APIs introduced in Android 1.1. </p>
+
+<p>If your application uses APIs introduced in Android 1.1 but does not declare <code>&lt;uses-sdk minSdkVersion="2" /&gt;</code>, then it will run properly on Android 1.1 devices but <em>not</em> on Android 1.0 devices. </p>
+
+<p>If your application does not use any new APIs introduced in Android 1.1, you can indicate Android 1.0 compatibility by removing <code>minSdkVersion</code> or setting the attribute to "1". However, before publishing your application, you must make sure to compile your application against the Android 1.0 system image (available in the Android 1.0 SDK), to ensure that it builds and functions properly for Android 1.0 devices. You should test the application against system images corresponding to the API Levels that the application is designed to be compatible with.</p>
+
+<p>If you are sure your application is not using Android 1.1 APIs and has no need to use them, you might find it easier to keep working in the Android 1.0 SDK, rather than migrating to the Android 1.1 SDK and having to do additional testing.</p>
+
+
+<h3>ADT Plugin Compatibility</h3>
+
+<p>For this version of the SDK &mdash; Android 1.1 SDK, Release 1
+&mdash; the compatible version of the Android Development Tools (ADT)
+Plugin for Eclipse is <strong>0.8.0</strong>. If you are using a
+previous version of ADT, you should update to the latest version for use
+with this SDK. For information about how to update your ADT plugin, see
+<a href="{@docRoot}sdk/1.1_r1/upgrading.html#update-plugin">Upgrading
+the SDK</a>.</p>
+
+<h3>Installation and Upgrade Notes</h3>
+
+<p>If you've been developing an application using an Android 1.0 SDK no
+changes to your application are needed. You may want to wipe application
+user data (emulator option <code>-wipe-data</code>) when running your
+application on the Android 1.1 emulator for the first time.</p>
+
+<p>If you're installing the Android SDK for the first time, please see
+the instructions in <a
+href="{@docRoot}sdk/1.1_r1/installing.html">Installing the SDK</a>.
+
+<h3>Other Notes</h3>
+
+<p><strong>MapView API Key</strong></p>
+
+<p>com.google.android.maps.MapView is a class that lets you
+easily integrate Google Maps into your application. Before you can
+access the maps data, you will need to register with the Google Maps
+service and receive a Maps API Key, which you then add to your MapView
+for authentication to the server.</p>
+
+<p>Developers should note that the registration service for MapView is now
+active and Google Maps is actively enforcing the Maps API Key requirement. 
+For information about how to register for a Maps API Key, see 
+<a href="{@docRoot}guide/topics/location/geo/mapkey.html">
+Obtaining a Maps API Key</a>.</p>
+
+<p><strong>USB Drivers for Windows</strong></p>
+
+<p>If you using Windows and want to develop or test your application on an
+Android-powered device (such as the T-Mobile G1), you need an appropriate USB
+driver. For your convenience, the Windows version of the Android SDK includes
+these USB drivers that you can install, to let you develop on the device:</p>
+
+<ul>
+<li>USB driver for 32-bit XP and Vista</li>
+<li>USB driver for 64-bit Vista only</li>
+</ul>
+
+<p>The USB driver files are located in the
+<code>&lt;SDK&gt;/usb_driver</code> directory. For details and
+installation instructions, see <a
+href="{@docRoot}guide/developing/device.html#setting-up">Setting Up a
+Device for Development</a>.</p>
+</p>
+
+<h3>Resolved Issues, Changes</h3>
+
+<p><strong>Emulator</strong></p>
+<ul>
+<li>Emulator now saves the user image in &lt;android&gt;/SDK1.1/</code></li>
+</ul>
+
+<h3>Known Issues</h3>
+
+<p><strong>JUnit and Eclipse/ADT</strong></p>
+<ul>
+<li>If you are developing in Eclipse/ADT and want to add JUnit test
+classes, you can do so. However, you need to set up a custom JUnit configuration
+before your tests will run properly. For detailed information about how to set
+up the JUnit configuration, see the troubleshooting topic <a
+href="{@docRoot}guide/appendix/faq/troubleshooting.html#addjunit">Running a Junit test class
+in Eclipse</a>.</li>
+</ul>
+
+<p><strong>Other</strong></p>
+
+<ul>
+<li>It is not possible to send MMS messages between emulator instances. </li>
+<li>In some cases, you may encounter problems when using the browser on an
+emulator started with the command-line option <code>-http-proxy</code>. </li>
+<li>On the OSX platform, if you manually remove the ~/.android directory
+using <code>rm -rf ~/.android</code>, then try to run 
+the emulator, it crashes. This happens because the emulator fails to create 
+a new .android directory before attempting to create the child SDK1.0 directory.
+To work around this issue, manually create a new .android directory using
+<code>mkdir ~/.android</code>, then run the emulator. The emulator 
+creates the SDK1.0 directory and starts normally. </li>
+<li>We regret to inform developers that Android 1.1 will not include support 
+for ARCNet network interfaces.</li>
+<li>The final set of Intent patterns honored by Android 1.0 has not yet been
+fully documented. Documentation will be provided in future releases.</li>
+<li>In ADT Editor, you can add at most ten new resource values at a time,
+in a given res/values/*.xml, using the form in the Android Resources pane. 
+If you add more than ten, the Android Resources pane will not display the
+attributes fields for the additional resource entries. To work around this 
+problem, you can close the file in the editor and open it again, or you 
+can edit the resource entries in the XML text mode. </li>
+<li>The emulator's battery-control commands (<code>power &lt;option&gt</code>)
+are not working in this release.</li>
+</ul>
+
+
+
+
+
+<h2 id="1.0_r2">Android 1.0 SDK, Release 2</h2>
+
+<p>This SDK release includes the Android 1.0 platform and application API.
+Applications developed on this SDK will be compatible with mobile devices
+running the Android 1.0 platform.</p>
+
+<p>This release includes mainly bug fixes, although some smaller features were
+added.</p>
+
+<h3>ADT Plugin Compatibility</h3>
+
+<p>For this release of the SDK, the compatible version of the Android
+Development Tools (ADT) Plugin for Eclipse is <strong>0.8.0</strong>. If you are
+using a previous version of ADT, you should update to the latest version for use
+with this SDK. For information about how to update your ADT plugin, see <a
+href="/android/intro/upgrading.html">Upgrading the SDK</a>.</p>
+
+<h3>Installation and Upgrade Notes</h3>
+
+<p>If you're installing the Android SDK for the first time, please see the
+instructions in <a href="/android/intro/installing.html">Installing the
+SDK</a>.
+
+<h3>Other Notes</h3>
+
+<p><strong>T-Mobile G1 Compatability</strong></p>
+
+<p>This version of the SDK has been tested for compatability with the first 
+Android-powered mobile device, the <a href="http://www.t-mobileg1.com">T-Mobile
+G1</a>. </p>
+
+<p><strong>MapView API Key</strong></p>
+
+<p>MapView is a class that lets you easily integrate Google Maps into your
+application. Before you can access the maps data, you will need to register with
+the Google Maps service and receive a Maps API Key, which you then add to your
+MapView for authentication to the server.</p>
+
+<p>Developers should note that the registration service for MapView is now
+active and Google Maps is actively enforcing the Maps API Key requirement. For
+information about how to register for a Maps API Key, see <a
+href="http://code.google.com/android/toolbox/apis/mapkey.html">http://code.
+google.com/android/toolbox/apis/mapkey.html</a>.</p>
+
+<p><strong>USB Driver for Windows</strong></p>
+<p>If you using Windows and want to develop or test your application on an
+Android-powered device (such as the T-Mobile G1), you need an appropriate USB
+driver. For your convenience, the Windows version of the Android SDK includes a
+USB driver that you can install, to let you develop on the device. The USB
+driver files are located in the <code>&lt;SDK&gt;/usb_driver</code> directory. 
+
+</p>
+
+<h3>Resolved Issues, Changes</h3>
+<ul>
+<li>The android.jar in this SDK release now includes several classes that were
+missing from the previous SDK. </li>
+<li>The android.R.styleable class and its fields were removed from the public
+API, to better ensure forward-compatibility for applications. The constants
+declared in android.R.styleable were platform-specific and subject to arbitrary
+change across versions, so were not suitable for use by applications. You can
+still access the platform's styleable attributes from your resources or code. To
+do so, declare a custom resource element using a
+<code>&lt;declare-styleable&gt;</code> in your project's res/values/R.attrs
+file, then declare the attribute inside. For examples, see 
+&lt;sdk&gt;/samples/ApiDemos/res/values/attrs.xml. For more information about
+custom resources, see <a
+href="/android/reference/available-resources.html#customresources">Custom
+Layout Resources</a>. Note that the android.R.styleable documentation is still
+provided in the SDK, but only as a reference of the platform's styleable
+attributes for the various elements.</li>
+<li>The VM now properly ensures that private classes are not 
+available to applications through reflection. If you were using reflection
+to access private classes in a previous release, you will now get a run-time 
+error. </li>
+
+<li>The Settings and Email applications are now included in the SDK and
+available in the emulator.</li>
+<li>We regret to inform developers that SDK 1.0_r2 does not support MFM, RLL, 
+or Winchester hard disk drives.</li>
+<li>In the emulator, the control key for enabling/disabling trackball mode 
+is changed from Control-T to F6. You can also enter trackball mode temporarily
+using the Delete key. While the key is pressed, you can send trackball events.</li>
+</ul>
+
+<p>Unless otherwise noted, Known Issues from the previous SDK release also apply
+to this release.</p>
+
+
+
+
+
+
+<h2 id="1.0_r1">Android 1.0 SDK, Release 1</h2>
+
+<p>This SDK release is the first to include the Android 1.0 platform and application API. Applications developed on this SDK will be compatible with mobile devices running the Android 1.0 platform, when such devices are available.</p>
+
+<p>This release includes mainly bug fixes, although some smaller features were added. The Android 1.0 also includes several API changes from the 0.9 version. For more information on API changes, see the <a href="/android/migrating/0.9-1.0/changes-overview.html">Overview of Changes</a> and the <a href="/android/migrating/0.9-1.0/changes.html">API Differences Report</a>. For those porting from the M5 release, the SDK also includes the legacy changes overview and API Differences Reports. See the current Overview of Changes for more information. </p>
+
+<h3>ADT Plugin Compatibility</h3>
+
+<p>For this version of the SDK &mdash; Android 1.0 SDK, Release 1 &mdash; the compatible version of the Android Development Tools (ADT) Plugin for Eclipse is <strong>0.8.0</strong>. If you are using a previous version of ADT, you should update to the latest version for use with this SDK. For information about how to update your ADT plugin, see <a href="/android/intro/upgrading.html">Upgrading the SDK</a>.</p>
+
+<h3>Installation and Upgrade Notes</h3>
+
+<p>If you've been developing an application using a previous SDK version and you want the application to run on Android-powered mobile devices, you must port the application to the Android 1.0 SDK. Please see <a href="/android/intro/upgrading.html">Upgrading the SDK</a> for detailed instructions on how to make the transition to this release.  Be sure to wipe application user data (emulator option <code>-wipe-data</code>) when running your application on the Android 1.0 SDK emulator.</p>
+
+<p>If you're installing the Android SDK for the first time, please see the instructions in <a href="/android/intro/installing.html">Installing the SDK</a>.
+
+<h3>Other Notes</h3>
+
+<p><strong>MapView API Key</strong></p>
+
+<p><a href="/android/reference/com/google/android/maps/MapView.html">MapView</a> is a class that lets you easily integrate Google Maps into your application. Before you can access the maps data, you will need to register with the Google Maps service and receive a Maps API Key, which you then add to your MapView for authentication to the server.</p>
+
+<p>Currently, the registration service for MapView is not yet active and Google Maps is not yet enforcing the Maps API Key requirement. However, note that the registration service will be activated soon, so that MapViews in any application deployed to a mobile device will require registration and a valid Maps API Key. </p>
+
+<p>As soon as the registration service becomes available, we will update the page at <a href="http://code.google.com/android/toolbox/apis/mapkey.html">http://code.google.com/android/toolbox/apis/mapkey.html</a> with details about how and where to register. Please check that page periodically for registration information, if you are using a MapView.</p>
+
+
+<h3>Resolved Issues, Changes</h3>
+
+<p><strong>Emulator</strong></p>
+<ul>
+<li>Emulator now saves the user image in &lt;android&gt;/SDK1.0/</code></li>
+<li>Fixed EsounD-related freezes on Linux.</li>
+<li>Fixed the documentation in -help-audio. '-audio list' doesn't work, one
+ needs to call -help-audio-out and -help-audio-in to get the list of valid
+ audio backends.</li>
+<li>Fixed scrollwheel Dpad emulation in rotated mode. before that, using the
+ scroll-wheel would always generated Dpad Up/Down events, even when in
+ landscape mode.</li>
+
+<li>Several Obsolete command options were removed.</li>
+<li>Setting the network speed through the console or the -netspeed option will
+ properly modify the connectivity icon on the device.</li>
+<li>Setting the GSM voice registration state to 'roaming' in the console will
+ properly modify the voice icon on the device</li>
+</ul>
+
+<p><strong>SQLite</strong></p>
+<ul>
+<li>SQLite is now included in the SDK package on all platforms. </li>
+</ul>
+
+<h3>Known Issues</h3>
+
+<p><strong>JUnit and Eclipse/ADT</strong></p>
+<ul>
+<li>If you are developing in Eclipse/ADT and want to add JUnit test
+classes, you can do so. However, you need to set up a custom JUnit configuration
+before your tests will run properly. For detailed information about how to set
+up the JUnit configuration, see the troubleshooting topic <a
+href="/android/kb/troubleshooting.html#addjunit">Running a Junit test class
+in Eclipse</a>.</li>
+</ul>
+
+<p><strong>Other</strong></p>
+
+<ul>
+<li>It is not possible to send MMS messages between emulator instances. </li>
+<li>In some cases, you may encounter problems when using the browser on an
+emulator started with the command-line option <code>-http-proxy</code>. </li>
+
+<li>We regret to inform developers that Android 1.0 will not include support for
+dot-matrix printers.</li>
+<li>On the OSX platform, if you manually remove the ~/.android directory
+using <code>rm -rf ~/.android</code>, then try to run 
+the emulator, it crashes. This happens because the emulator fails to create 
+a new .android directory before attempting to create the child SDK1.0 directory.
+To work around this issue, manually create a new .android directory using
+<code>mkdir ~/.android</code>, then run the emulator. The emulator 
+creates the SDK1.0 directory and starts normally. </li>
+<li>The final set of Intent patterns honored by Android 1.0 has not yet been
+fully documented. Documentation will be provided in future releases.</li>
+<li>In ADT Editor, you can add at most ten new resource values at a time,
+in a given res/values/*.xml, using the form in the Android Resources pane. 
+If you add more than ten, the Android Resources pane will not display the
+attributes fields for the additional resource entries. To work around this 
+problem, you can close the file in the editor and open it again, or you 
+can edit the resource entries in the XML text mode. </li>
+<li>The emulator's battery-control commands (<code>power &lt;option&gt</code>)
+are not working in this release.</li>
+
+</ul>
+
diff --git a/docs/html/sdk/adt_download.jd b/docs/html/sdk/adt_download.jd
new file mode 100644
index 0000000..6e9eec4
--- /dev/null
+++ b/docs/html/sdk/adt_download.jd
@@ -0,0 +1,65 @@
+page.title=Download the ADT Plugin Zip File
+@jd:body
+
+<p>
+If you are unable to download the ADT plugin through <a
+href="{@docRoot}guide/developing/tools/adt.html#installingplugin">setting up a remote
+update site</a> in Eclipse, you can download the ADT zip file and install it 
+from your computer (archived site) instead. 
+</p>
+<p>
+If you go with this method, in order to update the plugin, you will need to 
+download the latest version from this page, uninstall the old version from 
+Eclipse, then install the new version. For more details on the procedure, 
+see Troubleshooting ADT Installation in the 
+<a href="{@docRoot}guide/developing/tools/adt.html#troubleshooting"> installation 
+page</a>.
+</p>
+<p>
+<table>
+  <tr>
+    <th>Version</th>
+    <th>File</th>
+    <th>Date</th>
+    <th>Compatible SDK Versions</th>
+    <th>Notes</th>
+  </tr>
+
+  <tr>
+     <td style="background-color:#ffcccc;">0.8.0</td>
+     <td style="background-color:#ffcccc;"><a href="http://dl-ssl.google.com/android/ADT-0.8.0.zip">ADT-0.8.0.zip</a></td>
+     <td style="background-color:#ffcccc;">23&nbsp;September&nbsp;2008</td>
+     <td style="background-color:#ffcccc;">Android&nbsp;1.1&nbsp;SDK,&nbsp;Release&nbsp;1<br />Android&nbsp;1.0&nbsp;SDK,&nbsp;Release&nbsp;1<br /></td>
+     <td style="background-color:#ffcccc;">Required for users of Android 1.1 SDK, Release&nbsp;1 and Android&nbsp;1.0&nbsp;SDK,&nbsp;Release&nbsp;1<br /> </td>
+  </tr>
+  <tr>
+     <td>0.7.1</td>
+     <td><a href="http://dl-ssl.google.com/android/ADT-0.7.1.zip">ADT-0.7.1.zip</a></td>
+     <td>18 Aug 2008</td>
+     <td>Android 0.9 SDK beta</td>
+     <td>Required for users of Android 0.9 SDK beta. As of this version, <b>Eclipse 3.2 is no longer supported.</b>
+     Please upgrade to Eclipse Ganymede (3.4) or Europa (3.3) if you are still using 3.2. </td>
+  </tr>
+  <tr>
+     <td>0.4.0</td>
+     <td><a href="http://dl-ssl.google.com/android/ADT-0.4.0.zip">ADT-0.4.0.zip</a></td>
+     <td>12 Feb 2008</td>
+     <td>m5-rc14</td>
+     <td>Required if you are using the M5 SDK. See the SDK Release Notes for details on changes and enhancements in this version.</td>
+  </tr>
+  <tr>
+     <td>0.3.3</td>
+     <td><a href="http://dl-ssl.google.com/android/ADT-0.3.3.zip">ADT-0.3.3.zip</a></td>
+     <td>14 Dec 2007</td>
+     <td>m3-rc37</td>
+     <td>Some significant enhancements (see SDK Release Notes).</td>
+  </tr>
+  <tr>
+     <td>0.3.1</td>
+     <td><a href="http://dl-ssl.google.com/android/ADT-0.3.1.zip">ADT-0.3.1.zip</a></td>
+     <td>21 Nov 2007</td>
+     <td>m3-rc20, m3-rc22</td>
+     <td>Initial Release.</td>
+  </tr>
+</table>
+</p>
diff --git a/docs/html/sdk/android-1.1.jd b/docs/html/sdk/android-1.1.jd
new file mode 100644
index 0000000..f70ad26
--- /dev/null
+++ b/docs/html/sdk/android-1.1.jd
@@ -0,0 +1,249 @@
+page.title=Android 1.1 Version Notes
+sdk.version=1.1_r1
+sys.date=February 2009
+@jd:body
+
+<p>
+<em>Date:</em> February 2009<br />
+<em>API Level:</em>&nbsp;<strong>2</strong></p>
+
+
+<p>This document provides version notes for the Android 1.1 system image included in the SDK. 
+
+<ul>
+<li><a href="#overview">Overview</a>
+<li><a href="#overview">External Libraries</a>
+<li><a href="#comp">Device Compatibility</a>
+<li><a href="#apps">Built-in Applications</a>
+<li><a href="#locs">UI Localizations</a>
+<li><a href="#resolved-issues">Resolved Issues</a>
+<li><a href="#features">New Features</a>
+<li><a href="#api-changes">API Changes</a>
+</ul></p>
+
+<h2 id="overview">Overview</h2>
+
+<p>The Android 1.1 system image delivered in the SDK is the development
+counterpart to the Android 1.1 production system image, deployable to
+Android-powered handsets starting in February 2009. </p>
+
+<p>The Android 1.1 system image delivers an updated version of the framework
+API. As with the Android 1.0 API, the Android 1.1 API 
+is assigned an integer identifier &mdash; <strong>2</strong> &mdash; that is
+stored in the system itself. This identifier, called the "API Level", allows the
+system to correctly determine whether an application is compatible with
+the system, prior to installing the application.</p>
+
+<p>Applications can reference a specific API Level value in their
+manifest files, to indicate the minimum version of the Android system
+required to run the app. To reference a minimum API Level, applications 
+can add a <code>minSdkVersion</code> attribute in their manifest files.
+The value of the attribute is an integer corresponding to an API Level 
+identifier. Prior to installing an application, the system then checks the value of 
+<code>minSdkVersion</code> and allows the install only
+if the referenced integer is less than or equal to the API Level integer stored
+in the system itself. </p>
+
+<p>If you use the Android 1.1 system image to build an application
+compatible with Android-powered devices running the Android 1.1
+platform, please note that you <strong><span
+style="color:red;">must</span></strong> set the the
+<code>android:minSdkVersion</code> attribute in the application's
+manifest to "2", which is the API strictly associated with Android 1.1.
+</p>
+
+<p>Specifically, you specify the <code>android:minSdkVersion</code>
+attribute in a <code>&lt;uses-sdk&gt;</code> element as a child of
+<code>&lt;manifest&gt;</code> in the manifest file. When set, the
+attribute looks like this: </p>
+
+<pre><code>&lt;manifest&gt;
+  ...
+  &lt;uses-sdk minSdkVersion="2" /&gt;
+  ...
+&lt;/manifest&gt;</code>
+</pre>
+
+<p>By setting <code>android:minSdkVersion</code> in this way, you ensure
+that users will only be able to install your application if their
+devices are running the Android 1.1 platform. In turn, this ensures that
+your application will function properly on their devices, especially if
+it uses <a href="#apichange">APIs introduced in Android 1.1</a>. </p>
+
+<p>If your application uses APIs introduced in Android 1.1 but does not
+declare <code>&lt;uses-sdk minSdkVersion="2" /&gt;</code>, then it will
+run properly on Android 1.1 devices but <em>not</em> on Android 1.0
+devices. In the latter case, the application will crash at runtime when
+it tries to use the Android 1.1 APIs.</p>
+
+<p>If your application does not use any new APIs introduced in Android
+1.1, you can indicate Android 1.0 compatibility by removing
+<code>minSdkVersion</code> or setting the attribute to "1". However,
+before publishing your application, you must make sure to compile your
+application against the Android 1.0 system image (available in the
+Android 1.0 SDK), to ensure that it builds and functions properly for
+Android 1.0 devices. You should test the application against system
+images corresponding to the API Levels that the application is designed
+to be compatible with.</p>
+
+<p>If you are sure your application is not using Android 1.1 APIs and
+has no need to use them, you might find it easier to keep working in the
+Android 1.0 SDK, rather than migrating to the Android 1.1 SDK and having
+to do additional testing.</p>
+
+
+<h2 id="extlibs">External Libraries</h2>
+
+<p>The system image includes these external libraries, which you can
+access from your application by adding a <a
+href="{@docRoot}guide/topics/manifest/uses-library-element.html">
+&lt;uses-library&gt;</a>.</p>
+	<ul>
+	<li>com.google.android.maps &mdash; gives your
+application access to Google Maps data. Note that, to use Google Maps
+data, a Maps API Key is required.</li>
+	</ul>
+
+<h2 id="comp">Device Compatibility</h2>
+
+<p>The Android 1.1 system image was tested for compatability with the
+Android-powered devices listed below:</p>
+	<ul>
+	<li><a href="http://www.t-mobileg1.com">T-Mobile G1</a></li>
+	</ul>
+
+<h2 id="apps">Built-in Applications</h2>
+
+<p>The system image includes these built-in applications:</p>
+	<ul>
+	<li>Alarm Clock</li>
+	<li>API Demos</li>
+	<li>Browser</li>
+	<li>Calculator</li>
+	<li>Camera</li>
+	<li>Contacts</li>
+	<li>Dev Tools</li>
+	<li>Dialer</li>
+	<li>Email</li>
+	<li>Maps (and StreetView)</li>
+	<li>Messaging</li>
+	<li>Music</li>
+	<li>Pictures</li>
+	<li>Settings</li>
+	</ul>
+
+<h2 id="locs">UI Localizations</h2>
+
+<p>The system image provides localized UI strings for the languages
+listed below.</p>
+	<ul>
+	<li>English, US (en_US)</li>
+	<li>German (de) </li>
+	</ul>
+
+<p>Localized UI strings match the locales that are displayable in 
+the emulator, accessible through the device Settings application.</p>
+
+<h2 id="resolved-issues">Resolved Issues</h2>
+<ul>
+<li>AlarmClock alert now plays audio/vibe directly, rather than through
+AlarmManager. AlarmClock alert starts playing audio/vibe in its
+IntentReceiver, rather than on activity start. These changes should
+prevent alarms from being blocked by modal dialogs.</li>
+<li>Fixes to device sleep. </li>
+<li>Single tap no longer opens the in-call dialpad; users now need to
+touch and drag it. </li>
+<li>Fixes a bug causing approximately 1 in 25 outbound messages to
+freeze up the IMAP connection (to a Gmail based server) when transferred
+to the Sent folder.</li>
+<li>Removes automatic account setup entries that were broken or not
+testable. Adds minor fixes to a few of the remaining entries. Makes
+improvements to warning dialogs used for a few special cases.	</li>
+<li>Changes default mail checking interval to every 15 minutes (instead
+of defaulting to "never").</li>
+<li>Fixes password-quoting bugs in IMAP, so that users can include
+special characters in passwords (e.g. spaces).</li>
+<li>Fixes various errors in auto and manual account setup	</li>
+<li>Improves reporting for various connection errors, making it easier
+for the user to diagnose failed account setups.</li>
+<li>Fixes new-mail notifications for POP3 accounts.</li>
+<li>Ensures proper auto-checking of accounts marked as "never
+check".</li>
+<li>Now displays date and time using user preference (e.g. 24 hr vs.
+AM/PM).</li>
+<li>Now shows cc: in message view.</li>
+<li>Improves recovery from POP3 connection failures.</li>
+<li>POP3 parser rules loosened, so the application can work with
+non-compliant email servers.</li>
+</ul>
+
+<h2 id="features">New Features</h2>
+
+<ul>
+<li>Maps: Adds details and reviews when a user does a search on Maps and
+clicks on a business to view its details.</li>
+<li>Dialer: In-call screen timeout default is now longer when using the
+speakerphone.</li>
+<li>Dialer: Adds a "Show dialpad" / "Hide dialpad" item to the in-call
+menu, to make it easier to discover the DTMF dialpad. </li>
+<li>Adds support for saving attachments from MMS</li>
+<li>Adds support for marquee in layouts.</li>
+</ul>
+
+<h2 id="api-changes">API Changes</h2>
+
+<h3>Overview</strong></h3>
+
+<ul>
+<li>Adds annotations for test systems, no actual (non-test) API
+changes.</li>
+<li>Adds a method to allow a process to easily determine its UID.
+<li>Adds support for marquee in layouts.</li>
+<li>Adds new methods for determining padding in views. Useful if you are
+writing your own
+subclasses of {@link android.view.View View}.</li>
+<li>Adds new permissions that allow an application to broadcast an SMS
+or WAP Push message. </li>
+<li>API cleanup: removes protected constructor from
+SDK-bound system images. </li>
+</ul>
+
+<h3>API Change Details</h3>
+
+<table>
+<tr>
+<th>Module or Feature</th><th>Change Description</th>
+</tr>
+<tr><td rowspan="4">Annotations for test systems</td></tr>
+    <tr><td>Added {@link android.test.suitebuilder.annotation.LargeTest LargeTest} annotation.</td></tr>
+    <tr><td>Added {@link android.test.suitebuilder.annotation.MediumTest MediumTest} annotation.</td></tr>
+    <tr><td>Added {@link android.test.suitebuilder.annotation.SmallTest SmallTest} annotation.</td></tr>
+
+<tr><td rowspan="2">Allow a process to easily know its UID.</td></tr>
+    <tr><td>Added public method {@link android.os.Process#myUid} to class {@link android.os.Process android.os.Process}</td></tr>
+
+<tr><td rowspan="6">Padding in views</td></tr>
+    <tr><td>Added public method {@link android.view.View#getBottomPaddingOffset} to class {@link android.view.View android.view.View}.</td></tr>
+    <tr><td>Added public method {@link android.view.View#getLeftPaddingOffset} to class {@link android.view.View android.view.View}.</td></tr>
+    <tr><td>Added public method {@link android.view.View#getRightPaddingOffset} to class {@link android.view.View android.view.View}.</td></tr>
+    <tr><td>Added public method {@link android.view.View#getTopPaddingOffset} to class {@link android.view.View android.view.View}.</td></tr>
+    <tr><td>Added public method {@link android.view.View#isPaddingOffsetRequired} to class {@link android.view.View android.view.View}.</td></tr>
+
+<tr><td rowspan="3">Marquee support</td></tr>
+    <tr><td>Added public method {@link android.widget.TextView#setMarqueeRepeatLimit} to class {@link android.widget.TextView}</td></tr>
+    <tr><td>Added public field {@link android.R.attr#marqueeRepeatLimit android.R.attr.marqueeRepeatLimit}</td></tr>
+
+<tr><td rowspan="3">New permissions</td></tr>
+    <tr><td>Added public field {@link android.Manifest.permission#BROADCAST_SMS android.Manifest.permission.BROADCAST_SMS}</td></tr>
+    <tr><td>Added public field {@link android.Manifest.permission#BROADCAST_WAP_PUSH android.Manifest.permission.BROADCAST_WAP_PUSH}</td></tr>
+
+<tr><td rowspan="2">API cleanup</td></tr>
+    <tr><td>Removed protected constructor java.net.ServerSocket.ServerSocket(java.net.SocketImpl).</td></tr>
+
+</table>
+
+
+
+
+
+
diff --git a/docs/html/sdk/download.jd b/docs/html/sdk/download.jd
new file mode 100644
index 0000000..3c4f06b
--- /dev/null
+++ b/docs/html/sdk/download.jd
@@ -0,0 +1,86 @@
+page.title=Download the Android SDK
+hide_license_footer=true
+
+@jd:body
+
+<script language="javascript">
+  function verify() {
+    document.getElementById('download-button').disabled = !document.getElementById('checkbox').checked;
+  }
+  function submit() {
+    var location = window.location.href;
+    if (location.indexOf('?v=') != -1) {
+      var filename = location.substring(location.indexOf('=')+1,location.length);
+      if (document.getElementById('checkbox').checked) {
+        document.location = "http://dl.google.com/android/" + filename;
+      }
+      document.getElementById('click-download').setAttribute("href", "http://dl.google.com/android/" + filename);
+      $("#terms-form").hide(500);
+      $("#next-steps").show(500);
+      document.getElementById('checkbox').disabled=true;
+      document.getElementById('download-button').disabled=true;
+    } else {
+      alert("You have not selected an SDK version. Please return to the Download page");
+    }
+  }
+</script>
+
+<div id="terms-form">
+    <p>Please carefully review the Android SDK License Agreement before downloading the SDK.
+The License Agreement constitutes a contract between you and Google with respect to your use of the SDK.</p>
+
+  <iframe id="terms" style="border:1px solid #888;margin:0 0 1em;height:400px;width:95%;" src="terms_body.html">
+  </iframe>
+
+  <p>
+    <input type="checkbox" id="checkbox" onclick="verify()" />
+    <label for="checkbox">I agree to the terms of the Android SDK License Agreement.</label>
+  </p>
+  <p>
+    <input type="submit" value="Download" id="download-button" disabled="disabled" onclick="submit()" />
+  </p>
+  <p>
+  <script language="javascript">
+    var loc = window.location.href;
+    if (loc.indexOf('?v=') != -1) {
+      var filename = loc.substring(loc.indexOf('=')+1,loc.length);
+      document.write("File: " + filename);
+    }
+  </script>
+  </p>
+</div><!-- end terms-form -->
+
+<noscript>
+  <p><strong>Please enable Javascript in your browser in order to agree to the terms and download the SDK.</strong></p>
+</noscript>
+
+<div class="special" id="next-steps" style="display:none">
+  <h2>Thank you for downloading the Android SDK!</h2>
+  <p>Your download should be underway. If not, <a id="click-download">click here to start the download</a>.</p>
+  <p>If you are upgrading from a previously installed version of the Android SDK, see
+    <a href="upgrading.html" class="addVersionPath">Upgrading the SDK</a>.</p>
+  <p>If you are installing for the first time, read 
+    <a href="installing.html" class="addVersionPath">Installing the Android SDK</a> to get your environment set up.
+    Once you have completed your installation, visit the <em>Dev Guide</em> tab and begin with the 
+    <a href="/guide/tutorials/hello-world.html">Hello World</a> tutorial to create your first
+    Android application. From there, learn more about Android with the 
+    <a href="/guide/topics/fundamentals.html">Application Fundamentals</a> documentation.</p>
+  <p>If you want to re-read the license agreement, it's available to you in the <em>SDK</em> tab.</p>
+</div>
+
+<script language="javascript">
+  var loc = window.location.href;
+  var filename = loc.substring(loc.indexOf('=')+1,loc.length);
+  version = filename.substring(filename.indexOf('.')-1,filename.lastIndexOf('.'));
+  $(".addVersionPath").each(function(i) {
+    var oldHref = $(this).attr("href");
+    $(this).attr({href: "/sdk/" + version + "/" + oldHref});
+  });
+</script>
+
+
+
+
+
+
+
diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd
new file mode 100644
index 0000000..38db6f8
--- /dev/null
+++ b/docs/html/sdk/index.jd
@@ -0,0 +1,5 @@
+sdk.redirect=1.1_r1
+@jd:body
+
+
+
diff --git a/docs/html/sdk/sdk_toc.cs b/docs/html/sdk/sdk_toc.cs
new file mode 100644
index 0000000..76c1c84
--- /dev/null
+++ b/docs/html/sdk/sdk_toc.cs
@@ -0,0 +1,42 @@
+
+<ul>
+  <li><?cs 
+   if:android.whichdoc != "online" ?>
+    <h2>Android 1.1 SDK, r1</h2><?cs 
+   else ?>
+    <h2>Current SDK Release</h2><?cs 
+   /if ?>
+    <ul><?cs 
+     if:android.whichdoc == "online" ?>
+      <li><a href="<?cs var:toroot ?>sdk/1.1_r1/index.html">Download</a></li><?cs 
+     /if ?>
+      <li><a href="<?cs var:toroot ?>sdk/1.1_r1/installing.html">Installing</a></li>
+      <li><a href="<?cs var:toroot ?>sdk/1.1_r1/upgrading.html">Upgrading</a></li>
+      <li><a href="<?cs var:toroot ?>sdk/1.1_r1/requirements.html">System Requirements</a></li>
+    </ul>
+    <ul>
+      <li><a href="<?cs var:toroot ?>sdk/terms.html">SDK Terms and Conditions</a></li>
+      <li><a href="<?cs var:toroot ?>sdk/RELEASENOTES.html">SDK Release Notes</a></li>
+    </ul><?cs 
+ if:android.whichdoc == "online" ?>
+  <li>
+    <h2>Android System Images</h2>
+    <ul>
+      <li><a href="<?cs var:toroot ?>sdk/android-1.1.html">Android 1.1 Version Notes</a></li>
+    </ul>
+  </li>
+  <li>
+    <h2>Previous SDK Releases</h2>
+    <ul>
+      <li><a href="<?cs var:toroot ?>sdk/1.0_r2/index.html">Android 1.0 SDK, release 2</a></li>
+      <li><a href="<?cs var:toroot ?>sdk/1.0_r1/index.html">Android 1.0 SDK, release 1</a></li>
+    </ul>
+  </li><?cs 
+ /if ?>
+</ul>
+
+<script type="text/javascript">
+<!--
+    buildToggleLists();
+//-->
+</script>
\ No newline at end of file
diff --git a/docs/html/sdk/terms.jd b/docs/html/sdk/terms.jd
new file mode 100644
index 0000000..46388504
--- /dev/null
+++ b/docs/html/sdk/terms.jd
@@ -0,0 +1,219 @@
+page.title=Terms and Conditions
+hide_license_footer=true
+@jd:body
+
+<p>This is the Android Software Development Kit License Agreement.</p>
+
+<h2>
+	1. Introduction
+</h2>
+<p>
+	1.1 The Android Software Development Kit (referred to in this License Agreement as the "SDK" and specifically including the Android system files and packaged APIs) is licensed to you subject to the terms of this License Agreement. This License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK.
+</p>
+<p>
+	1.2 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
+</p>
+<h2>
+	2. Accepting this License Agreement
+</h2>
+<p>
+	2.1 In order to use the SDK, you must first agree to this License Agreement. You may not use the SDK if you do not accept this License Agreement.
+</p>
+<p>
+	2.2 You can accept this License Agreement by:
+</p>
+<p>
+	(A) clicking to accept or agree to this License Agreement, where this option is made available to you; or
+</p>
+<p>
+	(B) by actually using the SDK. In this case, you agree that use of the SDK constitutes acceptance of the Licensing Agreement from that point onwards.
+</p>
+<p>
+	2.3 You may not use the SDK and may not accept the Licensing Agreement if you are a person barred from receiving the SDK under the laws of the United States or other countries including the country in which you are resident or from which you use the SDK.
+</p>
+<p>
+	2.4 If you are agreeing to be bound by this License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to this License Agreement. If you do not have the requisite authority, you may not accept the Licensing Agreement or use the SDK on behalf of your employer or other entity.
+</p>
+<h2>
+	3. SDK License from Google
+</h2>
+<p>
+	3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non- assignable and non-exclusive license to use the SDK solely to develop applications to run on the Android platform.
+</p>
+<p>
+	3.2 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. The Android Open Source Project
+</p>
+<p>
+	3.3 Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK. Except to the extent required by applicable third party licenses, you may not load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK.
+</p>
+<p>
+	3.4 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not this License Agreement.
+</p>
+<p>
+	3.5 You agree that the form and nature of the SDK that Google provides may change without prior notice to you and that future versions of the SDK may be incompatible with applications developed on previous versions of the SDK. You agree that Google may stop (permanently or temporarily) providing the SDK (or any features within the SDK) to you or to users generally at Google's sole discretion, without prior notice to you.
+</p>
+<p>
+	3.6 Nothing in this License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.
+</p>
+<p>
+	3.7 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the SDK.
+</p>
+<h2>
+	4. Use of the SDK by You
+</h2>
+<p>
+	4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under this License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights which subsist in those applications.
+</p>
+<p>
+	4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) this License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).
+</p>
+<p>
+	4.3 You agree that if you use the SDK to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, your must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so.
+</p>
+<p>
+	4.4 You agree that you will not engage in any activity with the SDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google or any mobile communications carrier.
+</p>
+<p>
+	4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through the Android platform and/or applications for the Android platform, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.
+</p>
+<p>
+	4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under this License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.
+</p>
+<h2>
+	5. Your Developer Credentials
+</h2>
+<p>
+	5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.
+</p>
+<h2>
+	6. Privacy and Information
+</h2>
+<p>
+	6.1 In order to continually innovate and improve the SDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the SDK are being used and how they are being used. Before any of this information is collected, the SDK will notify you and seek your consent. If you withhold consent, the information will not be collected.
+</p>
+<p>
+	6.2 The data collected is examined in the aggregate to improve the SDK and is maintained in accordance with Google's Privacy Policy.
+</p>
+<h2>
+	7. Third Party Applications for the Android Platform
+</h2>
+<p>
+	7.1 If you use the SDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.
+</p>
+<p>
+	7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.
+</p>
+<p>
+	7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, this License Agreement does not affect your legal relationship with these third parties.
+</p>
+<h2>
+	8. Using Android APIs
+</h2>
+<p>
+	8.1 Android Maps API
+</p>
+<p>
+	8.1.1 If you use the Android Maps API (described in the SDK by the Package names "com.google.android.maps" and "com.android.location.Geocoder"), the terms of your binding legal agreement with Google include this License Agreement, the <a href="http://www.google.com/apis/maps/terms.html">Google Maps API Terms of Service</a> and the <a href="http://www.google.com/intl/en_ALL/help/terms_local.html">Google Maps Terms of Service</a>. You must read and agree to those Terms of Service before you use the Android Maps API.
+</p>
+<p>
+	8.1.2 If you use the Android Maps API to retrieve map or satellite image data from Google, you must include the following copyright notice in your application or service in a manner that is reasonably available to users:
+</p>
+<p>
+	"Copyright Notice: Data: (c)2007 TeleAtlas, AND, Europa Technologies, Kingway, Map Data Sciences Pty Ltd, PSMA, ZENRIN, Geocentre, MapLink/TeleAtlas; Imagery: (c)2007 DigitalGlobe, EarthSat, Sanborn, NYGIS, Scankort, TerraMetrics, MassGIS Commonwealth of Massachusetts, Digital Earth Technology."
+</p>
+<p>
+	8.2 Google Data APIs
+</p>
+<p>
+	8.2.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by those who provide that data (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless you have been specifically given permission to do so by the owners of that data.
+</p>
+<p>
+	8.2.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.
+</p>
+<h2>
+	9. Terminating this License Agreement
+</h2>
+<p>
+	9.1 This License Agreement will continue to apply until terminated by either you or Google as set out below.
+</p>
+<p>
+	9.2 If you want to terminate this License Agreement, you may do so by ceasing your use of the SDK and any relevant developer credentials.
+</p>
+<p>
+	9.3 Google may at any time, terminate this License Agreement with you if:
+</p>
+<p>
+	(A) you have breached any provision of this License Agreement; or
+</p>
+<p>
+	(B) Google is required to do so by law; or
+</p>
+<p>
+	(C) the partner with whom Google offered certain parts of SDK (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the SDK to you; or
+</p>
+<p>
+	(D) Google decides to no longer providing the SDK or certain parts of the SDK to users in the country in which you are resident or from which you use the service, or the provision of the SDK or certain SDK services to you by Google is, in Google's sole discretion, no longer commercially viable.
+</p>
+<p>
+	9.4 When this License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst this License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely.
+</p>
+<h2>
+	10. DISCLAIMER OF WARRANTIES
+</h2>
+<p>
+	10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SDK IS AT YOUR SOLE RISK AND THAT THE SDK IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
+</p>
+<p>
+	10.2 YOUR USE OF THE SDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE SDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE.
+</p>
+<p>
+	10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+</p>
+<h2>
+	11. LIMITATION OF LIABILITY
+</h2>
+<p>
+	11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
+</p>
+<h2>
+	12. Indemnification
+</h2>
+<p>
+	12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the SDK, (b) any application you develop on the SDK that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with this License Agreement.
+</p>
+<h2>
+	13. Changes to the License Agreement
+</h2>
+<p>
+	13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the SDK is made available and with the SDK downloadable.
+</p>
+<p>
+	13.2 You agree that your use of a specific version of the SDK is governed by the License Agreement included with that version of the SDK.
+</p>
+<h2>
+	14. General Legal Terms
+</h2>
+<p>
+	14.1 This License Agreement constitute the whole legal agreement between you and Google and govern your use of the SDK (excluding any services which Google may provide to you under a separate written agreement), and completely replace any prior agreements between you and Google in relation to the SDK.
+</p>
+<p>
+	14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in this License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.
+</p>
+<p>
+	14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of this License Agreement is invalid, then that provision will be removed from this License Agreement without affecting the rest of this License Agreement. The remaining provisions of this License Agreement will continue to be valid and enforceable.
+</p>
+<p>
+	14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to this License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of this License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to this License Agreement.
+</p>
+<p>
+	14.5 EXPORT RESTRICTIONS. THE SDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE SDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.
+</p>
+<p>
+	14.6 The rights granted in this License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under this License Agreement without the prior written approval of the other party.
+</p>
+<p>
+	14.7 This License Agreement, and your relationship with Google under this License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from this License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
+</p>
+<p>
+	<em>August 18, 2008</em>
+</p>
diff --git a/docs/html/sdk/terms_body.html b/docs/html/sdk/terms_body.html
new file mode 100644
index 0000000..e8fdc3c
--- /dev/null
+++ b/docs/html/sdk/terms_body.html
@@ -0,0 +1,216 @@
+
+<p>This is the Android Software Development Kit License Agreement.</p>
+
+<h2>
+	1. Introduction
+</h2>
+<p>
+	1.1 The Android Software Development Kit (referred to in this License Agreement as the "SDK" and specifically including the Android system files and packaged APIs) is licensed to you subject to the terms of this License Agreement. This License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK.
+</p>
+<p>
+	1.2 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
+</p>
+<h2>
+	2. Accepting this License Agreement
+</h2>
+<p>
+	2.1 In order to use the SDK, you must first agree to this License Agreement. You may not use the SDK if you do not accept this License Agreement.
+</p>
+<p>
+	2.2 You can accept this License Agreement by:
+</p>
+<p>
+	(A) clicking to accept or agree to this License Agreement, where this option is made available to you; or
+</p>
+<p>
+	(B) by actually using the SDK. In this case, you agree that use of the SDK constitutes acceptance of the Licensing Agreement from that point onwards.
+</p>
+<p>
+	2.3 You may not use the SDK and may not accept the Licensing Agreement if you are a person barred from receiving the SDK under the laws of the United States or other countries including the country in which you are resident or from which you use the SDK.
+</p>
+<p>
+	2.4 If you are agreeing to be bound by this License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to this License Agreement. If you do not have the requisite authority, you may not accept the Licensing Agreement or use the SDK on behalf of your employer or other entity.
+</p>
+<h2>
+	3. SDK License from Google
+</h2>
+<p>
+	3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non- assignable and non-exclusive license to use the SDK solely to develop applications to run on the Android platform.
+</p>
+<p>
+	3.2 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. The Android Open Source Project
+</p>
+<p>
+	3.3 Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK. Except to the extent required by applicable third party licenses, you may not load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK.
+</p>
+<p>
+	3.4 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not this License Agreement.
+</p>
+<p>
+	3.5 You agree that the form and nature of the SDK that Google provides may change without prior notice to you and that future versions of the SDK may be incompatible with applications developed on previous versions of the SDK. You agree that Google may stop (permanently or temporarily) providing the SDK (or any features within the SDK) to you or to users generally at Google's sole discretion, without prior notice to you.
+</p>
+<p>
+	3.6 Nothing in this License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.
+</p>
+<p>
+	3.7 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the SDK.
+</p>
+<h2>
+	4. Use of the SDK by You
+</h2>
+<p>
+	4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under this License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights which subsist in those applications.
+</p>
+<p>
+	4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) this License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).
+</p>
+<p>
+	4.3 You agree that if you use the SDK to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, your must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so.
+</p>
+<p>
+	4.4 You agree that you will not engage in any activity with the SDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google or any mobile communications carrier.
+</p>
+<p>
+	4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through the Android platform and/or applications for the Android platform, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.
+</p>
+<p>
+	4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under this License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.
+</p>
+<h2>
+	5. Your Developer Credentials
+</h2>
+<p>
+	5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.
+</p>
+<h2>
+	6. Privacy and Information
+</h2>
+<p>
+	6.1 In order to continually innovate and improve the SDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the SDK are being used and how they are being used. Before any of this information is collected, the SDK will notify you and seek your consent. If you withhold consent, the information will not be collected.
+</p>
+<p>
+	6.2 The data collected is examined in the aggregate to improve the SDK and is maintained in accordance with Google's Privacy Policy.
+</p>
+<h2>
+	7. Third Party Applications for the Android Platform
+</h2>
+<p>
+	7.1 If you use the SDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.
+</p>
+<p>
+	7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.
+</p>
+<p>
+	7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, this License Agreement does not affect your legal relationship with these third parties.
+</p>
+<h2>
+	8. Using Android APIs
+</h2>
+<p>
+	8.1 Android Maps API
+</p>
+<p>
+	8.1.1 If you use the Android Maps API (described in the SDK by the Package names "com.google.android.maps" and "com.android.location.Geocoder"), the terms of your binding legal agreement with Google include this License Agreement, the <a href="http://www.google.com/apis/maps/terms.html">Google Maps API Terms of Service</a> and the <a href="http://www.google.com/intl/en_ALL/help/terms_local.html">Google Maps Terms of Service</a>. You must read and agree to those Terms of Service before you use the Android Maps API.
+</p>
+<p>
+	8.1.2 If you use the Android Maps API to retrieve map or satellite image data from Google, you must include the following copyright notice in your application or service in a manner that is reasonably available to users:
+</p>
+<p>
+	"Copyright Notice: Data: (c)2007 TeleAtlas, AND, Europa Technologies, Kingway, Map Data Sciences Pty Ltd, PSMA, ZENRIN, Geocentre, MapLink/TeleAtlas; Imagery: (c)2007 DigitalGlobe, EarthSat, Sanborn, NYGIS, Scankort, TerraMetrics, MassGIS Commonwealth of Massachusetts, Digital Earth Technology."
+</p>
+<p>
+	8.2 Google Data APIs
+</p>
+<p>
+	8.2.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by those who provide that data (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless you have been specifically given permission to do so by the owners of that data.
+</p>
+<p>
+	8.2.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.
+</p>
+<h2>
+	9. Terminating this License Agreement
+</h2>
+<p>
+	9.1 This License Agreement will continue to apply until terminated by either you or Google as set out below.
+</p>
+<p>
+	9.2 If you want to terminate this License Agreement, you may do so by ceasing your use of the SDK and any relevant developer credentials.
+</p>
+<p>
+	9.3 Google may at any time, terminate this License Agreement with you if:
+</p>
+<p>
+	(A) you have breached any provision of this License Agreement; or
+</p>
+<p>
+	(B) Google is required to do so by law; or
+</p>
+<p>
+	(C) the partner with whom Google offered certain parts of SDK (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the SDK to you; or
+</p>
+<p>
+	(D) Google decides to no longer providing the SDK or certain parts of the SDK to users in the country in which you are resident or from which you use the service, or the provision of the SDK or certain SDK services to you by Google is, in Google's sole discretion, no longer commercially viable.
+</p>
+<p>
+	9.4 When this License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst this License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely.
+</p>
+<h2>
+	10. DISCLAIMER OF WARRANTIES
+</h2>
+<p>
+	10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SDK IS AT YOUR SOLE RISK AND THAT THE SDK IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
+</p>
+<p>
+	10.2 YOUR USE OF THE SDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE SDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE.
+</p>
+<p>
+	10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+</p>
+<h2>
+	11. LIMITATION OF LIABILITY
+</h2>
+<p>
+	11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
+</p>
+<h2>
+	12. Indemnification
+</h2>
+<p>
+	12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the SDK, (b) any application you develop on the SDK that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with this License Agreement.
+</p>
+<h2>
+	13. Changes to the License Agreement
+</h2>
+<p>
+	13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the SDK is made available and with the SDK downloadable.
+</p>
+<p>
+	13.2 You agree that your use of a specific version of the SDK is governed by the License Agreement included with that version of the SDK.
+</p>
+<h2>
+	14. General Legal Terms
+</h2>
+<p>
+	14.1 This License Agreement constitute the whole legal agreement between you and Google and govern your use of the SDK (excluding any services which Google may provide to you under a separate written agreement), and completely replace any prior agreements between you and Google in relation to the SDK.
+</p>
+<p>
+	14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in this License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.
+</p>
+<p>
+	14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of this License Agreement is invalid, then that provision will be removed from this License Agreement without affecting the rest of this License Agreement. The remaining provisions of this License Agreement will continue to be valid and enforceable.
+</p>
+<p>
+	14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to this License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of this License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to this License Agreement.
+</p>
+<p>
+	14.5 EXPORT RESTRICTIONS. THE SDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE SDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.
+</p>
+<p>
+	14.6 The rights granted in this License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under this License Agreement without the prior written approval of the other party.
+</p>
+<p>
+	14.7 This License Agreement, and your relationship with Google under this License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from this License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
+</p>
+<p>
+	<em>August 18, 2008</em>
+</p>
diff --git a/docs/html/search.jd b/docs/html/search.jd
new file mode 100644
index 0000000..0a802a6
--- /dev/null
+++ b/docs/html/search.jd
@@ -0,0 +1,104 @@
+page.title=Search Results

+@jd:body

+

+<script src="http://www.google.com/jsapi" type="text/javascript"></script>

+<script src="/assets/jquery-history.js" type="text/javascript"></script>

+<script type="text/javascript">

+      google.load('search', '1');

+

+      function OnLoad() {

+        document.getElementById("search_autocomplete").style.color = "#000";

+

+        // create search control

+        searchControl = new google.search.SearchControl();

+

+        // use our existing search form and use tabs when multiple searchers are used

+        drawOptions = new google.search.DrawOptions();

+        drawOptions.setDrawMode(google.search.SearchControl.DRAW_MODE_TABBED);

+        drawOptions.setInput(document.getElementById("search_autocomplete"));

+

+        // configure search result options

+        searchOptions = new google.search.SearcherOptions();

+        searchOptions.setExpandMode(GSearchControl.EXPAND_MODE_OPEN);

+

+        // configure each of the searchers, for each tab

+        devSiteSearcher = new google.search.WebSearch();

+        devSiteSearcher.setUserDefinedLabel("All Developers Site");

+        devSiteSearcher.setSiteRestriction("http://developer.android.com/");

+

+        devGuideSearcher = new google.search.WebSearch();

+        devGuideSearcher.setUserDefinedLabel("Dev Guide");

+        devGuideSearcher.setSiteRestriction("http://developer.android.com/guide/");

+

+        referenceSearcher = new google.search.WebSearch();

+        referenceSearcher.setUserDefinedLabel("Reference");

+        referenceSearcher.setSiteRestriction("http://developer.android.com/reference/");

+

+        blogSearcher = new google.search.WebSearch();

+        blogSearcher.setUserDefinedLabel("Blog");

+        blogSearcher.setSiteRestriction("http://android-developers.blogspot.com");

+

+        groupsSearcher = new google.search.WebSearch();

+        groupsSearcher.setUserDefinedLabel("Developer Groups");

+        groupsSearcher.setSiteRestriction("001283715400630100512:ggqrtvkztwm");

+

+        sourceSiteSearcher = new google.search.WebSearch();

+        sourceSiteSearcher.setUserDefinedLabel("Android Source");

+        sourceSiteSearcher.setSiteRestriction("http://source.android.com");

+

+        homeSiteSearcher = new google.search.WebSearch();

+        homeSiteSearcher.setUserDefinedLabel("Android Home");

+        homeSiteSearcher.setSiteRestriction("http://www.android.com");

+ 

+        // add each searcher to the search control

+        searchControl.addSearcher(devSiteSearcher, searchOptions);

+        searchControl.addSearcher(devGuideSearcher, searchOptions);

+        searchControl.addSearcher(referenceSearcher, searchOptions);

+        searchControl.addSearcher(groupsSearcher, searchOptions);

+        searchControl.addSearcher(sourceSiteSearcher, searchOptions);

+        searchControl.addSearcher(blogSearcher, searchOptions);

+

+        // configure result options

+        searchControl.setResultSetSize(google.search.Search.LARGE_RESULTSET);

+        searchControl.setLinkTarget(google.search.Search.LINK_TARGET_SELF);

+        searchControl.setTimeoutInterval(google.search.SearchControl.TIMEOUT_LONG);

+        searchControl.setNoResultsString(google.search.SearchControl.NO_RESULTS_DEFAULT_STRING);

+

+        // upon ajax search, refresh the url and search title

+        searchControl.setSearchStartingCallback(this, function(control, searcher, query) {

+            $("#searchTitle").html("search results for <em>" + query + "</em>");

+            $.history.add('q=' + query); // add the current query to the browser history

+        });

+

+        // draw the search results box

+        searchControl.draw(document.getElementById("leftSearchControl"), drawOptions);

+

+        // execute a search upon page load, from url hash query

+        if (location.href.indexOf("#q=") != -1) {

+          url = location.href.split("#q=");

+          searchControl.execute(decodeURI(url[1]));

+        }

+        document.getElementById("search_autocomplete").focus();

+      }

+

+      google.setOnLoadCallback(OnLoad, true);

+

+      // when an event on the browser history occurs (back, forward, load) perform a search

+      $(window).history(function(e, hash) {

+        hashParts = hash.split('=');

+        searchControl.execute(decodeURI(hashParts[1]));

+        $("#searchTitle").html("search results for <em>" + decodeURI(hashParts[1]) + "</em>");

+      });

+

+      // forcefully regain key-up event control (previously jacked by search api)

+      $("#search_autocomplete").keyup(function(event) {

+        return search_changed(event, false, '/');

+      });

+</script>

+

+  <div id="mainBodyFixed" style="width:auto; margin:20px">

+          <h2 id="searchTitle">search results</h2>

+          <img src="{@docRoot}assets/images/hr_gray_main.jpg" />

+          <div><br /></div>

+          <div id="leftSearchControl" class="search-control">Loading...</div>

+  </div>

diff --git a/docs/html/security_at_android_dot_com.txt b/docs/html/security_at_android_dot_com.txt
new file mode 100644
index 0000000..daeda53
--- /dev/null
+++ b/docs/html/security_at_android_dot_com.txt
@@ -0,0 +1,40 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+mQGiBEigu7MRBAD7gZJzevtYLB3c1pE7uMwu+zHzGGJDrEyEaz0lYTAaJ2YXmJ1+
+IvmvBI/iMrRqpFLR35uUcz2UHgJtIP+xenCF4WIhHv5wg3XvBvTgG/ooZaj1gtez
+miXV2bXTlEMxSqsZKvkieQRrMv3eV2VYhgaPvp8xJhl+xs8eVhlrmMv94wCgzWUw
+BrOICLPF5lANocvkqGNO3UUEAMH7GguhvXNlIUncqOpHC0N4FGPirPh/6nYxa9iZ
+kQEEg6mB6wPkaHZ5ddpagzFC6AncoOrhX5HPin9T6+cPhdIIQMogJOqDZ4xsAYCY
+KwjkoLQjfMdS5CYrMihFm4guNMKpWPfCe/T4TU7tFmTug8nnAIPFh2BNm8/EqHpg
+jR4JA/9wJMxv+2eFuFGeLtiPjo+o2+AfIxTTEIlWyNkO+a9KkzmPY/JP4OyVGKjM
+V+aO0vZ6FamdlrXAaAPm1ULmY5pC15P/hNr0YAbN28Y8cwNGuuKGbiYvYD35KKhs
+5c5/pfMy0rgDElhFTGd4rpZdkHei3lwF5cyV0htv5s2lwGJKnrQnQW5kcm9pZCBT
+ZWN1cml0eSA8c2VjdXJpdHlAYW5kcm9pZC5jb20+iGAEExECACAFAkigu7MCGwMG
+CwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRBzHmufAFQPw547AKDIDW3mDx+84xk1
+EfzH/uNQQLYBBgCeMabHPlx+2+IGnfPsQ8UsxMPLFnO5BA0ESKC72BAQALKb8W8l
+U3Xs+lbquuVEA5x+mNnJriRnq1q1ZA8J43z0lCqT6n+q/nICuE/SjGxfp+8G/K3/
+LrIfBWLLQHZMQyk/1Eild/ZoRxNAbjTGiQY6HWrZOd+Z2fWiSN03nSSpWImPbua3
+6LwSRRZNmZ77tdY0hI9TqJzqax1WQWk7IxfWubNTbNsPiktm/d6C2P04OkKOAmr8
+QCqKLLCO578zYLTgraL6F4g2YVurGgAB1KFSX2F8fh6Igr+pIW/ytoS9n2H+uecR
+l+2RB6Pq7MahwZvPPeMavwUMPQpOI6Or3pYZTzp/IJWNyL6MOBzV5q4gkD0xYtEq
+Ihr1hX1IdiGdOA4oH1Rk1K/XIPwLelQdYp3ftiReh4/Gb3kfKCxpmMXL1f/ndx6N
+zIiqweDU5mZBpXBsBzFZfUDALL4VGqpc2eEltkVtD0RuQI2YaImBjOPsHI4StN5t
+2OspWke4xJGf0PqRVjTDJmtUrIJX4X5Fh8M85unHYYIpBCaDbM/7/xIaNQbQfdeO
+6yqGrj/0WAjL34wbo4D12BiPeoUTreD60aNwmpu5z1NRPS2Wn+6kTIHGhf47wGTZ
+v9OFYWhgSs3INpna4VA4E8SpOWPd8LFYLs9clAlaUhqJyLJ3JlmXmhGnWM41z+p9
+RA8UQXhvQcvYJSR77SC4O503wdVKJ07OH6WbAAMFD/4yjBZ+X7QBIKTLHXAIQBjB
+526iOhmfxyIgmX4vWcggJFZrBxPFulkGJj65Mwr9AwZeIceukKQUGcf2LpEoIdZY
+dP8gEshRDZQ1Y3GDD9ukChRDoK9kFIxnYmH8euU/TwTPtAEEDASfwEZnM5DcJQOA
+Q6G3GVKr/8uwmT5hUn5sR2L9vmrjw1nPkfZeDQNBmeTI8A+byosp6Nxl8thJIGNt
+8UTa02+g/nbf+ODRrEf3xeeFUNb14kTqULNT/hTj8/6xDwxwaF2ms60kYxA/EXDB
+21jqmhnfUwjSa++R38Qig9tGwOo83Z7uNCqtU3caFW1P55iD/Sju/ZecHVSgfq6j
+2H7mNWfvB9ILkS7w1w/InjEA7LpY9jtmPKDIYYQ7YGZuxFwOxtw69ulkS6ddc1Pt
+AQ5oe0d59rBicE8R7rBCxwzMihG5ctJ+a+t4/MHqi6jy/WI9OK+SwWmCeT1nVy6F
+NZ00QOPe89DFBCqhj4qSGfjOtCEKAM7SOhkyEYJ8jk5KrsLOcWPOM9i3uus1RquG
+XJ2Cljt6zJYtEnpkjrw+Ge0SBDNEMGZEBLbEZKECtNJ2NBrMRKYeAseCGNQ+uJOz
+8vL7ztUKoi1SbFGuHkv5N2NmPq42QrN8dftW01DceGDnJ1KHRvCUbpPcyQYFhRFb
+nxd3tMIEGO83iEmozvJfB4hJBBgRAgAJBQJIoLvYAhsMAAoJEHMea58AVA/D6ewA
+ninKQSW+oL4z28F3T0GHag38WeWyAJ45d7dx4z0GxhTm2b9DclLombY+nw==
+=XyBX
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/docs/html/sitemap.txt b/docs/html/sitemap.txt
new file mode 100644
index 0000000..a8221bf
--- /dev/null
+++ b/docs/html/sitemap.txt
@@ -0,0 +1,5444 @@
+http://developer.android.com/index.html
+http://developer.android.com/sdk/1.1_r1/index.html
+http://developer.android.com/guide/index.html 
+http://developer.android.com/reference/packages.html
+http://developer.android.com/community/index.html
+http://developer.android.com/sdk/index.html
+http://developer.android.com/license.html
+http://developer.android.com/sdk/terms.html
+http://developer.android.com/guide/developing/tools/index.html
+http://developer.android.com/reference/com/google/android/maps/package-summary.html
+http://developer.android.com/reference/classes.html
+http://developer.android.com/reference/android/package-summary.html
+http://developer.android.com/reference/android/app/package-summary.html
+http://developer.android.com/reference/android/content/package-summary.html
+http://developer.android.com/reference/android/content/pm/package-summary.html
+http://developer.android.com/reference/android/content/res/package-summary.html
+http://developer.android.com/reference/android/database/package-summary.html
+http://developer.android.com/reference/android/database/sqlite/package-summary.html
+http://developer.android.com/reference/android/graphics/package-summary.html
+http://developer.android.com/reference/android/graphics/drawable/package-summary.html
+http://developer.android.com/reference/android/graphics/drawable/shapes/package-summary.html
+http://developer.android.com/reference/android/hardware/package-summary.html
+http://developer.android.com/reference/android/location/package-summary.html
+http://developer.android.com/reference/android/media/package-summary.html
+http://developer.android.com/reference/android/net/package-summary.html
+
+http://developer.android.com/reference/android/net/http/package-summary.html
+http://developer.android.com/reference/android/net/wifi/package-summary.html
+
+http://developer.android.com/reference/android/opengl/package-summary.html
+http://developer.android.com/reference/android/os/package-summary.html
+
+http://developer.android.com/reference/android/preference/package-summary.html
+http://developer.android.com/reference/android/provider/package-summary.html
+
+http://developer.android.com/reference/android/sax/package-summary.html
+http://developer.android.com/reference/android/telephony/package-summary.html
+
+http://developer.android.com/reference/android/telephony/gsm/package-summary.html
+http://developer.android.com/reference/android/test/package-summary.html
+
+http://developer.android.com/reference/android/test/mock/package-summary.html
+http://developer.android.com/reference/android/test/suitebuilder/package-summary.html
+
+http://developer.android.com/reference/android/text/package-summary.html
+http://developer.android.com/reference/android/text/method/package-summary.html
+
+http://developer.android.com/reference/android/text/style/package-summary.html
+http://developer.android.com/reference/android/text/util/package-summary.html
+
+http://developer.android.com/reference/android/util/package-summary.html
+http://developer.android.com/reference/android/view/package-summary.html
+
+http://developer.android.com/reference/android/view/animation/package-summary.html
+http://developer.android.com/reference/android/webkit/package-summary.html
+
+http://developer.android.com/reference/android/widget/package-summary.html
+http://developer.android.com/reference/dalvik/bytecode/package-summary.html
+
+http://developer.android.com/reference/dalvik/system/package-summary.html
+http://developer.android.com/reference/java/awt/font/package-summary.html
+
+http://developer.android.com/reference/java/io/package-summary.html
+http://developer.android.com/reference/java/lang/package-summary.html
+
+http://developer.android.com/reference/java/lang/annotation/package-summary.html
+http://developer.android.com/reference/java/lang/ref/package-summary.html
+
+http://developer.android.com/reference/java/lang/reflect/package-summary.html
+http://developer.android.com/reference/java/math/package-summary.html
+
+http://developer.android.com/reference/java/net/package-summary.html
+http://developer.android.com/reference/java/nio/package-summary.html
+
+http://developer.android.com/reference/java/nio/channels/package-summary.html
+http://developer.android.com/reference/java/nio/channels/spi/package-summary.html
+
+http://developer.android.com/reference/java/nio/charset/package-summary.html
+http://developer.android.com/reference/java/nio/charset/spi/package-summary.html
+
+http://developer.android.com/reference/java/security/package-summary.html
+http://developer.android.com/reference/java/security/acl/package-summary.html
+
+http://developer.android.com/reference/java/security/cert/package-summary.html
+http://developer.android.com/reference/java/security/interfaces/package-summary.html
+
+http://developer.android.com/reference/java/security/spec/package-summary.html
+http://developer.android.com/reference/java/sql/package-summary.html
+
+http://developer.android.com/reference/java/text/package-summary.html
+http://developer.android.com/reference/java/util/package-summary.html
+
+http://developer.android.com/reference/java/util/concurrent/package-summary.html
+http://developer.android.com/reference/java/util/concurrent/atomic/package-summary.html
+
+http://developer.android.com/reference/java/util/concurrent/locks/package-summary.html
+http://developer.android.com/reference/java/util/jar/package-summary.html
+
+http://developer.android.com/reference/java/util/logging/package-summary.html
+http://developer.android.com/reference/java/util/prefs/package-summary.html
+
+http://developer.android.com/reference/java/util/regex/package-summary.html
+http://developer.android.com/reference/java/util/zip/package-summary.html
+
+http://developer.android.com/reference/javax/crypto/package-summary.html
+http://developer.android.com/reference/javax/crypto/interfaces/package-summary.html
+
+http://developer.android.com/reference/javax/crypto/spec/package-summary.html
+http://developer.android.com/reference/javax/microedition/khronos/egl/package-summary.html
+
+http://developer.android.com/reference/javax/microedition/khronos/opengles/package-summary.html
+
+http://developer.android.com/reference/javax/net/package-summary.html
+http://developer.android.com/reference/javax/net/ssl/package-summary.html
+
+http://developer.android.com/reference/javax/security/auth/package-summary.html
+http://developer.android.com/reference/javax/security/auth/callback/package-summary.html
+
+http://developer.android.com/reference/javax/security/auth/login/package-summary.html
+http://developer.android.com/reference/javax/security/auth/x500/package-summary.html
+
+http://developer.android.com/reference/javax/security/cert/package-summary.html
+http://developer.android.com/reference/javax/sql/package-summary.html
+
+http://developer.android.com/reference/javax/xml/package-summary.html
+http://developer.android.com/reference/javax/xml/parsers/package-summary.html
+
+http://developer.android.com/reference/junit/framework/package-summary.html
+http://developer.android.com/reference/junit/runner/package-summary.html
+
+http://developer.android.com/reference/org/apache/http/package-summary.html
+http://developer.android.com/reference/org/apache/http/auth/package-summary.html
+
+http://developer.android.com/reference/org/apache/http/auth/params/package-summary.html
+http://developer.android.com/reference/org/apache/http/client/package-summary.html
+
+http://developer.android.com/reference/org/apache/http/client/entity/package-summary.html
+http://developer.android.com/reference/org/apache/http/client/methods/package-summary.html
+
+http://developer.android.com/reference/org/apache/http/client/params/package-summary.html
+http://developer.android.com/reference/org/apache/http/client/protocol/package-summary.html
+
+http://developer.android.com/reference/org/apache/http/client/utils/package-summary.html
+http://developer.android.com/reference/org/apache/http/conn/package-summary.html
+
+http://developer.android.com/reference/org/apache/http/conn/params/package-summary.html
+http://developer.android.com/reference/org/apache/http/conn/routing/package-summary.html
+
+http://developer.android.com/reference/org/apache/http/conn/scheme/package-summary.html
+http://developer.android.com/reference/org/apache/http/conn/ssl/package-summary.html
+
+http://developer.android.com/reference/org/apache/http/conn/util/package-summary.html
+http://developer.android.com/reference/org/apache/http/cookie/package-summary.html
+
+http://developer.android.com/reference/org/apache/http/cookie/params/package-summary.html
+http://developer.android.com/reference/org/apache/http/entity/package-summary.html
+
+http://developer.android.com/reference/org/apache/http/impl/package-summary.html
+http://developer.android.com/reference/org/apache/http/impl/auth/package-summary.html
+
+http://developer.android.com/reference/org/apache/http/impl/client/package-summary.html
+http://developer.android.com/reference/org/apache/http/impl/conn/package-summary.html
+
+http://developer.android.com/reference/org/apache/http/impl/conn/tsccm/package-summary.html
+http://developer.android.com/reference/org/apache/http/impl/cookie/package-summary.html
+
+http://developer.android.com/reference/org/apache/http/impl/entity/package-summary.html
+http://developer.android.com/reference/org/apache/http/impl/io/package-summary.html
+
+http://developer.android.com/reference/org/apache/http/io/package-summary.html
+http://developer.android.com/reference/org/apache/http/message/package-summary.html
+
+http://developer.android.com/reference/org/apache/http/params/package-summary.html
+http://developer.android.com/reference/org/apache/http/protocol/package-summary.html
+
+http://developer.android.com/reference/org/apache/http/util/package-summary.html
+http://developer.android.com/reference/org/json/package-summary.html
+
+http://developer.android.com/reference/org/w3c/dom/package-summary.html
+http://developer.android.com/reference/org/xml/sax/package-summary.html
+
+http://developer.android.com/reference/org/xml/sax/ext/package-summary.html
+http://developer.android.com/reference/org/xml/sax/helpers/package-summary.html
+
+http://developer.android.com/reference/org/xmlpull/v1/package-summary.html
+http://developer.android.com/reference/org/xmlpull/v1/sax2/package-summary.html
+
+http://developer.android.com/reference/org/apache/http/message/AbstractHttpMessage.html
+http://developer.android.com/guide/basics/what-is-android.html
+
+http://developer.android.com/guide/topics/fundamentals.html
+http://developer.android.com/guide/topics/ui/index.html
+
+http://developer.android.com/guide/topics/ui/declaring-layout.html
+http://developer.android.com/guide/topics/ui/menus.html
+
+http://developer.android.com/guide/topics/ui/layout-objects.html
+http://developer.android.com/guide/topics/ui/binding.html
+
+http://developer.android.com/guide/topics/ui/ui-events.html
+http://developer.android.com/guide/topics/ui/themes.html
+
+http://developer.android.com/guide/topics/ui/custom-components.html
+http://developer.android.com/guide/topics/ui/how-android-draws.html
+
+http://developer.android.com/guide/topics/resources/index.html
+http://developer.android.com/guide/topics/resources/resources-i18n.html
+
+http://developer.android.com/guide/topics/resources/available-resources.html
+http://developer.android.com/guide/topics/intents/intents-filters.html
+
+http://developer.android.com/guide/topics/data/data-storage.html
+http://developer.android.com/guide/topics/providers/content-providers.html
+
+http://developer.android.com/guide/topics/security/security.html
+http://developer.android.com/guide/topics/manifest/manifest-intro.html
+
+http://developer.android.com/guide/topics/manifest/action-element.html
+http://developer.android.com/guide/topics/manifest/activity-element.html
+
+http://developer.android.com/guide/topics/manifest/activity-alias-element.html
+http://developer.android.com/guide/topics/manifest/application-element.html
+
+http://developer.android.com/guide/topics/manifest/category-element.html
+http://developer.android.com/guide/topics/manifest/data-element.html
+
+http://developer.android.com/guide/topics/manifest/grant-uri-permission-element.html
+http://developer.android.com/guide/topics/manifest/instrumentation-element.html
+
+http://developer.android.com/guide/topics/manifest/intent-filter-element.html
+http://developer.android.com/guide/topics/manifest/manifest-element.html
+
+http://developer.android.com/guide/topics/manifest/meta-data-element.html
+http://developer.android.com/guide/topics/manifest/permission-element.html
+
+http://developer.android.com/guide/topics/manifest/permission-group-element.html
+http://developer.android.com/guide/topics/manifest/permission-tree-element.html
+
+http://developer.android.com/guide/topics/manifest/provider-element.html
+http://developer.android.com/guide/topics/manifest/receiver-element.html
+
+http://developer.android.com/guide/topics/manifest/service-element.html
+http://developer.android.com/guide/topics/manifest/uses-library-element.html
+
+http://developer.android.com/guide/topics/manifest/uses-permission-element.html
+http://developer.android.com/guide/topics/manifest/uses-sdk-element.html
+
+http://developer.android.com/guide/topics/graphics/index.html
+http://developer.android.com/guide/topics/graphics/2d-graphics.html
+
+http://developer.android.com/guide/topics/graphics/opengl.html
+http://developer.android.com/guide/topics/media/index.html
+
+http://developer.android.com/guide/topics/location/index.html
+http://developer.android.com/guide/developing/eclipse-adt.html
+
+http://developer.android.com/guide/developing/other-ide.html
+http://developer.android.com/guide/developing/device.html
+
+http://developer.android.com/guide/developing/debug-tasks.html
+http://developer.android.com/guide/developing/tools/aapt.html
+
+http://developer.android.com/guide/developing/tools/adb.html
+http://developer.android.com/guide/developing/tools/othertools.html
+
+http://developer.android.com/guide/developing/tools/aidl.html
+http://developer.android.com/guide/developing/tools/ddms.html
+
+http://developer.android.com/guide/developing/tools/draw9patch.html
+http://developer.android.com/guide/developing/tools/emulator.html
+
+http://developer.android.com/guide/developing/tools/hierarchy-viewer.html
+http://developer.android.com/guide/developing/tools/monkey.html
+
+http://developer.android.com/guide/developing/tools/traceview.html
+http://developer.android.com/guide/publishing/app-signing.html
+
+http://developer.android.com/guide/publishing/versioning.html
+http://developer.android.com/guide/publishing/preparing.html
+
+http://developer.android.com/guide/publishing/publishing.html
+http://developer.android.com/guide/practices/design/performance.html
+
+http://developer.android.com/guide/practices/design/responsiveness.html
+http://developer.android.com/guide/practices/design/seamlessness.html
+
+http://developer.android.com/guide/tutorials/hello-world.html
+http://developer.android.com/guide/tutorials/views/index.html
+
+http://developer.android.com/guide/tutorials/notepad/index.html
+http://developer.android.com/guide/samples/ApiDemos/index.html
+
+http://developer.android.com/guide/samples/LunarLander/index.html
+http://developer.android.com/guide/samples/NotePad/index.html
+
+http://developer.android.com/guide/appendix/media-formats.html
+http://developer.android.com/guide/appendix/g-app-intents.html
+
+http://developer.android.com/guide/appendix/glossary.html
+http://developer.android.com/guide/appendix/faq/commontasks.html
+
+http://developer.android.com/guide/appendix/faq/framework.html
+http://developer.android.com/guide/appendix/faq/troubleshooting.html
+
+http://developer.android.com/guide/appendix/faq/licensingandoss.html
+http://developer.android.com/guide/appendix/faq/security.html
+
+http://developer.android.com/reference/org/apache/http/impl/client/AbstractAuthenticationHandler.html
+
+http://developer.android.com/reference/org/apache/http/impl/client/AbstractHttpClient.html
+http://developer.android.com/reference/org/apache/http/impl/client/BasicCookieStore.html
+
+http://developer.android.com/reference/org/apache/http/impl/client/BasicCredentialsProvider.html
+
+http://developer.android.com/reference/org/apache/http/impl/client/BasicResponseHandler.html
+http://developer.android.com/reference/org/apache/http/impl/client/ClientParamsStack.html
+
+http://developer.android.com/reference/org/apache/http/impl/client/DefaultConnectionKeepAliveStrategy.html
+
+http://developer.android.com/reference/org/apache/http/impl/client/DefaultHttpClient.html
+http://developer.android.com/reference/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.html
+
+http://developer.android.com/reference/org/apache/http/impl/client/DefaultProxyAuthenticationHandler.html
+
+http://developer.android.com/reference/org/apache/http/impl/client/DefaultRedirectHandler.html
+
+http://developer.android.com/reference/org/apache/http/impl/client/DefaultRequestDirector.html
+
+http://developer.android.com/reference/org/apache/http/impl/client/DefaultTargetAuthenticationHandler.html
+
+http://developer.android.com/reference/org/apache/http/impl/client/DefaultUserTokenHandler.html
+
+http://developer.android.com/reference/org/apache/http/impl/client/EntityEnclosingRequestWrapper.html
+
+http://developer.android.com/reference/org/apache/http/impl/client/RedirectLocations.html
+http://developer.android.com/reference/org/apache/http/impl/client/RequestWrapper.html
+
+http://developer.android.com/reference/org/apache/http/impl/client/RoutedRequest.html
+http://developer.android.com/reference/org/apache/http/impl/client/TunnelRefusedException.html
+
+http://developer.android.com/reference/org/apache/http/client/CookieStore.html
+http://developer.android.com/reference/org/apache/http/client/CredentialsProvider.html
+
+http://developer.android.com/reference/org/apache/http/client/ResponseHandler.html
+http://developer.android.com/reference/org/apache/http/client/HttpRequestRetryHandler.html
+
+http://developer.android.com/reference/org/apache/http/client/RedirectHandler.html
+http://developer.android.com/reference/org/apache/http/client/RequestDirector.html
+
+http://developer.android.com/reference/org/apache/http/HttpEntityEnclosingRequest.html
+http://developer.android.com/reference/org/apache/http/HttpRequest.html
+
+http://developer.android.com/reference/android/Manifest.html
+http://developer.android.com/reference/android/Manifest.permission.html
+
+http://developer.android.com/reference/android/Manifest.permission_group.html
+http://developer.android.com/reference/android/R.html
+
+http://developer.android.com/reference/android/R.anim.html
+http://developer.android.com/reference/android/R.array.html
+
+http://developer.android.com/reference/android/R.attr.html
+http://developer.android.com/reference/android/R.color.html
+
+http://developer.android.com/reference/android/R.dimen.html
+http://developer.android.com/reference/android/R.drawable.html
+
+http://developer.android.com/reference/android/R.id.html
+http://developer.android.com/reference/android/R.layout.html
+
+http://developer.android.com/reference/android/R.plurals.html
+http://developer.android.com/reference/android/R.raw.html
+
+http://developer.android.com/reference/android/R.string.html
+http://developer.android.com/reference/android/R.style.html
+
+http://developer.android.com/reference/android/R.styleable.html
+http://developer.android.com/reference/android/R.xml.html
+
+http://developer.android.com/reference/android/package-descr.html
+http://developer.android.com/reference/android/os/Debug.html
+
+http://developer.android.com/reference/java/security/acl/Acl.html
+http://developer.android.com/reference/java/security/acl/AclEntry.html
+
+http://developer.android.com/reference/java/security/acl/Group.html
+http://developer.android.com/reference/java/security/acl/Owner.html
+
+http://developer.android.com/reference/java/security/acl/Permission.html
+http://developer.android.com/reference/java/security/acl/AclNotFoundException.html
+
+http://developer.android.com/reference/java/security/acl/LastOwnerException.html
+http://developer.android.com/reference/java/security/acl/NotOwnerException.html
+
+http://developer.android.com/reference/java/security/acl/package-descr.html
+http://developer.android.com/reference/java/text/AttributedCharacterIterator.html
+
+http://developer.android.com/reference/java/text/CharacterIterator.html
+http://developer.android.com/reference/java/text/Annotation.html
+
+http://developer.android.com/reference/java/text/AttributedCharacterIterator.Attribute.html
+http://developer.android.com/reference/java/text/AttributedString.html
+
+http://developer.android.com/reference/java/text/Bidi.html
+http://developer.android.com/reference/java/text/BreakIterator.html
+
+http://developer.android.com/reference/java/text/ChoiceFormat.html
+http://developer.android.com/reference/java/text/CollationElementIterator.html
+
+http://developer.android.com/reference/java/text/CollationKey.html
+http://developer.android.com/reference/java/text/Collator.html
+
+http://developer.android.com/reference/java/text/DateFormat.html
+http://developer.android.com/reference/java/text/DateFormat.Field.html
+
+http://developer.android.com/reference/java/text/DateFormatSymbols.html
+http://developer.android.com/reference/java/text/DecimalFormat.html
+
+http://developer.android.com/reference/java/text/DecimalFormatSymbols.html
+http://developer.android.com/reference/java/text/FieldPosition.html
+
+http://developer.android.com/reference/java/text/Format.html
+http://developer.android.com/reference/java/text/Format.Field.html
+
+http://developer.android.com/reference/java/text/MessageFormat.html
+http://developer.android.com/reference/java/text/MessageFormat.Field.html
+
+http://developer.android.com/reference/java/text/NumberFormat.html
+http://developer.android.com/reference/java/text/NumberFormat.Field.html
+
+http://developer.android.com/reference/java/text/ParsePosition.html
+http://developer.android.com/reference/java/text/RuleBasedCollator.html
+
+http://developer.android.com/reference/java/text/SimpleDateFormat.html
+http://developer.android.com/reference/java/text/StringCharacterIterator.html
+
+http://developer.android.com/reference/java/text/ParseException.html
+http://developer.android.com/reference/java/text/package-descr.html
+
+http://developer.android.com/reference/android/view/Menu.html
+http://developer.android.com/reference/android/view/ContextMenu.html
+
+http://developer.android.com/reference/android/view/SubMenu.html
+http://developer.android.com/reference/android/app/Activity.html
+
+http://developer.android.com/reference/android/view/MenuItem.html
+http://developer.android.com/reference/android/widget/ListView.html
+
+http://developer.android.com/reference/android/view/View.html
+http://developer.android.com/reference/android/view/ContextMenu.ContextMenuInfo.html
+
+http://developer.android.com/reference/android/widget/AdapterView.AdapterContextMenuInfo.html
+
+http://developer.android.com/reference/android/app/ListActivity.html
+http://developer.android.com/reference/android/view/MenuInflater.html
+
+http://developer.android.com/reference/android/preference/PreferenceActivity.html
+http://developer.android.com/reference/android/media/MediaPlayer.html
+
+http://developer.android.com/reference/android/media/MediaRecorder.html
+http://developer.android.com/reference/android/content/ContentValues.html
+
+http://developer.android.com/reference/android/content/ContentResolver.html
+http://developer.android.com/reference/android/test/PerformanceTestCase.html
+
+http://developer.android.com/reference/android/test/PerformanceTestCase.Intermediates.html
+http://developer.android.com/reference/android/test/TestSuiteProvider.html
+
+http://developer.android.com/reference/android/test/ActivityInstrumentationTestCase.html
+http://developer.android.com/reference/android/test/ActivityTestCase.html
+
+http://developer.android.com/reference/android/test/ActivityUnitTestCase.html
+http://developer.android.com/reference/android/test/AndroidTestCase.html
+
+http://developer.android.com/reference/android/test/AndroidTestRunner.html
+http://developer.android.com/reference/android/test/ApplicationTestCase.html
+
+http://developer.android.com/reference/android/app/Application.html
+http://developer.android.com/reference/android/test/InstrumentationTestCase.html
+
+http://developer.android.com/reference/android/test/InstrumentationTestRunner.html
+http://developer.android.com/reference/android/test/InstrumentationTestSuite.html
+
+http://developer.android.com/reference/android/test/IsolatedContext.html
+http://developer.android.com/reference/android/test/MoreAsserts.html
+
+http://developer.android.com/reference/android/test/ProviderTestCase.html
+http://developer.android.com/reference/android/content/ContentProvider.html
+
+http://developer.android.com/reference/android/test/RenamingDelegatingContext.html
+http://developer.android.com/reference/android/test/ServiceTestCase.html
+
+http://developer.android.com/reference/android/app/Service.html
+http://developer.android.com/reference/android/test/SingleLaunchActivityTestCase.html
+
+http://developer.android.com/reference/android/test/SyncBaseInstrumentation.html
+http://developer.android.com/reference/android/test/TouchUtils.html
+
+http://developer.android.com/reference/android/test/ViewAsserts.html
+http://developer.android.com/reference/android/test/AssertionFailedError.html
+
+http://developer.android.com/reference/android/test/ComparisonFailure.html
+http://developer.android.com/reference/android/app/Instrumentation.html
+
+http://developer.android.com/reference/junit/framework/TestCase.html
+http://developer.android.com/reference/junit/framework/TestSuite.html
+
+http://developer.android.com/reference/android/content/Intent.html
+http://developer.android.com/reference/android/content/Context.html
+
+http://developer.android.com/reference/android/os/Bundle.html
+http://developer.android.com/reference/android/view/ViewGroup.html
+
+http://developer.android.com/reference/android/widget/Button.html
+http://developer.android.com/reference/android/widget/TextView.html
+
+http://developer.android.com/reference/android/widget/EditText.html
+http://developer.android.com/reference/android/widget/CheckBox.html
+
+http://developer.android.com/reference/android/widget/RadioButton.html
+http://developer.android.com/reference/android/widget/Gallery.html
+
+http://developer.android.com/reference/android/widget/Spinner.html
+http://developer.android.com/reference/android/widget/AutoCompleteTextView.html
+
+http://developer.android.com/reference/android/widget/ImageSwitcher.html
+http://developer.android.com/reference/android/widget/TextSwitcher.html
+
+http://developer.android.com/reference/android/widget/LinearLayout.html
+http://developer.android.com/reference/android/widget/FrameLayout.html
+
+http://developer.android.com/reference/android/widget/AbsoluteLayout.html
+http://developer.android.com/reference/android/graphics/Canvas.html
+
+http://developer.android.com/reference/android/view/SurfaceView.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/LabelView.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/custom_view_1.html
+http://developer.android.com/guide/samples/NotePad/src/com/example/android/notepad/NoteEditor.html
+
+http://developer.android.com/reference/java/net/ContentHandlerFactory.html
+http://developer.android.com/reference/java/net/DatagramSocketImplFactory.html
+
+http://developer.android.com/reference/java/net/FileNameMap.html
+http://developer.android.com/reference/java/net/SocketImplFactory.html
+
+http://developer.android.com/reference/java/net/SocketOptions.html
+http://developer.android.com/reference/java/net/URLStreamHandlerFactory.html
+
+http://developer.android.com/reference/java/net/Authenticator.html
+http://developer.android.com/reference/java/net/CacheRequest.html
+
+http://developer.android.com/reference/java/net/CacheResponse.html
+http://developer.android.com/reference/java/net/ContentHandler.html
+
+http://developer.android.com/reference/java/net/CookieHandler.html
+http://developer.android.com/reference/java/net/DatagramPacket.html
+
+http://developer.android.com/reference/java/net/DatagramSocket.html
+http://developer.android.com/reference/java/net/DatagramSocketImpl.html
+
+http://developer.android.com/reference/java/net/HttpURLConnection.html
+http://developer.android.com/reference/java/net/Inet4Address.html
+
+http://developer.android.com/reference/java/net/Inet6Address.html
+http://developer.android.com/reference/java/net/InetAddress.html
+
+http://developer.android.com/reference/java/net/InetSocketAddress.html
+http://developer.android.com/reference/java/net/JarURLConnection.html
+
+http://developer.android.com/reference/java/net/MulticastSocket.html
+http://developer.android.com/reference/java/net/NetPermission.html
+
+http://developer.android.com/reference/java/net/NetworkInterface.html
+http://developer.android.com/reference/java/net/PasswordAuthentication.html
+
+http://developer.android.com/reference/java/net/Proxy.html
+http://developer.android.com/reference/java/net/ProxySelector.html
+
+http://developer.android.com/reference/java/net/ResponseCache.html
+http://developer.android.com/reference/java/net/SecureCacheResponse.html
+
+http://developer.android.com/reference/java/net/ServerSocket.html
+http://developer.android.com/reference/java/net/Socket.html
+
+http://developer.android.com/reference/java/net/SocketAddress.html
+http://developer.android.com/reference/java/net/SocketImpl.html
+
+http://developer.android.com/reference/java/net/SocketPermission.html
+http://developer.android.com/reference/java/net/URI.html
+
+http://developer.android.com/reference/java/net/URL.html
+http://developer.android.com/reference/java/net/URLClassLoader.html
+
+http://developer.android.com/reference/java/net/URLConnection.html
+http://developer.android.com/reference/java/net/URLDecoder.html
+
+http://developer.android.com/reference/java/net/URLEncoder.html
+http://developer.android.com/reference/java/net/URLStreamHandler.html
+
+http://developer.android.com/reference/java/net/Authenticator.RequestorType.html
+http://developer.android.com/reference/java/net/Proxy.Type.html
+
+http://developer.android.com/reference/java/net/BindException.html
+http://developer.android.com/reference/java/net/ConnectException.html
+
+http://developer.android.com/reference/java/net/HttpRetryException.html
+http://developer.android.com/reference/java/net/MalformedURLException.html
+
+http://developer.android.com/reference/java/net/NoRouteToHostException.html
+http://developer.android.com/reference/java/net/PortUnreachableException.html
+
+http://developer.android.com/reference/java/net/ProtocolException.html
+http://developer.android.com/reference/java/net/SocketException.html
+
+http://developer.android.com/reference/java/net/SocketTimeoutException.html
+http://developer.android.com/reference/java/net/UnknownHostException.html
+
+http://developer.android.com/reference/java/net/UnknownServiceException.html
+http://developer.android.com/reference/java/net/URISyntaxException.html
+
+http://developer.android.com/reference/java/net/package-descr.html
+http://developer.android.com/reference/android/graphics/drawable/Drawable.html
+
+http://developer.android.com/reference/android/graphics/drawable/BitmapDrawable.html
+http://developer.android.com/reference/android/graphics/drawable/ShapeDrawable.html
+
+http://developer.android.com/reference/android/graphics/drawable/PictureDrawable.html
+http://developer.android.com/reference/android/graphics/drawable/LayerDrawable.html
+
+http://developer.android.com/reference/android/widget/ImageView.html
+http://developer.android.com/reference/android/content/res/Resources.html
+
+http://developer.android.com/reference/android/graphics/drawable/shapes/OvalShape.html
+http://developer.android.com/reference/android/graphics/drawable/NinePatchDrawable.html
+
+http://developer.android.com/reference/android/view/animation/AnimationSet.html
+http://developer.android.com/reference/android/view/animation/Animation.html
+
+http://developer.android.com/reference/android/view/animation/Interpolator.html
+http://developer.android.com/reference/android/view/animation/AccelerateInterpolator.html
+
+http://developer.android.com/reference/android/graphics/drawable/AnimationDrawable.html
+http://developer.android.com/reference/java/util/logging/Filter.html
+
+http://developer.android.com/reference/java/util/logging/LoggingMXBean.html
+http://developer.android.com/reference/java/util/logging/ConsoleHandler.html
+
+http://developer.android.com/reference/java/util/logging/ErrorManager.html
+http://developer.android.com/reference/java/util/logging/FileHandler.html
+
+http://developer.android.com/reference/java/util/logging/Formatter.html
+http://developer.android.com/reference/java/util/logging/Handler.html
+
+http://developer.android.com/reference/java/util/logging/Level.html
+http://developer.android.com/reference/java/util/logging/Logger.html
+
+http://developer.android.com/reference/java/util/logging/LoggingPermission.html
+http://developer.android.com/reference/java/util/logging/LogManager.html
+
+http://developer.android.com/reference/java/util/logging/LogRecord.html
+http://developer.android.com/reference/java/util/logging/MemoryHandler.html
+
+http://developer.android.com/reference/java/util/logging/SimpleFormatter.html
+http://developer.android.com/reference/java/util/logging/SocketHandler.html
+
+http://developer.android.com/reference/java/util/logging/StreamHandler.html
+http://developer.android.com/reference/java/util/logging/XMLFormatter.html
+
+http://developer.android.com/reference/java/util/logging/package-descr.html
+http://developer.android.com/reference/android/test/suitebuilder/annotation/LargeTest.html
+http://developer.android.com/reference/android/test/suitebuilder/annotation/MediumTest.html
+
+http://developer.android.com/reference/android/test/suitebuilder/annotation/SmallTest.html
+http://developer.android.com/reference/android/os/Process.html
+
+http://developer.android.com/reference/android/graphics/AvoidXfermode.html
+http://developer.android.com/reference/android/graphics/Bitmap.html
+
+http://developer.android.com/reference/android/graphics/BitmapFactory.html
+http://developer.android.com/reference/android/graphics/BitmapFactory.Options.html
+
+http://developer.android.com/reference/android/graphics/BitmapShader.html
+http://developer.android.com/reference/android/graphics/BlurMaskFilter.html
+
+http://developer.android.com/reference/android/graphics/Camera.html
+http://developer.android.com/reference/android/graphics/Color.html
+
+http://developer.android.com/reference/android/graphics/ColorFilter.html
+http://developer.android.com/reference/android/graphics/ColorMatrix.html
+
+http://developer.android.com/reference/android/graphics/ColorMatrixColorFilter.html
+http://developer.android.com/reference/android/graphics/ComposePathEffect.html
+
+http://developer.android.com/reference/android/graphics/ComposeShader.html
+http://developer.android.com/reference/android/graphics/CornerPathEffect.html
+
+http://developer.android.com/reference/android/graphics/DashPathEffect.html
+http://developer.android.com/reference/android/graphics/DiscretePathEffect.html
+
+http://developer.android.com/reference/android/graphics/DrawFilter.html
+http://developer.android.com/reference/android/graphics/EmbossMaskFilter.html
+
+http://developer.android.com/reference/android/graphics/Interpolator.html
+http://developer.android.com/reference/android/graphics/LayerRasterizer.html
+
+http://developer.android.com/reference/android/graphics/LightingColorFilter.html
+http://developer.android.com/reference/android/graphics/LinearGradient.html
+
+http://developer.android.com/reference/android/graphics/MaskFilter.html
+http://developer.android.com/reference/android/graphics/Matrix.html
+
+http://developer.android.com/reference/android/graphics/Movie.html
+http://developer.android.com/reference/android/graphics/NinePatch.html
+
+http://developer.android.com/reference/android/graphics/Paint.html
+http://developer.android.com/reference/android/graphics/Paint.FontMetrics.html
+
+http://developer.android.com/reference/android/graphics/Paint.FontMetricsInt.html
+http://developer.android.com/reference/android/graphics/PaintFlagsDrawFilter.html
+
+http://developer.android.com/reference/android/graphics/Path.html
+http://developer.android.com/reference/android/graphics/PathDashPathEffect.html
+
+http://developer.android.com/reference/android/graphics/PathEffect.html
+http://developer.android.com/reference/android/graphics/PathMeasure.html
+
+http://developer.android.com/reference/android/graphics/Picture.html
+http://developer.android.com/reference/android/graphics/PixelFormat.html
+
+http://developer.android.com/reference/android/graphics/PixelXorXfermode.html
+http://developer.android.com/reference/android/graphics/Point.html
+
+http://developer.android.com/reference/android/graphics/PointF.html
+http://developer.android.com/reference/android/graphics/PorterDuff.html
+
+http://developer.android.com/reference/android/graphics/PorterDuffColorFilter.html
+http://developer.android.com/reference/android/graphics/PorterDuffXfermode.html
+
+http://developer.android.com/reference/android/graphics/RadialGradient.html
+http://developer.android.com/reference/android/graphics/Rasterizer.html
+
+http://developer.android.com/reference/android/graphics/Rect.html
+http://developer.android.com/reference/android/graphics/RectF.html
+
+http://developer.android.com/reference/android/graphics/Region.html
+http://developer.android.com/reference/android/graphics/RegionIterator.html
+
+http://developer.android.com/reference/android/graphics/Shader.html
+http://developer.android.com/reference/android/graphics/SumPathEffect.html
+
+http://developer.android.com/reference/android/graphics/SweepGradient.html
+http://developer.android.com/reference/android/graphics/Typeface.html
+
+http://developer.android.com/reference/android/graphics/Xfermode.html
+http://developer.android.com/reference/android/graphics/AvoidXfermode.Mode.html
+
+http://developer.android.com/reference/android/graphics/Bitmap.CompressFormat.html
+http://developer.android.com/reference/android/graphics/Bitmap.Config.html
+
+http://developer.android.com/reference/android/graphics/BlurMaskFilter.Blur.html
+http://developer.android.com/reference/android/graphics/Canvas.EdgeType.html
+
+http://developer.android.com/reference/android/graphics/Canvas.VertexMode.html
+http://developer.android.com/reference/android/graphics/Interpolator.Result.html
+
+http://developer.android.com/reference/android/graphics/Matrix.ScaleToFit.html
+http://developer.android.com/reference/android/graphics/Paint.Align.html
+
+http://developer.android.com/reference/android/graphics/Paint.Cap.html
+http://developer.android.com/reference/android/graphics/Paint.Join.html
+
+http://developer.android.com/reference/android/graphics/Paint.Style.html
+http://developer.android.com/reference/android/graphics/Path.Direction.html
+
+http://developer.android.com/reference/android/graphics/Path.FillType.html
+http://developer.android.com/reference/android/graphics/PathDashPathEffect.Style.html
+
+http://developer.android.com/reference/android/graphics/PorterDuff.Mode.html
+http://developer.android.com/reference/android/graphics/Region.Op.html
+
+http://developer.android.com/reference/android/graphics/Shader.TileMode.html
+http://developer.android.com/reference/android/graphics/package-descr.html
+
+http://developer.android.com/reference/android/content/BroadcastReceiver.html
+http://developer.android.com/reference/org/apache/http/cookie/ClientCookie.html
+
+http://developer.android.com/reference/org/apache/http/cookie/Cookie.html
+http://developer.android.com/reference/org/apache/http/cookie/CookieAttributeHandler.html
+
+http://developer.android.com/reference/org/apache/http/cookie/CookieSpec.html
+http://developer.android.com/reference/org/apache/http/cookie/CookieSpecFactory.html
+
+http://developer.android.com/reference/org/apache/http/cookie/SetCookie.html
+http://developer.android.com/reference/org/apache/http/cookie/SetCookie2.html
+
+http://developer.android.com/reference/org/apache/http/cookie/SM.html
+http://developer.android.com/reference/org/apache/http/cookie/CookieIdentityComparator.html
+
+http://developer.android.com/reference/org/apache/http/cookie/CookieOrigin.html
+http://developer.android.com/reference/org/apache/http/cookie/CookiePathComparator.html
+
+http://developer.android.com/reference/org/apache/http/cookie/CookieSpecRegistry.html
+http://developer.android.com/reference/org/apache/http/cookie/MalformedCookieException.html
+
+http://developer.android.com/reference/org/apache/http/cookie/package-descr.html
+http://developer.android.com/reference/java/nio/channels/spi/AbstractInterruptibleChannel.html
+
+http://developer.android.com/reference/java/nio/channels/spi/AbstractSelectableChannel.html
+http://developer.android.com/reference/java/nio/channels/spi/AbstractSelectionKey.html
+
+http://developer.android.com/reference/java/nio/channels/spi/AbstractSelector.html
+http://developer.android.com/reference/java/nio/channels/spi/SelectorProvider.html
+
+http://developer.android.com/reference/java/nio/channels/spi/package-descr.html
+http://developer.android.com/reference/org/apache/http/client/AuthenticationHandler.html
+
+http://developer.android.com/reference/org/apache/http/client/HttpClient.html
+http://developer.android.com/reference/org/apache/http/client/UserTokenHandler.html
+
+http://developer.android.com/reference/org/apache/http/client/CircularRedirectException.html
+http://developer.android.com/reference/org/apache/http/client/ClientProtocolException.html
+
+http://developer.android.com/reference/org/apache/http/client/HttpResponseException.html
+http://developer.android.com/reference/org/apache/http/client/NonRepeatableRequestException.html
+
+http://developer.android.com/reference/org/apache/http/client/RedirectException.html
+http://developer.android.com/reference/org/apache/http/client/package-descr.html
+
+http://developer.android.com/reference/org/apache/http/HttpResponse.html
+http://developer.android.com/reference/java/util/prefs/NodeChangeListener.html
+
+http://developer.android.com/reference/java/util/prefs/PreferenceChangeListener.html
+http://developer.android.com/reference/java/util/prefs/PreferencesFactory.html
+
+http://developer.android.com/reference/java/util/prefs/AbstractPreferences.html
+http://developer.android.com/reference/java/util/prefs/NodeChangeEvent.html
+
+http://developer.android.com/reference/java/util/prefs/PreferenceChangeEvent.html
+http://developer.android.com/reference/java/util/prefs/Preferences.html
+
+http://developer.android.com/reference/java/util/prefs/BackingStoreException.html
+http://developer.android.com/reference/java/util/prefs/InvalidPreferencesFormatException.html
+
+http://developer.android.com/reference/java/util/prefs/package-descr.html
+http://developer.android.com/sdk/adt_download.html
+http://developer.android.com/reference/android/provider/BaseColumns.html
+
+http://developer.android.com/reference/android/provider/Contacts.ContactMethodsColumns.html
+http://developer.android.com/reference/android/provider/Contacts.ExtensionsColumns.html
+
+http://developer.android.com/reference/android/provider/Contacts.GroupsColumns.html
+http://developer.android.com/reference/android/provider/Contacts.OrganizationColumns.html
+
+http://developer.android.com/reference/android/provider/Contacts.PeopleColumns.html
+http://developer.android.com/reference/android/provider/Contacts.PhonesColumns.html
+
+http://developer.android.com/reference/android/provider/Contacts.PhotosColumns.html
+http://developer.android.com/reference/android/provider/Contacts.PresenceColumns.html
+
+http://developer.android.com/reference/android/provider/Contacts.SettingsColumns.html
+http://developer.android.com/reference/android/provider/MediaStore.Audio.AlbumColumns.html
+
+http://developer.android.com/reference/android/provider/MediaStore.Audio.ArtistColumns.html
+http://developer.android.com/reference/android/provider/MediaStore.Audio.AudioColumns.html
+
+http://developer.android.com/reference/android/provider/MediaStore.Audio.GenresColumns.html
+http://developer.android.com/reference/android/provider/MediaStore.Audio.PlaylistsColumns.html
+
+http://developer.android.com/reference/android/provider/MediaStore.Images.ImageColumns.html
+http://developer.android.com/reference/android/provider/MediaStore.MediaColumns.html
+
+http://developer.android.com/reference/android/provider/MediaStore.Video.VideoColumns.html
+http://developer.android.com/reference/android/provider/OpenableColumns.html
+
+http://developer.android.com/reference/android/provider/Browser.html
+http://developer.android.com/reference/android/provider/Browser.BookmarkColumns.html
+
+http://developer.android.com/reference/android/provider/Browser.SearchColumns.html
+http://developer.android.com/reference/android/provider/CallLog.html
+
+http://developer.android.com/reference/android/provider/CallLog.Calls.html
+http://developer.android.com/reference/android/provider/Contacts.html
+
+http://developer.android.com/reference/android/provider/Contacts.ContactMethods.html
+http://developer.android.com/reference/android/provider/Contacts.Extensions.html
+
+http://developer.android.com/reference/android/provider/Contacts.GroupMembership.html
+http://developer.android.com/reference/android/provider/Contacts.Groups.html
+
+http://developer.android.com/reference/android/provider/Contacts.Intents.html
+http://developer.android.com/reference/android/provider/Contacts.Intents.Insert.html
+
+http://developer.android.com/reference/android/provider/Contacts.Intents.UI.html
+http://developer.android.com/reference/android/provider/Contacts.Organizations.html
+
+http://developer.android.com/reference/android/provider/Contacts.People.html
+http://developer.android.com/reference/android/provider/Contacts.People.ContactMethods.html
+
+http://developer.android.com/reference/android/provider/Contacts.People.Extensions.html
+http://developer.android.com/reference/android/provider/Contacts.People.Phones.html
+
+http://developer.android.com/reference/android/provider/Contacts.Phones.html
+http://developer.android.com/reference/android/provider/Contacts.Photos.html
+
+http://developer.android.com/reference/android/provider/Contacts.Settings.html
+http://developer.android.com/reference/android/provider/MediaStore.html
+
+http://developer.android.com/reference/android/provider/MediaStore.Audio.html
+http://developer.android.com/reference/android/provider/MediaStore.Audio.Albums.html
+
+http://developer.android.com/reference/android/provider/MediaStore.Audio.Artists.html
+http://developer.android.com/reference/android/provider/MediaStore.Audio.Artists.Albums.html
+
+http://developer.android.com/reference/android/provider/MediaStore.Audio.Genres.html
+http://developer.android.com/reference/android/provider/MediaStore.Audio.Genres.Members.html
+
+http://developer.android.com/reference/android/provider/MediaStore.Audio.Media.html
+http://developer.android.com/reference/android/provider/MediaStore.Audio.Playlists.html
+
+http://developer.android.com/reference/android/provider/MediaStore.Audio.Playlists.Members.html
+
+http://developer.android.com/reference/android/provider/MediaStore.Images.html
+http://developer.android.com/reference/android/provider/MediaStore.Images.Media.html
+
+http://developer.android.com/reference/android/provider/MediaStore.Images.Thumbnails.html
+http://developer.android.com/reference/android/provider/MediaStore.Video.html
+
+http://developer.android.com/reference/android/provider/MediaStore.Video.Media.html
+http://developer.android.com/reference/android/provider/SearchRecentSuggestions.html
+
+http://developer.android.com/reference/android/provider/Settings.html
+http://developer.android.com/reference/android/provider/Settings.NameValueTable.html
+
+http://developer.android.com/reference/android/provider/Settings.System.html
+http://developer.android.com/reference/android/provider/Settings.SettingNotFoundException.html
+
+http://developer.android.com/reference/android/provider/package-descr.html
+http://developer.android.com/reference/android/content/SearchRecentSuggestionsProvider.html
+
+http://developer.android.com/reference/android/net/UrlQuerySanitizer.ValueSanitizer.html
+http://developer.android.com/reference/android/net/ConnectivityManager.html
+
+http://developer.android.com/reference/android/net/Credentials.html
+http://developer.android.com/reference/android/net/DhcpInfo.html
+
+http://developer.android.com/reference/android/net/LocalServerSocket.html
+http://developer.android.com/reference/android/net/LocalSocket.html
+
+http://developer.android.com/reference/android/net/LocalSocketAddress.html
+http://developer.android.com/reference/android/net/MailTo.html
+
+http://developer.android.com/reference/android/net/NetworkInfo.html
+http://developer.android.com/reference/android/net/Proxy.html
+
+http://developer.android.com/reference/android/net/SSLCertificateSocketFactory.html
+http://developer.android.com/reference/android/net/Uri.html
+
+http://developer.android.com/reference/android/net/Uri.Builder.html
+http://developer.android.com/reference/android/net/UrlQuerySanitizer.html
+
+http://developer.android.com/reference/android/net/UrlQuerySanitizer.IllegalCharacterValueSanitizer.html
+
+http://developer.android.com/reference/android/net/UrlQuerySanitizer.ParameterValuePair.html
+http://developer.android.com/reference/android/net/LocalSocketAddress.Namespace.html
+
+http://developer.android.com/reference/android/net/NetworkInfo.DetailedState.html
+http://developer.android.com/reference/android/net/NetworkInfo.State.html
+
+http://developer.android.com/reference/android/net/package-descr.html
+http://developer.android.com/reference/javax/microedition/khronos/egl/EGL.html
+
+http://developer.android.com/reference/javax/microedition/khronos/egl/EGL10.html
+http://developer.android.com/reference/javax/microedition/khronos/egl/EGL11.html
+
+http://developer.android.com/reference/javax/microedition/khronos/egl/EGLConfig.html
+http://developer.android.com/reference/javax/microedition/khronos/egl/EGLContext.html
+
+http://developer.android.com/reference/javax/microedition/khronos/egl/EGLDisplay.html
+http://developer.android.com/reference/javax/microedition/khronos/egl/EGLSurface.html
+
+http://developer.android.com/reference/android/content/pm/PackageItemInfo.html
+http://developer.android.com/reference/org/apache/http/auth/params/AuthPNames.html
+
+http://developer.android.com/reference/org/apache/http/auth/params/AuthParamBean.html
+http://developer.android.com/reference/org/apache/http/auth/params/AuthParams.html
+
+http://developer.android.com/reference/org/apache/http/auth/params/package-descr.html
+http://developer.android.com/reference/org/apache/http/params/HttpParams.html
+
+http://developer.android.com/reference/java/lang/Object.html
+http://developer.android.com/reference/org/apache/http/conn/ConnectionKeepAliveStrategy.html
+
+http://developer.android.com/reference/org/apache/http/protocol/HttpContext.html
+http://developer.android.com/reference/java/lang/Class.html
+
+http://developer.android.com/reference/java/lang/String.html
+http://developer.android.com/reference/org/apache/http/ConnectionReuseStrategy.html
+
+http://developer.android.com/reference/org/xml/sax/ext/Attributes2.html
+http://developer.android.com/reference/org/xml/sax/ext/DeclHandler.html
+
+http://developer.android.com/reference/org/xml/sax/ext/EntityResolver2.html
+http://developer.android.com/reference/org/xml/sax/ext/LexicalHandler.html
+
+http://developer.android.com/reference/org/xml/sax/ext/Locator2.html
+http://developer.android.com/reference/org/xml/sax/ext/Attributes2Impl.html
+
+http://developer.android.com/reference/org/xml/sax/ext/DefaultHandler2.html
+http://developer.android.com/reference/org/xml/sax/ext/Locator2Impl.html
+
+http://developer.android.com/reference/org/xml/sax/ext/package-descr.html
+http://developer.android.com/reference/org/xml/sax/Attributes.html
+
+http://developer.android.com/reference/org/xml/sax/Locator.html
+http://developer.android.com/reference/android/content/pm/PackageManager.html
+
+http://developer.android.com/reference/org/apache/http/HttpHost.html
+
+http://developer.android.com/reference/org/apache/http/HttpException.html
+http://developer.android.com/reference/java/io/IOException.html
+
+http://developer.android.com/reference/javax/security/auth/x500/X500Principal.html
+http://developer.android.com/reference/javax/security/auth/x500/package-descr.html
+
+http://developer.android.com/reference/java/util/Date.html
+http://developer.android.com/reference/java/util/List.html
+
+http://developer.android.com/reference/android/sax/ElementListener.html
+http://developer.android.com/reference/android/sax/EndElementListener.html
+
+http://developer.android.com/reference/android/sax/EndTextElementListener.html
+http://developer.android.com/reference/android/sax/StartElementListener.html
+
+http://developer.android.com/reference/android/sax/TextElementListener.html
+http://developer.android.com/reference/android/sax/Element.html
+
+http://developer.android.com/reference/android/sax/RootElement.html
+http://developer.android.com/reference/android/sax/package-descr.html
+
+http://developer.android.com/reference/junit/runner/BaseTestRunner.html
+http://developer.android.com/reference/junit/framework/TestListener.html
+
+http://developer.android.com/reference/junit/framework/TestResult.html
+http://developer.android.com/reference/junit/framework/Test.html
+
+http://developer.android.com/reference/java/lang/Throwable.html
+http://developer.android.com/reference/junit/framework/AssertionFailedError.html
+
+http://developer.android.com/reference/junit/runner/TestSuiteLoader.html
+http://developer.android.com/reference/java/util/Properties.html
+
+http://developer.android.com/reference/java/lang/ClassNotFoundException.html
+http://developer.android.com/reference/org/apache/http/impl/io/AbstractMessageParser.html
+
+http://developer.android.com/reference/org/apache/http/impl/io/AbstractMessageWriter.html
+http://developer.android.com/reference/org/apache/http/impl/io/AbstractSessionInputBuffer.html
+
+http://developer.android.com/reference/org/apache/http/impl/io/AbstractSessionOutputBuffer.html
+
+http://developer.android.com/reference/org/apache/http/impl/io/ChunkedInputStream.html
+http://developer.android.com/reference/org/apache/http/impl/io/ChunkedOutputStream.html
+
+http://developer.android.com/reference/org/apache/http/impl/io/ContentLengthInputStream.html
+http://developer.android.com/reference/org/apache/http/impl/io/ContentLengthOutputStream.html
+
+http://developer.android.com/reference/org/apache/http/impl/io/HttpRequestParser.html
+http://developer.android.com/reference/org/apache/http/impl/io/HttpRequestWriter.html
+
+http://developer.android.com/reference/org/apache/http/impl/io/HttpResponseParser.html
+http://developer.android.com/reference/org/apache/http/impl/io/HttpResponseWriter.html
+
+http://developer.android.com/reference/org/apache/http/impl/io/HttpTransportMetricsImpl.html
+http://developer.android.com/reference/org/apache/http/impl/io/IdentityInputStream.html
+
+http://developer.android.com/reference/org/apache/http/impl/io/IdentityOutputStream.html
+http://developer.android.com/reference/org/apache/http/impl/io/SocketInputBuffer.html
+
+http://developer.android.com/reference/org/apache/http/impl/io/SocketOutputBuffer.html
+http://developer.android.com/reference/org/apache/http/impl/io/package-descr.html
+
+http://developer.android.com/reference/java/io/InputStream.html
+http://developer.android.com/reference/java/io/OutputStream.html
+
+http://developer.android.com/reference/org/apache/http/io/HttpTransportMetrics.html
+http://developer.android.com/reference/org/apache/http/io/SessionInputBuffer.html
+
+http://developer.android.com/reference/junit/framework/Assert.html
+http://developer.android.com/reference/java/lang/IllegalAccessException.html
+
+http://developer.android.com/reference/java/lang/Exception.html
+http://developer.android.com/reference/java/util/jar/Pack200.Packer.html
+
+http://developer.android.com/reference/java/util/jar/Pack200.Unpacker.html
+http://developer.android.com/reference/java/util/jar/Attributes.html
+
+http://developer.android.com/reference/java/util/jar/Attributes.Name.html
+http://developer.android.com/reference/java/util/jar/JarEntry.html
+
+http://developer.android.com/reference/java/util/jar/JarFile.html
+http://developer.android.com/reference/java/util/jar/JarInputStream.html
+
+http://developer.android.com/reference/java/util/jar/JarOutputStream.html
+http://developer.android.com/reference/java/util/jar/Manifest.html
+
+http://developer.android.com/reference/java/util/jar/Pack200.html
+http://developer.android.com/reference/java/util/jar/JarException.html
+
+http://developer.android.com/reference/java/util/jar/package-descr.html
+http://developer.android.com/reference/android/view/View.MeasureSpec.html
+
+http://developer.android.com/guide/tutorials/views/hello-formstuff.html
+http://developer.android.com/reference/android/view/View.OnClickListener.html
+
+http://developer.android.com/reference/android/view/View.OnLongClickListener.html
+http://developer.android.com/reference/android/view/View.OnFocusChangeListener.html
+
+http://developer.android.com/reference/android/view/View.OnKeyListener.html
+http://developer.android.com/reference/android/view/View.OnTouchListener.html
+
+http://developer.android.com/reference/android/view/View.OnCreateContextMenuListener.html
+http://developer.android.com/reference/android/view/ViewParent.html
+
+http://developer.android.com/reference/android/database/sqlite/SQLiteCursorDriver.html
+http://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.CursorFactory.html
+
+http://developer.android.com/reference/android/database/sqlite/SQLiteClosable.html
+http://developer.android.com/reference/android/database/sqlite/SQLiteCursor.html
+
+http://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.html
+http://developer.android.com/reference/android/database/sqlite/SQLiteOpenHelper.html
+
+http://developer.android.com/reference/android/database/sqlite/SQLiteProgram.html
+http://developer.android.com/reference/android/database/sqlite/SQLiteQuery.html
+
+http://developer.android.com/reference/android/database/sqlite/SQLiteQueryBuilder.html
+http://developer.android.com/reference/android/database/sqlite/SQLiteStatement.html
+
+http://developer.android.com/reference/android/database/sqlite/SQLiteAbortException.html
+http://developer.android.com/reference/android/database/sqlite/SQLiteConstraintException.html
+
+http://developer.android.com/reference/android/database/sqlite/SQLiteDatabaseCorruptException.html
+
+http://developer.android.com/reference/android/database/sqlite/SQLiteDiskIOException.html
+http://developer.android.com/reference/android/database/sqlite/SQLiteDoneException.html
+
+http://developer.android.com/reference/android/database/sqlite/SQLiteException.html
+http://developer.android.com/reference/android/database/sqlite/SQLiteFullException.html
+
+http://developer.android.com/reference/android/database/sqlite/SQLiteMisuseException.html
+http://developer.android.com/reference/android/database/sqlite/package-descr.html
+
+http://developer.android.com/reference/android/database/Cursor.html
+http://developer.android.com/reference/java/lang/StackTraceElement.html
+
+http://developer.android.com/reference/java/io/PrintWriter.html
+http://developer.android.com/reference/java/io/PrintStream.html
+
+http://developer.android.com/reference/java/math/BigDecimal.html
+http://developer.android.com/reference/java/math/BigInteger.html
+
+http://developer.android.com/reference/java/math/MathContext.html
+http://developer.android.com/reference/java/math/RoundingMode.html
+
+http://developer.android.com/reference/java/math/package-descr.html
+http://developer.android.com/reference/dalvik/system/DexFile.html
+
+http://developer.android.com/reference/dalvik/system/PathClassLoader.html
+http://developer.android.com/reference/dalvik/system/TemporaryDirectory.html
+
+http://developer.android.com/reference/dalvik/system/TouchDex.html
+http://developer.android.com/reference/dalvik/system/VMDebug.html
+
+http://developer.android.com/reference/dalvik/system/VMRuntime.html
+http://developer.android.com/reference/dalvik/system/VMStack.html
+
+http://developer.android.com/reference/dalvik/system/Zygote.html
+http://developer.android.com/reference/dalvik/system/AllocationLimitError.html
+
+http://developer.android.com/reference/dalvik/system/PotentialDeadlockError.html
+http://developer.android.com/reference/dalvik/system/StaleDexCacheError.html
+
+http://developer.android.com/reference/org/apache/http/client/protocol/ClientContext.html
+http://developer.android.com/reference/org/apache/http/client/protocol/ClientContextConfigurer.html
+
+http://developer.android.com/reference/org/apache/http/client/protocol/RequestAddCookies.html
+
+http://developer.android.com/reference/org/apache/http/client/protocol/RequestDefaultHeaders.html
+
+http://developer.android.com/reference/org/apache/http/client/protocol/RequestProxyAuthentication.html
+
+http://developer.android.com/reference/org/apache/http/client/protocol/RequestTargetAuthentication.html
+
+http://developer.android.com/reference/org/apache/http/client/protocol/ResponseProcessCookies.html
+
+http://developer.android.com/reference/org/apache/http/client/protocol/package-descr.html
+http://developer.android.com/reference/android/graphics/drawable/Drawable.Callback.html
+
+http://developer.android.com/reference/android/graphics/drawable/ClipDrawable.html
+http://developer.android.com/reference/android/graphics/drawable/ColorDrawable.html
+
+http://developer.android.com/reference/android/graphics/drawable/Drawable.ConstantState.html
+http://developer.android.com/reference/android/graphics/drawable/DrawableContainer.html
+
+http://developer.android.com/reference/android/graphics/drawable/DrawableContainer.DrawableContainerState.html
+
+http://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html
+http://developer.android.com/reference/android/graphics/drawable/InsetDrawable.html
+
+http://developer.android.com/reference/android/graphics/drawable/LevelListDrawable.html
+http://developer.android.com/reference/android/graphics/drawable/PaintDrawable.html
+
+http://developer.android.com/reference/android/graphics/drawable/RotateDrawable.html
+http://developer.android.com/reference/android/graphics/drawable/ScaleDrawable.html
+
+http://developer.android.com/reference/android/graphics/drawable/ShapeDrawable.ShaderFactory.html
+
+http://developer.android.com/reference/android/graphics/drawable/StateListDrawable.html
+http://developer.android.com/reference/android/graphics/drawable/TransitionDrawable.html
+
+http://developer.android.com/reference/android/graphics/drawable/GradientDrawable.Orientation.html
+
+http://developer.android.com/reference/java/lang/Runnable.html
+http://developer.android.com/reference/org/xmlpull/v1/XmlPullParser.html
+
+http://developer.android.com/reference/android/util/AttributeSet.html
+http://developer.android.com/reference/org/xmlpull/v1/XmlPullParserException.html
+
+http://developer.android.com/reference/java/util/EventListener.html
+http://developer.android.com/reference/android/app/AliasActivity.html
+
+http://developer.android.com/reference/java/lang/ref/PhantomReference.html
+http://developer.android.com/reference/java/lang/ref/Reference.html
+
+http://developer.android.com/reference/java/lang/ref/ReferenceQueue.html
+http://developer.android.com/reference/java/lang/ref/SoftReference.html
+
+http://developer.android.com/reference/java/lang/ref/WeakReference.html
+http://developer.android.com/reference/javax/xml/parsers/DocumentBuilder.html
+
+http://developer.android.com/reference/javax/xml/parsers/DocumentBuilderFactory.html
+http://developer.android.com/reference/javax/xml/parsers/SAXParser.html
+
+http://developer.android.com/reference/javax/xml/parsers/SAXParserFactory.html
+http://developer.android.com/reference/javax/xml/parsers/ParserConfigurationException.html
+
+http://developer.android.com/reference/javax/xml/parsers/FactoryConfigurationError.html
+http://developer.android.com/reference/javax/xml/parsers/package-descr.html
+
+http://developer.android.com/reference/android/app/DatePickerDialog.OnDateSetListener.html
+http://developer.android.com/reference/android/app/KeyguardManager.OnKeyguardExitResult.html
+
+http://developer.android.com/reference/android/app/PendingIntent.OnFinished.html
+http://developer.android.com/reference/android/app/SearchManager.OnCancelListener.html
+
+http://developer.android.com/reference/android/app/SearchManager.OnDismissListener.html
+http://developer.android.com/reference/android/app/TimePickerDialog.OnTimeSetListener.html
+
+http://developer.android.com/reference/android/app/ActivityGroup.html
+http://developer.android.com/reference/android/app/ActivityManager.html
+
+http://developer.android.com/reference/android/app/ActivityManager.MemoryInfo.html
+http://developer.android.com/reference/android/app/ActivityManager.ProcessErrorStateInfo.html
+
+http://developer.android.com/reference/android/app/ActivityManager.RecentTaskInfo.html
+http://developer.android.com/reference/android/app/ActivityManager.RunningServiceInfo.html
+
+http://developer.android.com/reference/android/app/ActivityManager.RunningTaskInfo.html
+http://developer.android.com/reference/android/app/AlarmManager.html
+
+http://developer.android.com/reference/android/app/AlertDialog.html
+http://developer.android.com/reference/android/app/AlertDialog.Builder.html
+
+http://developer.android.com/reference/android/app/DatePickerDialog.html
+http://developer.android.com/reference/android/app/Dialog.html
+
+http://developer.android.com/reference/android/app/ExpandableListActivity.html
+http://developer.android.com/reference/android/app/Instrumentation.ActivityMonitor.html
+
+http://developer.android.com/reference/android/app/Instrumentation.ActivityResult.html
+http://developer.android.com/reference/android/app/KeyguardManager.html
+
+http://developer.android.com/reference/android/app/KeyguardManager.KeyguardLock.html
+http://developer.android.com/reference/android/app/LauncherActivity.html
+
+http://developer.android.com/reference/android/app/LocalActivityManager.html
+http://developer.android.com/reference/android/app/Notification.html
+
+http://developer.android.com/reference/android/app/NotificationManager.html
+http://developer.android.com/reference/android/app/PendingIntent.html
+
+http://developer.android.com/reference/android/app/ProgressDialog.html
+http://developer.android.com/reference/android/app/SearchManager.html
+
+http://developer.android.com/reference/android/app/TabActivity.html
+http://developer.android.com/reference/android/app/TimePickerDialog.html
+
+http://developer.android.com/reference/android/app/PendingIntent.CanceledException.html
+http://developer.android.com/reference/android/content/ContextWrapper.html
+
+http://developer.android.com/reference/android/view/ContextThemeWrapper.html
+http://developer.android.com/reference/android/widget/ListAdapter.html
+
+http://developer.android.com/reference/android/widget/SimpleAdapter.html
+http://developer.android.com/reference/android/widget/SimpleCursorAdapter.html
+
+http://developer.android.com/reference/android/media/AudioManager.html
+http://developer.android.com/reference/android/text/ClipboardManager.html
+
+http://developer.android.com/reference/android/view/LayoutInflater.html
+http://developer.android.com/reference/android/location/LocationManager.html
+
+http://developer.android.com/reference/android/os/PowerManager.html
+http://developer.android.com/reference/android/hardware/SensorManager.html
+
+http://developer.android.com/reference/android/telephony/TelephonyManager.html
+http://developer.android.com/reference/android/os/Vibrator.html
+
+http://developer.android.com/reference/android/net/wifi/WifiManager.html
+http://developer.android.com/reference/android/view/WindowManager.html
+
+http://developer.android.com/reference/android/view/ViewGroup.LayoutParams.html
+http://developer.android.com/reference/android/view/KeyEvent.html
+
+http://developer.android.com/reference/android/view/MotionEvent.html
+http://developer.android.com/reference/android/content/ComponentName.html
+
+http://developer.android.com/reference/android/view/Window.html
+http://developer.android.com/reference/android/content/SharedPreferences.html
+
+http://developer.android.com/reference/java/lang/CharSequence.html
+http://developer.android.com/reference/android/content/res/Resources.Theme.html
+
+http://developer.android.com/reference/android/content/res/Configuration.html
+http://developer.android.com/reference/android/view/Window.Callback.html
+
+http://developer.android.com/reference/android/view/LayoutInflater.Factory.html
+http://developer.android.com/reference/android/view/KeyEvent.Callback.html
+
+http://developer.android.com/reference/android/view/WindowManager.LayoutParams.html
+http://developer.android.com/reference/android/content/ServiceConnection.html
+
+http://developer.android.com/reference/java/lang/SecurityException.html
+http://developer.android.com/reference/android/content/res/AssetManager.html
+
+http://developer.android.com/reference/java/io/File.html
+http://developer.android.com/reference/java/lang/ClassLoader.html
+
+http://developer.android.com/reference/android/os/Looper.html
+http://developer.android.com/reference/java/io/FileInputStream.html
+
+http://developer.android.com/reference/java/io/FileOutputStream.html
+http://developer.android.com/reference/android/content/IntentFilter.html
+
+http://developer.android.com/reference/android/os/Handler.html
+http://developer.android.com/reference/java/util/Formatter.html
+
+http://developer.android.com/reference/android/content/res/TypedArray.html
+http://developer.android.com/reference/android/content/ComponentCallbacks.html
+
+http://developer.android.com/reference/android/view/animation/Animation.AnimationListener.html
+
+http://developer.android.com/reference/android/view/animation/AccelerateDecelerateInterpolator.html
+
+http://developer.android.com/reference/android/view/animation/AlphaAnimation.html
+http://developer.android.com/reference/android/view/animation/Animation.Description.html
+
+http://developer.android.com/reference/android/view/animation/AnimationUtils.html
+http://developer.android.com/reference/android/view/animation/CycleInterpolator.html
+
+http://developer.android.com/reference/android/view/animation/DecelerateInterpolator.html
+http://developer.android.com/reference/android/view/animation/GridLayoutAnimationController.html
+
+http://developer.android.com/reference/android/view/animation/GridLayoutAnimationController.AnimationParameters.html
+
+http://developer.android.com/reference/android/view/animation/LayoutAnimationController.html
+http://developer.android.com/reference/android/view/animation/LayoutAnimationController.AnimationParameters.html
+
+http://developer.android.com/reference/android/view/animation/LinearInterpolator.html
+http://developer.android.com/reference/android/view/animation/RotateAnimation.html
+
+http://developer.android.com/reference/android/view/animation/ScaleAnimation.html
+http://developer.android.com/reference/android/view/animation/Transformation.html
+
+http://developer.android.com/reference/android/view/animation/TranslateAnimation.html
+http://developer.android.com/reference/android/view/animation/package-descr.html
+
+http://developer.android.com/reference/android/os/IBinder.html
+http://developer.android.com/reference/android/os/IBinder.DeathRecipient.html
+
+http://developer.android.com/reference/android/os/IInterface.html
+http://developer.android.com/reference/android/os/MessageQueue.IdleHandler.html
+
+http://developer.android.com/reference/android/os/Parcelable.html
+http://developer.android.com/reference/android/os/Parcelable.Creator.html
+
+http://developer.android.com/reference/android/os/BatteryManager.html
+http://developer.android.com/reference/android/os/Binder.html
+
+http://developer.android.com/reference/android/os/Build.html
+http://developer.android.com/reference/android/os/Build.VERSION.html
+
+http://developer.android.com/reference/android/os/ConditionVariable.html
+http://developer.android.com/reference/android/os/CountDownTimer.html
+
+http://developer.android.com/reference/android/os/Debug.InstructionCount.html
+http://developer.android.com/reference/android/os/Debug.MemoryInfo.html
+
+http://developer.android.com/reference/android/os/Environment.html
+http://developer.android.com/reference/android/os/FileObserver.html
+
+http://developer.android.com/reference/android/os/HandlerThread.html
+http://developer.android.com/reference/android/os/MemoryFile.html
+
+http://developer.android.com/reference/android/os/Message.html
+http://developer.android.com/reference/android/os/MessageQueue.html
+
+http://developer.android.com/reference/android/os/Messenger.html
+http://developer.android.com/reference/android/os/Parcel.html
+
+http://developer.android.com/reference/android/os/ParcelFileDescriptor.html
+http://developer.android.com/reference/android/os/ParcelFileDescriptor.AutoCloseInputStream.html
+
+http://developer.android.com/reference/android/os/ParcelFileDescriptor.AutoCloseOutputStream.html
+
+http://developer.android.com/reference/android/os/PatternMatcher.html
+http://developer.android.com/reference/android/os/PowerManager.WakeLock.html
+
+http://developer.android.com/reference/android/os/RemoteCallbackList.html
+http://developer.android.com/reference/android/os/StatFs.html
+
+http://developer.android.com/reference/android/os/SystemClock.html
+http://developer.android.com/reference/android/os/TokenWatcher.html
+
+http://developer.android.com/reference/android/os/BadParcelableException.html
+http://developer.android.com/reference/android/os/DeadObjectException.html
+
+http://developer.android.com/reference/android/os/ParcelFormatException.html
+http://developer.android.com/reference/android/os/RemoteException.html
+
+http://developer.android.com/reference/java/lang/Cloneable.html
+http://developer.android.com/reference/java/lang/Byte.html
+
+http://developer.android.com/reference/java/util/ArrayList.html
+http://developer.android.com/reference/java/lang/Integer.html
+
+http://developer.android.com/reference/java/io/Serializable.html
+http://developer.android.com/reference/android/util/SparseArray.html
+
+http://developer.android.com/reference/java/util/Set.html
+http://developer.android.com/reference/java/nio/channels/DatagramChannel.html
+
+http://developer.android.com/reference/java/lang/IllegalArgumentException.html
+http://developer.android.com/reference/android/webkit/WebView.html
+
+http://developer.android.com/reference/android/hardware/Camera.html
+http://developer.android.com/reference/android/text/Spannable.html
+
+http://developer.android.com/reference/android/util/Log.html
+http://developer.android.com/reference/org/xml/sax/helpers/AttributeListImpl.html
+
+http://developer.android.com/reference/org/xml/sax/helpers/AttributesImpl.html
+http://developer.android.com/reference/org/xml/sax/helpers/DefaultHandler.html
+
+http://developer.android.com/reference/org/xml/sax/helpers/LocatorImpl.html
+http://developer.android.com/reference/org/xml/sax/helpers/NamespaceSupport.html
+
+http://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html
+http://developer.android.com/reference/org/xml/sax/helpers/ParserFactory.html
+
+http://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl.html
+http://developer.android.com/reference/org/xml/sax/helpers/XMLReaderAdapter.html
+
+http://developer.android.com/reference/org/xml/sax/helpers/XMLReaderFactory.html
+http://developer.android.com/reference/org/xml/sax/helpers/package-descr.html
+
+http://developer.android.com/reference/org/xml/sax/AttributeList.html
+http://developer.android.com/reference/org/xml/sax/Parser.html
+
+http://developer.android.com/reference/android/widget/AbsListView.OnScrollListener.html
+http://developer.android.com/reference/android/widget/AbsListView.RecyclerListener.html
+
+http://developer.android.com/reference/android/widget/Adapter.html
+http://developer.android.com/reference/android/widget/AdapterView.OnItemClickListener.html
+
+http://developer.android.com/reference/android/widget/AdapterView.OnItemLongClickListener.html
+
+http://developer.android.com/reference/android/widget/AdapterView.OnItemSelectedListener.html
+
+http://developer.android.com/reference/android/widget/AutoCompleteTextView.Validator.html
+http://developer.android.com/reference/android/widget/Checkable.html
+
+http://developer.android.com/reference/android/widget/CompoundButton.OnCheckedChangeListener.html
+
+http://developer.android.com/reference/android/widget/DatePicker.OnDateChangedListener.html
+http://developer.android.com/reference/android/widget/ExpandableListAdapter.html
+
+http://developer.android.com/reference/android/widget/ExpandableListView.OnChildClickListener.html
+
+http://developer.android.com/reference/android/widget/ExpandableListView.OnGroupClickListener.html
+
+http://developer.android.com/reference/android/widget/ExpandableListView.OnGroupCollapseListener.html
+
+http://developer.android.com/reference/android/widget/ExpandableListView.OnGroupExpandListener.html
+
+http://developer.android.com/reference/android/widget/Filter.FilterListener.html
+http://developer.android.com/reference/android/widget/Filterable.html
+
+http://developer.android.com/reference/android/widget/FilterQueryProvider.html
+http://developer.android.com/reference/android/widget/MediaController.MediaPlayerControl.html
+
+http://developer.android.com/reference/android/widget/MultiAutoCompleteTextView.Tokenizer.html
+
+http://developer.android.com/reference/android/widget/RadioGroup.OnCheckedChangeListener.html
+
+http://developer.android.com/reference/android/widget/RatingBar.OnRatingBarChangeListener.html
+
+http://developer.android.com/reference/android/widget/SeekBar.OnSeekBarChangeListener.html
+http://developer.android.com/reference/android/widget/SimpleAdapter.ViewBinder.html
+
+http://developer.android.com/reference/android/widget/SimpleCursorAdapter.CursorToStringConverter.html
+
+http://developer.android.com/reference/android/widget/SimpleCursorAdapter.ViewBinder.html
+http://developer.android.com/reference/android/widget/SpinnerAdapter.html
+
+http://developer.android.com/reference/android/widget/TabHost.OnTabChangeListener.html
+http://developer.android.com/reference/android/widget/TabHost.TabContentFactory.html
+
+http://developer.android.com/reference/android/widget/TimePicker.OnTimeChangedListener.html
+http://developer.android.com/reference/android/widget/ViewSwitcher.ViewFactory.html
+
+http://developer.android.com/reference/android/widget/WrapperListAdapter.html
+http://developer.android.com/reference/android/widget/AbsListView.html
+
+http://developer.android.com/reference/android/widget/AbsListView.LayoutParams.html
+http://developer.android.com/reference/android/widget/AbsoluteLayout.LayoutParams.html
+
+http://developer.android.com/reference/android/widget/AbsSeekBar.html
+http://developer.android.com/reference/android/widget/AbsSpinner.html
+
+http://developer.android.com/reference/android/widget/AdapterView.html
+http://developer.android.com/reference/android/widget/AnalogClock.html
+
+http://developer.android.com/reference/android/widget/ArrayAdapter.html
+http://developer.android.com/reference/android/widget/BaseAdapter.html
+
+http://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html
+http://developer.android.com/reference/android/widget/CheckedTextView.html
+
+http://developer.android.com/reference/android/widget/Chronometer.html
+http://developer.android.com/reference/android/widget/CompoundButton.html
+
+http://developer.android.com/reference/android/widget/CursorAdapter.html
+http://developer.android.com/reference/android/widget/CursorTreeAdapter.html
+
+http://developer.android.com/reference/android/widget/DatePicker.html
+http://developer.android.com/reference/android/widget/DialerFilter.html
+
+http://developer.android.com/reference/android/widget/DigitalClock.html
+http://developer.android.com/reference/android/widget/ExpandableListView.html
+
+http://developer.android.com/reference/android/widget/ExpandableListView.ExpandableListContextMenuInfo.html
+
+http://developer.android.com/reference/android/widget/Filter.html
+http://developer.android.com/reference/android/widget/Filter.FilterResults.html
+
+http://developer.android.com/reference/android/widget/FrameLayout.LayoutParams.html
+http://developer.android.com/reference/android/widget/Gallery.LayoutParams.html
+
+http://developer.android.com/reference/android/widget/GridView.html
+http://developer.android.com/reference/android/widget/HeaderViewListAdapter.html
+
+http://developer.android.com/reference/android/widget/ImageButton.html
+http://developer.android.com/reference/android/widget/LinearLayout.LayoutParams.html
+
+http://developer.android.com/reference/android/widget/ListView.FixedViewInfo.html
+http://developer.android.com/reference/android/widget/MediaController.html
+
+http://developer.android.com/reference/android/widget/MultiAutoCompleteTextView.html
+http://developer.android.com/reference/android/widget/MultiAutoCompleteTextView.CommaTokenizer.html
+
+http://developer.android.com/reference/android/widget/PopupWindow.html
+http://developer.android.com/reference/android/widget/ProgressBar.html
+
+http://developer.android.com/reference/android/widget/RadioGroup.html
+http://developer.android.com/reference/android/widget/RadioGroup.LayoutParams.html
+
+http://developer.android.com/reference/android/widget/RatingBar.html
+http://developer.android.com/reference/android/widget/RelativeLayout.html
+
+http://developer.android.com/reference/android/widget/RelativeLayout.LayoutParams.html
+http://developer.android.com/reference/android/widget/RemoteViews.html
+
+http://developer.android.com/reference/android/widget/ResourceCursorAdapter.html
+http://developer.android.com/reference/android/widget/ResourceCursorTreeAdapter.html
+
+http://developer.android.com/reference/android/widget/Scroller.html
+http://developer.android.com/reference/android/widget/ScrollView.html
+
+http://developer.android.com/reference/android/widget/SeekBar.html
+http://developer.android.com/reference/android/widget/SimpleCursorTreeAdapter.html
+
+http://developer.android.com/reference/android/widget/SimpleExpandableListAdapter.html
+http://developer.android.com/reference/android/widget/TabHost.html
+
+http://developer.android.com/reference/android/widget/TabHost.TabSpec.html
+http://developer.android.com/reference/android/widget/TableLayout.html
+
+http://developer.android.com/reference/android/widget/TableLayout.LayoutParams.html
+http://developer.android.com/reference/android/widget/TableRow.html
+
+http://developer.android.com/reference/android/widget/TableRow.LayoutParams.html
+http://developer.android.com/reference/android/widget/TabWidget.html
+
+http://developer.android.com/reference/android/widget/TextView.SavedState.html
+http://developer.android.com/reference/android/widget/TimePicker.html
+
+http://developer.android.com/reference/android/widget/Toast.html
+http://developer.android.com/reference/android/widget/ToggleButton.html
+
+http://developer.android.com/reference/android/widget/TwoLineListItem.html
+http://developer.android.com/reference/android/widget/VideoView.html
+
+http://developer.android.com/reference/android/widget/ViewAnimator.html
+http://developer.android.com/reference/android/widget/ViewFlipper.html
+
+http://developer.android.com/reference/android/widget/ViewSwitcher.html
+http://developer.android.com/reference/android/widget/ZoomButton.html
+
+http://developer.android.com/reference/android/widget/ZoomControls.html
+http://developer.android.com/reference/android/widget/ImageView.ScaleType.html
+
+http://developer.android.com/reference/android/widget/TextView.BufferType.html
+http://developer.android.com/reference/android/widget/RemoteViews.ActionException.html
+
+http://developer.android.com/reference/java/lang/RuntimeException.html
+http://developer.android.com/reference/android/view/ViewGroup.OnHierarchyChangeListener.html
+
+http://developer.android.com/reference/android/view/TouchDelegate.html
+http://developer.android.com/reference/android/view/ViewTreeObserver.html
+
+http://developer.android.com/reference/android/view/ViewManager.html
+http://developer.android.com/reference/android/view/Gravity.html
+
+http://developer.android.com/reference/javax/microedition/khronos/opengles/GL.html
+http://developer.android.com/reference/java/awt/font/NumericShaper.html
+
+http://developer.android.com/reference/java/awt/font/TextAttribute.html
+http://developer.android.com/reference/android/text/TextWatcher.html
+
+http://developer.android.com/reference/android/text/method/MovementMethod.html
+http://developer.android.com/reference/android/text/TextUtils.TruncateAt.html
+
+http://developer.android.com/reference/android/text/InputFilter.html
+http://developer.android.com/reference/android/content/res/ColorStateList.html
+
+http://developer.android.com/reference/android/text/method/KeyListener.html
+http://developer.android.com/reference/android/text/Layout.html
+
+http://developer.android.com/reference/android/text/method/LinkMovementMethod.html
+http://developer.android.com/reference/android/text/TextPaint.html
+
+http://developer.android.com/reference/android/text/Selection.html
+http://developer.android.com/reference/android/text/method/TransformationMethod.html
+
+http://developer.android.com/reference/android/text/style/URLSpan.html
+http://developer.android.com/reference/android/text/util/Linkify.html
+
+http://developer.android.com/reference/android/text/Editable.Factory.html
+http://developer.android.com/reference/android/text/Spannable.Factory.html
+
+http://developer.android.com/reference/android/view/ViewTreeObserver.OnPreDrawListener.html
+http://developer.android.com/reference/java/security/BasicPermission.html
+
+http://developer.android.com/reference/java/security/Guard.html
+http://developer.android.com/reference/java/security/Permission.html
+
+http://developer.android.com/reference/java/security/PermissionCollection.html
+http://developer.android.com/reference/java/util/Locale.html
+
+http://developer.android.com/reference/java/lang/NullPointerException.html
+http://developer.android.com/reference/org/apache/http/FormattedHeader.html
+
+http://developer.android.com/reference/org/apache/http/Header.html
+http://developer.android.com/reference/org/apache/http/HeaderElement.html
+
+http://developer.android.com/reference/org/apache/http/HeaderElementIterator.html
+http://developer.android.com/reference/org/apache/http/HeaderIterator.html
+
+http://developer.android.com/reference/org/apache/http/HttpClientConnection.html
+http://developer.android.com/reference/org/apache/http/HttpConnection.html
+
+http://developer.android.com/reference/org/apache/http/HttpConnectionMetrics.html
+http://developer.android.com/reference/org/apache/http/HttpEntity.html
+
+http://developer.android.com/reference/org/apache/http/HttpInetConnection.html
+http://developer.android.com/reference/org/apache/http/HttpMessage.html
+
+http://developer.android.com/reference/org/apache/http/HttpRequestFactory.html
+http://developer.android.com/reference/org/apache/http/HttpRequestInterceptor.html
+
+http://developer.android.com/reference/org/apache/http/HttpResponseFactory.html
+http://developer.android.com/reference/org/apache/http/HttpResponseInterceptor.html
+
+http://developer.android.com/reference/org/apache/http/HttpServerConnection.html
+http://developer.android.com/reference/org/apache/http/HttpStatus.html
+
+http://developer.android.com/reference/org/apache/http/NameValuePair.html
+http://developer.android.com/reference/org/apache/http/ReasonPhraseCatalog.html
+
+http://developer.android.com/reference/org/apache/http/RequestLine.html
+http://developer.android.com/reference/org/apache/http/StatusLine.html
+
+http://developer.android.com/reference/org/apache/http/TokenIterator.html
+http://developer.android.com/reference/org/apache/http/HttpVersion.html
+
+http://developer.android.com/reference/org/apache/http/ProtocolVersion.html
+http://developer.android.com/reference/org/apache/http/ConnectionClosedException.html
+
+http://developer.android.com/reference/org/apache/http/MalformedChunkCodingException.html
+http://developer.android.com/reference/org/apache/http/MethodNotSupportedException.html
+
+http://developer.android.com/reference/org/apache/http/NoHttpResponseException.html
+http://developer.android.com/reference/org/apache/http/ParseException.html
+
+http://developer.android.com/reference/org/apache/http/ProtocolException.html
+http://developer.android.com/reference/org/apache/http/UnsupportedHttpVersionException.html
+
+http://developer.android.com/reference/org/apache/http/impl/DefaultConnectionReuseStrategy.html
+
+http://developer.android.com/reference/org/apache/http/impl/NoConnectionReuseStrategy.html
+http://developer.android.com/reference/java/lang/Enum.html
+
+http://developer.android.com/reference/java/lang/Comparable.html
+http://developer.android.com/reference/javax/crypto/SecretKey.html
+
+http://developer.android.com/reference/javax/crypto/Cipher.html
+http://developer.android.com/reference/javax/crypto/CipherInputStream.html
+
+http://developer.android.com/reference/javax/crypto/CipherOutputStream.html
+http://developer.android.com/reference/javax/crypto/CipherSpi.html
+
+http://developer.android.com/reference/javax/crypto/EncryptedPrivateKeyInfo.html
+http://developer.android.com/reference/javax/crypto/ExemptionMechanism.html
+
+http://developer.android.com/reference/javax/crypto/ExemptionMechanismSpi.html
+http://developer.android.com/reference/javax/crypto/KeyAgreement.html
+
+http://developer.android.com/reference/javax/crypto/KeyAgreementSpi.html
+http://developer.android.com/reference/javax/crypto/KeyGenerator.html
+
+http://developer.android.com/reference/javax/crypto/KeyGeneratorSpi.html
+http://developer.android.com/reference/javax/crypto/Mac.html
+
+http://developer.android.com/reference/javax/crypto/MacSpi.html
+http://developer.android.com/reference/javax/crypto/NullCipher.html
+
+http://developer.android.com/reference/javax/crypto/SealedObject.html
+http://developer.android.com/reference/javax/crypto/SecretKeyFactory.html
+
+http://developer.android.com/reference/javax/crypto/SecretKeyFactorySpi.html
+http://developer.android.com/reference/javax/crypto/BadPaddingException.html
+
+http://developer.android.com/reference/javax/crypto/ExemptionMechanismException.html
+http://developer.android.com/reference/javax/crypto/IllegalBlockSizeException.html
+
+http://developer.android.com/reference/javax/crypto/NoSuchPaddingException.html
+http://developer.android.com/reference/javax/crypto/ShortBufferException.html
+
+http://developer.android.com/reference/javax/crypto/package-descr.html
+http://developer.android.com/reference/android/database/CrossProcessCursor.html
+
+http://developer.android.com/reference/android/database/AbstractCursor.html
+http://developer.android.com/reference/android/database/AbstractCursor.SelfContentObserver.html
+
+http://developer.android.com/reference/android/database/AbstractWindowedCursor.html
+http://developer.android.com/reference/android/database/CharArrayBuffer.html
+
+http://developer.android.com/reference/android/database/ContentObservable.html
+http://developer.android.com/reference/android/database/ContentObserver.html
+
+http://developer.android.com/reference/android/database/CursorJoiner.html
+http://developer.android.com/reference/android/database/CursorWindow.html
+
+http://developer.android.com/reference/android/database/CursorWrapper.html
+http://developer.android.com/reference/android/database/DatabaseUtils.html
+
+http://developer.android.com/reference/android/database/DatabaseUtils.InsertHelper.html
+http://developer.android.com/reference/android/database/DataSetObservable.html
+
+http://developer.android.com/reference/android/database/DataSetObserver.html
+http://developer.android.com/reference/android/database/MatrixCursor.html
+
+http://developer.android.com/reference/android/database/MatrixCursor.RowBuilder.html
+http://developer.android.com/reference/android/database/MergeCursor.html
+
+http://developer.android.com/reference/android/database/Observable.html
+http://developer.android.com/reference/android/database/CursorJoiner.Result.html
+
+http://developer.android.com/reference/android/database/CursorIndexOutOfBoundsException.html
+http://developer.android.com/reference/android/database/SQLException.html
+
+http://developer.android.com/reference/android/database/StaleDataException.html
+http://developer.android.com/reference/android/database/package-descr.html
+
+http://developer.android.com/reference/org/apache/http/conn/ClientConnectionManager.html
+http://developer.android.com/reference/org/apache/http/conn/ClientConnectionManagerFactory.html
+
+http://developer.android.com/reference/org/apache/http/conn/ClientConnectionOperator.html
+http://developer.android.com/reference/org/apache/http/conn/ClientConnectionRequest.html
+
+http://developer.android.com/reference/org/apache/http/conn/ConnectionReleaseTrigger.html
+http://developer.android.com/reference/org/apache/http/conn/EofSensorWatcher.html
+
+http://developer.android.com/reference/org/apache/http/conn/ManagedClientConnection.html
+http://developer.android.com/reference/org/apache/http/conn/OperatedClientConnection.html
+
+http://developer.android.com/reference/org/apache/http/conn/BasicEofSensorWatcher.html
+http://developer.android.com/reference/org/apache/http/conn/BasicManagedEntity.html
+
+http://developer.android.com/reference/org/apache/http/conn/EofSensorInputStream.html
+http://developer.android.com/reference/org/apache/http/conn/MultihomePlainSocketFactory.html
+
+http://developer.android.com/reference/org/apache/http/conn/ConnectionPoolTimeoutException.html
+
+http://developer.android.com/reference/org/apache/http/conn/ConnectTimeoutException.html
+http://developer.android.com/reference/org/apache/http/conn/HttpHostConnectException.html
+
+http://developer.android.com/reference/java/nio/charset/Charset.html
+http://developer.android.com/reference/java/nio/charset/CharsetDecoder.html
+
+http://developer.android.com/reference/java/nio/charset/CharsetEncoder.html
+http://developer.android.com/reference/java/nio/charset/CoderResult.html
+
+http://developer.android.com/reference/java/nio/charset/CodingErrorAction.html
+http://developer.android.com/reference/java/nio/charset/CharacterCodingException.html
+
+http://developer.android.com/reference/java/nio/charset/IllegalCharsetNameException.html
+http://developer.android.com/reference/java/nio/charset/MalformedInputException.html
+
+http://developer.android.com/reference/java/nio/charset/UnmappableCharacterException.html
+http://developer.android.com/reference/java/nio/charset/UnsupportedCharsetException.html
+
+http://developer.android.com/reference/java/nio/charset/CoderMalfunctionError.html
+http://developer.android.com/reference/java/nio/charset/package-descr.html
+
+http://developer.android.com/reference/com/google/android/maps/MapView.html
+http://developer.android.com/reference/com/google/android/maps/MapActivity.html
+
+http://developer.android.com/guide/topics/location/geo/mapkey.html
+http://developer.android.com/reference/com/google/android/maps/MapController.html
+
+http://developer.android.com/reference/com/google/android/maps/ItemizedOverlay.html
+http://developer.android.com/reference/com/google/android/maps/Overlay.html
+
+http://developer.android.com/reference/java/lang/CloneNotSupportedException.html
+http://developer.android.com/reference/java/security/AlgorithmParameters.html
+
+http://developer.android.com/reference/java/security/spec/PKCS8EncodedKeySpec.html
+http://developer.android.com/reference/java/security/Key.html
+
+http://developer.android.com/reference/java/security/Provider.html
+http://developer.android.com/reference/java/security/NoSuchAlgorithmException.html
+
+http://developer.android.com/reference/java/security/NoSuchProviderException.html
+http://developer.android.com/reference/java/security/InvalidKeyException.html
+
+http://developer.android.com/reference/java/security/spec/InvalidKeySpecException.html
+http://developer.android.com/reference/android/webkit/DownloadListener.html
+
+http://developer.android.com/reference/android/webkit/Plugin.PreferencesClickHandler.html
+http://developer.android.com/reference/android/webkit/UrlInterceptHandler.html
+
+http://developer.android.com/reference/android/webkit/WebIconDatabase.IconListener.html
+http://developer.android.com/reference/android/webkit/WebView.PictureListener.html
+
+http://developer.android.com/reference/android/webkit/CacheManager.html
+http://developer.android.com/reference/android/webkit/CacheManager.CacheResult.html
+
+http://developer.android.com/reference/android/webkit/CookieManager.html
+http://developer.android.com/reference/android/webkit/CookieSyncManager.html
+
+http://developer.android.com/reference/android/webkit/DateSorter.html
+http://developer.android.com/reference/android/webkit/HttpAuthHandler.html
+
+http://developer.android.com/reference/android/webkit/JsPromptResult.html
+http://developer.android.com/reference/android/webkit/JsResult.html
+
+http://developer.android.com/reference/android/webkit/MimeTypeMap.html
+http://developer.android.com/reference/android/webkit/Plugin.html
+
+http://developer.android.com/reference/android/webkit/PluginList.html
+http://developer.android.com/reference/android/webkit/SslErrorHandler.html
+
+http://developer.android.com/reference/android/webkit/UrlInterceptRegistry.html
+http://developer.android.com/reference/android/webkit/URLUtil.html
+
+http://developer.android.com/reference/android/webkit/WebBackForwardList.html
+http://developer.android.com/reference/android/webkit/WebChromeClient.html
+
+http://developer.android.com/reference/android/webkit/WebHistoryItem.html
+http://developer.android.com/reference/android/webkit/WebIconDatabase.html
+
+http://developer.android.com/reference/android/webkit/WebSettings.html
+http://developer.android.com/reference/android/webkit/WebView.HitTestResult.html
+
+http://developer.android.com/reference/android/webkit/WebView.WebViewTransport.html
+http://developer.android.com/reference/android/webkit/WebViewClient.html
+
+http://developer.android.com/reference/android/webkit/WebViewDatabase.html
+http://developer.android.com/reference/android/webkit/WebSettings.LayoutAlgorithm.html
+
+http://developer.android.com/reference/android/webkit/WebSettings.RenderPriority.html
+http://developer.android.com/reference/android/webkit/WebSettings.TextSize.html
+
+http://developer.android.com/reference/android/webkit/package-descr.html
+http://developer.android.com/reference/java/util/Map.html
+
+http://developer.android.com/reference/android/graphics/drawable/shapes/ArcShape.html
+http://developer.android.com/reference/android/graphics/drawable/shapes/PathShape.html
+
+http://developer.android.com/reference/android/graphics/drawable/shapes/RectShape.html
+http://developer.android.com/reference/android/graphics/drawable/shapes/RoundRectShape.html
+
+http://developer.android.com/reference/android/graphics/drawable/shapes/Shape.html
+http://developer.android.com/reference/android/graphics/drawable/package-descr.html
+
+http://developer.android.com/reference/java/lang/IndexOutOfBoundsException.html
+http://developer.android.com/reference/android/content/pm/ActivityInfo.html
+
+http://developer.android.com/reference/java/lang/InstantiationException.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/GLSurfaceView.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/GLSurfaceViewActivity.html
+
+http://developer.android.com/reference/java/util/concurrent/BlockingQueue.html
+http://developer.android.com/reference/java/util/concurrent/Callable.html
+
+http://developer.android.com/reference/java/util/concurrent/CompletionService.html
+http://developer.android.com/reference/java/util/concurrent/ConcurrentMap.html
+
+http://developer.android.com/reference/java/util/concurrent/Delayed.html
+http://developer.android.com/reference/java/util/concurrent/Executor.html
+
+http://developer.android.com/reference/java/util/concurrent/ExecutorService.html
+http://developer.android.com/reference/java/util/concurrent/Future.html
+
+http://developer.android.com/reference/java/util/concurrent/RejectedExecutionHandler.html
+http://developer.android.com/reference/java/util/concurrent/ScheduledExecutorService.html
+
+http://developer.android.com/reference/java/util/concurrent/ScheduledFuture.html
+http://developer.android.com/reference/java/util/concurrent/ThreadFactory.html
+
+http://developer.android.com/reference/java/util/concurrent/AbstractExecutorService.html
+http://developer.android.com/reference/java/util/concurrent/ArrayBlockingQueue.html
+
+http://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html
+http://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedQueue.html
+
+http://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html
+http://developer.android.com/reference/java/util/concurrent/CopyOnWriteArraySet.html
+
+http://developer.android.com/reference/java/util/concurrent/CountDownLatch.html
+http://developer.android.com/reference/java/util/concurrent/CyclicBarrier.html
+
+http://developer.android.com/reference/java/util/concurrent/DelayQueue.html
+http://developer.android.com/reference/java/util/concurrent/Exchanger.html
+
+http://developer.android.com/reference/java/util/concurrent/ExecutorCompletionService.html
+http://developer.android.com/reference/java/util/concurrent/Executors.html
+
+http://developer.android.com/reference/java/util/concurrent/FutureTask.html
+http://developer.android.com/reference/java/util/concurrent/LinkedBlockingQueue.html
+
+http://developer.android.com/reference/java/util/concurrent/PriorityBlockingQueue.html
+http://developer.android.com/reference/java/util/concurrent/ScheduledThreadPoolExecutor.html
+
+http://developer.android.com/reference/java/util/concurrent/Semaphore.html
+http://developer.android.com/reference/java/util/concurrent/SynchronousQueue.html
+
+http://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.html
+http://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.AbortPolicy.html
+
+http://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.CallerRunsPolicy.html
+
+http://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.DiscardOldestPolicy.html
+
+http://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.DiscardPolicy.html
+
+http://developer.android.com/reference/java/util/concurrent/TimeUnit.html
+http://developer.android.com/reference/java/util/concurrent/BrokenBarrierException.html
+
+http://developer.android.com/reference/java/util/concurrent/CancellationException.html
+http://developer.android.com/reference/java/util/concurrent/ExecutionException.html
+
+http://developer.android.com/reference/java/util/concurrent/RejectedExecutionException.html
+http://developer.android.com/reference/java/util/concurrent/TimeoutException.html
+
+http://developer.android.com/reference/java/util/concurrent/package-descr.html
+http://developer.android.com/reference/java/util/Queue.html
+
+http://developer.android.com/reference/java/util/PriorityQueue.html
+http://developer.android.com/reference/android/telephony/CellLocation.html
+
+http://developer.android.com/reference/android/telephony/PhoneNumberFormattingTextWatcher.html
+
+http://developer.android.com/reference/android/telephony/PhoneNumberUtils.html
+http://developer.android.com/reference/android/telephony/PhoneStateListener.html
+
+http://developer.android.com/reference/android/telephony/ServiceState.html
+http://developer.android.com/reference/java/lang/Appendable.html
+
+http://developer.android.com/reference/java/lang/Iterable.html
+http://developer.android.com/reference/java/lang/Readable.html
+
+http://developer.android.com/reference/java/lang/Thread.UncaughtExceptionHandler.html
+http://developer.android.com/reference/java/lang/Boolean.html
+
+http://developer.android.com/reference/java/lang/Character.html
+http://developer.android.com/reference/java/lang/Character.Subset.html
+
+http://developer.android.com/reference/java/lang/Character.UnicodeBlock.html
+http://developer.android.com/reference/java/lang/Compiler.html
+
+http://developer.android.com/reference/java/lang/Double.html
+http://developer.android.com/reference/java/lang/Float.html
+
+http://developer.android.com/reference/java/lang/InheritableThreadLocal.html
+http://developer.android.com/reference/java/lang/Long.html
+
+http://developer.android.com/reference/java/lang/Math.html
+http://developer.android.com/reference/java/lang/Number.html
+
+http://developer.android.com/reference/java/lang/Package.html
+http://developer.android.com/reference/java/lang/Process.html
+
+http://developer.android.com/reference/java/lang/ProcessBuilder.html
+http://developer.android.com/reference/java/lang/Runtime.html
+
+http://developer.android.com/reference/java/lang/RuntimePermission.html
+http://developer.android.com/reference/java/lang/SecurityManager.html
+
+http://developer.android.com/reference/java/lang/Short.html
+http://developer.android.com/reference/java/lang/StrictMath.html
+
+http://developer.android.com/reference/java/lang/StringBuffer.html
+http://developer.android.com/reference/java/lang/StringBuilder.html
+
+http://developer.android.com/reference/java/lang/System.html
+http://developer.android.com/reference/java/lang/Thread.html
+
+http://developer.android.com/reference/java/lang/ThreadGroup.html
+http://developer.android.com/reference/java/lang/ThreadLocal.html
+
+http://developer.android.com/reference/java/lang/Void.html
+http://developer.android.com/reference/java/lang/Thread.State.html
+
+http://developer.android.com/reference/java/lang/ArithmeticException.html
+http://developer.android.com/reference/java/lang/ArrayIndexOutOfBoundsException.html
+
+http://developer.android.com/reference/java/lang/ArrayStoreException.html
+http://developer.android.com/reference/java/lang/ClassCastException.html
+
+http://developer.android.com/reference/java/lang/EnumConstantNotPresentException.html
+http://developer.android.com/reference/java/lang/IllegalMonitorStateException.html
+
+http://developer.android.com/reference/java/lang/IllegalStateException.html
+http://developer.android.com/reference/java/lang/IllegalThreadStateException.html
+
+http://developer.android.com/reference/java/lang/InterruptedException.html
+http://developer.android.com/reference/java/lang/NegativeArraySizeException.html
+
+http://developer.android.com/reference/java/lang/NoSuchFieldException.html
+http://developer.android.com/reference/java/lang/NoSuchMethodException.html
+
+http://developer.android.com/reference/java/lang/NumberFormatException.html
+http://developer.android.com/reference/java/lang/StringIndexOutOfBoundsException.html
+
+http://developer.android.com/reference/java/lang/TypeNotPresentException.html
+http://developer.android.com/reference/java/lang/UnsupportedOperationException.html
+
+http://developer.android.com/reference/java/lang/AbstractMethodError.html
+http://developer.android.com/reference/java/lang/AssertionError.html
+
+http://developer.android.com/reference/java/lang/ClassCircularityError.html
+http://developer.android.com/reference/java/lang/ClassFormatError.html
+
+http://developer.android.com/reference/java/lang/Error.html
+http://developer.android.com/reference/java/lang/ExceptionInInitializerError.html
+
+http://developer.android.com/reference/java/lang/IllegalAccessError.html
+http://developer.android.com/reference/java/lang/IncompatibleClassChangeError.html
+
+http://developer.android.com/reference/java/lang/InstantiationError.html
+http://developer.android.com/reference/java/lang/InternalError.html
+
+http://developer.android.com/reference/java/lang/LinkageError.html
+http://developer.android.com/reference/java/lang/NoClassDefFoundError.html
+
+http://developer.android.com/reference/java/lang/NoSuchFieldError.html
+http://developer.android.com/reference/java/lang/NoSuchMethodError.html
+
+http://developer.android.com/reference/java/lang/OutOfMemoryError.html
+http://developer.android.com/reference/java/lang/StackOverflowError.html
+
+http://developer.android.com/reference/java/lang/ThreadDeath.html
+http://developer.android.com/reference/java/lang/UnknownError.html
+
+http://developer.android.com/reference/java/lang/UnsatisfiedLinkError.html
+http://developer.android.com/reference/java/lang/UnsupportedClassVersionError.html
+
+http://developer.android.com/reference/java/lang/VerifyError.html
+http://developer.android.com/reference/java/lang/VirtualMachineError.html
+
+http://developer.android.com/reference/java/nio/ByteBuffer.html
+http://developer.android.com/reference/java/util/Calendar.html
+
+http://developer.android.com/reference/java/nio/CharBuffer.html
+http://developer.android.com/reference/android/preference/CheckBoxPreference.html
+
+http://developer.android.com/reference/java/sql/Date.html
+http://developer.android.com/reference/android/preference/DialogPreference.html
+
+http://developer.android.com/reference/java/nio/DoubleBuffer.html
+http://developer.android.com/reference/android/preference/EditTextPreference.html
+
+http://developer.android.com/reference/java/lang/annotation/ElementType.html
+http://developer.android.com/reference/java/nio/FloatBuffer.html
+
+http://developer.android.com/reference/java/util/Formatter.BigDecimalLayoutForm.html
+http://developer.android.com/reference/java/util/GregorianCalendar.html
+
+http://developer.android.com/reference/java/nio/IntBuffer.html
+http://developer.android.com/reference/java/security/KeyRep.Type.html
+
+http://developer.android.com/reference/android/text/Layout.Alignment.html
+http://developer.android.com/reference/android/preference/ListPreference.html
+
+http://developer.android.com/reference/java/nio/LongBuffer.html
+http://developer.android.com/reference/com/google/android/maps/MapView.ReticleDrawMode.html
+
+http://developer.android.com/reference/java/nio/MappedByteBuffer.html
+http://developer.android.com/reference/java/io/ObjectStreamField.html
+
+http://developer.android.com/reference/android/preference/Preference.html
+http://developer.android.com/reference/android/preference/PreferenceCategory.html
+
+http://developer.android.com/reference/android/preference/PreferenceGroup.html
+http://developer.android.com/reference/android/preference/PreferenceScreen.html
+
+http://developer.android.com/reference/java/lang/annotation/RetentionPolicy.html
+http://developer.android.com/reference/android/preference/RingtonePreference.html
+
+http://developer.android.com/reference/org/apache/http/conn/routing/RouteInfo.LayerType.html
+http://developer.android.com/reference/org/apache/http/conn/routing/RouteInfo.TunnelType.html
+
+http://developer.android.com/reference/javax/net/ssl/SSLEngineResult.HandshakeStatus.html
+http://developer.android.com/reference/javax/net/ssl/SSLEngineResult.Status.html
+
+http://developer.android.com/reference/java/nio/ShortBuffer.html
+http://developer.android.com/reference/android/telephony/gsm/SmsMessage.MessageClass.html
+
+http://developer.android.com/reference/android/net/wifi/SupplicantState.html
+http://developer.android.com/reference/android/text/method/TextKeyListener.Capitalize.html
+
+http://developer.android.com/reference/java/sql/Time.html
+http://developer.android.com/reference/java/sql/Timestamp.html
+
+http://developer.android.com/reference/java/util/UUID.html
+http://developer.android.com/reference/android/view/ViewDebug.HierarchyTraceType.html
+
+http://developer.android.com/reference/android/view/ViewDebug.RecyclerTraceType.html
+http://developer.android.com/reference/android/util/Xml.Encoding.html
+
+http://developer.android.com/reference/org/apache/http/impl/auth/NTLMEngine.html
+http://developer.android.com/reference/org/apache/http/impl/auth/AuthSchemeBase.html
+
+http://developer.android.com/reference/org/apache/http/impl/auth/BasicScheme.html
+http://developer.android.com/reference/org/apache/http/impl/auth/BasicSchemeFactory.html
+
+http://developer.android.com/reference/org/apache/http/impl/auth/DigestScheme.html
+http://developer.android.com/reference/org/apache/http/impl/auth/DigestSchemeFactory.html
+
+http://developer.android.com/reference/org/apache/http/impl/auth/NTLMScheme.html
+http://developer.android.com/reference/org/apache/http/impl/auth/RFC2617Scheme.html
+
+http://developer.android.com/reference/org/apache/http/impl/auth/NTLMEngineException.html
+http://developer.android.com/reference/org/apache/http/impl/auth/UnsupportedDigestAlgorithmException.html
+
+http://developer.android.com/reference/android/preference/Preference.OnPreferenceChangeListener.html
+
+http://developer.android.com/reference/android/preference/Preference.OnPreferenceClickListener.html
+
+http://developer.android.com/reference/android/preference/PreferenceManager.OnActivityDestroyListener.html
+
+http://developer.android.com/reference/android/preference/PreferenceManager.OnActivityResultListener.html
+
+http://developer.android.com/reference/android/preference/PreferenceManager.OnActivityStopListener.html
+
+http://developer.android.com/reference/android/preference/Preference.BaseSavedState.html
+http://developer.android.com/reference/android/preference/PreferenceManager.html
+
+http://developer.android.com/reference/android/util/Printer.html
+http://developer.android.com/reference/android/util/Config.html
+
+http://developer.android.com/reference/android/util/DebugUtils.html
+http://developer.android.com/reference/android/util/DisplayMetrics.html
+
+http://developer.android.com/reference/android/util/EventLogTags.html
+http://developer.android.com/reference/android/util/EventLogTags.Description.html
+
+http://developer.android.com/reference/android/util/FloatMath.html
+http://developer.android.com/reference/android/util/LogPrinter.html
+
+http://developer.android.com/reference/android/util/MonthDisplayHelper.html
+http://developer.android.com/reference/android/util/PrintWriterPrinter.html
+
+http://developer.android.com/reference/android/util/SparseBooleanArray.html
+http://developer.android.com/reference/android/util/SparseIntArray.html
+
+http://developer.android.com/reference/android/util/StateSet.html
+http://developer.android.com/reference/android/util/StringBuilderPrinter.html
+
+http://developer.android.com/reference/android/util/TimeUtils.html
+http://developer.android.com/reference/android/util/TimingLogger.html
+
+http://developer.android.com/reference/android/util/TypedValue.html
+http://developer.android.com/reference/android/util/Xml.html
+
+http://developer.android.com/reference/android/util/AndroidException.html
+http://developer.android.com/reference/android/util/AndroidRuntimeException.html
+
+http://developer.android.com/reference/android/util/TimeFormatException.html
+http://developer.android.com/reference/android/content/res/XmlResourceParser.html
+
+http://developer.android.com/reference/javax/net/ssl/SSLSocketFactory.html
+http://developer.android.com/reference/javax/net/SocketFactory.html
+
+http://developer.android.com/reference/java/security/KeyManagementException.html
+http://developer.android.com/reference/org/apache/http/message/BasicHeader.html
+
+http://developer.android.com/reference/org/apache/http/message/BufferedHeader.html
+http://developer.android.com/reference/android/view/GestureDetector.OnGestureListener.html
+
+http://developer.android.com/reference/android/view/LayoutInflater.Filter.html
+http://developer.android.com/reference/android/view/MenuItem.OnMenuItemClickListener.html
+
+http://developer.android.com/reference/android/view/SurfaceHolder.html
+http://developer.android.com/reference/android/view/SurfaceHolder.Callback.html
+
+http://developer.android.com/reference/android/view/ViewStub.OnInflateListener.html
+http://developer.android.com/reference/android/view/ViewTreeObserver.OnGlobalFocusChangeListener.html
+
+http://developer.android.com/reference/android/view/ViewTreeObserver.OnGlobalLayoutListener.html
+
+http://developer.android.com/reference/android/view/ViewTreeObserver.OnTouchModeChangeListener.html
+
+http://developer.android.com/reference/android/view/AbsSavedState.html
+http://developer.android.com/reference/android/view/Display.html
+
+http://developer.android.com/reference/android/view/FocusFinder.html
+http://developer.android.com/reference/android/view/GestureDetector.html
+
+http://developer.android.com/reference/android/view/GestureDetector.SimpleOnGestureListener.html
+
+http://developer.android.com/reference/android/view/KeyCharacterMap.html
+http://developer.android.com/reference/android/view/KeyCharacterMap.KeyData.html
+
+http://developer.android.com/reference/android/view/OrientationListener.html
+http://developer.android.com/reference/android/view/SoundEffectConstants.html
+
+http://developer.android.com/reference/android/view/Surface.html
+http://developer.android.com/reference/android/view/VelocityTracker.html
+
+http://developer.android.com/reference/android/view/View.BaseSavedState.html
+http://developer.android.com/reference/android/view/ViewConfiguration.html
+
+http://developer.android.com/reference/android/view/ViewDebug.html
+http://developer.android.com/reference/android/view/ViewGroup.MarginLayoutParams.html
+
+http://developer.android.com/reference/android/view/ViewStub.html
+http://developer.android.com/reference/android/view/InflateException.html
+
+http://developer.android.com/reference/android/view/Surface.OutOfResourcesException.html
+http://developer.android.com/reference/android/view/SurfaceHolder.BadSurfaceTypeException.html
+
+http://developer.android.com/reference/android/view/WindowManager.BadTokenException.html
+http://developer.android.com/reference/org/apache/http/entity/AbstractHttpEntity.html
+
+http://developer.android.com/reference/org/apache/http/entity/BasicHttpEntity.html
+http://developer.android.com/reference/org/apache/http/entity/BufferedHttpEntity.html
+
+http://developer.android.com/reference/org/apache/http/entity/ByteArrayEntity.html
+http://developer.android.com/reference/org/apache/http/entity/EntityTemplate.html
+
+http://developer.android.com/reference/org/apache/http/entity/FileEntity.html
+http://developer.android.com/reference/org/apache/http/entity/HttpEntityWrapper.html
+
+http://developer.android.com/reference/org/apache/http/entity/InputStreamEntity.html
+http://developer.android.com/reference/org/apache/http/entity/SerializableEntity.html
+
+http://developer.android.com/reference/org/apache/http/entity/StringEntity.html
+http://developer.android.com/reference/org/apache/http/client/entity/UrlEncodedFormEntity.html
+
+http://developer.android.com/reference/java/util/concurrent/atomic/AtomicInteger.html
+http://developer.android.com/reference/java/util/concurrent/atomic/AtomicLong.html
+
+http://developer.android.com/reference/java/util/Collection.html
+http://developer.android.com/reference/java/util/Comparator.html
+
+http://developer.android.com/reference/java/util/Enumeration.html
+http://developer.android.com/reference/java/util/Formattable.html
+
+http://developer.android.com/reference/java/util/Iterator.html
+http://developer.android.com/reference/java/util/ListIterator.html
+
+http://developer.android.com/reference/java/util/Map.Entry.html
+http://developer.android.com/reference/java/util/Observer.html
+
+http://developer.android.com/reference/java/util/RandomAccess.html
+http://developer.android.com/reference/java/util/SortedMap.html
+
+http://developer.android.com/reference/java/util/SortedSet.html
+http://developer.android.com/reference/java/util/AbstractCollection.html
+
+http://developer.android.com/reference/java/util/AbstractList.html
+http://developer.android.com/reference/java/util/AbstractMap.html
+
+http://developer.android.com/reference/java/util/AbstractQueue.html
+http://developer.android.com/reference/java/util/AbstractSequentialList.html
+
+http://developer.android.com/reference/java/util/AbstractSet.html
+http://developer.android.com/reference/java/util/Arrays.html
+
+http://developer.android.com/reference/java/util/BitSet.html
+http://developer.android.com/reference/java/util/Collections.html
+
+http://developer.android.com/reference/java/util/Currency.html
+http://developer.android.com/reference/java/util/Dictionary.html
+
+http://developer.android.com/reference/java/util/EnumMap.html
+http://developer.android.com/reference/java/util/EnumSet.html
+
+http://developer.android.com/reference/java/util/EventListenerProxy.html
+http://developer.android.com/reference/java/util/EventObject.html
+
+http://developer.android.com/reference/java/util/FormattableFlags.html
+http://developer.android.com/reference/java/util/HashMap.html
+
+http://developer.android.com/reference/java/util/HashSet.html
+http://developer.android.com/reference/java/util/Hashtable.html
+
+http://developer.android.com/reference/java/util/IdentityHashMap.html
+http://developer.android.com/reference/java/util/LinkedHashMap.html
+
+http://developer.android.com/reference/java/util/LinkedHashSet.html
+http://developer.android.com/reference/java/util/LinkedList.html
+
+http://developer.android.com/reference/java/util/ListResourceBundle.html
+http://developer.android.com/reference/java/util/Observable.html
+
+http://developer.android.com/reference/java/util/PropertyPermission.html
+http://developer.android.com/reference/java/util/PropertyResourceBundle.html
+
+http://developer.android.com/reference/java/util/Random.html
+http://developer.android.com/reference/java/util/ResourceBundle.html
+
+http://developer.android.com/reference/java/util/Scanner.html
+http://developer.android.com/reference/java/util/SimpleTimeZone.html
+
+http://developer.android.com/reference/java/util/Stack.html
+http://developer.android.com/reference/java/util/StringTokenizer.html
+
+http://developer.android.com/reference/java/util/Timer.html
+http://developer.android.com/reference/java/util/TimerTask.html
+
+http://developer.android.com/reference/java/util/TimeZone.html
+http://developer.android.com/reference/java/util/TreeMap.html
+
+http://developer.android.com/reference/java/util/TreeSet.html
+http://developer.android.com/reference/java/util/Vector.html
+
+http://developer.android.com/reference/java/util/WeakHashMap.html
+http://developer.android.com/reference/java/util/ConcurrentModificationException.html
+
+http://developer.android.com/reference/java/util/DuplicateFormatFlagsException.html
+http://developer.android.com/reference/java/util/EmptyStackException.html
+
+http://developer.android.com/reference/java/util/FormatFlagsConversionMismatchException.html
+http://developer.android.com/reference/java/util/FormatterClosedException.html
+
+http://developer.android.com/reference/java/util/IllegalFormatCodePointException.html
+http://developer.android.com/reference/java/util/IllegalFormatConversionException.html
+
+http://developer.android.com/reference/java/util/IllegalFormatException.html
+http://developer.android.com/reference/java/util/IllegalFormatFlagsException.html
+
+http://developer.android.com/reference/java/util/IllegalFormatPrecisionException.html
+http://developer.android.com/reference/java/util/IllegalFormatWidthException.html
+
+http://developer.android.com/reference/java/util/InputMismatchException.html
+http://developer.android.com/reference/java/util/InvalidPropertiesFormatException.html
+
+http://developer.android.com/reference/java/util/MissingFormatArgumentException.html
+http://developer.android.com/reference/java/util/MissingFormatWidthException.html
+
+http://developer.android.com/reference/java/util/MissingResourceException.html
+http://developer.android.com/reference/java/util/NoSuchElementException.html
+
+http://developer.android.com/reference/java/util/TooManyListenersException.html
+http://developer.android.com/reference/java/util/UnknownFormatConversionException.html
+
+http://developer.android.com/reference/java/util/UnknownFormatFlagsException.html
+http://developer.android.com/reference/org/apache/http/impl/EnglishReasonPhraseCatalog.html
+
+http://developer.android.com/reference/org/apache/http/params/CoreConnectionPNames.html
+http://developer.android.com/reference/org/apache/http/params/CoreProtocolPNames.html
+
+http://developer.android.com/reference/org/apache/http/params/AbstractHttpParams.html
+http://developer.android.com/reference/org/apache/http/params/BasicHttpParams.html
+
+http://developer.android.com/reference/org/apache/http/params/DefaultedHttpParams.html
+http://developer.android.com/reference/org/apache/http/params/HttpAbstractParamBean.html
+
+http://developer.android.com/reference/org/apache/http/params/HttpConnectionParamBean.html
+http://developer.android.com/reference/org/apache/http/params/HttpConnectionParams.html
+
+http://developer.android.com/reference/org/apache/http/params/HttpProtocolParamBean.html
+http://developer.android.com/reference/org/apache/http/params/HttpProtocolParams.html
+
+http://developer.android.com/reference/org/apache/http/params/package-descr.html
+http://developer.android.com/reference/org/apache/http/io/SessionOutputBuffer.html
+
+http://developer.android.com/reference/org/apache/http/util/CharArrayBuffer.html
+http://developer.android.com/reference/android/content/res/AssetFileDescriptor.html
+
+http://developer.android.com/reference/android/content/res/AssetManager.AssetInputStream.html
+
+http://developer.android.com/reference/android/content/res/Resources.NotFoundException.html
+http://developer.android.com/reference/java/util/zip/ZipEntry.html
+
+http://developer.android.com/reference/java/security/cert/Certificate.html
+http://developer.android.com/reference/java/security/CodeSigner.html
+
+http://developer.android.com/reference/org/apache/http/auth/AuthSchemeFactory.html
+http://developer.android.com/reference/org/apache/http/auth/AuthScheme.html
+
+http://developer.android.com/reference/android/content/SharedPreferences.Editor.html
+http://developer.android.com/reference/android/media/RingtoneManager.html
+
+http://developer.android.com/reference/android/content/DialogInterface.html
+http://developer.android.com/reference/android/content/DialogInterface.OnClickListener.html
+
+http://developer.android.com/reference/android/content/DialogInterface.OnDismissListener.html
+
+http://developer.android.com/reference/org/apache/http/conn/routing/HttpRouteDirector.html
+http://developer.android.com/reference/org/apache/http/conn/routing/HttpRoutePlanner.html
+
+http://developer.android.com/reference/org/apache/http/conn/routing/RouteInfo.html
+http://developer.android.com/reference/org/apache/http/conn/routing/BasicRouteDirector.html
+
+http://developer.android.com/reference/org/apache/http/conn/routing/HttpRoute.html
+http://developer.android.com/reference/org/apache/http/conn/routing/RouteTracker.html
+
+http://developer.android.com/reference/org/apache/http/impl/conn/DefaultClientConnectionOperator.html
+
+http://developer.android.com/reference/org/apache/http/conn/scheme/SocketFactory.html
+http://developer.android.com/reference/java/nio/channels/Channel.html
+
+http://developer.android.com/reference/org/apache/http/message/LineParser.html
+http://developer.android.com/reference/org/apache/http/io/HttpMessageParser.html
+
+http://developer.android.com/reference/java/security/AuthProvider.html
+http://developer.android.com/reference/org/apache/http/impl/cookie/BasicClientCookie.html
+
+http://developer.android.com/reference/org/apache/http/impl/cookie/BasicClientCookie2.html
+http://developer.android.com/reference/org/apache/http/message/BasicHeaderElement.html
+
+http://developer.android.com/reference/org/apache/http/protocol/BasicHttpProcessor.html
+http://developer.android.com/reference/org/apache/http/message/BasicNameValuePair.html
+
+http://developer.android.com/reference/org/apache/http/message/BasicRequestLine.html
+http://developer.android.com/reference/org/apache/http/message/BasicStatusLine.html
+
+http://developer.android.com/reference/java/security/cert/CRLSelector.html
+http://developer.android.com/reference/java/security/cert/CertPathBuilderResult.html
+
+http://developer.android.com/reference/java/security/cert/CertPathParameters.html
+http://developer.android.com/reference/java/security/cert/CertPathValidatorResult.html
+
+http://developer.android.com/reference/java/security/cert/CertSelector.html
+http://developer.android.com/reference/java/security/cert/CertStoreParameters.html
+
+http://developer.android.com/reference/java/security/cert/CollectionCertStoreParameters.html
+http://developer.android.com/reference/org/apache/http/message/HeaderGroup.html
+
+http://developer.android.com/reference/org/apache/http/client/methods/HttpDelete.html
+http://developer.android.com/reference/org/apache/http/client/methods/HttpEntityEnclosingRequestBase.html
+
+http://developer.android.com/reference/org/apache/http/client/methods/HttpGet.html
+http://developer.android.com/reference/org/apache/http/client/methods/HttpHead.html
+
+http://developer.android.com/reference/org/apache/http/client/methods/HttpOptions.html
+http://developer.android.com/reference/org/apache/http/client/methods/HttpPost.html
+
+http://developer.android.com/reference/org/apache/http/client/methods/HttpPut.html
+http://developer.android.com/reference/org/apache/http/client/methods/HttpRequestBase.html
+
+http://developer.android.com/reference/org/apache/http/client/methods/HttpTrace.html
+http://developer.android.com/reference/java/security/cert/LDAPCertStoreParameters.html
+
+http://developer.android.com/reference/java/security/cert/PKIXBuilderParameters.html
+http://developer.android.com/reference/java/security/cert/PKIXCertPathBuilderResult.html
+
+http://developer.android.com/reference/java/security/cert/PKIXCertPathChecker.html
+http://developer.android.com/reference/java/security/cert/PKIXCertPathValidatorResult.html
+
+http://developer.android.com/reference/java/security/cert/PKIXParameters.html
+http://developer.android.com/reference/java/security/cert/X509CRLSelector.html
+
+http://developer.android.com/reference/java/security/cert/X509CertSelector.html
+http://developer.android.com/reference/android/text/Editable.html
+http://developer.android.com/reference/java/security/spec/AlgorithmParameterSpec.html
+
+http://developer.android.com/reference/java/security/SecureRandom.html
+http://developer.android.com/reference/javax/net/ssl/HandshakeCompletedListener.html
+
+http://developer.android.com/reference/javax/net/ssl/HostnameVerifier.html
+http://developer.android.com/reference/javax/net/ssl/KeyManager.html
+
+http://developer.android.com/reference/javax/net/ssl/ManagerFactoryParameters.html
+http://developer.android.com/reference/javax/net/ssl/SSLSession.html
+
+http://developer.android.com/reference/javax/net/ssl/SSLSessionBindingListener.html
+http://developer.android.com/reference/javax/net/ssl/SSLSessionContext.html
+
+http://developer.android.com/reference/javax/net/ssl/TrustManager.html
+http://developer.android.com/reference/javax/net/ssl/X509KeyManager.html
+
+http://developer.android.com/reference/javax/net/ssl/X509TrustManager.html
+http://developer.android.com/reference/javax/net/ssl/CertPathTrustManagerParameters.html
+
+http://developer.android.com/reference/javax/net/ssl/HandshakeCompletedEvent.html
+http://developer.android.com/reference/javax/net/ssl/HttpsURLConnection.html
+
+http://developer.android.com/reference/javax/net/ssl/KeyManagerFactory.html
+http://developer.android.com/reference/javax/net/ssl/KeyManagerFactorySpi.html
+
+http://developer.android.com/reference/javax/net/ssl/KeyStoreBuilderParameters.html
+http://developer.android.com/reference/javax/net/ssl/SSLContext.html
+
+http://developer.android.com/reference/javax/net/ssl/SSLContextSpi.html
+http://developer.android.com/reference/javax/net/ssl/SSLEngine.html
+
+http://developer.android.com/reference/javax/net/ssl/SSLEngineResult.html
+http://developer.android.com/reference/javax/net/ssl/SSLPermission.html
+
+http://developer.android.com/reference/javax/net/ssl/SSLServerSocket.html
+http://developer.android.com/reference/javax/net/ssl/SSLServerSocketFactory.html
+
+http://developer.android.com/reference/javax/net/ssl/SSLSessionBindingEvent.html
+http://developer.android.com/reference/javax/net/ssl/SSLSocket.html
+
+http://developer.android.com/reference/javax/net/ssl/TrustManagerFactory.html
+http://developer.android.com/reference/javax/net/ssl/TrustManagerFactorySpi.html
+
+http://developer.android.com/reference/javax/net/ssl/X509ExtendedKeyManager.html
+http://developer.android.com/reference/javax/net/ssl/SSLException.html
+
+http://developer.android.com/reference/javax/net/ssl/SSLHandshakeException.html
+http://developer.android.com/reference/javax/net/ssl/SSLKeyException.html
+
+http://developer.android.com/reference/javax/net/ssl/SSLPeerUnverifiedException.html
+http://developer.android.com/reference/javax/net/ssl/SSLProtocolException.html
+
+http://developer.android.com/reference/javax/crypto/spec/DESedeKeySpec.html
+http://developer.android.com/reference/javax/crypto/spec/DESKeySpec.html
+
+http://developer.android.com/reference/javax/crypto/spec/DHGenParameterSpec.html
+http://developer.android.com/reference/javax/crypto/spec/DHParameterSpec.html
+
+http://developer.android.com/reference/javax/crypto/spec/DHPrivateKeySpec.html
+http://developer.android.com/reference/javax/crypto/spec/DHPublicKeySpec.html
+
+http://developer.android.com/reference/javax/crypto/spec/IvParameterSpec.html
+http://developer.android.com/reference/javax/crypto/spec/OAEPParameterSpec.html
+
+http://developer.android.com/reference/javax/crypto/spec/PBEKeySpec.html
+http://developer.android.com/reference/javax/crypto/spec/PBEParameterSpec.html
+
+http://developer.android.com/reference/javax/crypto/spec/PSource.html
+http://developer.android.com/reference/javax/crypto/spec/PSource.PSpecified.html
+
+http://developer.android.com/reference/javax/crypto/spec/RC2ParameterSpec.html
+http://developer.android.com/reference/javax/crypto/spec/RC5ParameterSpec.html
+
+http://developer.android.com/reference/javax/crypto/spec/SecretKeySpec.html
+http://developer.android.com/reference/javax/crypto/spec/package-descr.html
+
+http://developer.android.com/reference/android/text/method/ArrowKeyMovementMethod.html
+http://developer.android.com/reference/android/text/method/BaseKeyListener.html
+
+http://developer.android.com/reference/android/text/method/CharacterPickerDialog.html
+http://developer.android.com/reference/android/text/method/DateKeyListener.html
+
+http://developer.android.com/reference/android/text/method/DateTimeKeyListener.html
+http://developer.android.com/reference/android/text/method/DialerKeyListener.html
+
+http://developer.android.com/reference/android/text/method/DigitsKeyListener.html
+http://developer.android.com/reference/android/text/method/HideReturnsTransformationMethod.html
+
+http://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html
+http://developer.android.com/reference/android/text/method/MultiTapKeyListener.html
+
+http://developer.android.com/reference/android/text/method/NumberKeyListener.html
+http://developer.android.com/reference/android/text/method/PasswordTransformationMethod.html
+
+http://developer.android.com/reference/android/text/method/QwertyKeyListener.html
+http://developer.android.com/reference/android/text/method/ReplacementTransformationMethod.html
+
+http://developer.android.com/reference/android/text/method/ScrollingMovementMethod.html
+http://developer.android.com/reference/android/text/method/SingleLineTransformationMethod.html
+
+http://developer.android.com/reference/android/text/method/TextKeyListener.html
+http://developer.android.com/reference/android/text/method/TimeKeyListener.html
+
+http://developer.android.com/reference/android/text/method/Touch.html
+http://developer.android.com/reference/android/location/Address.html
+
+http://developer.android.com/reference/android/content/pm/ApplicationInfo.html
+http://developer.android.com/reference/android/location/Criteria.html
+
+http://developer.android.com/reference/android/content/pm/InstrumentationInfo.html
+http://developer.android.com/reference/android/content/Intent.ShortcutIconResource.html
+
+http://developer.android.com/reference/android/location/Location.html
+http://developer.android.com/reference/android/content/pm/PackageInfo.html
+
+http://developer.android.com/reference/android/content/pm/PackageStats.html
+http://developer.android.com/reference/android/content/pm/PermissionGroupInfo.html
+
+http://developer.android.com/reference/android/content/pm/PermissionInfo.html
+http://developer.android.com/reference/android/content/pm/ProviderInfo.html
+
+http://developer.android.com/reference/android/content/pm/ResolveInfo.html
+http://developer.android.com/reference/android/net/wifi/ScanResult.html
+
+http://developer.android.com/reference/android/content/pm/ServiceInfo.html
+http://developer.android.com/reference/android/content/pm/Signature.html
+
+http://developer.android.com/reference/android/net/wifi/WifiConfiguration.html
+http://developer.android.com/reference/android/net/wifi/WifiInfo.html
+
+http://developer.android.com/reference/java/io/FileDescriptor.html
+http://developer.android.com/reference/java/security/SecureClassLoader.html
+
+http://developer.android.com/reference/java/security/ProtectionDomain.html
+http://developer.android.com/reference/java/io/Closeable.html
+
+http://developer.android.com/reference/java/io/DataInput.html
+http://developer.android.com/reference/java/io/DataOutput.html
+
+http://developer.android.com/reference/java/io/Externalizable.html
+http://developer.android.com/reference/java/io/FileFilter.html
+
+http://developer.android.com/reference/java/io/FilenameFilter.html
+http://developer.android.com/reference/java/io/Flushable.html
+
+http://developer.android.com/reference/java/io/ObjectInput.html
+http://developer.android.com/reference/java/io/ObjectInputValidation.html
+
+http://developer.android.com/reference/java/io/ObjectOutput.html
+http://developer.android.com/reference/java/io/ObjectStreamConstants.html
+
+http://developer.android.com/reference/java/io/BufferedInputStream.html
+http://developer.android.com/reference/java/io/BufferedOutputStream.html
+
+http://developer.android.com/reference/java/io/BufferedReader.html
+http://developer.android.com/reference/java/io/BufferedWriter.html
+
+http://developer.android.com/reference/java/io/ByteArrayInputStream.html
+http://developer.android.com/reference/java/io/ByteArrayOutputStream.html
+
+http://developer.android.com/reference/java/io/CharArrayReader.html
+http://developer.android.com/reference/java/io/CharArrayWriter.html
+
+http://developer.android.com/reference/java/io/DataInputStream.html
+http://developer.android.com/reference/java/io/DataOutputStream.html
+
+http://developer.android.com/reference/java/io/FilePermission.html
+http://developer.android.com/reference/java/io/FileReader.html
+
+http://developer.android.com/reference/java/io/FileWriter.html
+http://developer.android.com/reference/java/io/FilterInputStream.html
+
+http://developer.android.com/reference/java/io/FilterOutputStream.html
+http://developer.android.com/reference/java/io/FilterReader.html
+
+http://developer.android.com/reference/java/io/FilterWriter.html
+http://developer.android.com/reference/java/io/InputStreamReader.html
+
+http://developer.android.com/reference/java/io/LineNumberInputStream.html
+http://developer.android.com/reference/java/io/LineNumberReader.html
+
+http://developer.android.com/reference/java/io/ObjectInputStream.html
+http://developer.android.com/reference/java/io/ObjectInputStream.GetField.html
+
+http://developer.android.com/reference/java/io/ObjectOutputStream.html
+http://developer.android.com/reference/java/io/ObjectOutputStream.PutField.html
+
+http://developer.android.com/reference/java/io/ObjectStreamClass.html
+http://developer.android.com/reference/java/io/OutputStreamWriter.html
+
+http://developer.android.com/reference/java/io/PipedInputStream.html
+http://developer.android.com/reference/java/io/PipedOutputStream.html
+
+http://developer.android.com/reference/java/io/PipedReader.html
+http://developer.android.com/reference/java/io/PipedWriter.html
+
+http://developer.android.com/reference/java/io/PushbackInputStream.html
+http://developer.android.com/reference/java/io/PushbackReader.html
+
+http://developer.android.com/reference/java/io/RandomAccessFile.html
+http://developer.android.com/reference/java/io/Reader.html
+
+http://developer.android.com/reference/java/io/SequenceInputStream.html
+http://developer.android.com/reference/java/io/SerializablePermission.html
+
+http://developer.android.com/reference/java/io/StreamTokenizer.html
+http://developer.android.com/reference/java/io/StringBufferInputStream.html
+
+http://developer.android.com/reference/java/io/StringReader.html
+http://developer.android.com/reference/java/io/StringWriter.html
+
+http://developer.android.com/reference/java/io/Writer.html
+http://developer.android.com/reference/java/io/CharConversionException.html
+
+http://developer.android.com/reference/java/io/EOFException.html
+http://developer.android.com/reference/java/io/FileNotFoundException.html
+
+http://developer.android.com/reference/java/io/InterruptedIOException.html
+http://developer.android.com/reference/java/io/InvalidClassException.html
+
+http://developer.android.com/reference/java/io/InvalidObjectException.html
+http://developer.android.com/reference/java/io/NotActiveException.html
+
+http://developer.android.com/reference/java/io/NotSerializableException.html
+http://developer.android.com/reference/java/io/ObjectStreamException.html
+
+http://developer.android.com/reference/java/io/OptionalDataException.html
+http://developer.android.com/reference/java/io/StreamCorruptedException.html
+
+http://developer.android.com/reference/java/io/SyncFailedException.html
+http://developer.android.com/reference/java/io/UnsupportedEncodingException.html
+
+http://developer.android.com/reference/java/io/UTFDataFormatException.html
+http://developer.android.com/reference/java/io/WriteAbortedException.html
+
+http://developer.android.com/reference/org/apache/http/entity/ContentLengthStrategy.html
+http://developer.android.com/reference/org/apache/http/entity/ContentProducer.html
+
+http://developer.android.com/reference/java/security/Certificate.html
+http://developer.android.com/reference/java/security/DomainCombiner.html
+
+http://developer.android.com/reference/java/security/KeyStore.Entry.html
+http://developer.android.com/reference/java/security/KeyStore.LoadStoreParameter.html
+
+http://developer.android.com/reference/java/security/KeyStore.ProtectionParameter.html
+http://developer.android.com/reference/java/security/Principal.html
+
+http://developer.android.com/reference/java/security/PrivateKey.html
+http://developer.android.com/reference/java/security/PrivilegedAction.html
+
+http://developer.android.com/reference/java/security/PrivilegedExceptionAction.html
+http://developer.android.com/reference/java/security/PublicKey.html
+
+http://developer.android.com/reference/java/security/AccessControlContext.html
+http://developer.android.com/reference/java/security/AccessController.html
+
+http://developer.android.com/reference/java/security/AlgorithmParameterGenerator.html
+http://developer.android.com/reference/java/security/AlgorithmParameterGeneratorSpi.html
+
+http://developer.android.com/reference/java/security/AlgorithmParametersSpi.html
+http://developer.android.com/reference/java/security/AllPermission.html
+
+http://developer.android.com/reference/java/security/CodeSource.html
+http://developer.android.com/reference/java/security/DigestInputStream.html
+
+http://developer.android.com/reference/java/security/DigestOutputStream.html
+http://developer.android.com/reference/java/security/GuardedObject.html
+
+http://developer.android.com/reference/java/security/Identity.html
+http://developer.android.com/reference/java/security/IdentityScope.html
+
+http://developer.android.com/reference/java/security/KeyFactory.html
+http://developer.android.com/reference/java/security/KeyFactorySpi.html
+
+http://developer.android.com/reference/java/security/KeyPair.html
+http://developer.android.com/reference/java/security/KeyPairGenerator.html
+
+http://developer.android.com/reference/java/security/KeyPairGeneratorSpi.html
+http://developer.android.com/reference/java/security/KeyRep.html
+
+http://developer.android.com/reference/java/security/KeyStore.html
+http://developer.android.com/reference/java/security/KeyStore.Builder.html
+
+http://developer.android.com/reference/java/security/KeyStore.CallbackHandlerProtection.html
+http://developer.android.com/reference/java/security/KeyStore.PasswordProtection.html
+
+http://developer.android.com/reference/java/security/KeyStore.PrivateKeyEntry.html
+http://developer.android.com/reference/java/security/KeyStore.SecretKeyEntry.html
+
+http://developer.android.com/reference/java/security/KeyStore.TrustedCertificateEntry.html
+http://developer.android.com/reference/java/security/KeyStoreSpi.html
+
+http://developer.android.com/reference/java/security/MessageDigest.html
+http://developer.android.com/reference/java/security/MessageDigestSpi.html
+
+http://developer.android.com/reference/java/security/Permissions.html
+http://developer.android.com/reference/java/security/Policy.html
+
+http://developer.android.com/reference/java/security/Provider.Service.html
+http://developer.android.com/reference/java/security/SecureRandomSpi.html
+
+http://developer.android.com/reference/java/security/Security.html
+http://developer.android.com/reference/java/security/SecurityPermission.html
+
+http://developer.android.com/reference/java/security/Signature.html
+http://developer.android.com/reference/java/security/SignatureSpi.html
+
+http://developer.android.com/reference/java/security/SignedObject.html
+http://developer.android.com/reference/java/security/Signer.html
+
+http://developer.android.com/reference/java/security/Timestamp.html
+http://developer.android.com/reference/java/security/UnresolvedPermission.html
+
+http://developer.android.com/reference/java/security/AccessControlException.html
+http://developer.android.com/reference/java/security/DigestException.html
+
+http://developer.android.com/reference/java/security/GeneralSecurityException.html
+http://developer.android.com/reference/java/security/InvalidAlgorithmParameterException.html
+
+http://developer.android.com/reference/java/security/InvalidParameterException.html
+http://developer.android.com/reference/java/security/KeyException.html
+
+http://developer.android.com/reference/java/security/KeyStoreException.html
+http://developer.android.com/reference/java/security/PrivilegedActionException.html
+
+http://developer.android.com/reference/java/security/ProviderException.html
+http://developer.android.com/reference/java/security/SignatureException.html
+
+http://developer.android.com/reference/java/security/UnrecoverableEntryException.html
+http://developer.android.com/reference/java/security/UnrecoverableKeyException.html
+
+http://developer.android.com/reference/java/nio/Buffer.html
+http://developer.android.com/reference/java/nio/ByteOrder.html
+
+http://developer.android.com/reference/java/nio/BufferOverflowException.html
+http://developer.android.com/reference/java/nio/BufferUnderflowException.html
+
+http://developer.android.com/reference/java/nio/InvalidMarkException.html
+http://developer.android.com/reference/java/nio/ReadOnlyBufferException.html
+
+http://developer.android.com/reference/org/apache/http/client/methods/AbortableHttpRequest.html
+
+http://developer.android.com/reference/org/apache/http/client/methods/HttpUriRequest.html
+http://developer.android.com/reference/org/apache/http/conn/package-descr.html
+
+http://developer.android.com/reference/java/security/cert/PolicyNode.html
+http://developer.android.com/reference/java/security/cert/X509Extension.html
+
+http://developer.android.com/reference/java/security/cert/Certificate.CertificateRep.html
+http://developer.android.com/reference/java/security/cert/CertificateFactory.html
+
+http://developer.android.com/reference/java/security/cert/CertificateFactorySpi.html
+http://developer.android.com/reference/java/security/cert/CertPath.html
+
+http://developer.android.com/reference/java/security/cert/CertPath.CertPathRep.html
+http://developer.android.com/reference/java/security/cert/CertPathBuilder.html
+
+http://developer.android.com/reference/java/security/cert/CertPathBuilderSpi.html
+http://developer.android.com/reference/java/security/cert/CertPathValidator.html
+
+http://developer.android.com/reference/java/security/cert/CertPathValidatorSpi.html
+http://developer.android.com/reference/java/security/cert/CertStore.html
+
+http://developer.android.com/reference/java/security/cert/CertStoreSpi.html
+http://developer.android.com/reference/java/security/cert/CRL.html
+
+http://developer.android.com/reference/java/security/cert/PolicyQualifierInfo.html
+http://developer.android.com/reference/java/security/cert/TrustAnchor.html
+
+http://developer.android.com/reference/java/security/cert/X509Certificate.html
+http://developer.android.com/reference/java/security/cert/X509CRL.html
+
+http://developer.android.com/reference/java/security/cert/X509CRLEntry.html
+http://developer.android.com/reference/java/security/cert/CertificateEncodingException.html
+
+http://developer.android.com/reference/java/security/cert/CertificateException.html
+http://developer.android.com/reference/java/security/cert/CertificateExpiredException.html
+
+http://developer.android.com/reference/java/security/cert/CertificateNotYetValidException.html
+
+http://developer.android.com/reference/java/security/cert/CertificateParsingException.html
+http://developer.android.com/reference/java/security/cert/CertPathBuilderException.html
+
+http://developer.android.com/reference/java/security/cert/CertPathValidatorException.html
+http://developer.android.com/reference/java/security/cert/CertStoreException.html
+
+http://developer.android.com/reference/java/security/cert/CRLException.html
+http://developer.android.com/reference/com/google/android/maps/ItemizedOverlay.OnFocusChangeListener.html
+
+http://developer.android.com/reference/com/google/android/maps/Projection.html
+http://developer.android.com/reference/com/google/android/maps/GeoPoint.html
+
+http://developer.android.com/reference/com/google/android/maps/OverlayItem.html
+http://developer.android.com/reference/com/google/android/maps/MapView.LayoutParams.html
+
+http://developer.android.com/reference/com/google/android/maps/MyLocationOverlay.html
+http://developer.android.com/reference/com/google/android/maps/TrackballGestureDetector.html
+
+http://developer.android.com/reference/java/sql/Array.html
+http://developer.android.com/reference/java/sql/Blob.html
+
+http://developer.android.com/reference/java/sql/CallableStatement.html
+http://developer.android.com/reference/java/sql/Clob.html
+
+http://developer.android.com/reference/java/sql/Connection.html
+http://developer.android.com/reference/java/sql/DatabaseMetaData.html
+
+http://developer.android.com/reference/java/sql/Driver.html
+http://developer.android.com/reference/java/sql/ParameterMetaData.html
+
+http://developer.android.com/reference/java/sql/PreparedStatement.html
+http://developer.android.com/reference/java/sql/Ref.html
+
+http://developer.android.com/reference/java/sql/ResultSet.html
+http://developer.android.com/reference/java/sql/ResultSetMetaData.html
+
+http://developer.android.com/reference/java/sql/Savepoint.html
+http://developer.android.com/reference/java/sql/SQLData.html
+
+http://developer.android.com/reference/java/sql/SQLInput.html
+http://developer.android.com/reference/java/sql/SQLOutput.html
+
+http://developer.android.com/reference/java/sql/Statement.html
+http://developer.android.com/reference/java/sql/Struct.html
+
+http://developer.android.com/reference/java/sql/DriverManager.html
+http://developer.android.com/reference/java/sql/DriverPropertyInfo.html
+
+http://developer.android.com/reference/java/sql/SQLPermission.html
+http://developer.android.com/reference/java/sql/Types.html
+
+http://developer.android.com/reference/java/sql/BatchUpdateException.html
+http://developer.android.com/reference/java/sql/DataTruncation.html
+
+http://developer.android.com/reference/java/sql/SQLException.html
+http://developer.android.com/reference/java/sql/SQLWarning.html
+
+http://developer.android.com/reference/org/apache/http/message/BasicTokenIterator.html
+http://developer.android.com/reference/java/security/package-descr.html
+
+http://developer.android.com/reference/java/security/spec/KeySpec.html
+http://developer.android.com/reference/android/text/GetChars.html
+
+http://developer.android.com/reference/android/text/Html.ImageGetter.html
+http://developer.android.com/reference/android/text/Html.TagHandler.html
+
+http://developer.android.com/reference/android/text/Spanned.html
+http://developer.android.com/reference/android/text/SpanWatcher.html
+
+http://developer.android.com/reference/android/text/TextUtils.EllipsizeCallback.html
+http://developer.android.com/reference/android/text/TextUtils.StringSplitter.html
+
+http://developer.android.com/reference/android/text/AlteredCharSequence.html
+http://developer.android.com/reference/android/text/AndroidCharacter.html
+
+http://developer.android.com/reference/android/text/Annotation.html
+http://developer.android.com/reference/android/text/AutoText.html
+
+http://developer.android.com/reference/android/text/BoringLayout.html
+http://developer.android.com/reference/android/text/BoringLayout.Metrics.html
+
+http://developer.android.com/reference/android/text/DynamicLayout.html
+http://developer.android.com/reference/android/text/Html.html
+
+http://developer.android.com/reference/android/text/InputFilter.AllCaps.html
+http://developer.android.com/reference/android/text/InputFilter.LengthFilter.html
+
+http://developer.android.com/reference/android/text/Layout.Directions.html
+http://developer.android.com/reference/android/text/LoginFilter.html
+
+http://developer.android.com/reference/android/text/LoginFilter.PasswordFilterGMail.html
+http://developer.android.com/reference/android/text/LoginFilter.UsernameFilterGeneric.html
+
+http://developer.android.com/reference/android/text/LoginFilter.UsernameFilterGMail.html
+http://developer.android.com/reference/android/text/SpannableString.html
+
+http://developer.android.com/reference/android/text/SpannableStringBuilder.html
+http://developer.android.com/reference/android/text/SpannedString.html
+
+http://developer.android.com/reference/android/text/StaticLayout.html
+http://developer.android.com/reference/android/text/TextUtils.html
+
+http://developer.android.com/reference/android/text/TextUtils.SimpleStringSplitter.html
+http://developer.android.com/reference/javax/security/auth/Subject.html
+
+http://developer.android.com/reference/javax/security/auth/callback/CallbackHandler.html
+http://developer.android.com/reference/javax/security/auth/login/LoginException.html
+
+http://developer.android.com/reference/java/nio/package-descr.html
+
+http://developer.android.com/reference/java/util/zip/ZipFile.html
+http://developer.android.com/reference/android/widget/RemoteViews.RemoteView.html
+
+http://developer.android.com/reference/javax/security/auth/Destroyable.html
+http://developer.android.com/reference/javax/security/auth/AuthPermission.html
+
+http://developer.android.com/reference/javax/security/auth/PrivateCredentialPermission.html
+http://developer.android.com/reference/javax/security/auth/SubjectDomainCombiner.html
+
+http://developer.android.com/reference/javax/security/auth/DestroyFailedException.html
+http://developer.android.com/reference/javax/security/auth/package-descr.html
+
+http://developer.android.com/guide/tutorials/views/hello-linearlayout.html
+http://developer.android.com/guide/tutorials/views/hello-tablelayout.html
+
+http://developer.android.com/guide/tutorials/views/hello-relativelayout.html
+http://developer.android.com/reference/android/view/ViewDebug.ExportedProperty.html
+
+http://developer.android.com/reference/android/view/ViewDebug.IntToString.html
+http://developer.android.com/reference/android/content/DialogInterface.OnCancelListener.html
+
+http://developer.android.com/reference/android/content/DialogInterface.OnKeyListener.html
+http://developer.android.com/reference/android/content/DialogInterface.OnMultiChoiceClickListener.html
+
+http://developer.android.com/reference/android/content/SharedPreferences.OnSharedPreferenceChangeListener.html
+
+http://developer.android.com/reference/android/content/AsyncQueryHandler.html
+http://developer.android.com/reference/android/content/AsyncQueryHandler.WorkerArgs.html
+
+http://developer.android.com/reference/android/content/AsyncQueryHandler.WorkerHandler.html
+http://developer.android.com/reference/android/content/ContentQueryMap.html
+
+http://developer.android.com/reference/android/content/ContentUris.html
+http://developer.android.com/reference/android/content/Intent.FilterComparison.html
+
+http://developer.android.com/reference/android/content/IntentFilter.AuthorityEntry.html
+http://developer.android.com/reference/android/content/MutableContextWrapper.html
+
+http://developer.android.com/reference/android/content/UriMatcher.html
+http://developer.android.com/reference/android/content/ActivityNotFoundException.html
+
+http://developer.android.com/reference/android/content/IntentFilter.MalformedMimeTypeException.html
+
+http://developer.android.com/reference/android/content/ReceiverCallNotAllowedException.html
+http://developer.android.com/reference/android/test/mock/MockContext.html
+
+http://developer.android.com/reference/android/test/mock/MockApplication.html
+http://developer.android.com/reference/android/content/pm/PackageManager.NameNotFoundException.html
+
+http://developer.android.com/reference/org/xml/sax/ContentHandler.html
+http://developer.android.com/reference/org/xml/sax/DocumentHandler.html
+
+http://developer.android.com/reference/org/xml/sax/DTDHandler.html
+http://developer.android.com/reference/org/xml/sax/EntityResolver.html
+
+http://developer.android.com/reference/org/xml/sax/ErrorHandler.html
+http://developer.android.com/reference/org/xml/sax/XMLFilter.html
+
+http://developer.android.com/reference/org/xml/sax/XMLReader.html
+http://developer.android.com/reference/org/xml/sax/HandlerBase.html
+
+http://developer.android.com/reference/org/xml/sax/InputSource.html
+http://developer.android.com/reference/org/xml/sax/SAXException.html
+
+http://developer.android.com/reference/org/xml/sax/SAXNotRecognizedException.html
+http://developer.android.com/reference/org/xml/sax/SAXNotSupportedException.html
+
+http://developer.android.com/reference/org/xml/sax/SAXParseException.html
+http://developer.android.com/reference/org/xml/sax/package-descr.html
+
+http://developer.android.com/reference/javax/sql/RowSet.html
+http://developer.android.com/reference/android/content/pm/IPackageInstallObserver.html
+
+http://developer.android.com/reference/android/content/pm/ApplicationInfo.DisplayNameComparator.html
+
+http://developer.android.com/reference/android/content/pm/ComponentInfo.html
+http://developer.android.com/reference/android/content/pm/IPackageInstallObserver.Stub.html
+
+http://developer.android.com/reference/android/content/pm/PackageItemInfo.DisplayNameComparator.html
+
+http://developer.android.com/reference/android/content/pm/ResolveInfo.DisplayNameComparator.html
+
+http://developer.android.com/guide/samples/NotePad/res/index.html
+http://developer.android.com/guide/samples/NotePad/src/index.html
+
+http://developer.android.com/guide/samples/NotePad/tests/index.html
+http://developer.android.com/guide/samples/NotePad/AndroidManifest.html
+
+http://developer.android.com/guide/samples/NotePad/sample_note.html
+http://developer.android.com/guide/samples/NotePad/sample_notepad.html
+
+http://developer.android.com/reference/android/telephony/gsm/GsmCellLocation.html
+
+http://developer.android.com/reference/java/nio/channels/ServerSocketChannel.html
+http://developer.android.com/reference/javax/xml/XMLConstants.html
+
+http://developer.android.com/reference/org/apache/http/impl/conn/DefaultResponseParser.html
+http://developer.android.com/reference/java/nio/channels/ByteChannel.html
+
+http://developer.android.com/reference/java/nio/channels/GatheringByteChannel.html
+http://developer.android.com/reference/java/nio/channels/InterruptibleChannel.html
+
+http://developer.android.com/reference/java/nio/channels/ReadableByteChannel.html
+http://developer.android.com/reference/java/nio/channels/ScatteringByteChannel.html
+
+http://developer.android.com/reference/java/nio/channels/WritableByteChannel.html
+http://developer.android.com/reference/java/nio/channels/Channels.html
+
+http://developer.android.com/reference/java/nio/channels/FileChannel.html
+http://developer.android.com/reference/java/nio/channels/FileChannel.MapMode.html
+
+http://developer.android.com/reference/java/nio/channels/FileLock.html
+http://developer.android.com/reference/java/nio/channels/Pipe.html
+
+http://developer.android.com/reference/java/nio/channels/Pipe.SinkChannel.html
+http://developer.android.com/reference/java/nio/channels/Pipe.SourceChannel.html
+
+http://developer.android.com/reference/java/nio/channels/SelectableChannel.html
+http://developer.android.com/reference/java/nio/channels/SelectionKey.html
+
+http://developer.android.com/reference/java/nio/channels/Selector.html
+http://developer.android.com/reference/java/nio/channels/SocketChannel.html
+
+http://developer.android.com/reference/java/nio/channels/AlreadyConnectedException.html
+http://developer.android.com/reference/java/nio/channels/AsynchronousCloseException.html
+
+http://developer.android.com/reference/java/nio/channels/CancelledKeyException.html
+http://developer.android.com/reference/java/nio/channels/ClosedByInterruptException.html
+
+http://developer.android.com/reference/java/nio/channels/ClosedChannelException.html
+http://developer.android.com/reference/java/nio/channels/ClosedSelectorException.html
+
+http://developer.android.com/reference/java/nio/channels/ConnectionPendingException.html
+http://developer.android.com/reference/java/nio/channels/FileLockInterruptionException.html
+
+http://developer.android.com/reference/java/nio/channels/IllegalBlockingModeException.html
+http://developer.android.com/reference/java/nio/channels/IllegalSelectorException.html
+
+http://developer.android.com/reference/java/nio/channels/NoConnectionPendingException.html
+http://developer.android.com/reference/java/nio/channels/NonReadableChannelException.html
+
+http://developer.android.com/reference/java/nio/channels/NonWritableChannelException.html
+http://developer.android.com/reference/java/nio/channels/NotYetBoundException.html
+
+http://developer.android.com/reference/java/nio/channels/NotYetConnectedException.html
+http://developer.android.com/reference/java/nio/channels/OverlappingFileLockException.html
+
+http://developer.android.com/reference/java/nio/channels/UnresolvedAddressException.html
+http://developer.android.com/reference/java/nio/channels/UnsupportedAddressTypeException.html
+
+http://developer.android.com/reference/org/apache/http/message/BasicHeaderIterator.html
+http://developer.android.com/reference/org/apache/http/message/BasicListHeaderIterator.html
+
+http://developer.android.com/reference/org/apache/http/impl/conn/AbstractClientConnAdapter.html
+
+http://developer.android.com/reference/org/apache/http/impl/conn/AbstractPooledConnAdapter.html
+
+http://developer.android.com/reference/org/apache/http/impl/conn/AbstractPoolEntry.html
+http://developer.android.com/reference/org/apache/http/impl/conn/DefaultClientConnection.html
+
+http://developer.android.com/reference/org/apache/http/impl/conn/DefaultHttpRoutePlanner.html
+
+http://developer.android.com/reference/org/apache/http/impl/conn/IdleConnectionHandler.html
+http://developer.android.com/reference/org/apache/http/impl/conn/LoggingSessionInputBuffer.html
+
+http://developer.android.com/reference/org/apache/http/impl/conn/LoggingSessionOutputBuffer.html
+
+http://developer.android.com/reference/org/apache/http/impl/conn/ProxySelectorRoutePlanner.html
+
+http://developer.android.com/reference/org/apache/http/impl/conn/SingleClientConnManager.html
+
+http://developer.android.com/reference/org/apache/http/impl/conn/SingleClientConnManager.ConnAdapter.html
+
+http://developer.android.com/reference/org/apache/http/impl/conn/SingleClientConnManager.PoolEntry.html
+
+http://developer.android.com/reference/org/apache/http/impl/conn/Wire.html
+http://developer.android.com/reference/java/security/spec/ECField.html
+
+http://developer.android.com/reference/java/security/spec/DSAParameterSpec.html
+http://developer.android.com/reference/java/security/spec/DSAPrivateKeySpec.html
+
+http://developer.android.com/reference/java/security/spec/DSAPublicKeySpec.html
+http://developer.android.com/reference/java/security/spec/ECFieldF2m.html
+
+http://developer.android.com/reference/java/security/spec/ECFieldFp.html
+http://developer.android.com/reference/java/security/spec/ECGenParameterSpec.html
+
+http://developer.android.com/reference/java/security/spec/ECParameterSpec.html
+http://developer.android.com/reference/java/security/spec/ECPoint.html
+
+http://developer.android.com/reference/java/security/spec/ECPrivateKeySpec.html
+http://developer.android.com/reference/java/security/spec/ECPublicKeySpec.html
+
+http://developer.android.com/reference/java/security/spec/EllipticCurve.html
+http://developer.android.com/reference/java/security/spec/EncodedKeySpec.html
+
+http://developer.android.com/reference/java/security/spec/MGF1ParameterSpec.html
+http://developer.android.com/reference/java/security/spec/PSSParameterSpec.html
+
+http://developer.android.com/reference/java/security/spec/RSAKeyGenParameterSpec.html
+http://developer.android.com/reference/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.html
+
+http://developer.android.com/reference/java/security/spec/RSAOtherPrimeInfo.html
+http://developer.android.com/reference/java/security/spec/RSAPrivateCrtKeySpec.html
+
+http://developer.android.com/reference/java/security/spec/RSAPrivateKeySpec.html
+http://developer.android.com/reference/java/security/spec/RSAPublicKeySpec.html
+
+http://developer.android.com/reference/java/security/spec/X509EncodedKeySpec.html
+http://developer.android.com/reference/java/security/spec/InvalidParameterSpecException.html
+
+http://developer.android.com/reference/org/apache/http/auth/Credentials.html
+http://developer.android.com/reference/org/apache/http/auth/AUTH.html
+
+http://developer.android.com/reference/org/apache/http/auth/AuthSchemeRegistry.html
+http://developer.android.com/reference/org/apache/http/auth/AuthScope.html
+
+http://developer.android.com/reference/org/apache/http/auth/AuthState.html
+http://developer.android.com/reference/org/apache/http/auth/BasicUserPrincipal.html
+
+http://developer.android.com/reference/org/apache/http/auth/NTCredentials.html
+http://developer.android.com/reference/org/apache/http/auth/NTUserPrincipal.html
+
+http://developer.android.com/reference/org/apache/http/auth/UsernamePasswordCredentials.html
+http://developer.android.com/reference/org/apache/http/auth/AuthenticationException.html
+
+http://developer.android.com/reference/org/apache/http/auth/InvalidCredentialsException.html
+http://developer.android.com/reference/org/apache/http/auth/MalformedChallengeException.html
+
+http://developer.android.com/reference/org/apache/http/auth/package-descr.html
+http://developer.android.com/reference/android/net/wifi/WifiConfiguration.AuthAlgorithm.html
+
+http://developer.android.com/reference/android/net/wifi/WifiConfiguration.GroupCipher.html
+http://developer.android.com/reference/android/net/wifi/WifiConfiguration.KeyMgmt.html
+
+http://developer.android.com/reference/android/net/wifi/WifiConfiguration.PairwiseCipher.html
+
+http://developer.android.com/reference/android/net/wifi/WifiConfiguration.Protocol.html
+http://developer.android.com/reference/android/net/wifi/WifiConfiguration.Status.html
+
+http://developer.android.com/reference/android/net/wifi/WifiManager.WifiLock.html
+http://developer.android.com/reference/org/apache/http/protocol/HTTP.html
+
+http://developer.android.com/reference/java/util/zip/ZipInputStream.html
+http://developer.android.com/reference/java/util/zip/InflaterInputStream.html
+
+http://developer.android.com/reference/java/util/zip/Inflater.html
+http://developer.android.com/reference/org/apache/http/impl/conn/tsccm/PoolEntryRequest.html
+http://developer.android.com/reference/org/apache/http/impl/conn/tsccm/RefQueueHandler.html
+
+http://developer.android.com/reference/org/apache/http/impl/conn/tsccm/AbstractConnPool.html
+http://developer.android.com/reference/org/apache/http/impl/conn/tsccm/BasicPooledConnAdapter.html
+
+http://developer.android.com/reference/org/apache/http/impl/conn/tsccm/BasicPoolEntry.html
+http://developer.android.com/reference/org/apache/http/impl/conn/tsccm/BasicPoolEntryRef.html
+
+http://developer.android.com/reference/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.html
+http://developer.android.com/reference/org/apache/http/impl/conn/tsccm/RefQueueWorker.html
+
+http://developer.android.com/reference/org/apache/http/impl/conn/tsccm/RouteSpecificPool.html
+
+http://developer.android.com/reference/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.html
+
+http://developer.android.com/reference/org/apache/http/impl/conn/tsccm/WaitingThread.html
+http://developer.android.com/reference/org/apache/http/impl/conn/tsccm/WaitingThreadAborter.html
+
+http://developer.android.com/reference/org/apache/http/impl/conn/tsccm/package-descr.html
+http://developer.android.com/reference/java/util/regex/PatternSyntaxException.html
+
+http://developer.android.com/reference/org/xmlpull/v1/sax2/Driver.html
+http://developer.android.com/guide/tutorials/views/hello-spinner.html
+
+http://developer.android.com/guide/tutorials/views/hello-listview.html
+http://developer.android.com/guide/tutorials/views/hello-gridview.html
+
+http://developer.android.com/reference/android/test/mock/MockPackageManager.html
+
+http://developer.android.com/reference/android/text/util/Linkify.MatchFilter.html
+
+http://developer.android.com/reference/android/text/util/Linkify.TransformFilter.html
+http://developer.android.com/reference/android/text/util/Rfc822Token.html
+
+http://developer.android.com/reference/android/text/util/Rfc822Tokenizer.html
+http://developer.android.com/reference/java/util/regex/Pattern.html
+
+http://developer.android.com/reference/java/lang/reflect/ReflectPermission.html
+
+http://developer.android.com/reference/javax/security/auth/callback/Callback.html
+http://developer.android.com/reference/javax/security/auth/callback/PasswordCallback.html
+
+http://developer.android.com/reference/javax/security/auth/callback/UnsupportedCallbackException.html
+
+http://developer.android.com/reference/javax/security/cert/Certificate.html
+http://developer.android.com/reference/javax/security/cert/X509Certificate.html
+
+http://developer.android.com/reference/javax/security/cert/CertificateEncodingException.html
+http://developer.android.com/reference/javax/security/cert/CertificateException.html
+
+http://developer.android.com/reference/javax/security/cert/CertificateExpiredException.html
+http://developer.android.com/reference/javax/security/cert/CertificateNotYetValidException.html
+
+http://developer.android.com/reference/javax/security/cert/CertificateParsingException.html
+http://developer.android.com/reference/javax/security/cert/package-descr.html
+
+http://developer.android.com/reference/org/apache/http/protocol/HttpRequestExecutor.html
+http://developer.android.com/reference/org/apache/http/protocol/HttpProcessor.html
+
+http://developer.android.com/reference/org/apache/http/impl/DefaultHttpRequestFactory.html
+http://developer.android.com/reference/javax/crypto/interfaces/PBEKey.html
+
+http://developer.android.com/reference/java/lang/annotation/Annotation.html
+http://developer.android.com/reference/java/lang/annotation/AnnotationTypeMismatchException.html
+
+http://developer.android.com/reference/java/lang/annotation/IncompleteAnnotationException.html
+
+http://developer.android.com/reference/java/lang/annotation/AnnotationFormatError.html
+http://developer.android.com/reference/java/lang/annotation/package-descr.html
+
+http://developer.android.com/reference/android/app/package-descr.html
+http://developer.android.com/reference/java/lang/reflect/Method.html
+
+http://developer.android.com/reference/org/apache/http/message/BasicHttpEntityEnclosingRequest.html
+
+http://developer.android.com/reference/org/apache/http/message/BasicHttpRequest.html
+http://developer.android.com/reference/org/apache/http/message/BasicHttpResponse.html
+
+http://developer.android.com/guide/samples/NotePad/src/com/index.html
+http://developer.android.com/reference/org/apache/http/io/HttpMessageWriter.html
+
+http://developer.android.com/reference/org/apache/http/io/package-descr.html
+http://developer.android.com/reference/android/location/LocationListener.html
+
+http://developer.android.com/reference/android/location/Geocoder.html
+http://developer.android.com/reference/android/location/LocationProvider.html
+
+http://developer.android.com/reference/org/apache/http/impl/cookie/AbstractCookieAttributeHandler.html
+
+http://developer.android.com/reference/org/apache/http/impl/cookie/AbstractCookieSpec.html
+http://developer.android.com/reference/org/apache/http/impl/cookie/BasicCommentHandler.html
+
+http://developer.android.com/reference/org/apache/http/impl/cookie/BasicDomainHandler.html
+http://developer.android.com/reference/org/apache/http/impl/cookie/BasicExpiresHandler.html
+
+http://developer.android.com/reference/org/apache/http/impl/cookie/BasicMaxAgeHandler.html
+http://developer.android.com/reference/org/apache/http/impl/cookie/BasicPathHandler.html
+
+http://developer.android.com/reference/org/apache/http/impl/cookie/BasicSecureHandler.html
+http://developer.android.com/reference/org/apache/http/impl/cookie/BestMatchSpec.html
+
+http://developer.android.com/reference/org/apache/http/impl/cookie/BestMatchSpecFactory.html
+http://developer.android.com/reference/org/apache/http/impl/cookie/BrowserCompatSpec.html
+
+http://developer.android.com/reference/org/apache/http/impl/cookie/BrowserCompatSpecFactory.html
+
+http://developer.android.com/reference/org/apache/http/impl/cookie/CookieSpecBase.html
+http://developer.android.com/reference/org/apache/http/impl/cookie/DateUtils.html
+
+http://developer.android.com/reference/org/apache/http/impl/cookie/NetscapeDomainHandler.html
+
+http://developer.android.com/reference/org/apache/http/impl/cookie/NetscapeDraftHeaderParser.html
+
+http://developer.android.com/reference/org/apache/http/impl/cookie/NetscapeDraftSpec.html
+http://developer.android.com/reference/org/apache/http/impl/cookie/NetscapeDraftSpecFactory.html
+
+http://developer.android.com/reference/org/apache/http/impl/cookie/RFC2109DomainHandler.html
+http://developer.android.com/reference/org/apache/http/impl/cookie/RFC2109Spec.html
+
+http://developer.android.com/reference/org/apache/http/impl/cookie/RFC2109SpecFactory.html
+http://developer.android.com/reference/org/apache/http/impl/cookie/RFC2109VersionHandler.html
+
+http://developer.android.com/reference/org/apache/http/impl/cookie/RFC2965CommentUrlAttributeHandler.html
+
+http://developer.android.com/reference/org/apache/http/impl/cookie/RFC2965DiscardAttributeHandler.html
+
+http://developer.android.com/reference/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.html
+
+http://developer.android.com/reference/org/apache/http/impl/cookie/RFC2965PortAttributeHandler.html
+
+http://developer.android.com/reference/org/apache/http/impl/cookie/RFC2965Spec.html
+http://developer.android.com/reference/org/apache/http/impl/cookie/RFC2965SpecFactory.html
+
+http://developer.android.com/reference/org/apache/http/impl/cookie/RFC2965VersionAttributeHandler.html
+
+http://developer.android.com/reference/org/apache/http/impl/cookie/DateParseException.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/LabelView.java
+
+http://developer.android.com/reference/android/net/http/SslCertificate.html
+http://developer.android.com/reference/android/net/http/SslCertificate.DName.html
+
+http://developer.android.com/reference/android/test/mock/MockContentResolver.html
+http://developer.android.com/reference/android/test/mock/MockDialogInterface.html
+
+http://developer.android.com/reference/android/test/mock/MockResources.html
+http://developer.android.com/reference/android/test/mock/package-descr.html
+
+http://developer.android.com/reference/junit/framework/Protectable.html
+http://developer.android.com/reference/junit/framework/TestFailure.html
+
+http://developer.android.com/reference/junit/framework/ComparisonFailure.html
+http://developer.android.com/reference/android/test/suitebuilder/TestSuiteBuilder.FailedToCreateTests.html
+
+http://developer.android.com/reference/java/util/concurrent/atomic/AtomicBoolean.html
+
+http://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerArray.html
+http://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html
+
+http://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongArray.html
+http://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongFieldUpdater.html
+
+http://developer.android.com/reference/java/util/concurrent/atomic/AtomicMarkableReference.html
+
+http://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html
+http://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html
+
+http://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html
+
+http://developer.android.com/reference/java/util/concurrent/atomic/AtomicStampedReference.html
+
+http://developer.android.com/reference/java/util/concurrent/atomic/package-descr.html
+http://developer.android.com/reference/org/apache/http/impl/AbstractHttpClientConnection.html
+
+http://developer.android.com/reference/org/apache/http/impl/AbstractHttpServerConnection.html
+
+http://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedSynchronizer.html
+
+http://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedSynchronizer.ConditionObject.html
+
+http://developer.android.com/reference/org/apache/http/conn/ssl/AbstractVerifier.html
+http://developer.android.com/reference/java/lang/reflect/AccessibleObject.html
+
+http://developer.android.com/reference/java/util/zip/Adler32.html
+http://developer.android.com/reference/android/text/style/AlignmentSpan.Standard.html
+
+http://developer.android.com/reference/java/lang/reflect/Array.html
+http://developer.android.com/reference/android/media/AsyncPlayer.html
+
+http://developer.android.com/reference/org/apache/http/client/params/AuthPolicy.html
+http://developer.android.com/reference/org/apache/http/message/BasicHeaderElementIterator.html
+
+http://developer.android.com/reference/org/apache/http/message/BasicHeaderValueFormatter.html
+
+http://developer.android.com/reference/org/apache/http/message/BasicHeaderValueParser.html
+http://developer.android.com/reference/org/apache/http/protocol/BasicHttpContext.html
+
+http://developer.android.com/reference/org/apache/http/message/BasicLineFormatter.html
+http://developer.android.com/reference/org/apache/http/message/BasicLineParser.html
+
+http://developer.android.com/reference/android/text/style/BulletSpan.html
+http://developer.android.com/reference/org/apache/http/util/ByteArrayBuffer.html
+
+http://developer.android.com/reference/java/util/zip/CRC32.html
+http://developer.android.com/reference/android/hardware/Camera.Parameters.html
+
+http://developer.android.com/reference/android/hardware/Camera.Size.html
+http://developer.android.com/reference/android/text/style/CharacterStyle.html
+
+http://developer.android.com/reference/java/nio/charset/spi/CharsetProvider.html
+http://developer.android.com/reference/org/apache/http/client/utils/CloneUtils.html
+
+http://developer.android.com/reference/org/apache/http/conn/params/ConnManagerParams.html
+http://developer.android.com/reference/org/apache/http/conn/params/ConnPerRouteBean.html
+
+http://developer.android.com/reference/org/apache/http/conn/params/ConnRouteParams.html
+http://developer.android.com/reference/org/apache/http/client/params/CookiePolicy.html
+
+http://developer.android.com/reference/org/apache/http/impl/DefaultHttpResponseFactory.html
+http://developer.android.com/reference/org/apache/http/protocol/DefaultedHttpContext.html
+
+http://developer.android.com/reference/java/util/zip/Deflater.html
+http://developer.android.com/reference/android/text/style/DrawableMarginSpan.html
+
+http://developer.android.com/reference/org/apache/http/util/EncodingUtils.html
+http://developer.android.com/reference/org/apache/http/impl/entity/EntityDeserializer.html
+
+http://developer.android.com/reference/org/apache/http/impl/entity/EntitySerializer.html
+http://developer.android.com/reference/org/apache/http/util/EntityUtils.html
+
+http://developer.android.com/reference/org/apache/http/util/ExceptionUtils.html
+http://developer.android.com/reference/android/media/FaceDetector.html
+
+http://developer.android.com/reference/android/media/FaceDetector.Face.html
+http://developer.android.com/reference/android/opengl/GLDebugHelper.html
+
+http://developer.android.com/reference/android/opengl/GLU.html
+http://developer.android.com/reference/android/opengl/GLUtils.html
+
+http://developer.android.com/reference/org/apache/http/client/params/HttpClientParams.html
+http://developer.android.com/reference/org/apache/http/impl/HttpConnectionMetricsImpl.html
+
+http://developer.android.com/reference/org/apache/http/protocol/HttpDateGenerator.html
+http://developer.android.com/reference/org/apache/http/protocol/HttpRequestHandlerRegistry.html
+
+http://developer.android.com/reference/org/apache/http/protocol/HttpService.html
+http://developer.android.com/reference/android/text/style/IconMarginSpan.html
+
+http://developer.android.com/reference/org/apache/http/conn/util/InetAddressUtils.html
+http://developer.android.com/reference/org/json/JSONArray.html
+
+http://developer.android.com/reference/org/json/JSONObject.html
+http://developer.android.com/reference/org/json/JSONStringer.html
+
+http://developer.android.com/reference/org/json/JSONTokener.html
+http://developer.android.com/reference/org/apache/http/util/LangUtils.html
+
+http://developer.android.com/reference/org/apache/http/impl/entity/LaxContentLengthStrategy.html
+
+http://developer.android.com/reference/android/text/style/LeadingMarginSpan.Standard.html
+http://developer.android.com/reference/java/util/concurrent/locks/LockSupport.html
+
+http://developer.android.com/reference/java/util/regex/Matcher.html
+http://developer.android.com/reference/android/opengl/Matrix.html
+
+http://developer.android.com/reference/android/media/MediaRecorder.AudioEncoder.html
+http://developer.android.com/reference/android/media/MediaRecorder.AudioSource.html
+
+http://developer.android.com/reference/android/media/MediaRecorder.OutputFormat.html
+http://developer.android.com/reference/android/media/MediaScannerConnection.html
+
+http://developer.android.com/reference/java/lang/reflect/Modifier.html
+http://developer.android.com/reference/org/apache/http/message/ParserCursor.html
+
+http://developer.android.com/reference/org/apache/http/conn/scheme/PlainSocketFactory.html
+http://developer.android.com/reference/android/text/style/QuoteSpan.html
+
+http://developer.android.com/reference/java/util/concurrent/locks/ReentrantLock.html
+http://developer.android.com/reference/java/util/concurrent/locks/ReentrantReadWriteLock.html
+
+http://developer.android.com/reference/java/util/concurrent/locks/ReentrantReadWriteLock.ReadLock.html
+
+http://developer.android.com/reference/java/util/concurrent/locks/ReentrantReadWriteLock.WriteLock.html
+
+http://developer.android.com/reference/org/apache/http/protocol/RequestConnControl.html
+http://developer.android.com/reference/org/apache/http/protocol/RequestContent.html
+
+http://developer.android.com/reference/org/apache/http/protocol/RequestDate.html
+http://developer.android.com/reference/org/apache/http/protocol/RequestExpectContinue.html
+
+http://developer.android.com/reference/org/apache/http/protocol/RequestTargetHost.html
+http://developer.android.com/reference/org/apache/http/protocol/RequestUserAgent.html
+
+http://developer.android.com/reference/org/apache/http/protocol/ResponseConnControl.html
+http://developer.android.com/reference/org/apache/http/protocol/ResponseContent.html
+
+http://developer.android.com/reference/org/apache/http/protocol/ResponseDate.html
+http://developer.android.com/reference/org/apache/http/protocol/ResponseServer.html
+
+http://developer.android.com/reference/android/media/Ringtone.html
+http://developer.android.com/reference/org/apache/http/conn/ssl/SSLSocketFactory.html
+
+http://developer.android.com/reference/org/apache/http/conn/scheme/Scheme.html
+http://developer.android.com/reference/org/apache/http/conn/scheme/SchemeRegistry.html
+
+http://developer.android.com/reference/javax/net/ServerSocketFactory.html
+http://developer.android.com/reference/android/telephony/gsm/SmsManager.html
+
+http://developer.android.com/reference/android/telephony/gsm/SmsMessage.html
+http://developer.android.com/reference/android/telephony/gsm/SmsMessage.SubmitPdu.html
+
+http://developer.android.com/reference/android/media/SoundPool.html
+http://developer.android.com/reference/org/apache/http/impl/entity/StrictContentLengthStrategy.html
+
+http://developer.android.com/reference/android/text/style/TabStopSpan.Standard.html
+http://developer.android.com/reference/android/test/suitebuilder/TestMethod.html
+
+http://developer.android.com/reference/android/test/suitebuilder/TestSuiteBuilder.html
+http://developer.android.com/reference/android/media/ToneGenerator.html
+
+http://developer.android.com/reference/org/apache/http/client/utils/URIUtils.html
+http://developer.android.com/reference/org/apache/http/client/utils/URLEncodedUtils.html
+
+http://developer.android.com/reference/org/apache/http/protocol/UriPatternMatcher.html
+http://developer.android.com/reference/junit/runner/Version.html
+
+http://developer.android.com/reference/org/apache/http/util/VersionInfo.html
+http://developer.android.com/reference/org/xmlpull/v1/XmlPullParserFactory.html
+
+http://developer.android.com/reference/java/util/concurrent/locks/Lock.html
+http://developer.android.com/reference/org/apache/http/conn/ssl/X509HostnameVerifier.html
+
+http://developer.android.com/reference/java/util/concurrent/locks/ReadWriteLock.html
+http://developer.android.com/reference/android/text/style/AbsoluteSizeSpan.html
+
+http://developer.android.com/reference/org/apache/http/conn/ssl/AllowAllHostnameVerifier.html
+
+http://developer.android.com/reference/android/text/style/BackgroundColorSpan.html
+http://developer.android.com/reference/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.html
+
+http://developer.android.com/reference/java/util/zip/CheckedInputStream.html
+http://developer.android.com/reference/java/util/zip/CheckedOutputStream.html
+
+http://developer.android.com/reference/android/text/style/ClickableSpan.html
+http://developer.android.com/reference/org/apache/http/client/params/ClientParamBean.html
+
+http://developer.android.com/reference/org/apache/http/conn/params/ConnConnectionParamBean.html
+
+http://developer.android.com/reference/org/apache/http/conn/params/ConnManagerParamBean.html
+http://developer.android.com/reference/org/apache/http/conn/params/ConnRouteParamBean.html
+
+http://developer.android.com/reference/javax/sql/ConnectionEvent.html
+http://developer.android.com/reference/java/lang/reflect/Constructor.html
+
+http://developer.android.com/reference/org/apache/http/cookie/params/CookieSpecParamBean.html
+
+http://developer.android.com/reference/org/w3c/dom/DOMException.html
+http://developer.android.com/reference/java/util/zip/DataFormatException.html
+
+http://developer.android.com/reference/org/apache/http/impl/DefaultHttpClientConnection.html
+http://developer.android.com/reference/org/apache/http/impl/DefaultHttpServerConnection.html
+
+http://developer.android.com/reference/java/util/zip/DeflaterOutputStream.html
+http://developer.android.com/reference/android/text/style/DynamicDrawableSpan.html
+
+http://developer.android.com/reference/java/lang/reflect/Field.html
+http://developer.android.com/reference/android/text/style/ForegroundColorSpan.html
+
+http://developer.android.com/reference/android/opengl/GLException.html
+http://developer.android.com/reference/java/util/zip/GZIPInputStream.html
+
+http://developer.android.com/reference/java/util/zip/GZIPOutputStream.html
+http://developer.android.com/reference/java/lang/reflect/GenericSignatureFormatError.html
+
+http://developer.android.com/reference/android/text/style/ImageSpan.html
+http://developer.android.com/reference/java/lang/reflect/InvocationTargetException.html
+
+http://developer.android.com/reference/org/json/JSONException.html
+http://developer.android.com/reference/java/lang/reflect/MalformedParameterizedTypeException.html
+
+http://developer.android.com/reference/android/text/style/MaskFilterSpan.html
+http://developer.android.com/reference/android/text/style/MetricAffectingSpan.html
+
+http://developer.android.com/reference/android/text/style/RasterizerSpan.html
+http://developer.android.com/reference/android/text/style/RelativeSizeSpan.html
+
+http://developer.android.com/reference/android/text/style/ReplacementSpan.html
+http://developer.android.com/reference/javax/sql/RowSetEvent.html
+
+http://developer.android.com/reference/android/text/style/ScaleXSpan.html
+http://developer.android.com/reference/org/apache/http/impl/SocketHttpClientConnection.html
+
+http://developer.android.com/reference/org/apache/http/impl/SocketHttpServerConnection.html
+http://developer.android.com/reference/org/apache/http/conn/ssl/StrictHostnameVerifier.html
+
+http://developer.android.com/reference/android/text/style/StrikethroughSpan.html
+http://developer.android.com/reference/android/text/style/StyleSpan.html
+
+http://developer.android.com/reference/android/text/style/SubscriptSpan.html
+http://developer.android.com/reference/android/text/style/SuperscriptSpan.html
+
+http://developer.android.com/reference/org/apache/http/protocol/SyncBasicHttpContext.html
+http://developer.android.com/reference/android/text/style/TextAppearanceSpan.html
+
+http://developer.android.com/reference/android/text/style/TypefaceSpan.html
+http://developer.android.com/reference/java/lang/reflect/UndeclaredThrowableException.html
+
+http://developer.android.com/reference/android/text/style/UnderlineSpan.html
+http://developer.android.com/reference/java/util/zip/ZipException.html
+
+http://developer.android.com/reference/java/util/zip/ZipOutputStream.html
+http://developer.android.com/reference/android/media/MediaPlayer.OnBufferingUpdateListener.html
+
+http://developer.android.com/reference/android/media/MediaPlayer.OnCompletionListener.html
+http://developer.android.com/reference/android/media/MediaPlayer.OnErrorListener.html
+
+http://developer.android.com/reference/android/media/MediaPlayer.OnPreparedListener.html
+http://developer.android.com/reference/android/media/MediaPlayer.OnSeekCompleteListener.html
+
+http://developer.android.com/reference/android/media/MediaScannerConnection.MediaScannerConnectionClient.html
+
+http://developer.android.com/reference/java/util/zip/Checksum.html
+http://developer.android.com/guide/developing/tools/adt.html
+
+http://developer.android.com/reference/org/apache/http/client/params/AllClientPNames.html
+http://developer.android.com/reference/org/apache/http/message/HeaderValueFormatter.html
+
+http://developer.android.com/reference/org/apache/http/message/HeaderValueParser.html
+http://developer.android.com/reference/org/apache/http/message/LineFormatter.html
+
+http://developer.android.com/reference/java/lang/package-descr.html
+http://developer.android.com/reference/org/apache/http/conn/params/ConnConnectionPNames.html
+
+http://developer.android.com/reference/org/apache/http/conn/params/ConnManagerPNames.html
+http://developer.android.com/reference/org/apache/http/conn/params/ConnPerRoute.html
+
+http://developer.android.com/reference/org/apache/http/conn/params/ConnRoutePNames.html
+http://developer.android.com/reference/org/apache/http/conn/scheme/HostNameResolver.html
+
+http://developer.android.com/reference/org/apache/http/conn/scheme/LayeredSocketFactory.html
+http://developer.android.com/reference/android/text/style/AlignmentSpan.html
+
+http://developer.android.com/reference/java/lang/reflect/AnnotatedElement.html
+http://developer.android.com/reference/org/w3c/dom/Attr.html
+
+http://developer.android.com/reference/android/hardware/Camera.AutoFocusCallback.html
+http://developer.android.com/reference/android/hardware/Camera.ErrorCallback.html
+
+http://developer.android.com/reference/android/hardware/Camera.PictureCallback.html
+http://developer.android.com/reference/android/hardware/Camera.PreviewCallback.html
+
+http://developer.android.com/reference/android/hardware/Camera.ShutterCallback.html
+http://developer.android.com/reference/org/w3c/dom/CDATASection.html
+
+http://developer.android.com/reference/org/w3c/dom/CharacterData.html
+http://developer.android.com/reference/org/apache/http/client/params/ClientPNames.html
+
+http://developer.android.com/reference/org/w3c/dom/Comment.html
+http://developer.android.com/reference/java/util/concurrent/locks/Condition.html
+
+http://developer.android.com/reference/javax/sql/ConnectionEventListener.html
+http://developer.android.com/reference/javax/sql/ConnectionPoolDataSource.html
+
+http://developer.android.com/reference/org/apache/http/cookie/params/CookieSpecPNames.html
+http://developer.android.com/reference/javax/sql/DataSource.html
+
+http://developer.android.com/reference/java/lang/Deprecated.html
+http://developer.android.com/reference/javax/crypto/interfaces/DHKey.html
+
+http://developer.android.com/reference/javax/crypto/interfaces/DHPrivateKey.html
+http://developer.android.com/reference/javax/crypto/interfaces/DHPublicKey.html
+
+http://developer.android.com/reference/org/w3c/dom/Document.html
+http://developer.android.com/reference/java/lang/annotation/Documented.html
+
+http://developer.android.com/reference/org/w3c/dom/DocumentFragment.html
+http://developer.android.com/reference/org/w3c/dom/DocumentType.html
+
+http://developer.android.com/reference/org/w3c/dom/DOMImplementation.html
+http://developer.android.com/reference/java/security/interfaces/DSAKey.html
+
+http://developer.android.com/reference/java/security/interfaces/DSAKeyPairGenerator.html
+http://developer.android.com/reference/java/security/interfaces/DSAParams.html
+
+http://developer.android.com/reference/java/security/interfaces/DSAPrivateKey.html
+http://developer.android.com/reference/java/security/interfaces/DSAPublicKey.html
+
+http://developer.android.com/reference/java/security/interfaces/ECKey.html
+http://developer.android.com/reference/java/security/interfaces/ECPrivateKey.html
+
+http://developer.android.com/reference/java/security/interfaces/ECPublicKey.html
+http://developer.android.com/reference/org/w3c/dom/Element.html
+
+http://developer.android.com/reference/org/w3c/dom/Entity.html
+http://developer.android.com/reference/org/w3c/dom/EntityReference.html
+
+http://developer.android.com/reference/org/apache/http/protocol/ExecutionContext.html
+http://developer.android.com/reference/android/test/FlakyTest.html
+
+http://developer.android.com/reference/java/lang/reflect/GenericArrayType.html
+http://developer.android.com/reference/java/lang/reflect/GenericDeclaration.html
+
+http://developer.android.com/reference/javax/microedition/khronos/opengles/GL10.html
+http://developer.android.com/reference/javax/microedition/khronos/opengles/GL10Ext.html
+
+http://developer.android.com/reference/javax/microedition/khronos/opengles/GL11.html
+http://developer.android.com/reference/javax/microedition/khronos/opengles/GL11Ext.html
+
+http://developer.android.com/reference/javax/microedition/khronos/opengles/GL11ExtensionPack.html
+
+http://developer.android.com/reference/org/apache/http/protocol/HttpExpectationVerifier.html
+http://developer.android.com/reference/org/apache/http/protocol/HttpRequestHandler.html
+
+http://developer.android.com/reference/org/apache/http/protocol/HttpRequestHandlerResolver.html
+
+http://developer.android.com/reference/org/apache/http/protocol/HttpRequestInterceptorList.html
+
+http://developer.android.com/reference/org/apache/http/protocol/HttpResponseInterceptorList.html
+
+http://developer.android.com/reference/java/lang/annotation/Inherited.html
+http://developer.android.com/reference/java/lang/reflect/InvocationHandler.html
+
+http://developer.android.com/reference/android/text/style/LeadingMarginSpan.html
+http://developer.android.com/reference/android/text/style/LineBackgroundSpan.html
+
+http://developer.android.com/reference/android/text/style/LineHeightSpan.html
+http://developer.android.com/reference/java/util/regex/MatchResult.html
+
+http://developer.android.com/reference/java/lang/reflect/Member.html
+http://developer.android.com/reference/org/w3c/dom/NamedNodeMap.html
+
+http://developer.android.com/reference/org/w3c/dom/Node.html
+http://developer.android.com/reference/org/w3c/dom/NodeList.html
+
+http://developer.android.com/reference/org/w3c/dom/Notation.html
+http://developer.android.com/reference/dalvik/bytecode/Opcodes.html
+
+http://developer.android.com/reference/java/lang/Override.html
+http://developer.android.com/reference/android/text/style/ParagraphStyle.html
+
+http://developer.android.com/reference/java/lang/reflect/ParameterizedType.html
+http://developer.android.com/reference/javax/sql/PooledConnection.html
+
+http://developer.android.com/reference/org/w3c/dom/ProcessingInstruction.html
+http://developer.android.com/reference/java/lang/reflect/Proxy.html
+
+http://developer.android.com/reference/java/lang/annotation/Retention.html
+http://developer.android.com/reference/javax/sql/RowSetInternal.html
+
+http://developer.android.com/reference/javax/sql/RowSetListener.html
+http://developer.android.com/reference/javax/sql/RowSetMetaData.html
+
+http://developer.android.com/reference/javax/sql/RowSetReader.html
+http://developer.android.com/reference/javax/sql/RowSetWriter.html
+
+http://developer.android.com/reference/java/security/interfaces/RSAKey.html
+http://developer.android.com/reference/java/security/interfaces/RSAMultiPrimePrivateCrtKey.html
+
+http://developer.android.com/reference/java/security/interfaces/RSAPrivateCrtKey.html
+http://developer.android.com/reference/java/security/interfaces/RSAPrivateKey.html
+
+http://developer.android.com/reference/java/security/interfaces/RSAPublicKey.html
+http://developer.android.com/reference/android/hardware/SensorListener.html
+
+http://developer.android.com/reference/android/test/suitebuilder/annotation/Smoke.html
+http://developer.android.com/reference/android/test/suitebuilder/annotation/Suppress.html
+
+http://developer.android.com/reference/java/lang/SuppressWarnings.html
+http://developer.android.com/reference/android/text/style/TabStopSpan.html
+
+http://developer.android.com/reference/java/lang/annotation/Target.html
+http://developer.android.com/reference/dalvik/annotation/TestTarget.html
+
+http://developer.android.com/reference/dalvik/annotation/TestTargetClass.html
+http://developer.android.com/reference/org/w3c/dom/Text.html
+
+http://developer.android.com/reference/java/lang/reflect/Type.html
+http://developer.android.com/reference/java/lang/reflect/TypeVariable.html
+
+http://developer.android.com/reference/android/test/UiThreadTest.html
+http://developer.android.com/reference/android/text/style/UpdateLayout.html
+
+http://developer.android.com/reference/java/lang/reflect/WildcardType.html
+http://developer.android.com/reference/android/text/style/WrapTogetherSpan.html
+
+http://developer.android.com/reference/org/xmlpull/v1/XmlSerializer.html
+
+http://developer.android.com/reference/java/util/zip/package-descr.html
+http://developer.android.com/reference/javax/security/auth/login/package-descr.html
+
+http://developer.android.com/reference/android/text/style/package-descr.html
+
+http://developer.android.com/reference/java/nio/channels/package-descr.html
+http://developer.android.com/reference/android/opengl/package-descr.html
+
+http://developer.android.com/guide/tutorials/notepad/notepad-ex1.html
+
+http://developer.android.com/guide/tutorials/notepad/notepad-ex2.html
+http://developer.android.com/guide/tutorials/notepad/notepad-ex3.html
+
+http://developer.android.com/guide/tutorials/notepad/notepad-extra-credit.html
+http://developer.android.com/reference/java/util/package-descr.html
+
+http://developer.android.com/reference/org/apache/http/client/methods/package-descr.html
+http://developer.android.com/reference/android/os/package-descr.html
+
+http://developer.android.com/reference/org/apache/http/client/utils/package-descr.html
+
+http://developer.android.com/reference/org/apache/http/impl/package-descr.html
+
+http://developer.android.com/reference/java/io/package-descr.html
+http://developer.android.com/guide/samples/NotePad/src/com/example/index.html
+
+http://developer.android.com/reference/java/nio/charset/spi/package-descr.html
+
+http://developer.android.com/reference/org/apache/http/impl/entity/package-descr.html
+
+http://developer.android.com/guide/samples/LunarLander/res/index.html
+
+http://developer.android.com/guide/samples/LunarLander/src/index.html
+http://developer.android.com/guide/samples/LunarLander/tests/index.html
+
+http://developer.android.com/guide/samples/LunarLander/AndroidManifest.html
+http://developer.android.com/guide/samples/LunarLander/sample_lunarlander.html
+
+http://developer.android.com/reference/javax/crypto/interfaces/package-descr.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/index.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/content/index.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/index.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/index.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/text/index.html
+
+http://developer.android.com/guide/samples/ApiDemos/assets/index.html
+http://developer.android.com/guide/samples/ApiDemos/res/index.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/index.html
+http://developer.android.com/guide/samples/ApiDemos/tests/index.html
+
+http://developer.android.com/guide/samples/ApiDemos/AndroidManifest.html
+http://developer.android.com/reference/android/widget/package-descr.html
+http://developer.android.com/reference/org/apache/http/conn/params/package-descr.html
+
+http://developer.android.com/guide/samples/ApiDemos/tests/src/index.html
+http://developer.android.com/guide/samples/ApiDemos/tests/AndroidManifest.html
+
+http://developer.android.com/reference/android/test/suitebuilder/package-descr.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/content/StyledText.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/content/ResourcesSample.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/content/ReadAsset.html
+
+http://developer.android.com/reference/android/view/package-descr.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/HelloWorld.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/SaveRestoreState.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/PersistentState.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/ReceiveResult.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/Forwarding.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/RedirectEnter.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/TranslucentActivity.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/LocalServiceController.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/LocalService.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/LocalServiceBinding.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/RemoteServiceController.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/RemoteServiceBinding.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/ServiceStartArgumentsController.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/ServiceStartArguments.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/AlarmController.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/OneShotAlarm.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/RepeatingAlarm.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/AlarmService.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/AlarmService_Service.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/NotifyWithText.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/IncomingMessage.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/SearchInvoke.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/SearchQueryResults.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/SearchSuggestionSampleProvider.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/AdvancedPreferences.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/AlertDialogSamples.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/ContactsFilter.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/ContactsFilterInstrumentation.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/ContactsSelectInstrumentation.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/CustomDialogActivity.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/CustomTitle.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/DefaultValues.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/DialogActivity.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/ForwardTarget.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/IncomingMessageView.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/LauncherShortcuts.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/LaunchingPreferences.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/LocalSample.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/LocalSampleInstrumentation.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/MenuInflateFromXml.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/MyPreference.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/NotifyingController.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/NotifyingService.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/PreferenceDependencies.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/PreferencesFromCode.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/PreferencesFromXml.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/RedirectGetter.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/RedirectMain.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/RemoteService.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/SendResult.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/StatusBarNotifications.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/TranslucentBlurActivity.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/CustomDialogActivity.java
+
+http://developer.android.com/reference/org/w3c/dom/package-descr.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/LocalServiceBinding.java
+
+http://developer.android.com/guide/samples/ApiDemos/res/anim/index.html
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/index.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/index.html
+http://developer.android.com/guide/samples/ApiDemos/res/menu/index.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/raw/index.html
+http://developer.android.com/guide/samples/ApiDemos/res/values/index.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/xml/index.html
+http://developer.android.com/reference/java/sql/package-descr.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/RepeatingAlarm.java
+
+http://developer.android.com/guide/samples/LunarLander/res/drawable/index.html
+http://developer.android.com/guide/samples/LunarLander/res/drawable-land/index.html
+
+http://developer.android.com/guide/samples/LunarLander/res/drawable-port/index.html
+http://developer.android.com/guide/samples/LunarLander/res/layout/index.html
+
+http://developer.android.com/guide/samples/LunarLander/res/values/index.html
+http://developer.android.com/reference/android/util/package-descr.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/LocalSampleInstrumentation.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/RedirectMain.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/Forwarding.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/ContactsFilterInstrumentation.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/SearchSuggestionSampleProvider.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/LaunchingPreferences.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/SearchInvoke.java
+
+http://developer.android.com/guide/samples/NotePad/src/com/example/android/index.html
+
+http://developer.android.com/reference/android/content/package-descr.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/ShapeDrawable1.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/CameraPreview.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/PolyToPoly.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/DrawPoints.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/PathEffects.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/SurfaceViewOverlay.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/TouchPaint.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/kube/index.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/spritetext/index.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/AlphaBitmap.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/AnimateDrawable.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/AnimateDrawables.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/Arcs.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/BitmapDecode.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/BitmapMesh.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/Clipping.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/ColorMatrixSample.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/ColorPickerDialog.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/Compass.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/CreateBitmap.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/Cube.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/CubeRenderer.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/FingerPaint.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/GradientDrawable1.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/GraphicsActivity.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/Layers.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/MeasureText.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/PathFillTypes.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/Patterns.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/PictureLayout.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/Pictures.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/ProxyDrawable.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/Regions.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/RoundRects.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/ScaleToFit.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/SensorTest.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/Sweep.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/TextAlign.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/TranslucentGLSurfaceViewActivity.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/TriangleActivity.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/TriangleRenderer.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/Typefaces.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/UnicodeChart.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/Vertices.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/Xfermodes.html
+
+http://developer.android.com/guide/samples/NotePad/tests/src/index.html
+http://developer.android.com/guide/samples/NotePad/tests/AndroidManifest.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/ShapeDrawable1.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/AnimateDrawable.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/Typefaces.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/ServiceStartArgumentsController.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/IncomingMessage.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/RoundRects.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/SaveRestoreState.java
+
+http://developer.android.com/reference/org/apache/http/client/params/package-descr.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/ForwardTarget.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/AlertDialogSamples.java
+
+http://developer.android.com/reference/java/security/spec/package-descr.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/FingerPaint.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/CameraPreview.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/TouchPaint.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/SearchQueryResults.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/NotifyingController.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/ScaleToFit.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/NotifyingService.java
+
+http://developer.android.com/guide/samples/LunarLander/res/drawable-land/earthrise.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/RedirectEnter.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/ContactsFilter.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/AnimateDrawables.java
+
+http://developer.android.com/reference/org/apache/http/conn/ssl/package-descr.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/Arcs.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/CubeRenderer.java
+
+http://developer.android.com/reference/org/apache/http/message/package-descr.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/TriangleRenderer.java
+
+http://developer.android.com/guide/samples/ApiDemos/assets/fonts/index.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/TranslucentBlurActivity.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/RemoteService.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/spritetext/Grid.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/spritetext/LabelMaker.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/spritetext/MatrixGrabber.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/spritetext/MatrixStack.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/spritetext/MatrixTrackingGL.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/spritetext/NumericSprite.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/spritetext/Projector.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/spritetext/SpriteTextActivity.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/spritetext/SpriteTextRenderer.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/GradientDrawable1.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/DialogActivity.java
+
+http://developer.android.com/reference/android/text/package-descr.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/BitmapDecode.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/content/ResourcesSample.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/TranslucentGLSurfaceViewActivity.java
+
+http://developer.android.com/reference/org/apache/http/conn/routing/package-descr.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/Vertices.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/PersistentState.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/ReceiveResult.java
+
+http://developer.android.com/guide/samples/NotePad/src/com/example/android/notepad/index.html
+
+http://developer.android.com/reference/com/google/android/maps/package-descr.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/LauncherShortcuts.java
+
+http://developer.android.com/guide/samples/NotePad/tests/src/com/index.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/BitmapMesh.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/SurfaceViewOverlay.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/CreateBitmap.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/CustomTitle.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/AdvancedPreferences.java
+
+http://developer.android.com/
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/GraphicsActivity.java
+
+http://developer.android.com/guide/samples/ApiDemos/res/xml/advanced_preferences.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/xml/default_values.html
+http://developer.android.com/guide/samples/ApiDemos/res/xml/preference_dependencies.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/xml/preferences.html
+http://developer.android.com/guide/samples/ApiDemos/res/xml/searchable.html
+
+http://developer.android.com/guide/samples/NotePad/src/com/example/android/notepad/NotePad.html
+
+http://developer.android.com/guide/samples/NotePad/src/com/example/android/notepad/NotePadProvider.html
+
+http://developer.android.com/guide/samples/NotePad/src/com/example/android/notepad/NotesList.html
+
+http://developer.android.com/guide/samples/NotePad/src/com/example/android/notepad/TitleEditor.html
+
+http://developer.android.com/guide/samples/NotePad/src/com/example/android/notepad/TitleEditor.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/Layers.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/RemoteServiceBinding.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/Compass.java
+
+http://developer.android.com/guide/samples/NotePad/src/com/example/android/notepad/NotesList.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/DefaultValues.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/AlarmService.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/OneShotAlarm.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/AlarmController.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/spritetext/MatrixTrackingGL.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/ProxyDrawable.java
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/alarm_controller.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/alarm_service.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/alert_dialog.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/alert_dialog_text_entry.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/animation_1.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/animation_2.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/animations_main_screen.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/autocomplete_1.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/autocomplete_2.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/autocomplete_3.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/autocomplete_4.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/autocomplete_5.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/autocomplete_6.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/baseline_1.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/baseline_2.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/baseline_3.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/baseline_4.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/baseline_6.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/baseline_7.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/baseline_nested_1.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/baseline_nested_2.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/baseline_nested_3.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/buttons_1.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/chronometer.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/contacts_filter.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/controls_1.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/custom_dialog_activity.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/custom_title.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/custom_title_1.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/date_widgets_example_1.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/date_widgets_example_2.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/dialog_activity.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/focus_1.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/focus_2.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/focus_3.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/forward_target.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/forwarding.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/gallery_1.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/gallery_2.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/google_login.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/grid_1.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/grid_2.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/hello_world.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/image_button_1.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/image_switcher_1.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/image_view_1.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/incoming_message.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/incoming_message_info.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/incoming_message_panel.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/incoming_message_view.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/launcher_shortcuts.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/layout_animation_1.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/layout_animation_3.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/layout_animation_4.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/layout_animation_5.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/layout_animation_6.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/layout_animation_7.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/linear_layout_1.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/linear_layout_10.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/linear_layout_2.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/linear_layout_3.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/linear_layout_4.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/linear_layout_5.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/linear_layout_6.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/linear_layout_7.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/linear_layout_8.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/linear_layout_9.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/link.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/list_12.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/list_13.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/list_7.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/list_8.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/list_item_checkbox.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/list_item_icon_text.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/list_position.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/local_sample.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/local_service_binding.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/local_service_controller.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/log_text_box_1.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/mapview.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/marquee.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/mediaplayer_1.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/mediaplayer_2.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/morse_code.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/notify_with_text.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/notifying_controller.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/preference_widget_mypreference.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/progressbar_1.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/progressbar_2.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/progressbar_3.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/progressbar_4.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/radio_group_1.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/ratingbar_1.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/read_asset.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/receive_result.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/redirect_enter.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/redirect_getter.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/redirect_main.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/relative_layout_1.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/relative_layout_2.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/remote_service_binding.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/remote_service_controller.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/resources.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/save_restore_state.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/scroll_view_1.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/scroll_view_2.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/scrollbar1.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/scrollbar2.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/scrollbar3.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/search_invoke.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/search_query_results.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/seekbar_1.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/select_dialog.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/send_result.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/service_start_arguments_controller.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/shape_drawable_1.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/spinner_1.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/status_bar_balloon.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/status_bar_notifications.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/styled_text.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/surface_view_overlay.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/table_layout_1.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/table_layout_10.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/table_layout_11.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/table_layout_12.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/table_layout_2.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/table_layout_3.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/table_layout_4.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/table_layout_5.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/table_layout_6.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/table_layout_7.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/table_layout_8.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/table_layout_9.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/tabs1.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/text_switcher_1.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/translucent_background.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/videoview.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/layout/visibility_1.html
+http://developer.android.com/guide/samples/ApiDemos/res/layout/webview_1.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/spritetext/NumericSprite.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/TranslucentActivity.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/LocalServiceController.java
+
+http://developer.android.com/guide/samples/ApiDemos/res/menu/category_order.html
+http://developer.android.com/guide/samples/ApiDemos/res/menu/checkable.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/menu/disabled.html
+http://developer.android.com/guide/samples/ApiDemos/res/menu/groups.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/menu/order.html
+http://developer.android.com/guide/samples/ApiDemos/res/menu/shortcuts.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/menu/submenu.html
+http://developer.android.com/guide/samples/ApiDemos/res/menu/title_icon.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/menu/title_only.html
+http://developer.android.com/guide/samples/ApiDemos/res/menu/visible.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/Clipping.java
+
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/alert_dialog_icon.html
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/animated_gif.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/app_sample_code.html
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/arrow_down_float.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/arrow_up_float.html
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/balloons.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/beach.html
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/black_box.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/black_opaque_box.html
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/box.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/button.9.html
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/circular_progress.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/filled_box.html
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/frog.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/gallery_background_1.html
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/gallery_photo_1.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/gallery_photo_2.html
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/gallery_photo_3.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/gallery_photo_4.html
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/gallery_photo_5.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/gallery_photo_6.html
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/gallery_photo_7.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/gallery_photo_8.html
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/ic_popup_reminder.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/icon48x48_1.html
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/icon48x48_2.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/line.html
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/photo1.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/photo2.html
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/photo3.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/photo4.html
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/photo5.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/photo6.html
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/picture_frame.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/progress_circular_background.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/progress_particle.html
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/robot.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/sample_0.html
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/sample_1.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/sample_2.html
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/sample_3.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/sample_4.html
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/sample_5.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/sample_6.html
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/sample_7.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/sample_thumb_0.html
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/sample_thumb_1.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/sample_thumb_2.html
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/sample_thumb_3.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/sample_thumb_4.html
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/sample_thumb_5.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/sample_thumb_6.html
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/sample_thumb_7.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/scrollbar_state2.html
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/scrollbar_vertical_thumb.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/scrollbar_vertical_track.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/shape_1.html
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/shape_2.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/shape_3.html
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/shape_4.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/shape_5.html
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/star_big_on.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/stat_happy.html
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/stat_neutral.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/stat_sad.html
+http://developer.android.com/guide/samples/ApiDemos/res/drawable/stat_sample.html
+
+http://developer.android.com/guide/samples/LunarLander/res/layout/lunar_layout.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/Cube.java
+
+http://developer.android.com/reference/android/hardware/package-descr.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/GLSurfaceViewActivity.java
+
+http://developer.android.com/guide/samples/NotePad/src/com/example/android/notepad/NotePadProvider.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/RemoteServiceController.java
+
+http://developer.android.com/reference/junit/runner/package-descr.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/TextAlign.java
+
+http://developer.android.com/guide/samples/NotePad/src/com/example/android/notepad/NotePad.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/spritetext/Projector.java
+
+http://developer.android.com/guide/samples/LunarLander/tests/src/index.html
+http://developer.android.com/guide/samples/LunarLander/tests/AndroidManifest.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/ColorMatrixSample.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/PreferencesFromXml.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/MeasureText.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/ColorPickerDialog.java
+
+http://developer.android.com/guide/samples/LunarLander/res/drawable/app_lunar_lander.html
+http://developer.android.com/guide/samples/LunarLander/res/drawable/lander_crashed.html
+
+http://developer.android.com/guide/samples/LunarLander/res/drawable/lander_firing.html
+http://developer.android.com/guide/samples/LunarLander/res/drawable/lander_plain.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/content/StyledText.java
+
+http://developer.android.com/reference/org/apache/http/package-descr.html
+http://developer.android.com/reference/javax/net/ssl/package-descr.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/RedirectGetter.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/DrawPoints.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/MyPreference.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/PathEffects.java
+
+http://developer.android.com/guide/samples/LunarLander/res/values/strings.html
+http://developer.android.com/guide/samples/ApiDemos/res/anim/cycle_7.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/anim/fade.html
+http://developer.android.com/guide/samples/ApiDemos/res/anim/hyperspace_in.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/anim/hyperspace_out.html
+http://developer.android.com/guide/samples/ApiDemos/res/anim/layout_animation_row_left_slide.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/anim/layout_animation_row_right_slide.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/anim/layout_animation_table.html
+http://developer.android.com/guide/samples/ApiDemos/res/anim/layout_bottom_to_top_slide.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/anim/layout_grid_fade.html
+http://developer.android.com/guide/samples/ApiDemos/res/anim/layout_grid_inverse_fade.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/anim/layout_random_fade.html
+http://developer.android.com/guide/samples/ApiDemos/res/anim/layout_wave_scale.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/anim/push_left_in.html
+http://developer.android.com/guide/samples/ApiDemos/res/anim/push_left_out.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/anim/push_up_in.html
+http://developer.android.com/guide/samples/ApiDemos/res/anim/push_up_out.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/anim/shake.html
+http://developer.android.com/guide/samples/ApiDemos/res/anim/slide_left.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/anim/slide_right.html
+http://developer.android.com/guide/samples/ApiDemos/res/anim/slide_top_to_bottom.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/anim/wave_scale.html
+
+http://developer.android.com/guide/tutorials/views/hello-datepicker.html
+
+http://developer.android.com/guide/tutorials/views/hello-timepicker.html
+http://developer.android.com/guide/tutorials/views/hello-autocomplete.html
+
+http://developer.android.com/guide/tutorials/views/hello-gallery.html
+http://developer.android.com/guide/tutorials/views/hello-tabwidget.html
+
+http://developer.android.com/guide/tutorials/views/hello-mapview.html
+http://developer.android.com/guide/tutorials/views/hello-webview.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/spritetext/SpriteTextActivity.java
+
+http://developer.android.com/guide/samples/NotePad/src/com/example/android/notepad/NoteEditor.java
+
+http://developer.android.com/reference/java/util/concurrent/locks/package-descr.html
+http://developer.android.com/guide/samples/NotePad/tests/src/com/example/index.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/PictureLayout.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/spritetext/MatrixGrabber.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/RelativeLayout1.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/RelativeLayout2.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/LinearLayout1.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/LinearLayout2.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/LinearLayout3.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/LinearLayout4.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/LinearLayout5.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/LinearLayout6.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/LinearLayout7.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/LinearLayout8.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/LinearLayout9.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/ScrollView1.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/ScrollView2.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/TableLayout1.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/TableLayout2.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/TableLayout3.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/TableLayout4.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/TableLayout5.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/TableLayout6.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/TableLayout7.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/TableLayout8.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/TableLayout9.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/TableLayout10.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/TableLayout11.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/TableLayout12.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Baseline1.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Baseline2.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Baseline3.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Baseline4.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Baseline6.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Baseline7.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/BaselineNested1.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/BaselineNested2.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/BaselineNested3.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/RadioGroup1.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/ScrollBar1.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/ScrollBar2.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Visibility1.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/List1.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/List2.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/List3.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/List4.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/List5.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/List6.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/List7.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/List8.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/CustomView1.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/ImageButton1.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/DateWidgets1.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/DateWidgets2.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Gallery1.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Gallery2.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Spinner1.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Grid1.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Grid2.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/ImageSwitcher1.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/TextSwitcher1.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Animation1.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Animation2.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Controls1.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Controls2.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/AutoComplete1.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/AutoComplete2.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/AutoComplete3.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/AutoComplete4.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/AutoComplete5.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/ProgressBar1.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/ProgressBar2.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/ProgressBar3.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/ProgressBar4.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Focus1.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Focus2.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Focus3.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/AutoComplete6.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Buttons1.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/ChronometerDemo.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/ExpandableList1.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/ExpandableList2.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/ExpandableList3.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/ImageView1.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/InternalSelectionFocus.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/InternalSelectionScroll.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/InternalSelectionView.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/LayoutAnimation1.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/LayoutAnimation2.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/LayoutAnimation3.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/LayoutAnimation4.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/LayoutAnimation5.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/LayoutAnimation6.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/LayoutAnimation7.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/LinearLayout10.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/List10.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/List11.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/List12.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/List13.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/List14.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/List9.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/MapViewCompassDemo.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/MapViewDemo.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/RatingBar1.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/ScrollBar3.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/SeekBar1.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Tabs1.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Tabs2.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Tabs3.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/WebView1.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/spritetext/LabelMaker.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/RelativeLayout1.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/CustomView1.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/LayoutAnimation7.java
+
+http://developer.android.com/reference/android/text/method/package-descr.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/LayoutAnimation1.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/NotifyWithText.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/InternalSelectionScroll.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/RadioGroup1.java
+
+http://developer.android.com/reference/org/apache/http/entity/package-descr.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/TriangleActivity.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Tabs3.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/WebView1.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/List14.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/LinearLayout9.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Baseline7.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/TableLayout6.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/TableLayout3.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Baseline1.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/HelloWorld.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/AlphaBitmap.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Buttons1.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/TableLayout10.java
+
+http://developer.android.com/guide/samples/ApiDemos/tests/src/com/index.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/TableLayout11.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/LinearLayout2.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/index.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/ExpandableList2.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Focus2.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/TableLayout7.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/BaselineNested2.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/LinearLayout3.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/ScrollView2.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/spritetext/MatrixStack.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/ScrollBar2.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/LinearLayout5.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/ScrollBar3.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/AlarmService_Service.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/AutoComplete6.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/List6.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/spritetext/Grid.java
+
+http://developer.android.com/reference/org/apache/http/protocol/package-descr.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/Regions.java
+
+http://developer.android.com/guide/samples/LunarLander/src/com/index.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Baseline4.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/PreferencesFromCode.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/PreferenceDependencies.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/GLSurfaceView.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/LocalSample.java
+
+http://developer.android.com/guide/samples/NotePad/tests/src/com/example/android/index.html
+http://developer.android.com/reference/javax/security/auth/callback/package-descr.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/List5.java
+
+http://developer.android.com/reference/javax/sql/package-descr.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/List9.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/List8.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/ProgressBar1.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/text/Link.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/text/LogTextBox.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/text/LogTextBox1.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/text/Marquee.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/List7.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/LinearLayout10.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Baseline3.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Baseline6.java
+
+http://developer.android.com/reference/android/location/package-descr.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/ImageSwitcher1.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/ServiceStartArguments.java
+
+http://developer.android.com/reference/java/util/regex/package-descr.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/kube/Cube.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/kube/GLColor.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/kube/GLFace.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/kube/GLShape.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/kube/GLVertex.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/kube/GLWorld.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/kube/Kube.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/kube/KubeRenderer.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/kube/Layer.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/kube/M4.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/ProgressBar4.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Gallery2.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/LayoutAnimation2.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Focus3.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/Sweep.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/List12.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Tabs2.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/Xfermodes.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/DateWidgets1.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Animation2.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/LayoutAnimation4.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/kube/GLWorld.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/content/ReadAsset.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/BaselineNested1.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Tabs1.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/PolyToPoly.java
+
+http://developer.android.com/reference/org/apache/http/cookie/params/package-descr.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/TableLayout4.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/StatusBarNotifications.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/text/LogTextBox.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/Pictures.java
+
+http://developer.android.com/reference/java/security/cert/package-descr.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/List13.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/ChronometerDemo.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/kube/KubeRenderer.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/TableLayout2.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/SensorTest.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/AutoComplete5.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/LayoutAnimation3.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/SendResult.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/TableLayout9.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Controls2.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/TextSwitcher1.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/ContactsSelectInstrumentation.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/ImageButton1.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/TableLayout8.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/kube/Kube.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Controls1.java
+
+http://developer.android.com/reference/org/apache/http/util/package-descr.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/kube/Layer.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/List10.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/BaselineNested3.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/List4.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/ScrollBar1.java
+
+http://developer.android.com/reference/java/security/interfaces/package-descr.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/LayoutAnimation5.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/TableLayout5.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/IncomingMessageView.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Gallery1.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/kube/GLColor.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/ProgressBar2.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Visibility1.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/DateWidgets2.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/PathFillTypes.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/TableLayout12.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/Patterns.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/List3.java
+
+http://developer.android.com/guide/samples/LunarLander/res/drawable-port/earthrise.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Baseline2.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/LinearLayout7.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/TableLayout1.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Grid1.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/RelativeLayout2.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Spinner1.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/index.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/kube/GLVertex.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Focus1.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/LinearLayout6.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/InternalSelectionFocus.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/LinearLayout4.java
+
+http://developer.android.com/guide/samples/LunarLander/src/com/example/index.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/kube/M4.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/InternalSelectionView.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/text/LogTextBox1.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/ExpandableList3.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/ScrollView1.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/ExpandableList1.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/RatingBar1.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Grid2.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/index.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/MenuInflateFromXml.java
+
+http://developer.android.com/guide/samples/ApiDemos/tests/src/com/example/index.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/UnicodeChart.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/AutoComplete3.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/kube/Cube.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/LinearLayout8.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/List2.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/text/Marquee.java
+
+http://developer.android.com/guide/samples/ApiDemos/res/values/arrays.html
+http://developer.android.com/guide/samples/ApiDemos/res/values/attrs.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/values/colors.html
+http://developer.android.com/guide/samples/ApiDemos/res/values/ids.html
+
+http://developer.android.com/guide/samples/ApiDemos/res/values/strings.html
+http://developer.android.com/guide/samples/ApiDemos/res/values/styles.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/AutoComplete1.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/app/LocalService.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/Animation1.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/kube/GLShape.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/LayoutAnimation6.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/MapViewCompassDemo.java
+
+http://developer.android.com/guide/samples/LunarLander/tests/src/com/index.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/List11.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/ImageView1.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/kube/GLFace.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/ProgressBar3.java
+
+http://developer.android.com/guide/samples/LunarLander/src/com/example/android/index.html
+http://developer.android.com/guide/samples/ApiDemos/tests/src/com/example/android/index.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/LinearLayout1.java
+
+http://developer.android.com/guide/samples/NotePad/tests/src/com/example/android/notepad/index.html
+
+http://developer.android.com/guide/samples/NotePad/tests/src/com/example/android/notepad/NotePadTest.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/SeekBar1.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/List1.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/graphics/spritetext/SpriteTextRenderer.java
+
+http://developer.android.com/guide/samples/NotePad/res/drawable/index.html
+http://developer.android.com/guide/samples/NotePad/res/layout/index.html
+
+http://developer.android.com/guide/samples/NotePad/res/values/index.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/AutoComplete4.java
+
+http://developer.android.com/guide/samples/NotePad/res/drawable/app_notes.html
+http://developer.android.com/guide/samples/ApiDemos/tests/src/com/example/android/apis/index.html
+
+http://developer.android.com/guide/samples/ApiDemos/tests/src/com/example/android/apis/app/index.html
+
+http://developer.android.com/guide/samples/ApiDemos/tests/src/com/example/android/apis/os/index.html
+
+http://developer.android.com/guide/samples/ApiDemos/tests/src/com/example/android/apis/view/index.html
+
+http://developer.android.com/guide/samples/ApiDemos/tests/src/com/example/android/apis/AllTests.html
+
+http://developer.android.com/guide/samples/ApiDemos/tests/src/com/example/android/apis/ApiDemosApplicationTests.html
+
+http://developer.android.com/guide/samples/ApiDemos/tests/src/com/example/android/apis/ApiDemosTest.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/MapViewDemo.java
+
+http://developer.android.com/guide/samples/NotePad/tests/src/com/example/android/notepad/NotePadTest.java
+
+http://developer.android.com/guide/samples/NotePad/res/values/strings.html
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/view/AutoComplete2.java
+
+http://developer.android.com/guide/samples/LunarLander/tests/src/com/example/index.html
+http://developer.android.com/guide/samples/ApiDemos/tests/src/com/example/android/apis/view/Focus2ActivityTest.html
+
+http://developer.android.com/guide/samples/ApiDemos/tests/src/com/example/android/apis/view/Focus2AndroidTest.html
+
+http://developer.android.com/guide/samples/ApiDemos/tests/src/com/example/android/apis/ApiDemosTest.java
+
+http://developer.android.com/guide/samples/ApiDemos/tests/src/com/example/android/apis/ApiDemosApplicationTests.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/index.html
+http://developer.android.com/guide/samples/ApiDemos/tests/src/com/example/android/apis/AllTests.java
+
+http://developer.android.com/guide/samples/ApiDemos/tests/src/com/example/android/apis/os/MorseCodeConverterTest.html
+
+http://developer.android.com/guide/samples/LunarLander/tests/src/com/example/android/index.html
+
+http://developer.android.com/guide/samples/ApiDemos/tests/src/com/example/android/apis/app/ForwardingTest.html
+
+http://developer.android.com/guide/samples/ApiDemos/tests/src/com/example/android/apis/app/LocalServiceTest.html
+
+http://developer.android.com/guide/samples/ApiDemos/tests/src/com/example/android/apis/view/Focus2AndroidTest.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/text/Link.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/animation/index.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/media/index.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/os/index.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/ApiDemos.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/ApiDemosApplication.html
+
+http://developer.android.com/guide/samples/ApiDemos/tests/src/com/example/android/apis/app/ForwardingTest.java
+
+http://developer.android.com/guide/samples/ApiDemos/tests/src/com/example/android/apis/view/Focus2ActivityTest.java
+
+http://developer.android.com/guide/samples/LunarLander/src/com/example/android/lunarlander/index.html
+
+http://developer.android.com/guide/samples/ApiDemos/tests/src/com/example/android/apis/os/MorseCodeConverterTest.java
+
+http://developer.android.com/guide/samples/NotePad/res/layout/note_editor.html
+http://developer.android.com/guide/samples/NotePad/res/layout/noteslist_item.html
+
+http://developer.android.com/guide/samples/NotePad/res/layout/title_editor.html
+http://developer.android.com/guide/samples/LunarLander/tests/src/com/example/android/lunarlander/index.html
+
+http://developer.android.com/guide/samples/ApiDemos/tests/src/com/example/android/apis/app/LocalServiceTest.java
+
+http://developer.android.com/guide/samples/LunarLander/src/com/example/android/lunarlander/LunarLander.html
+
+http://developer.android.com/guide/samples/LunarLander/src/com/example/android/lunarlander/LunarView.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/os/MorseCode.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/os/MorseCodeConverter.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/os/Sensors.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/ApiDemosApplication.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/media/MediaPlayerDemo.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/media/MediaPlayerDemo_Audio.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/media/MediaPlayerDemo_Video.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/media/VideoViewDemo.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/animation/Rotate3dAnimation.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/animation/Transition3d.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/ApiDemos.java
+
+http://developer.android.com/guide/samples/LunarLander/tests/src/com/example/android/lunarlander/LunarLanderTest.html
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/os/MorseCode.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/media/MediaPlayerDemo_Audio.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/os/MorseCodeConverter.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/media/VideoViewDemo.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/animation/Rotate3dAnimation.java
+
+http://developer.android.com/guide/samples/LunarLander/src/com/example/android/lunarlander/LunarView.java
+
+http://developer.android.com/guide/samples/LunarLander/src/com/example/android/lunarlander/LunarLander.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/media/MediaPlayerDemo.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/os/Sensors.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/media/MediaPlayerDemo_Video.java
+
+http://developer.android.com/guide/samples/LunarLander/tests/src/com/example/android/lunarlander/LunarLanderTest.java
+
+http://developer.android.com/guide/samples/ApiDemos/src/com/example/android/apis/animation/Transition3d.java
\ No newline at end of file
diff --git a/docs/overview-ext.html b/docs/overview-ext.html
new file mode 100644
index 0000000..5720245
--- /dev/null
+++ b/docs/overview-ext.html
@@ -0,0 +1,8 @@
+<body>

+Some random libraries that we've imported:

+<ul>

+    <li>GData</li>

+    <li>Apache commons HTTPClient</li>

+    <li>A sax parser</li>

+</ul>

+</body>