diff options
author | Scott Main <smain@google.com> | 2010-07-15 18:17:16 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-15 18:17:16 -0700 |
commit | 4cb8293bb3e611777cdc6c0a09410839c9dc161f (patch) | |
tree | 91fc46a5906357909697c5d8d2e1bcd3c064fb0c /docs | |
parent | b8f4a84ab9b4a2241b1ac7f2e3209131a73a108e (diff) | |
parent | d59f1dea1746b316e556df5b4d2080f110aabd1c (diff) | |
download | frameworks_base-4cb8293bb3e611777cdc6c0a09410839c9dc161f.zip frameworks_base-4cb8293bb3e611777cdc6c0a09410839c9dc161f.tar.gz frameworks_base-4cb8293bb3e611777cdc6c0a09410839c9dc161f.tar.bz2 |
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
Diffstat (limited to 'docs')
-rw-r--r-- | docs/html/resources/tutorials/notepad/codelab/NotepadCodeLab.zip | bin | 88600 -> 93415 bytes | |||
-rw-r--r-- | docs/html/resources/tutorials/notepad/notepad-ex2.jd | 6 |
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 Binary files differindex 502a326..cd30f29 100644 --- a/docs/html/resources/tutorials/notepad/codelab/NotepadCodeLab.zip +++ b/docs/html/resources/tutorials/notepad/codelab/NotepadCodeLab.zip 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, |