summaryrefslogtreecommitdiffstats
path: root/docs/html/guide/topics/fundamentals
diff options
context:
space:
mode:
authorRoman Nurik <romannurik@google.com>2011-06-03 18:02:01 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-03 18:02:01 -0700
commit1d3a5c11336de19fd2c7f3ab1c021741e0189e96 (patch)
treefd79146b6de095a8709120f4e2aa2028d617e676 /docs/html/guide/topics/fundamentals
parent29bf3307277973ad4d148340c20aa7b32038c8af (diff)
parent16475a3a40beac982886ce6bc300f4ffe29f581d (diff)
downloadframeworks_base-1d3a5c11336de19fd2c7f3ab1c021741e0189e96.zip
frameworks_base-1d3a5c11336de19fd2c7f3ab1c021741e0189e96.tar.gz
frameworks_base-1d3a5c11336de19fd2c7f3ab1c021741e0189e96.tar.bz2
am 16475a3a: am 07613835: am e7d60078: Add old blog posts as articles, batch 1
* commit '16475a3a40beac982886ce6bc300f4ffe29f581d': Add old blog posts as articles, batch 1
Diffstat (limited to 'docs/html/guide/topics/fundamentals')
-rw-r--r--docs/html/guide/topics/fundamentals/services.jd7
-rw-r--r--docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd5
2 files changed, 12 insertions, 0 deletions
diff --git a/docs/html/guide/topics/fundamentals/services.jd b/docs/html/guide/topics/fundamentals/services.jd
index a9dd315..468a417 100644
--- a/docs/html/guide/topics/fundamentals/services.jd
+++ b/docs/html/guide/topics/fundamentals/services.jd
@@ -49,6 +49,13 @@ perform interprocess communication</li>
LocalService}</a></li>
</ol>
+<h2>Articles</h2>
+<ol>
+ <li><a href="{@docRoot}resources/articles/multitasking-android-way.html">Multitasking the Android Way</a></li>
+ <li><a href="{@docRoot}resources/articles/service-api-changes-starting-with.html">Service API changes starting
+ with Android 2.0</a></li>
+</ol>
+
<h2>See also</h2>
<ol>
<li><a href="{@docRoot}guide/topics/fundamentals/bound-services.html">Bound Services</a></li>
diff --git a/docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd b/docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd
index f22e5b2..072488c 100644
--- a/docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd
+++ b/docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd
@@ -27,6 +27,11 @@ to perform other tasks without losing their work</li>
</li>
</ol>
+<h2>Articles</h2>
+<ol>
+ <li><a href="{@docRoot}resources/articles/multitasking-android-way.html">Multitasking the Android Way</a></li>
+</ol>
+
<h2>See also</h2>
<ol>
<li><a><a href="{@docRoot}videos/index.html#v=fL6gSd4ugSI">Application Lifecycle video</a></li>