diff --git a/docs/html/guide/topics/fundamentals/index.jd b/docs/html/guide/topics/fundamentals/index.jd index de2e31249aaa7..f427a927daaf1 100644 --- a/docs/html/guide/topics/fundamentals/index.jd +++ b/docs/html/guide/topics/fundamentals/index.jd @@ -180,9 +180,7 @@ instance, it might initiate a service to perform some work based on the event.

A broadcast receiver is implemented as a subclass of {@link android.content.BroadcastReceiver} and each broadcast is delivered as an {@link android.content.Intent} object. For more information, -see the Intents and Intent Filters -developer guide.

+see the {@link android.content.BroadcastReceiver} class.

@@ -220,35 +218,56 @@ Intents bind individual components to each other at runtime (you can think of th as the messengers that request an action from other components), whether the component belongs to your application or another.

-

An intent is defined by an {@link android.content.Intent} object, which defines a message to +

An intent is created with an {@link android.content.Intent} object, which defines a message to activate either a specific component or a specific type of component—an intent can be either explicit or implicit, respectively.

For activities and services, an intent defines the action to perform (for example, to "view" or "send" something) and may specify the URI of the data to act on (among other things that the component being started might need to know). For example, an intent might convey a request for an -activity to present an image to the user or to open a web page. In some cases, you can start a -component in order to receive a result, in which case, the component that is started also returns -the result in an {@link android.content.Intent} object (for example, you can issue an intent to let +activity to show an image or to open a web page. In some cases, you can start an +activity to receive a result, in which case, the activity also returns +the result in an {@link android.content.Intent} (for example, you can issue an intent to let the user pick a personal contact and have it returned to you—the return intent includes a -URI pointing to the chosen contact). For broadcast receivers, the intent simply defines the +URI pointing to the chosen contact).

+ +

For broadcast receivers, the intent simply defines the announcement being broadcast (for example, a broadcast to indicate the device battery is low includes only a known action string that indicates "battery is low").

-

The remaining type of component, content provider, is not activated by intents. Rather, it is +

The other component type, content provider, is not activated by intents. Rather, it is activated when targeted by a request from a {@link android.content.ContentResolver}. The content resolver handles all direct transactions with the content provider so that the component that's performing transactions with the provider doesn't need to and instead calls methods on the {@link android.content.ContentResolver} object. This leaves a layer of abstraction between the content provider and the component requesting information (for security).

+

There are separate methods for activiting each type of component:

+ +

For more information about using intents, see the Intents and Intent Filters document. More information about activating specific components is also provided -in the Activities, Services, and Content Providers developer -guides.

+in the following documents: Activities, Services, {@link +android.content.BroadcastReceiver} and Content Providers.

The Manifest File