diff options
| author | Joe Fernandez <joefernandez@google.com> | 2014-10-17 19:44:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-17 19:44:38 +0000 |
| commit | 5259fee88ec13bf0d1281c0589c19f4c9563cbdb (patch) | |
| tree | c02e242615406d4eb073e48fcdb04411e601d952 /docs/html/guide | |
| parent | 3de84d0de63387c252ef790b4afaf29012cc0bf7 (diff) | |
| parent | f21746fca8603ed5a4d328b804ad6de24226ef49 (diff) | |
| download | frameworks_base-5259fee88ec13bf0d1281c0589c19f4c9563cbdb.zip frameworks_base-5259fee88ec13bf0d1281c0589c19f4c9563cbdb.tar.gz frameworks_base-5259fee88ec13bf0d1281c0589c19f4c9563cbdb.tar.bz2 | |
am f21746fc: Merge "docs: update location of sample apps" into lmp-dev
* commit 'f21746fca8603ed5a4d328b804ad6de24226ef49':
docs: update location of sample apps
Diffstat (limited to 'docs/html/guide')
| -rw-r--r-- | docs/html/guide/components/recents.jd | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/html/guide/components/recents.jd b/docs/html/guide/components/recents.jd index b44c682..78cc6ac 100644 --- a/docs/html/guide/components/recents.jd +++ b/docs/html/guide/components/recents.jd @@ -30,7 +30,7 @@ page.tags="recents","overview" <h2>Sample code</h2> <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> </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 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> <pre> 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 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> <pre> @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 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> <pre> 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 {@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> <pre> private Intent newDocumentIntent() { |