am b508d6e2: Merge "docs: fix links to revised fundamentals documents" into honeycomb

* commit 'b508d6e26e3a1fd68bf637dc29df335f0e7ccd92':
  docs: fix links to revised fundamentals documents

core/java/android/app/Activity.java

@@ -111,9 +111,15 @@ import java.util.HashMap;
  * 
  * <p>The Activity class is an important part of an application's overall lifecycle,
  * and the way activities are launched and put together is a fundamental
- * part of the platform's application model. For a detailed perspective on the structure of
+ * part of the platform's application model. For a detailed perspective on the structure of an
- * Android applications and lifecycles, please read the <em>Dev Guide</em> document on 
+ * Android application and how activities behave, please read the
- * <a href="{@docRoot}guide/topics/fundamentals.html">Application Fundamentals</a>.</p>
+ * <a href="{@docRoot}guide/topics/fundamentals.html">Application Fundamentals</a> and
+ * <a href="{@docRoot}guide/topics/fundamentals/tasks-and-back-stack.html">Tasks and Back Stack</a>
+ * documents.</p>
+ *
+ * <p>You can also find a detailed discussion about how to create activities in the
+ * <a href="{@docRoot}guide/topics/fundamentals/activities.html">Activities</a>
+ * document.</p>
  * 
  * <p>Topics covered here:
  * <ol>

core/java/android/app/Notification.java

