am d59f1dea: Merge "docs: update notepad tutorial to change EditNote activity title and update codelab zip" into froyo
Merge commit 'd59f1dea1746b316e556df5b4d2080f110aabd1c' into gingerbread
* commit 'd59f1dea1746b316e556df5b4d2080f110aabd1c':
docs: update notepad tutorial to change EditNote activity title and update codelab zip
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 @@
<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,
