diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 8b6b819ad7b2e..d5b00554d3ec4 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -111,9 +111,15 @@ import java.util.HashMap; * *

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 - * Android applications and lifecycles, please read the Dev Guide document on - * Application Fundamentals.

+ * part of the platform's application model. For a detailed perspective on the structure of an + * Android application and how activities behave, please read the + * Application Fundamentals and + * Tasks and Back Stack + * documents.

+ * + *

You can also find a detailed discussion about how to create activities in the + * Activities + * document.

* *

Topics covered here: *

    diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 5049e19ba7d86..4370ebf93c281 100644 --- a/core/java/android/app/Notification.java +++ b/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 Activities and Tasks - * section of the Application - * Fundamentals document. + * that you take care of task management as described in the + * Tasks and Back + * Stack 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 - * Application Fundamentals: Activities and Tasks. + * that you take care of task management as described in the + * Tasks and Back + * Stack document. * * @deprecated Use {@link Builder} instead. */ diff --git a/core/java/android/app/Service.java b/core/java/android/app/Service.java index 024c5f38954ba..05b9781354d9d 100644 --- a/core/java/android/app/Service.java +++ b/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 - * Application Fundamentals: - * Processes and Threads. The {@link IntentService} class is available + * Processes and + * Threads. 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.

    - * - *

    The Service class is an important part of an - * application's overall lifecycle.

    + * + *

    You can find a detailed discussion about how to create services in the + * Services + * document.

    * *

    Topics covered here: *

      @@ -453,9 +454,9 @@ public abstract class Service extends ContextWrapper implements ComponentCallbac * *

      Note that unlike other application components, calls on to the * IBinder interface returned here may not happen on the main thread - * of the process. More information about this can be found - * in Application Fundamentals: - * Processes and Threads.

      + * of the process. More information about the main thread can be found in + * Processes and + * Threads.

      * * @param intent The Intent that was used to bind to this service, * as given to {@link android.content.Context#bindService diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java index 1764e113d3d00..1a5c675fa9749 100644 --- a/core/java/android/content/ContentProvider.java +++ b/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 - * Application Fundamentals: - * Processes and Threads. + * Processes + * and Threads. */ 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 - * Application Fundamentals: - * Processes and Threads. + * Processes + * and Threads. */ 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 - * Application Fundamentals: - * Processes and Threads. + * Processes + * and Threads. */ 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 - * Application Fundamentals: - * Processes and Threads. + * Processes + * and Threads. *

      * Example client call:

      * 

      // Request a specific record.
@@ -555,8 +555,8 @@ public abstract class ContentProvider implements ComponentCallbacks {
      * vnd.android.cursor.item for a single record,
      * or vnd.android.cursor.dir/ for multiple items.
      * This method can be called from multiple threads, as described in
-     * Application Fundamentals:
-     * Processes and Threads.
+     * Processes
+     * and Threads.
      *
      * 
      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
-     * Application Fundamentals:
-     * Processes and Threads.
+     * Processes
+     * and Threads.
      * @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
-     * Application Fundamentals:
-     * Processes and Threads.
+     * Processes
+     * and Threads.
      *
      * @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
-     * Application Fundamentals:
-     * Processes and Threads.
+     * Processes
+     * and Threads.
      *
      * 
      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
-     * Application Fundamentals:
-     * Processes and Threads.
+     * Processes
+     * and Threads.
      *
      * @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
-     * Application Fundamentals:
-     * Processes and Threads.
+     * Processes
+     * and Threads.
      *
      * 
      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
-     * Application Fundamentals:
-     * Processes and Threads.
+     * Processes
+     * and Threads.
      *
      * 
      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
-     * Application Fundamentals:
-     * Processes and Threads.
+     * Processes
+     * and Threads.
      *
      * @param operations the operations to apply
      * @return the results of the applications
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index 6e3663e341d52..4706c1a56ef46 100644
--- a/core/java/android/content/Intent.java
+++ b/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
-     * Application Fundamentals:
-     * Activities and Tasks for more details on tasks.
+     * Tasks and Back
+     * Stack for more information about tasks.
      *
      * 
      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 {
      * 
      This flag is ignored if
      * {@link #FLAG_ACTIVITY_NEW_TASK} is not set.
      *
-     * 
      See Application Fundamentals:
-     * Activities and Tasks for more details on tasks.
+     * 
      See
+     * Tasks and Back
+     * Stack 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.
      *
-     * 
      See Application Fundamentals:
-     * Activities and Tasks for more details on tasks.
+     * 
      See
+     * Tasks and Back
+     * Stack 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()}.
      *
-     * 
      See the Application Fundamentals:
-     * Activities and Tasks documentation for important information on how some of these options impact
+     * 
      See the
+     * Tasks and Back
+     * Stack documentation for important information on how some of these options impact
      * the behavior of your application.
      *
      * @param flags The desired flags.
diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml
index a9a7e4af85925..e8f30ad28f6bf 100644
--- a/core/res/res/values/attrs_manifest.xml
+++ b/core/res/res/values/attrs_manifest.xml
@@ -441,8 +441,8 @@
     
     
     
+            Tasks and Back
+            Stack document for more details about tasks.-->
         
         
+            Tasks and Back
+            Stack document for more details about tasks.-->
         
     
     
diff --git a/test-runner/src/android/test/ServiceTestCase.java b/test-runner/src/android/test/ServiceTestCase.java
index f9e8adb07bf17..8fad5d670dcd3 100644
--- a/test-runner/src/android/test/ServiceTestCase.java
+++ b/test-runner/src/android/test/ServiceTestCase.java
@@ -36,9 +36,9 @@ import java.util.Random;
  *
  * 
      Lifecycle Support.
  * A Service is accessed with a specific sequence of
- * calls, as documented in the section
- * 
- * Service lifecycle in the Developer Guide. In order to support the lifecycle of a Service,
+ * calls, as described in the
+ * Services
+ * document. In order to support the lifecycle of a Service,
  * ServiceTestCase enforces this protocol:
  *
  *