summaryrefslogtreecommitdiffstats
path: root/docs/html/guide/topics
diff options
context:
space:
mode:
authorRoman Nurik <romannurik@google.com>2011-05-18 17:50:39 -0700
committerRoman Nurik <romannurik@google.com>2011-06-03 16:45:00 -0700
commite7d6007872af7f27b62bfb46aadf2b7a07c0eac0 (patch)
tree1a560c8d9968c914d18f1070c7c5e71358ccca7d /docs/html/guide/topics
parent185e3e243ee1da136bcace854026b8abaf0c4c86 (diff)
downloadframeworks_base-e7d6007872af7f27b62bfb46aadf2b7a07c0eac0.zip
frameworks_base-e7d6007872af7f27b62bfb46aadf2b7a07c0eac0.tar.gz
frameworks_base-e7d6007872af7f27b62bfb46aadf2b7a07c0eac0.tar.bz2
Add old blog posts as articles, batch 1
Change-Id: Ibe1bcf1ceef2eb1a1b4bc0c1b2451ed69838ee3a
Diffstat (limited to 'docs/html/guide/topics')
-rw-r--r--docs/html/guide/topics/fundamentals/services.jd7
-rw-r--r--docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd7
2 files changed, 13 insertions, 1 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 cfed742..95ee129 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>
@@ -566,4 +571,4 @@ activate other application components and publish the intents to which your comp
respond, continue with the <b><a
href="{@docRoot}guide/topics/intents/intents-filters.html">Intents and Intent
Filters</a></b> document.</p>
---> \ No newline at end of file
+-->