Code drop from //branches/cupcake/...@124589

5 files changed, 35 insertions, 73 deletions

diff --git a/docs/html/guide/basics/android-sdk.jd b/docs/html/guide/basics/android-sdk.jd
new file mode 100644
index 0000000..d1f3437
--- /dev/null
+++ b/docs/html/guide/basics/android-sdk.jd
@@ -0,0 +1,11 @@
+page.title=The Android SDK
+@jd:body
+
+<p>FIXME</p>
+
+<p>The downloadable Android SDK includes the Android API libraries, sample code, documentation,
+and a collection of Android development tools, like the emulator and debugger.</p>
+
+<p>The SDK supports developing on Linux, Mac OS X, and Windows (XP and Vista).</p>
+
+<p>The Java Development Kit is required.</p>
\ No newline at end of file
diff --git a/docs/html/guide/basics/app-framework.jd b/docs/html/guide/basics/app-framework.jd
new file mode 100644
index 0000000..8513884
--- /dev/null
+++ b/docs/html/guide/basics/app-framework.jd
@@ -0,0 +1,4 @@
+page.title=The Application Framework
+@jd:body
+
+TODO
\ No newline at end of file
diff --git a/docs/html/guide/basics/appmodel.jd b/docs/html/guide/basics/appmodel.jd
index af5f037..323fc9b 100644
--- a/docs/html/guide/basics/appmodel.jd
+++ b/docs/html/guide/basics/appmodel.jd
@@ -168,13 +168,18 @@ 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 task
-affinity to the empty string "" (indicating no affinity) and setting the
-{@link android.R.styleable#AndroidManifestActivity_finishOnTaskLaunch
-finishOnBackground} attribute.  This approach is useful if you would like the notification
+<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 this attribute, the activity will
-be finished whether the user leaves it with BACK or HOME; if the attribute
+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>
 
diff --git a/docs/html/guide/basics/index.jd b/docs/html/guide/basics/index.jd
deleted file mode 100644
index e1bbc52..0000000
--- a/docs/html/guide/basics/index.jd
+++ /dev/null
@@ -1,58 +0,0 @@
-page.title=Developing Applications
-@jd:body
-<h1>Developing Android Applications</h1>
-<p>You can develop Android applications with the same high-quality tools you
-use to develop Java applications. The Android core libraries provide the
-functionality needed to build some amazingly rich mobile applications, and
-the Android development tools make running, debugging, and testing your
-applications a snap.</p>
-
-<p>This section explains the ins and outs of developing Android
-applications. It outlines the philosophy
-behind the system and then describes each of the
-key subsystems in detail. After reading this section, you'll have the knowledge
-and confidence to begin writing that real-world Android app you have in
-mind.</p>
-
-<p>Before reading this section you should read the <a
-href="{@docRoot}intro/index.html">Getting Started Guide</a>, which helps you get
-up and running with the Android SDK and shows you how to build a basic
-app. This section builds on the information in the Getting Started
-section.</p>
-
-<p>Here's the content you'll find in this section:</p>
-
-<dl>
-    <dt><a href="{@docRoot}devel/implementing-ui.html">Implementing a UI</a></dt>
-    <dd>Explains how to construct and interact with user interfaces for Android
-        applications. After reading this page you'll have a solid understanding of
-        how Android layouts are built, how they operate at runtime, and how you can
-        make them pretty.</dd>
-    <dt><a href="{@docRoot}devel/building-blocks.html">Building Blocks</a></dt>
-    <dd>Detailed descriptions of Android components. Covers the ins and outs
-        of the components summarized in Anatomy of an Android App, plus more. This
-        section goes into detail on each of the key Android components (Intents,
-        Activities, Views, and events.)</dd>
-    <dt><a href="{@docRoot}devel/data.html">Storing and Retrieving Data</a></dt>
-    <dd>How to read and write data to the various storage mechanisms
-        provided by Android, and to network services. There are several
-        different ways to read and write data from an Android application,
-        each aimed at different needs. This page describes them all and
-        explains how to pick the right one for your needs.</dd>
-    <dt><a href="{@docRoot}devel/security.html">Security Model</a></dt>
-    <dd>Gaining access to secure system resources and features, and
-        declaring permissions to control access to your own secure features.
-        Permissions control whether a given application is able to access
-        piece of functionality provided by another application (for example,
-        which applications can dial the phone). This page describes how
-        permissions work and how to request permissions as well as define your
-        own.</dd>
-    <dt><a href="{@docRoot}devel/resources-i18n.html">Resources and i18n</a></dt>
-    <dd>Detailed descriptions of Android's application-resource management
-        system, including how it's used for internationalization and
-        localization. "Resources" are application assets (such as images,
-        localized strings, and XML layouts) that need to be resolved at
-        runtime. This page describes how Android resolves which resource to
-        load from a selection of them, as well as how to create and use
-        resources.</dd>
-</dl>
diff --git a/docs/html/guide/basics/what-is-android.jd b/docs/html/guide/basics/what-is-android.jd
index 926b433..9e2801a 100755..100644
--- a/docs/html/guide/basics/what-is-android.jd
+++ b/docs/html/guide/basics/what-is-android.jd
@@ -58,23 +58,23 @@ 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}reference/view-gallery.html">Views</a> that can be used to
+    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}devel/data/contentproviders.html">Content
+    <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}devel/resources-i18n.html">Resource Manager</a>,
-    providing access to non-code resources such as localized strings, graphics,
-    and layout files</li>
+    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
-    life cycle of applications and provides a common navigation backstack</li>
+    lifecycle of applications and provides a common navigation backstack</li>
 </ul>
 
-<p>For more details and a walkthrough of an application, see <a
-href="{@docRoot}intro/tutorial.html">Writing an Android Application</a>.</p>
+<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>