@@ -106,9 +106,9 @@ public class Notification implements Parcelable
      * The intent to execute when the expanded status entry is clicked.  If
      * this is an activity, it must include the
      * {@link android.content.Intent#FLAG_ACTIVITY_NEW_TASK} flag, which requires
-     * that you take care of task management as described in the <em>Activities and Tasks</em>
+     * that you take care of task management as described in the
-     * section of the <a href="{@docRoot}guide/topics/fundamentals.html#acttask">Application 
+     * <a href="{@docRoot}guide/topics/fundamentals/tasks-and-back-stack.html">Tasks and Back
-     * Fundamentals</a> document.
+     * Stack</a> document.
      */
     public PendingIntent contentIntent;
 
@@ -540,8 +540,9 @@ public class Notification implements Parcelable
      * @param contentIntent The intent to launch when the user clicks the expanded notification.
      * If this is an activity, it must include the
      * {@link android.content.Intent#FLAG_ACTIVITY_NEW_TASK} flag, which requires
-     * that you take care of task management as described in 
+     * that you take care of task management as described in the
-     * <a href="{@docRoot}guide/topics/fundamentals.html#lcycles">Application Fundamentals: Activities and Tasks</a>.
+     * <a href="{@docRoot}guide/topics/fundamentals/tasks-and-back-stack.html">Tasks and Back
+     * Stack</a> document.
      * 
      * @deprecated Use {@link Builder} instead.
      */

core/java/android/app/Service.java

@@ -46,13 +46,14 @@ import java.io.PrintWriter;
  * to do any CPU intensive (such as MP3 playback) or blocking (such as
  * networking) operations, it should spawn its own thread in which to do that
  * work.  More information on this can be found in
- * <a href="{@docRoot}guide/topics/fundamentals.html#procthread">Application Fundamentals:
+ * <a href="{@docRoot}guide/topics/fundamentals/processes-and-threads.html">Processes and
- * Processes and Threads</a>.  The {@link IntentService} class is available
+ * Threads</a>.  The {@link IntentService} class is available
  * as a standard implementation of Service that has its own thread where it
  * schedules its work to be done.</p>
- * 
+ *
- * <p>The Service class is an important part of an
+ * <p>You can find a detailed discussion about how to create services in the 
- * <a href="{@docRoot}guide/topics/fundamentals.html#lcycles">application's overall lifecycle</a>.</p>
+ * <a href="{@docRoot}guide/topics/fundamentals/services.html">Services</a>
+ * document.</p>
  * 
  * <p>Topics covered here:
  * <ol>
@@ -453,9 +454,9 @@ public abstract class Service extends ContextWrapper implements ComponentCallbac
      * 
      * <p><em>Note that unlike other application components, calls on to the
      * IBinder interface returned here may not happen on the main thread
-     * of the process</em>.  More information about this can be found
+     * of the process</em>.  More information about the main thread can be found in
-     * in <a href="{@docRoot}guide/topics/fundamentals.html#procthread">Application Fundamentals:
+     * <a href="{@docRoot}guide/topics/fundamentals/processes-and-threads.html">Processes and
-     * Processes and Threads</a>.</p>
+     * Threads</a>.</p>
      * 
      * @param intent The Intent that was used to bind to this service,
      * as given to {@link android.content.Context#bindService

core/java/android/content/ContentProvider.java

@@ -389,8 +389,8 @@ public abstract class ContentProvider implements ComponentCallbacks {
      * Return the name of the permission required for read-only access to
      * this content provider.  This method can be called from multiple
      * threads, as described in
-     * <a href="{@docRoot}guide/topics/fundamentals.html#procthread">Application Fundamentals:
+     * <a href="{@docRoot}guide/topics/fundamentals/processes-and-threads.html#Threads">Processes
-     * Processes and Threads</a>.
+     * and Threads</a>.
      */
     public final String getReadPermission() {
         return mReadPermission;
@@ -411,8 +411,8 @@ public abstract class ContentProvider implements ComponentCallbacks {
      * Return the name of the permission required for read/write access to
      * this content provider.  This method can be called from multiple
      * threads, as described in
-     * <a href="{@docRoot}guide/topics/fundamentals.html#procthread">Application Fundamentals:
+     * <a href="{@docRoot}guide/topics/fundamentals/processes-and-threads.html#Threads">Processes
-     * Processes and Threads</a>.
+     * and Threads</a>.
      */
     public final String getWritePermission() {
         return mWritePermission;
@@ -433,8 +433,8 @@ public abstract class ContentProvider implements ComponentCallbacks {
      * Return the path-based permissions required for read and/or write access to
      * this content provider.  This method can be called from multiple
      * threads, as described in
-     * <a href="{@docRoot}guide/topics/fundamentals.html#procthread">Application Fundamentals:
+     * <a href="{@docRoot}guide/topics/fundamentals/processes-and-threads.html#Threads">Processes
-     * Processes and Threads</a>.
+     * and Threads</a>.
      */
     public final PathPermission[] getPathPermissions() {
         return mPathPermissions;
@@ -494,8 +494,8 @@ public abstract class ContentProvider implements ComponentCallbacks {
     /**
      * Implement this to handle query requests from clients.
      * This method can be called from multiple threads, as described in
-     * <a href="{@docRoot}guide/topics/fundamentals.html#procthread">Application Fundamentals:
+     * <a href="{@docRoot}guide/topics/fundamentals/processes-and-threads.html#Threads">Processes
-     * Processes and Threads</a>.
+     * and Threads</a>.
      * <p>
      * Example client call:<p>
      * <pre>// Request a specific record.
@@ -555,8 +555,8 @@ public abstract class ContentProvider implements ComponentCallbacks {
      * <code>vnd.android.cursor.item</code> for a single record,
      * or <code>vnd.android.cursor.dir/</code> for multiple items.
      * This method can be called from multiple threads, as described in
-     * <a href="{@docRoot}guide/topics/fundamentals.html#procthread">Application Fundamentals:
+     * <a href="{@docRoot}guide/topics/fundamentals/processes-and-threads.html#Threads">Processes
-     * Processes and Threads</a>.
+     * and Threads</a>.
      *
      * <p>Note that there are no permissions needed for an application to
      * access this information; if your content provider requires read and/or
@@ -574,8 +574,8 @@ public abstract class ContentProvider implements ComponentCallbacks {
      * As a courtesy, call {@link ContentResolver#notifyChange(android.net.Uri ,android.database.ContentObserver) notifyChange()}
      * after inserting.
      * This method can be called from multiple threads, as described in
-     * <a href="{@docRoot}guide/topics/fundamentals.html#procthread">Application Fundamentals:
+     * <a href="{@docRoot}guide/topics/fundamentals/processes-and-threads.html#Threads">Processes
-     * Processes and Threads</a>.
+     * and Threads</a>.
      * @param uri The content:// URI of the insertion request.
      * @param values A set of column_name/value pairs to add to the database.
      * @return The URI for the newly inserted item.
@@ -589,8 +589,8 @@ public abstract class ContentProvider implements ComponentCallbacks {
      * As a courtesy, call {@link ContentResolver#notifyChange(android.net.Uri ,android.database.ContentObserver) notifyChange()}
      * after inserting.
      * This method can be called from multiple threads, as described in
-     * <a href="{@docRoot}guide/topics/fundamentals.html#procthread">Application Fundamentals:
+     * <a href="{@docRoot}guide/topics/fundamentals/processes-and-threads.html#Threads">Processes
-     * Processes and Threads</a>.
+     * and Threads</a>.
      *
      * @param uri The content:// URI of the insertion request.
      * @param values An array of sets of column_name/value pairs to add to the database.
@@ -611,8 +611,8 @@ public abstract class ContentProvider implements ComponentCallbacks {
      * As a courtesy, call {@link ContentResolver#notifyChange(android.net.Uri ,android.database.ContentObserver) notifyDelete()}
      * after deleting.
      * This method can be called from multiple threads, as described in
-     * <a href="{@docRoot}guide/topics/fundamentals.html#procthread">Application Fundamentals:
+     * <a href="{@docRoot}guide/topics/fundamentals/processes-and-threads.html#Threads">Processes
-     * Processes and Threads</a>.
+     * and Threads</a>.
      *
      * <p>The implementation is responsible for parsing out a row ID at the end
      * of the URI, if a specific row is being deleted. That is, the client would
@@ -633,8 +633,8 @@ public abstract class ContentProvider implements ComponentCallbacks {
      * As a courtesy, call {@link ContentResolver#notifyChange(android.net.Uri ,android.database.ContentObserver) notifyChange()}
      * after updating.
      * This method can be called from multiple threads, as described in
-     * <a href="{@docRoot}guide/topics/fundamentals.html#procthread">Application Fundamentals:
+     * <a href="{@docRoot}guide/topics/fundamentals/processes-and-threads.html#Threads">Processes
-     * Processes and Threads</a>.
+     * and Threads</a>.
      *
      * @param uri The URI to query. This can potentially have a record ID if this
      * is an update request for a specific record.
@@ -650,8 +650,8 @@ public abstract class ContentProvider implements ComponentCallbacks {
      * Override this to handle requests to open a file blob.
      * The default implementation always throws {@link FileNotFoundException}.
      * This method can be called from multiple threads, as described in
-     * <a href="{@docRoot}guide/topics/fundamentals.html#procthread">Application Fundamentals:
+     * <a href="{@docRoot}guide/topics/fundamentals/processes-and-threads.html#Threads">Processes
-     * Processes and Threads</a>.
+     * and Threads</a>.
      *
      * <p>This method returns a ParcelFileDescriptor, which is returned directly
      * to the caller.  This way large data (such as images and documents) can be
@@ -688,8 +688,8 @@ public abstract class ContentProvider implements ComponentCallbacks {
      * that need to be able to return sub-sections of files, often assets
      * inside of their .apk.
      * This method can be called from multiple threads, as described in
-     * <a href="{@docRoot}guide/topics/fundamentals.html#procthread">Application Fundamentals:
+     * <a href="{@docRoot}guide/topics/fundamentals/processes-and-threads.html#Threads">Processes
-     * Processes and Threads</a>.
+     * and Threads</a>.
      *
      * <p>If you implement this, your clients must be able to deal with such
      * file slices, either directly with
@@ -965,8 +965,8 @@ public abstract class ContentProvider implements ComponentCallbacks {
      * elements as there were operations will be returned.  If any of the calls
      * fail, it is up to the implementation how many of the others take effect.
      * This method can be called from multiple threads, as described in
-     * <a href="{@docRoot}guide/topics/fundamentals.html#procthread">Application Fundamentals:
+     * <a href="{@docRoot}guide/topics/fundamentals/processes-and-threads.html#Threads">Processes
-     * Processes and Threads</a>.
+     * and Threads</a>.
      *
      * @param operations the operations to apply
      * @return the results of the applications

core/java/android/content/Intent.java

@@ -2462,8 +2462,8 @@ public class Intent implements Parcelable, Cloneable {
      * user can move to.  Tasks can be moved to the foreground and background;
      * all of the activities inside of a particular task always remain in
      * the same order.  See
-     * <a href="{@docRoot}guide/topics/fundamentals.html#acttask">Application Fundamentals:
+     * <a href="{@docRoot}guide/topics/fundamentals/tasks-and-back-stack.html">Tasks and Back
-     * Activities and Tasks</a> for more details on tasks.
+     * Stack</a> for more information about tasks.
      *
      * <p>This flag is generally used by activities that want
      * to present a "launcher" style behavior: they give the user a list of
@@ -2496,8 +2496,9 @@ public class Intent implements Parcelable, Cloneable {
      * <p>This flag is ignored if
      * {@link #FLAG_ACTIVITY_NEW_TASK} is not set.
      *
-     * <p>See <a href="{@docRoot}guide/topics/fundamentals.html#acttask">Application Fundamentals:
+     * <p>See
-     * Activities and Tasks</a> for more details on tasks.
+     * <a href="{@docRoot}guide/topics/fundamentals/tasks-and-back-stack.html">Tasks and Back
+     * Stack</a> for more information about tasks.
      */
     public static final int FLAG_ACTIVITY_MULTIPLE_TASK = 0x08000000;
     /**
@@ -2527,8 +2528,9 @@ public class Intent implements Parcelable, Cloneable {
      * especially useful, for example, when launching an activity from the
      * notification manager.
      *
-     * <p>See <a href="{@docRoot}guide/topics/fundamentals.html#acttask">Application Fundamentals:
+     * <p>See
-     * Activities and Tasks</a> for more details on tasks.
+     * <a href="{@docRoot}guide/topics/fundamentals/tasks-and-back-stack.html">Tasks and Back
+     * Stack</a> for more information about tasks.
      */
     public static final int FLAG_ACTIVITY_CLEAR_TOP = 0x04000000;
     /**
@@ -4938,8 +4940,9 @@ public class Intent implements Parcelable, Cloneable {
      * FLAG_RECEIVER_* flags are all for use with
      * {@link Context#sendBroadcast(Intent) Context.sendBroadcast()}.
      *
-     * <p>See the <a href="{@docRoot}guide/topics/fundamentals.html#acttask">Application Fundamentals:
+     * <p>See the
-     * Activities and Tasks</a> documentation for important information on how some of these options impact
+     * <a href="{@docRoot}guide/topics/fundamentals/tasks-and-back-stack.html">Tasks and Back
+     * Stack</a> documentation for important information on how some of these options impact
      * the behavior of your application.
      *
      * @param flags The desired flags.

core/res/res/values/attrs_manifest.xml

@@ -441,8 +441,8 @@
     <attr name="priority" format="integer" />
     
     <!-- Specify how an activity should be launched.  See the
-         <a href="{@docRoot}guide/topics/fundamentals.html#acttask">Application Fundamentals</a>
+         <a href="{@docRoot}guide/topics/fundamentals/tasks-and-back-stack.html">Tasks and Back
-         documentation for important information on how these options impact
+         Stack</a> document for important information on how these options impact
          the behavior of your application.
          
          <p>If this attribute is not specified, <code>standard</code> launch
@@ -478,8 +478,8 @@
             of the activity being started at the top of the stack, it will
             receive the Intent as described there (without the
             FLAG_ACTIVITY_BROUGHT_TO_FRONT flag set).  See the
-            <a href="{@docRoot}guide/topics/fundamentals.html#acttask">Application Fundamentals</a>
+            <a href="{@docRoot}guide/topics/fundamentals/tasks-and-back-stack.html">Tasks and Back
-            documentation for more details on tasks.-->
+            Stack</a> document for more details about tasks.-->
         <enum name="singleTask" value="2" />
         <!-- Only allow one instance of this activity to ever be 
             running.  This activity gets a unique task with only itself running 
@@ -489,8 +489,8 @@
             method called.  If this 
             activity tries to start a new activity, that new activity will be 
             launched in a separate task.  See the
-            <a href="{@docRoot}guide/topics/fundamentals.html#acttask">Application Fundamentals</a>
+            <a href="{@docRoot}guide/topics/fundamentals/tasks-and-back-stack.html">Tasks and Back
-            documentation for more details on tasks. -->
+            Stack</a> document for more details about tasks.-->
         <enum name="singleInstance" value="3" />
     </attr>
     

test-runner/src/android/test/ServiceTestCase.java

@@ -36,9 +36,9 @@ import java.util.Random;
  *
  * <p><b>Lifecycle Support.</b>
  * A Service is accessed with a specific sequence of
- * calls, as documented in the section
+ * calls, as described in the
- * <a href="http://developer.android.com/guide/topics/fundamentals.html#servlife">
+ * <a href="http://developer.android.com/guide/topics/fundamentals/services.html">Services</a>
- * Service lifecycle</a> in the Developer Guide. In order to support the lifecycle of a Service,
+ * document. In order to support the lifecycle of a Service,
  * <code>ServiceTestCase</code> enforces this protocol:
  *
  * <ul>