Merge "docs: update location of sample apps" into lmp-dev

This commit is contained in:
Joe Fernandez
2014-10-17 19:39:27 +00:00
committed by Android (Google) Code Review

View File

@@ -30,7 +30,7 @@ page.tags="recents","overview"
<h2>Sample code</h2> <h2>Sample code</h2>
<ol> <ol>
<li><a href="{@docRoot}samples/activitytasks/index.html">Document-centric Apps</a></li> <li><a href="{@docRoot}samples/DocumentCentricApps/index.html">Document-centric Apps</a></li>
</ol> </ol>
</div> </div>
@@ -84,7 +84,7 @@ the new document, the system always creates a new task with the target activity
This setting allows the same document to be opened in more than one task. The following code demonstrates This setting allows the same document to be opened in more than one task. The following code demonstrates
how the main activity does this:</p> how the main activity does this:</p>
<p class="code-caption"><a href="{@docRoot}samples/activitytasks/src/com/example/android/documentcentricrecents/DocumentCentricActivity.html"> <p class="code-caption"><a href="{@docRoot}samples/DocumentCentricApps/index.html">
DocumentCentricActivity.java</a></p> DocumentCentricActivity.java</a></p>
<pre> <pre>
public void createNewDocument(View view) { public void createNewDocument(View view) {
@@ -122,7 +122,7 @@ to the front and passes the new intent to {@link android.app.Activity#onNewInten
The new activity gets the intent and creates a new document in the overview screen, as in the The new activity gets the intent and creates a new document in the overview screen, as in the
following example:</p> following example:</p>
<p class="code-caption"><a href="{@docRoot}samples/activitytasks/src/com/example/android/documentcentricrecents/NewDocumentActivity.html"> <p class="code-caption"><a href="{@docRoot}samples/DocumentCentricApps/index.html">
NewDocumentActivity.java</a></p> NewDocumentActivity.java</a></p>
<pre> <pre>
&#64;Override &#64;Override
@@ -209,7 +209,7 @@ is 50 (25 on low memory devices); values less than 1 are not valid.</p>
specify when to remove the task and finish all activities associated with it by calling specify when to remove the task and finish all activities associated with it by calling
the {@link android.app.ActivityManager.AppTask#finishAndRemoveTask() finishAndRemoveTask()} method.</p> the {@link android.app.ActivityManager.AppTask#finishAndRemoveTask() finishAndRemoveTask()} method.</p>
<p class="code-caption"><a href="{@docRoot}samples/activitytasks/index.html"> <p class="code-caption"><a href="{@docRoot}samples/DocumentCentricApps/index.html">
NewDocumentActivity.java</a></p> NewDocumentActivity.java</a></p>
<pre> <pre>
public void onRemoveFromRecents(View view) { public void onRemoveFromRecents(View view) {
@@ -229,7 +229,7 @@ discussed below.</p>
the {@link android.content.Intent#FLAG_ACTIVITY_RETAIN_IN_RECENTS} flag in the the {@link android.content.Intent#FLAG_ACTIVITY_RETAIN_IN_RECENTS} flag in the
{@link android.content.Intent#addFlags(int) addFlags()} method of the Intent that launches the activity.</p> {@link android.content.Intent#addFlags(int) addFlags()} method of the Intent that launches the activity.</p>
<p class="code-caption"><a href="{@docRoot}samples/activitytasks/src/com/example/android/documentcentricrecents/DocumentCentricActivity.html"> <p class="code-caption"><a href="{@docRoot}samples/DocumentCentricApps/index.html">
DocumentCentricActivity.java</a></p> DocumentCentricActivity.java</a></p>
<pre> <pre>
private Intent newDocumentIntent() { private Intent newDocumentIntent() {