summaryrefslogtreecommitdiffstats
path: root/docs/html
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2011-02-08 14:05:54 -0800
committerScott Main <smain@google.com>2011-02-08 14:05:54 -0800
commitb70afd342b658d23518e0fa69aff9e45ec01e222 (patch)
tree73d904333b2c7f237b7127f6944d9037e40262df /docs/html
parentb508d6e26e3a1fd68bf637dc29df335f0e7ccd92 (diff)
downloadframeworks_base-b70afd342b658d23518e0fa69aff9e45ec01e222.zip
frameworks_base-b70afd342b658d23518e0fa69aff9e45ec01e222.tar.gz
frameworks_base-b70afd342b658d23518e0fa69aff9e45ec01e222.tar.bz2
docs: remove and correct parent links for fundamental docs
and hide the "beginner's path" because it's not complete Change-Id: I2f2a201a6571da6f660eb78f6ece94e47a5cddd1
Diffstat (limited to 'docs/html')
-rw-r--r--docs/html/guide/topics/fundamentals.jd6
-rw-r--r--docs/html/guide/topics/fundamentals/activities.jd5
-rw-r--r--docs/html/guide/topics/fundamentals/fragments.jd2
-rw-r--r--docs/html/guide/topics/fundamentals/processes-and-threads.jd5
-rw-r--r--docs/html/guide/topics/fundamentals/services.jd5
-rw-r--r--docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd7
6 files changed, 16 insertions, 14 deletions
diff --git a/docs/html/guide/topics/fundamentals.jd b/docs/html/guide/topics/fundamentals.jd
index f427a92..3fdbd95 100644
--- a/docs/html/guide/topics/fundamentals.jd
+++ b/docs/html/guide/topics/fundamentals.jd
@@ -89,11 +89,12 @@ application.</li>
gracefully optimize its behavior for a variety of device configurations.</li>
</ul>
+<!--
<p class="note"><strong>Tip:</strong> If you're new to Android development, we suggest that you
follow the Beginner's Path link at the bottom of this page. For each document in the Application
Fundamentals, the Beginner's Path points you to the document we suggest you read next, in order
to get up to speed on the core Android concepts.</p>
-
+-->
<h2 id="Components">Application Components</h2>
@@ -507,9 +508,10 @@ to create alternative resources for various device configurations, see the <a
href="{@docRoot}guide/topics/resources/index.html">Application Resources</a> developer guide.</p>
+<!--
<h2>Beginner's Path</h2>
<p>For a close look at implementing activities&mdash;the components your users use to
interact with your application&mdash;continue with the <b><a
href="{@docRoot}guide/topics/fundamentals/activities.html">Activities</a></b> document.</p>
-
+-->
diff --git a/docs/html/guide/topics/fundamentals/activities.jd b/docs/html/guide/topics/fundamentals/activities.jd
index b616ab8..9079ef6 100644
--- a/docs/html/guide/topics/fundamentals/activities.jd
+++ b/docs/html/guide/topics/fundamentals/activities.jd
@@ -1,6 +1,4 @@
page.title=Activities
-parent.title=Application Fundamentals
-parent.link=index.html
@jd:body
<div id="qv-wrapper">
@@ -753,10 +751,11 @@ first activity stops so that the following activity can read it, then you should
database during {@link android.app.Activity#onPause onPause()} instead of during {@link
android.app.Activity#onStop onStop()}.</p>
-
+<!--
<h2>Beginner's Path</h2>
<p>For more information about how Android maintains a history of activities and
enables user multitasking, continue with the <b><a
href="{@docRoot}guide/topics/fundamentals/tasks-and-back-stack.html">Tasks and Back
Stack</a></b> document.</p>
+--> \ No newline at end of file
diff --git a/docs/html/guide/topics/fundamentals/fragments.jd b/docs/html/guide/topics/fundamentals/fragments.jd
index 9eceef1..7ca990e 100644
--- a/docs/html/guide/topics/fundamentals/fragments.jd
+++ b/docs/html/guide/topics/fundamentals/fragments.jd
@@ -1,4 +1,6 @@
page.title=Fragments
+parent.title=Activities
+parent.link=activities.html
@jd:body
<div id="qv-wrapper">
diff --git a/docs/html/guide/topics/fundamentals/processes-and-threads.jd b/docs/html/guide/topics/fundamentals/processes-and-threads.jd
index c35108e..3d7710c 100644
--- a/docs/html/guide/topics/fundamentals/processes-and-threads.jd
+++ b/docs/html/guide/topics/fundamentals/processes-and-threads.jd
@@ -1,6 +1,4 @@
page.title=Processes and Threads
-parent.title=Application Fundamentals
-parent.link=index.html
@jd:body
<div id="qv-wrapper">
@@ -417,9 +415,10 @@ android.content.Context#bindService bindService()}. For more information, see th
href="{@docRoot}guide/topics/fundamentals/services.html">Services</a> developer guide.</p>
+<!--
<h2>Beginner's Path</h2>
<p>For information about how to perform work in the background for an indefinite period of time
(without a user interface), continue with the <b><a
href="{@docRoot}guide/topics/fundamentals/services.html">Services</a></b> document.</p>
-
+-->
diff --git a/docs/html/guide/topics/fundamentals/services.jd b/docs/html/guide/topics/fundamentals/services.jd
index df1eace..d0c924a 100644
--- a/docs/html/guide/topics/fundamentals/services.jd
+++ b/docs/html/guide/topics/fundamentals/services.jd
@@ -1,6 +1,4 @@
page.title=Services
-parent.title=Application Fundamentals
-parent.link=index.html
@jd:body
<div id="qv-wrapper">
@@ -851,10 +849,11 @@ href="{@docRoot}guide/topics/fundamentals/bound-services.html#Lifecycle">Managin
a Bound Service</a>.</p>
-
+<!--
<h2>Beginner's Path</h2>
<p>To learn how to query data from the system or other applications (such as contacts or media
stored on the device), continue with the <b><a
href="{@docRoot}guide/topics/providers/content-providers.html">Content Providers</a></b>
document.</p>
+-->
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 47dc547..bd542bd 100644
--- a/docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd
+++ b/docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd
@@ -1,6 +1,6 @@
page.title=Tasks and Back Stack
-parent.title=Application Fundamentals
-parent.link=index.html
+parent.title=Activities
+parent.link=activities.html
@jd:body
<div id="qv-wrapper">
@@ -558,7 +558,7 @@ href="#Clearing">Clearing the stack</a>).</p>
-
+<!--
<h2>Beginner's Path</h2>
<p>For more information about how to use intents to
@@ -566,3 +566,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