summaryrefslogtreecommitdiffstats
path: root/docs/html
diff options
context:
space:
mode:
authorAndrew Solovay <asolovay@google.com>2014-07-22 18:47:26 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-22 18:47:26 +0000
commit3a14c2890e9821a36399b042261d75ee4dfdf71f (patch)
tree73e1ef5640eb9834aae3e0dc20f26e90239122d3 /docs/html
parent47495df6a6797704919af3ea4a695cf7b2c53f00 (diff)
parenta2beba70b947a948c2a12513c8bdda4d403c2fd6 (diff)
downloadframeworks_base-3a14c2890e9821a36399b042261d75ee4dfdf71f.zip
frameworks_base-3a14c2890e9821a36399b042261d75ee4dfdf71f.tar.gz
frameworks_base-3a14c2890e9821a36399b042261d75ee4dfdf71f.tar.bz2
am a2beba70: am 170556f8: Merge "docs: Removed reference to a sample notepad app." into klp-modular-docs
* commit 'a2beba70b947a948c2a12513c8bdda4d403c2fd6': docs: Removed reference to a sample notepad app.
Diffstat (limited to 'docs/html')
-rw-r--r--docs/html/training/notepad/index.jd24
1 files changed, 8 insertions, 16 deletions
diff --git a/docs/html/training/notepad/index.jd b/docs/html/training/notepad/index.jd
index d1aa221..507b232 100644
--- a/docs/html/training/notepad/index.jd
+++ b/docs/html/training/notepad/index.jd
@@ -17,13 +17,9 @@ the steps in each exercise to gradually build and refine your
application. The exercises explain each step in detail and provide all the
sample code you need to complete the application. </p>
-<p>When you are finished with the tutorial, you will have created a functioning
+<p><p>When you are finished with the tutorial, you will have created a functioning
Android application and will have learned many of the most important
-concepts in Android development. If you want to add more complex features to
-your application, you can examine the code in an alternative implementation
-of a Note Pad application, in the
-<a href="{@docRoot}resources/samples/index.html">Sample Code</a> section. </p>
-
+concepts in Android development.</p>
<a name="who"></a>
<h2>Who Should Use this Tutorial</h2>
@@ -122,17 +118,13 @@ highly recommended.</td>
<li>For a lighter but broader introduction to concepts not covered in the
tutorial,
take a look at <a href="{@docRoot}resources/faq/commontasks.html">Common Android Tasks</a>.</li>
-<li>The Android SDK includes a variety of fully functioning sample applications
-that make excellent opportunities for further learning. You can find the sample
-applications in the <code>samples/</code> directory of your downloaded SDK, or browser them
-here, in the <a href="{@docRoot}resources/samples/index.html">Sample Code</a> section.</li>
+
<li>This tutorial draws from the full Notepad application included in the
-<code>samples/</code> directory of the SDK, though it does not match it exactly.
-When you are done with the tutorial,
-it is highly recommended that you take a closer look at this version of the Notepad
-application,
-as it demonstrates a variety of interesting additions for your application,
-such as:</li>
+<code>samples/legacy/NotePad</code> directory of the SDK, though it does not
+match it exactly. When you are done with the tutorial, it is highly recommended
+that you take a closer look at this version of the Notepad application, as it
+demonstrates a variety of interesting additions for your application, such
+as:</li>
<ul>
<li>Setting up a custom striped list for the list of notes.</li>
<li>Creating a custom text edit view that overrides the <code>draw()</code>