summaryrefslogtreecommitdiffstats
path: root/docs/html/training/basics
diff options
context:
space:
mode:
authorJoe Malin <jmalin@google.com>2013-08-26 14:55:54 -0700
committerJoe Malin <jmalin@google.com>2013-10-11 16:48:18 -0700
commit45edbb701ac44891aa07a403a55ee2393da9b25f (patch)
tree26b1f1d067f6a8a83f41c21873efc40944b49b64 /docs/html/training/basics
parentc0da3f1d60f99c3188906d429ed38edbdd934f12 (diff)
downloadframeworks_base-45edbb701ac44891aa07a403a55ee2393da9b25f.zip
frameworks_base-45edbb701ac44891aa07a403a55ee2393da9b25f.tar.gz
frameworks_base-45edbb701ac44891aa07a403a55ee2393da9b25f.tar.bz2
DOC CHANGE: FileProvider training class
Change-Id: Idad8840dec02150733f23cfefdeaf152a260f63a
Diffstat (limited to 'docs/html/training/basics')
-rw-r--r--docs/html/training/basics/intents/filters.jd5
-rw-r--r--docs/html/training/basics/intents/index.jd7
-rw-r--r--docs/html/training/basics/intents/result.jd5
-rw-r--r--docs/html/training/basics/intents/sending.jd4
4 files changed, 12 insertions, 9 deletions
diff --git a/docs/html/training/basics/intents/filters.jd b/docs/html/training/basics/intents/filters.jd
index 0090c98..9b6a111 100644
--- a/docs/html/training/basics/intents/filters.jd
+++ b/docs/html/training/basics/intents/filters.jd
@@ -20,7 +20,8 @@ previous.link=result.html
<h2>You should also read</h2>
<ul>
- <li><a href="{@docRoot}training/sharing/index.html">Sharing Content</a></li>
+ <li><a href="{@docRoot}training/sharing/index.html">Sharing Simple Data</a></li>
+ <li><a href="{@docRoot}training/secure-file-sharing/index.html">Sharing Files</a>
</ul>
</div>
</div>
@@ -152,7 +153,7 @@ implicit intents will resolve to your activity.</p>
<p>For more information about sending and receiving {@link android.content.Intent#ACTION_SEND}
intents that perform social sharing behaviors, see the lesson about <a
-href="{@docRoot}training/sharing/receive.html">Receiving Content from Other Apps</a>.</p>
+href="{@docRoot}training/sharing/receive.html">Receiving Simple Data from Other Apps</a>.</p>
<h2 id="HandleIntent">Handle the Intent in Your Activity</h2>
diff --git a/docs/html/training/basics/intents/index.jd b/docs/html/training/basics/intents/index.jd
index 8876a33..59ba11f 100644
--- a/docs/html/training/basics/intents/index.jd
+++ b/docs/html/training/basics/intents/index.jd
@@ -19,7 +19,8 @@ Lifecycle</a>)</li>
<h2>You should also read</h2>
<ul>
- <li><a href="{@docRoot}training/sharing/index.html">Sharing Content</a></li>
+ <li><a href="{@docRoot}training/sharing/index.html">Sharing Simple Data</a></li>
+ <li><a href="{@docRoot}training/secure-file-sharing/index.html">Sharing Files</a>
<li><a
href="http://android-developers.blogspot.com/2009/11/integrating-application-with-intents.html">
Integrating Application with Intents (blog post)</a></li>
@@ -49,7 +50,7 @@ interactions with other apps, such as start another app, receive a result from t
make your app able to respond to intents from other apps.</p>
<h2>Lessons</h2>
-
+
<dl>
<dt><b><a href="sending.html">Sending the User to Another App</a></b></dt>
<dd>Shows how you can create implicit intents to launch other apps that can perform an
@@ -59,5 +60,5 @@ action.</dd>
<dt><b><a href="filters.html">Allowing Other Apps to Start Your Activity</a></b></dt>
<dd>Shows how to make activities in your app open for use by other apps by defining
intent filters that declare the implicit intents your app accepts.</dd>
-</dl>
+</dl>
diff --git a/docs/html/training/basics/intents/result.jd b/docs/html/training/basics/intents/result.jd
index 24ecc46..64fbb8b 100644
--- a/docs/html/training/basics/intents/result.jd
+++ b/docs/html/training/basics/intents/result.jd
@@ -21,7 +21,8 @@ next.link=filters.html
<h2>You should also read</h2>
<ul>
- <li><a href="{@docRoot}training/sharing/index.html">Sharing Content</a></li>
+ <li><a href="{@docRoot}training/sharing/index.html">Sharing Simple Data</a></li>
+ <li><a href="{@docRoot}training/secure-file-sharing/index.html">Sharing Files</a>
</ul>
</div>
@@ -71,7 +72,7 @@ private void pickContact() {
<h2 id="ReceiveResult">Receive the Result</h2>
-<p>When the user is done with the subsequent activity and returns, the system calls your activity's
+<p>When the user is done with the subsequent activity and returns, the system calls your activity's
{@link android.app.Activity#onActivityResult onActivityResult()} method. This method includes three
arguments:</p>
diff --git a/docs/html/training/basics/intents/sending.jd b/docs/html/training/basics/intents/sending.jd
index aba3896..79c017b 100644
--- a/docs/html/training/basics/intents/sending.jd
+++ b/docs/html/training/basics/intents/sending.jd
@@ -22,7 +22,7 @@ next.link=result.html
<h2>You should also read</h2>
<ul>
- <li><a href="{@docRoot}training/sharing/index.html">Sharing Content</a></li>
+ <li><a href="{@docRoot}training/sharing/index.html">Sharing Simple Data</a></li>
</ul>
</div>
@@ -200,7 +200,7 @@ Intent mapIntent = new Intent(Intent.ACTION_VIEW, location);
PackageManager packageManager = {@link android.content.Context#getPackageManager()};
List&lt;ResolveInfo> activities = packageManager.queryIntentActivities(mapIntent, 0);
boolean isIntentSafe = activities.size() > 0;
-
+
// Start an activity if it's safe
if (isIntentSafe) {
startActivity(mapIntent);