summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2010-07-15 18:14:16 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-07-15 18:14:16 -0700
commitd59f1dea1746b316e556df5b4d2080f110aabd1c (patch)
treebb17d3b345712454bb7b757378b0e306d751696a /docs
parent80fa5c866eaf323c39bef4159a351950f0ea527a (diff)
parenta99839cad7fa6f071154c38d2d49ec48298b4c8f (diff)
downloadframeworks_base-d59f1dea1746b316e556df5b4d2080f110aabd1c.zip
frameworks_base-d59f1dea1746b316e556df5b4d2080f110aabd1c.tar.gz
frameworks_base-d59f1dea1746b316e556df5b4d2080f110aabd1c.tar.bz2
Merge "docs: update notepad tutorial to change EditNote activity title and update codelab zip" into froyo
Diffstat (limited to 'docs')
-rw-r--r--docs/html/resources/tutorials/notepad/codelab/NotepadCodeLab.zipbin88600 -> 93415 bytes
-rw-r--r--docs/html/resources/tutorials/notepad/notepad-ex2.jd6
2 files changed, 5 insertions, 1 deletions
diff --git a/docs/html/resources/tutorials/notepad/codelab/NotepadCodeLab.zip b/docs/html/resources/tutorials/notepad/codelab/NotepadCodeLab.zip
index 502a326..cd30f29 100644
--- a/docs/html/resources/tutorials/notepad/codelab/NotepadCodeLab.zip
+++ b/docs/html/resources/tutorials/notepad/codelab/NotepadCodeLab.zip
Binary files differ
diff --git a/docs/html/resources/tutorials/notepad/notepad-ex2.jd b/docs/html/resources/tutorials/notepad/notepad-ex2.jd
index a945a62..289b5fe 100644
--- a/docs/html/resources/tutorials/notepad/notepad-ex2.jd
+++ b/docs/html/resources/tutorials/notepad/notepad-ex2.jd
@@ -393,7 +393,11 @@ case ACTIVITY_EDIT:
<pre>setContentView(R.layout.note_edit);</pre>
</li>
<li>
- Find the edit and button components we need:
+ Change the Activity title to the "Edit Note" string:
+ <pre>setTitle(R.string.edit_note);</pre>
+ </li>
+ <li>
+ Find the {@link android.widget.EditText} and {@link android.widget.Button} components we need:
<p>These are found by the
IDs associated to them in the R class, and need to be cast to the right
type of <code>View</code> (<code>EditText</code> for the two text views,