diff options
| author | smain@google.com <smain@google.com> | 2014-11-19 23:06:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-19 23:06:27 +0000 |
| commit | 2411fe88d7b11f628e5338bd8f314c98a9d45bb4 (patch) | |
| tree | 0ed225d2cfcd46689c0eae4b07b7030099db1085 /docs/html/training/basics/activity-lifecycle | |
| parent | 9b822b96aaf16ac4ad8e5a1c8da998fba2f3f404 (diff) | |
| parent | cca0d6bfd62b0506a892e1450542aee7f80dc8c0 (diff) | |
| download | frameworks_base-2411fe88d7b11f628e5338bd8f314c98a9d45bb4.zip frameworks_base-2411fe88d7b11f628e5338bd8f314c98a9d45bb4.tar.gz frameworks_base-2411fe88d7b11f628e5338bd8f314c98a9d45bb4.tar.bz2 | |
Merge "add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes" into lmp-docs
Diffstat (limited to 'docs/html/training/basics/activity-lifecycle')
5 files changed, 10 insertions, 22 deletions
diff --git a/docs/html/training/basics/activity-lifecycle/index.jd b/docs/html/training/basics/activity-lifecycle/index.jd index 127c1c2..afeab86 100644 --- a/docs/html/training/basics/activity-lifecycle/index.jd +++ b/docs/html/training/basics/activity-lifecycle/index.jd @@ -1,9 +1,9 @@ page.title=Managing the Activity Lifecycle +page.tags=activity lifecycle +helpoutsWidget=true trainingnavtop=true startpage=true -next.title=Launching an Activity -next.link=starting.html @jd:body diff --git a/docs/html/training/basics/activity-lifecycle/pausing.jd b/docs/html/training/basics/activity-lifecycle/pausing.jd index f656fce..de2c92a 100644 --- a/docs/html/training/basics/activity-lifecycle/pausing.jd +++ b/docs/html/training/basics/activity-lifecycle/pausing.jd @@ -1,12 +1,8 @@ page.title=Pausing and Resuming an Activity -parent.title=Managing the Activity Lifecycle -parent.link=index.html +page.tags=activity lifecycle +helpoutsWidget=true trainingnavtop=true -previous.title=Starting an Activity -previous.link=starting.html -next.title=Stopping and Restarting an Activity -next.link=stopping.html @jd:body diff --git a/docs/html/training/basics/activity-lifecycle/recreating.jd b/docs/html/training/basics/activity-lifecycle/recreating.jd index 71fd5dd..a52d5fd 100644 --- a/docs/html/training/basics/activity-lifecycle/recreating.jd +++ b/docs/html/training/basics/activity-lifecycle/recreating.jd @@ -1,10 +1,8 @@ page.title=Recreating an Activity -parent.title=Managing the Activity Lifecycle -parent.link=index.html +page.tags=activity lifecycle +helpoutsWidget=true trainingnavtop=true -previous.title=Stopping and Restarting an Activity -previous.link=stopping.html @jd:body diff --git a/docs/html/training/basics/activity-lifecycle/starting.jd b/docs/html/training/basics/activity-lifecycle/starting.jd index 9046599..2501f38 100644 --- a/docs/html/training/basics/activity-lifecycle/starting.jd +++ b/docs/html/training/basics/activity-lifecycle/starting.jd @@ -1,10 +1,8 @@ page.title=Starting an Activity -parent.title=Managing the Activity Lifecycle -parent.link=index.html +page.tags=activity lifecycle +helpoutsWidget=true trainingnavtop=true -next.title=Pausing and Resuming an Activity -next.link=pausing.html @jd:body diff --git a/docs/html/training/basics/activity-lifecycle/stopping.jd b/docs/html/training/basics/activity-lifecycle/stopping.jd index d56c921..51c95ea 100644 --- a/docs/html/training/basics/activity-lifecycle/stopping.jd +++ b/docs/html/training/basics/activity-lifecycle/stopping.jd @@ -1,12 +1,8 @@ page.title=Stopping and Restarting an Activity -parent.title=Managing the Activity Lifecycle -parent.link=index.html +page.tags=activity lifecycle +helpoutsWidget=true trainingnavtop=true -previous.title=Pausing and Resuming an Activity -previous.link=pausing.html -next.title=Recreating an Activity -next.link=recreating.html @jd:body |