diff --git a/docs/html/images/training/sharing/share-text-screenshot.png b/docs/html/images/training/sharing/share-text-screenshot.png index 089221ccace64..0c9f46ecb8457 100644 Binary files a/docs/html/images/training/sharing/share-text-screenshot.png and b/docs/html/images/training/sharing/share-text-screenshot.png differ diff --git a/docs/html/training/sharing/index.jd b/docs/html/training/sharing/index.jd index cb133c393c419..9ee5e29ac7f34 100644 --- a/docs/html/training/sharing/index.jd +++ b/docs/html/training/sharing/index.jd @@ -26,9 +26,9 @@ Intent Filters integrate with each other. Why reinvent functionality that isn't core to your application when it already exists in another application?

-

This class shows some common ways you can send and receive content between +

This class covers some common ways you can send and receive content between applications using {@link android.content.Intent} APIs and the {@link -android.view.ActionProvider}.

+android.view.ActionProvider} object.

Lessons

@@ -40,7 +40,7 @@ applications with intents.
Receiving Content from Other Apps
Learn how to set up your application to receive text and binary data from intents.
- +
Adding an Easy Share Action
Learn how to add a "share" action item to your action bar.
diff --git a/docs/html/training/sharing/receive.jd b/docs/html/training/sharing/receive.jd index b2cac304325d0..cc55967a11e0b 100644 --- a/docs/html/training/sharing/receive.jd +++ b/docs/html/training/sharing/receive.jd @@ -43,8 +43,8 @@ new Google+ post with photos from the Android Gallery app.

Update Your Manifest

Intent filters inform the system what intents an application component is willing to accept. -Just as you constructed an intent with action {@link android.content.Intent#ACTION_SEND} in the -Send Content to Other Apps Using Intents +Similar to how you constructed an intent with action {@link android.content.Intent#ACTION_SEND} in +the Send Content to Other Apps Using Intents lesson, you create intent filters in order to be able to receive intents with this action. You define an intent filter in your manifest, using the

When another application tries to share any of these things by constructing an intent and passing it to {@link android.content.Context#startActivity(android.content.Intent) startActivity()}, your -application will be listed as an option in the intent chooser (see figure 1). If the user selects -your application, the corresponding activity (.ui.MyActivity in the example above) will -be started. It is then up to you to handle the content appropriately within your code and UI.

+application will be listed as an option in the intent chooser. If the user selects your application, +the corresponding activity (.ui.MyActivity in the example above) will be started. It +is then up to you to handle the content appropriately within your code and UI.

Handle the Incoming Content

diff --git a/docs/html/training/sharing/send.jd b/docs/html/training/sharing/send.jd index d151ed03c7dbe..afb0e3487a1fd 100644 --- a/docs/html/training/sharing/send.jd +++ b/docs/html/training/sharing/send.jd @@ -40,7 +40,7 @@ from other applications by specifying them in your manifest.

Sending and receiving data between applications with intents is most commonly used for social sharing of content. Intents allow users to share information quickly and easily, using their -favorite social applications.

+favorite applications.

Note: The best way to add a share action item to an {@link android.app.ActionBar} is to use {@link android.widget.ShareActionProvider}, which became diff --git a/docs/html/training/sharing/shareaction.jd b/docs/html/training/sharing/shareaction.jd index f6be745b93b84..873f61457b690 100644 --- a/docs/html/training/sharing/shareaction.jd +++ b/docs/html/training/sharing/shareaction.jd @@ -109,7 +109,7 @@ private void setShareIntent(Intent shareIntent) { want to set it and then update it as the UI changes. For example, when you view photos full screen in the Gallery app, the sharing intent changes as you flip between photos.

-

For further discussion about the {@link android.widget.ShareActionProvider}, see the For further discussion about the {@link android.widget.ShareActionProvider} object, see the Action Bar guide.