From 94b6d06899ddb3f97cd0171bce5de1cb60602d01 Mon Sep 17 00:00:00 2001
From: Tom O'Neill <tomo@google.com>
Date: Wed, 9 Dec 2009 15:41:05 -0800
Subject: [PATCH] Extract and check in NotepadCodeLab.zip for change tracking

The 3-part Notepad tutorial is currently only available in the zip archive
frameworks/base/docs/html/guide/tutorials/notepad/codelab/NotepadCodeLab.zip.
This CL adds the uncompressed code to the repository so that there is a
paper trail of future changes to the code.
---
 .../Notepadv1/AndroidManifest.xml             |  11 +
 .../Notepadv1/res/drawable/icon.png           | Bin 0 -> 6094 bytes
 .../Notepadv1/res/layout/notepad_list.xml     |   6 +
 .../Notepadv1/res/values/strings.xml          |   5 +
 .../com/android/demo/notepad1/Notepadv1.java  |  44 ++++
 .../android/demo/notepad1/NotesDbAdapter.java | 188 ++++++++++++++++++
 .../Notepadv1Solution/AndroidManifest.xml     |  12 ++
 .../Notepadv1Solution/res/drawable/icon.png   | Bin 0 -> 6094 bytes
 .../res/layout/notepad_list.xml               |  14 ++
 .../res/layout/notes_row.xml                  |   5 +
 .../Notepadv1Solution/res/values/strings.xml  |   6 +
 .../com/android/demo/notepad1/Notepadv1.java  |  78 ++++++++
 .../android/demo/notepad1/NotesDbAdapter.java | 188 ++++++++++++++++++
 .../Notepadv2/AndroidManifest.xml             |  12 ++
 .../Notepadv2/res/drawable/icon.png           | Bin 0 -> 6094 bytes
 .../Notepadv2/res/layout/note_edit.xml        |  33 +++
 .../Notepadv2/res/layout/notes_list.xml       |  13 ++
 .../Notepadv2/res/layout/notes_row.xml        |   4 +
 .../Notepadv2/res/values/strings.xml          |  11 +
 .../com/android/demo/notepad2/Notepadv2.java  | 120 +++++++++++
 .../android/demo/notepad2/NotesDbAdapter.java | 188 ++++++++++++++++++
 .../Notepadv2Solution/AndroidManifest.xml     |  12 ++
 .../Notepadv2Solution/res/drawable/icon.png   | Bin 0 -> 6094 bytes
 .../res/layout/note_edit.xml                  |  33 +++
 .../res/layout/notes_list.xml                 |  13 ++
 .../res/layout/notes_row.xml                  |   4 +
 .../Notepadv2Solution/res/values/strings.xml  |  11 +
 .../com/android/demo/notepad2/NoteEdit.java   |  76 +++++++
 .../com/android/demo/notepad2/Notepadv2.java  | 147 ++++++++++++++
 .../android/demo/notepad2/NotesDbAdapter.java | 188 ++++++++++++++++++
 .../Notepadv3/AndroidManifest.xml             |  12 ++
 .../Notepadv3/res/drawable/icon.png           | Bin 0 -> 6094 bytes
 .../Notepadv3/res/layout/note_edit.xml        |  33 +++
 .../Notepadv3/res/layout/notes_list.xml       |  13 ++
 .../Notepadv3/res/layout/notes_row.xml        |   4 +
 .../Notepadv3/res/values/strings.xml          |  11 +
 .../com/android/demo/notepad3/NoteEdit.java   |  76 +++++++
 .../com/android/demo/notepad3/Notepadv3.java  | 148 ++++++++++++++
 .../android/demo/notepad3/NotesDbAdapter.java | 188 ++++++++++++++++++
 .../Notepadv3Solution/AndroidManifest.xml     |  12 ++
 .../Notepadv3Solution/res/drawable/icon.png   | Bin 0 -> 6094 bytes
 .../res/layout/note_edit.xml                  |  33 +++
 .../res/layout/notes_list.xml                 |  13 ++
 .../res/layout/notes_row.xml                  |   4 +
 .../Notepadv3Solution/res/values/strings.xml  |  11 +
 .../com/android/demo/notepad3/NoteEdit.java   | 109 ++++++++++
 .../com/android/demo/notepad3/Notepadv3.java  | 124 ++++++++++++
 .../android/demo/notepad3/NotesDbAdapter.java | 188 ++++++++++++++++++
 48 files changed, 2401 insertions(+)
 create mode 100755 tutorials/NotepadCodeLab/Notepadv1/AndroidManifest.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv1/res/drawable/icon.png
 create mode 100755 tutorials/NotepadCodeLab/Notepadv1/res/layout/notepad_list.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv1/res/values/strings.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv1/src/com/android/demo/notepad1/Notepadv1.java
 create mode 100755 tutorials/NotepadCodeLab/Notepadv1/src/com/android/demo/notepad1/NotesDbAdapter.java
 create mode 100755 tutorials/NotepadCodeLab/Notepadv1Solution/AndroidManifest.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv1Solution/res/drawable/icon.png
 create mode 100755 tutorials/NotepadCodeLab/Notepadv1Solution/res/layout/notepad_list.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv1Solution/res/layout/notes_row.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv1Solution/res/values/strings.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv1Solution/src/com/android/demo/notepad1/Notepadv1.java
 create mode 100755 tutorials/NotepadCodeLab/Notepadv1Solution/src/com/android/demo/notepad1/NotesDbAdapter.java
 create mode 100755 tutorials/NotepadCodeLab/Notepadv2/AndroidManifest.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv2/res/drawable/icon.png
 create mode 100755 tutorials/NotepadCodeLab/Notepadv2/res/layout/note_edit.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv2/res/layout/notes_list.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv2/res/layout/notes_row.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv2/res/values/strings.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv2/src/com/android/demo/notepad2/Notepadv2.java
 create mode 100755 tutorials/NotepadCodeLab/Notepadv2/src/com/android/demo/notepad2/NotesDbAdapter.java
 create mode 100755 tutorials/NotepadCodeLab/Notepadv2Solution/AndroidManifest.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv2Solution/res/drawable/icon.png
 create mode 100755 tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/note_edit.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/notes_list.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/notes_row.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv2Solution/res/values/strings.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv2Solution/src/com/android/demo/notepad2/NoteEdit.java
 create mode 100755 tutorials/NotepadCodeLab/Notepadv2Solution/src/com/android/demo/notepad2/Notepadv2.java
 create mode 100755 tutorials/NotepadCodeLab/Notepadv2Solution/src/com/android/demo/notepad2/NotesDbAdapter.java
 create mode 100755 tutorials/NotepadCodeLab/Notepadv3/AndroidManifest.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv3/res/drawable/icon.png
 create mode 100755 tutorials/NotepadCodeLab/Notepadv3/res/layout/note_edit.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv3/res/layout/notes_list.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv3/res/layout/notes_row.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv3/res/values/strings.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv3/src/com/android/demo/notepad3/NoteEdit.java
 create mode 100755 tutorials/NotepadCodeLab/Notepadv3/src/com/android/demo/notepad3/Notepadv3.java
 create mode 100755 tutorials/NotepadCodeLab/Notepadv3/src/com/android/demo/notepad3/NotesDbAdapter.java
 create mode 100755 tutorials/NotepadCodeLab/Notepadv3Solution/AndroidManifest.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv3Solution/res/drawable/icon.png
 create mode 100755 tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/note_edit.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/notes_list.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/notes_row.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv3Solution/res/values/strings.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv3Solution/src/com/android/demo/notepad3/NoteEdit.java
 create mode 100755 tutorials/NotepadCodeLab/Notepadv3Solution/src/com/android/demo/notepad3/Notepadv3.java
 create mode 100755 tutorials/NotepadCodeLab/Notepadv3Solution/src/com/android/demo/notepad3/NotesDbAdapter.java

diff --git a/tutorials/NotepadCodeLab/Notepadv1/AndroidManifest.xml b/tutorials/NotepadCodeLab/Notepadv1/AndroidManifest.xml
new file mode 100755
index 000000000..33f30da3c
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv1/AndroidManifest.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.demo.notepad1">
+    <application android:icon="@drawable/icon">
+        <activity android:name=".Notepadv1" android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest> 
\ No newline at end of file
diff --git a/tutorials/NotepadCodeLab/Notepadv1/res/drawable/icon.png b/tutorials/NotepadCodeLab/Notepadv1/res/drawable/icon.png
new file mode 100755
index 0000000000000000000000000000000000000000..64e3601c234d3818409fb5daad54b099b76e9a04
GIT binary patch
literal 6094
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
U$@ynO6#xJL07*qoM6N<$f@Zv%aR2}S

literal 0
HcmV?d00001

diff --git a/tutorials/NotepadCodeLab/Notepadv1/res/layout/notepad_list.xml b/tutorials/NotepadCodeLab/Notepadv1/res/layout/notepad_list.xml
new file mode 100755
index 000000000..154888dd3
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv1/res/layout/notepad_list.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+      android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+</LinearLayout>
\ No newline at end of file
diff --git a/tutorials/NotepadCodeLab/Notepadv1/res/values/strings.xml b/tutorials/NotepadCodeLab/Notepadv1/res/values/strings.xml
new file mode 100755
index 000000000..5698961a6
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv1/res/values/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Notepad v1</string>
+    <string name="no_notes">No Notes Yet</string>
+</resources>
diff --git a/tutorials/NotepadCodeLab/Notepadv1/src/com/android/demo/notepad1/Notepadv1.java b/tutorials/NotepadCodeLab/Notepadv1/src/com/android/demo/notepad1/Notepadv1.java
new file mode 100755
index 000000000..43e7a7733
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv1/src/com/android/demo/notepad1/Notepadv1.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.demo.notepad1;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+
+public class Notepadv1 extends Activity {
+	private int mNoteNumber = 1;
+    
+    /** Called when the activity is first created. */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // TODO Auto-generated method stub
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // TODO Auto-generated method stub
+        return super.onOptionsItemSelected(item);
+    }
+}
diff --git a/tutorials/NotepadCodeLab/Notepadv1/src/com/android/demo/notepad1/NotesDbAdapter.java b/tutorials/NotepadCodeLab/Notepadv1/src/com/android/demo/notepad1/NotesDbAdapter.java
new file mode 100755
index 000000000..6f85bbd20
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv1/src/com/android/demo/notepad1/NotesDbAdapter.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright (C) 2008 Google Inc.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.android.demo.notepad1;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.SQLException;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.util.Log;
+
+/**
+ * Simple notes database access helper class. Defines the basic CRUD operations
+ * for the notepad example, and gives the ability to list all notes as well as
+ * retrieve or modify a specific note.
+ * 
+ * This has been improved from the first version of this tutorial through the
+ * addition of better error handling and also using returning a Cursor instead
+ * of using a collection of inner classes (which is less scalable and not
+ * recommended).
+ */
+public class NotesDbAdapter {
+
+    public static final String KEY_TITLE = "title";
+    public static final String KEY_BODY = "body";
+    public static final String KEY_ROWID = "_id";
+
+    private static final String TAG = "NotesDbAdapter";
+    private DatabaseHelper mDbHelper;
+    private SQLiteDatabase mDb;
+    
+    /**
+     * Database creation sql statement
+     */
+    private static final String DATABASE_CREATE =
+            "create table notes (_id integer primary key autoincrement, "
+                    + "title text not null, body text not null);";
+
+    private static final String DATABASE_NAME = "data";
+    private static final String DATABASE_TABLE = "notes";
+    private static final int DATABASE_VERSION = 2;
+
+    private final Context mCtx;
+
+    private static class DatabaseHelper extends SQLiteOpenHelper {
+
+        DatabaseHelper(Context context) {
+            super(context, DATABASE_NAME, null, DATABASE_VERSION);
+        }
+
+        @Override
+        public void onCreate(SQLiteDatabase db) {
+
+            db.execSQL(DATABASE_CREATE);
+        }
+
+        @Override
+        public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+            Log.w(TAG, "Upgrading database from version " + oldVersion + " to "
+                    + newVersion + ", which will destroy all old data");
+            db.execSQL("DROP TABLE IF EXISTS notes");
+            onCreate(db);
+        }
+    }
+
+    /**
+     * Constructor - takes the context to allow the database to be
+     * opened/created
+     * 
+     * @param ctx the Context within which to work
+     */
+    public NotesDbAdapter(Context ctx) {
+        this.mCtx = ctx;
+    }
+
+    /**
+     * Open the notes database. If it cannot be opened, try to create a new
+     * instance of the database. If it cannot be created, throw an exception to
+     * signal the failure
+     * 
+     * @return this (self reference, allowing this to be chained in an
+     *         initialization call)
+     * @throws SQLException if the database could be neither opened or created
+     */
+    public NotesDbAdapter open() throws SQLException {
+        mDbHelper = new DatabaseHelper(mCtx);
+        mDb = mDbHelper.getWritableDatabase();
+        return this;
+    }
+    
+    public void close() {
+        mDbHelper.close();
+    }
+
+
+    /**
+     * Create a new note using the title and body provided. If the note is
+     * successfully created return the new rowId for that note, otherwise return
+     * a -1 to indicate failure.
+     * 
+     * @param title the title of the note
+     * @param body the body of the note
+     * @return rowId or -1 if failed
+     */
+    public long createNote(String title, String body) {
+        ContentValues initialValues = new ContentValues();
+        initialValues.put(KEY_TITLE, title);
+        initialValues.put(KEY_BODY, body);
+
+        return mDb.insert(DATABASE_TABLE, null, initialValues);
+    }
+
+    /**
+     * Delete the note with the given rowId
+     * 
+     * @param rowId id of note to delete
+     * @return true if deleted, false otherwise
+     */
+    public boolean deleteNote(long rowId) {
+
+        return mDb.delete(DATABASE_TABLE, KEY_ROWID + "=" + rowId, null) > 0;
+    }
+
+    /**
+     * Return a Cursor over the list of all notes in the database
+     * 
+     * @return Cursor over all notes
+     */
+    public Cursor fetchAllNotes() {
+
+        return mDb.query(DATABASE_TABLE, new String[] {KEY_ROWID, KEY_TITLE,
+                KEY_BODY}, null, null, null, null, null);
+    }
+
+    /**
+     * Return a Cursor positioned at the note that matches the given rowId
+     * 
+     * @param rowId id of note to retrieve
+     * @return Cursor positioned to matching note, if found
+     * @throws SQLException if note could not be found/retrieved
+     */
+    public Cursor fetchNote(long rowId) throws SQLException {
+
+        Cursor mCursor =
+
+                mDb.query(true, DATABASE_TABLE, new String[] {KEY_ROWID,
+                        KEY_TITLE, KEY_BODY}, KEY_ROWID + "=" + rowId, null,
+                        null, null, null, null);
+        if (mCursor != null) {
+            mCursor.moveToFirst();
+        }
+        return mCursor;
+
+    }
+
+    /**
+     * Update the note using the details provided. The note to be updated is
+     * specified using the rowId, and it is altered to use the title and body
+     * values passed in
+     * 
+     * @param rowId id of note to update
+     * @param title value to set note title to
+     * @param body value to set note body to
+     * @return true if the note was successfully updated, false otherwise
+     */
+    public boolean updateNote(long rowId, String title, String body) {
+        ContentValues args = new ContentValues();
+        args.put(KEY_TITLE, title);
+        args.put(KEY_BODY, body);
+
+        return mDb.update(DATABASE_TABLE, args, KEY_ROWID + "=" + rowId, null) > 0;
+    }
+}
diff --git a/tutorials/NotepadCodeLab/Notepadv1Solution/AndroidManifest.xml b/tutorials/NotepadCodeLab/Notepadv1Solution/AndroidManifest.xml
new file mode 100755
index 000000000..99023fe78
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv1Solution/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.demo.notepad1">
+    <application android:icon="@drawable/icon">
+        <activity android:name=".Notepadv1" android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest> 
\ No newline at end of file
diff --git a/tutorials/NotepadCodeLab/Notepadv1Solution/res/drawable/icon.png b/tutorials/NotepadCodeLab/Notepadv1Solution/res/drawable/icon.png
new file mode 100755
index 0000000000000000000000000000000000000000..64e3601c234d3818409fb5daad54b099b76e9a04
GIT binary patch
literal 6094
zcmV;<7cuCGP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00004XF*Lt007q5
z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU}U`a$lRCwCV
zTM3jE<(0lwuipN;-+N6jwA~;(G@?K&3L-fsW9B$wjLVpaior}!XJX=+L=@wgj2aV-
z95Z3`jBz=M#%vyU1vMiivNVkd?ucO9Y)wP&{rc^-&AtC$RqwBQ4;KcQ>2v;5_3G8D
z`tQBpz4yEK{~Juxgkv?{ed(Y4-fN$<{rsBUoA3Lb_xj#9?#ots#yd}6>OYoql;Ifu
zB^pm_M`6D%UaP8~@xx@(oGW*?-!s;}*8T3Icf}iLh4*h=d6jtYzRkaQIW}tI)yHy<
zM@<3mzkHqIy;fB>y|rfS{O3B`?`@*b9UJbDL$Sswk>mtYL>pb}Z2MVltaj>;BJr^h
zNt}4M{o8}@{QALU)9iDj$#JKbz3bU;H2%L+09w0a|Jx7WWPjeZ?k9>8j6<|$GSrNj
zzrX99M-tWbC*Ko@i~=PPg=lhOQ-8+`S0Nf+2v?ne*J2QgH8gf@T^T>H?f$P<*SB07
zu08>Rk(%?w_Z--A_ZzXAaW@^Uc`HZjK`3ZG7;Ctv=c8v@>!)6PS-86Sbe}&AG|<8%
z+@K`;!5^%`yCn!jYVf;L9+M>>$V!kd0VyZhbm}HqR$2m)1jw?F?q}BC{rd8{MB_=_
z@rG%>)WHwd{+}XX`(M5{!+Xsah)xMrkAXzf8Q)AD+_Ed)*m|QM5kQjpln4Z4jZ8qv
z=jSi>1%bZD-+?62G)z=T1j6y=mS9x_eji}>`NIiFee%>pwd3aXRMk%O`B9;!Y2?Ir
zfAqql>F@t}VdHUAK(uDcxBEI?HoHIg{ZE|-;e=(ha3DMiVxy)_iY6yr<U?40_Md4D
zV2Y3s5t1Z1*Zo0smzwcQqlsozWPl+BeJjsm$}8VddbZsDY)#{|4}y{EiAN%fM5*A5
z{_T6~*NaDu`|{(8KML95J)o=E^P)AAR)=CI2ts*|rdbl!G=!re9Cdz9N1$`f8uqyg
zdLa$DRM&=Lc3_u35V|@PjYEE<2dY}WFCDiSpyr3(217?k*MWjQt!stVKJw$kS=a=R
zB1Gjt1*M7i0Y7Jo!Mv>~5U#2_D;$lVCCenUhWaTU+aS2_t%vqu<bEwba^T0~=Puhf
zVcyN}W%{>U&=0XuE=XmV^P^!2C|chvzt8j_2ZzLBir;#S3Wiq1Thz_=n|8l?^|`X*
z|9&pjw`uA{&)j)b6hOjPH_TcRA3b}?(Ebe>ytFcs7;jBV`gGrR1n>%7$px$<7%rjR
zL;Njwl|V3BJ+STHAC+X^w`<4FfMPC%ZZUYnQHuec?Y|h)F!}twk;DWrQ0pcR$qITU
z1(+2qZh9<i9A4;3N5}Vd=KpLMbVSG-GzxfI0a1WM$NMmdn&_IT-o1M5oS!O3EenjF
zd(*yRu0LboOJz)BJ`8?b_)73LOIEal85<f!5BD&=M~&ZSAKC8=;b@Y{1e6%4euMD^
zninMxwUB{qs(0o8Dh6zS_4*kY)xV9o`Yj506VANlJ$(5}Q&(>RmY;2brOH;fCn$+Z
zFa%{7!e`S1dxHx}h>;A>{et_5zc=}H<Odj#RVs3R{Nd9VjY5}bR{X)s)j~Fy9_U^+
zXKB0oxm}>|;}^|Hav~Fe?jX{lgc3~C<$iBkmkhUXA_7eDD5N|G?xKH-@k4Y6ox6Yq
zf6(*nv#F!t2z>*GR>(skI}DmyM30bIkR0yaw|esVe^~g1f}oloyh{m0ZlzS`vNnr*
zrdN$_tJ^|LBK-A|5YD+JoMe<zorok!PzK#&SkIKK-$(+2tY=Z048;<7N=i{7Gk6H{
z>7h%HC<qSid)=(ApMeh*)12f6faLW{kI;wxEGWQ>1k=L>oa=-DjiW%f5TGGKbseFv
zJ18LGX%uoJFmRybiAm=@zW9jJpsr@l)3w}c*&#WSJK9Td7~ut<&ke!$_jbbiws*ki
zlYz*KjG>o~M0sU4fWei{`B4@=%ltE*8>j?b)1X)^LQS;{Up>2-a|6?j0+S6=N)bLy
zcozcRU-ca&(RgY{v}R(S3LE0~N}w9KeGNx|B)EYj3U5{rUWXT-d<Gu>(<`v)%^eU5
zg&-6RK_CzSe*h~&Br=L02f~$~D|n9A%Z~g$y2pq28ion^d=XM385mP9!Ow4QMFb!s
zRP=pJgANLGt^l=2@n8gWJQ6b0e5PZh|KR3XSN`RSG6c+6_=vWD+XD{-qxJWMs+&B)
zjx;M-aF+z(y@Ah!b+5h(-&?i<4)qR0BpQKubu|Q00YN5wfC=UImy|%l+Mk{8tos6_
zEPsG0jufJ!0&=-L&P{<xxM;<ja+1XmfG$Ayg`(A9Mq-HO0wH1|W{H0|tP3=^e)ktW
zAO5iwncp|b@<c3{z!f<=xKmhh2rggz16cKH8$_c~h{d94`7i{7K_&>Zvd;%Tg0w7i
zXj^b+!@4fhJ?JV79jJs5{yrGOXP_cbes)ixsNpjWPYSi6&oc&B0zVqM3c2(!r24wg
zId#cjcYSIMsBc+xS*mN@sY)<5iE4J9k0m$lb#zh^e%^x1;Da5VD0~dU;V@1xh(h?-
zy<|CpDH;W#YJfsRLD*^vsCe{iG&E}<jCGwiEb+a5i}zDZz(ScRhMr4`bnyo(P@1OU
z9{5tNSU_?#aPQ1TtJi#L5Zv|G<x04^>Gb&MneU<6CV|i3(uzuuBscLv;TL@Q3fTEc
z7gSYOIsQsN(=?q4%$c8E@5{`>K7^-_38PrCKw&Nsz(J@9N5T+`7MV{=c5p<-XXsX>
zH$CL3EC`l@A>Oa!dk?+&*g4Zq`_^kaTtV>N=dbc78fUdv)wQ%zY3sv)=MTjh-9;v4
z32ga2g=-giHeku(e}-3HYiCv`$g*fnX^2QFTAr+_qY}n8*TOg)mL_=gmrKy+N|BkH
zkjsP-_R(k<vPDFR5k}=!vv{DY8Vn7OKy54o%fCATb&Ej|T|z^IsfZvA2fdRk%FYHF
zQsf*WA<r^HF`G`M`VOv`drjM&%E=czrtWUL>kbTh&ruW7r-VJVyjfC$tNJtHrKg^T
zzpQ-&s;a7()kt^}R>PO%ayclfDqMZp*|6+i&WHMGC%RdoAu>F%cCg754%vj4pV|S>
zuN&k6EkxwTKqaV5NO#p}xOj!=0yJem&QC$bk`ju!v_Zl<E->!QTc7XTct<l<dHZ9d
zCb8Zemr)YZpX5%3#S|>NZ6y<)tnWk1vB_a&MuG=}3aowlHkdZ|B&)z7@}gOSizG-d
zFM}n!9xx!6&%;PM%`yq+0>CV7=z4icT?T()=o|&<!M?7OE`FxDtQs6Y|HobFzK@bx
zepp~<6((n$zr1QKkb6_a4_WXh<&fWpgMR4T{s;;`oePcy3bGd*cvQVZvvN7l=j@z>
zGdM~L1q@)>9ON<m(RmS{p}7!HVv?qi21RAixsD3RrBjcH!n+jE@wer2Ae^|B`Mu5L
z%Ai?#>4U#{jz#=PB*Jn$4^TK^oZ!Y6?*PnSoU)b)YMtAk+0ePrx+T0l7~C}^KLsW{
zJzK>hhptg@tOS44tgHlyy3Rh|f^EM$=R#K&=v;r>H5dSY*f8mwDS>bjNl3&JT;%?u
z|4WeV>4uLxyCD&eBh-1Fpjr`s@g?)2Zt9ql<!u2CP4Ig+Y+bd!Bo;!zEJs!+w^EBm
z7MNAdg8-o<_NGF+wxBE$ibkg@{u7?v`QoLJ9T|FQq`&uO1u5@>K&Wa;C{~9-B4VXI
zUC8&6FgRc~Y<ipdeJIT7Em2UKgNBp3{l-hU&uhZ4Azi8X5xc~;?@M+g6j&rDpQpe_
zLy|Gb5(0F?WqlLu1<!K-=ZzCY0P+V}rdVP^G4DSgv(Imp6VJSD@$U7v-Kyq?+oH*_
zO@sn_QNq!JX$f!g$#r%2I{cn;c#*7)C^>mrGx!^kK~k4i7kycG2fwm@py@_|2~H(Q
zY))ee;DZ#vgP=fxD@1<Nqi9kN^#<}-8)SwC9+-9cYuA^uz=AvX5)<y<{+p|O4K0t!
zvQH@dECsNKaRgAl<`g&JM1P9VW1DKY^=+XKo9;|E^vzP#w=M554PtUue&+~~Ed+qe
z1zZ%^69;SsV+!m|5A@HQedU^tvLM*``tn+zKX@Gxl=1}$y>yNNa`V=Y7%8D)S9Qef
zW=<dDNpT|N&BF`ta))w$Pnm_efTnUJPz+!SHY?<Q-LZJ7ufSaZ<3JtOB-fQ?f$ld~
z+*LbvPH!wZW*!lak^)2}XgrXih0i>FDyOh^CFkeW+Xp)jxUFq^dU>W<9=OW-eQt&D
zKA+~efri3s4i6{^Z+QK_f{RfpUR6_b<Bn&~*S0)5kF7c@`!@b08z0>g4p(6i^oL6A
zDQ^rghz84+JD3cLWOXWMiSm+59PCYdy0;Y?rDehkR=0m6tR%5wM%NuTpjv{{T@X;C
z^UBXC`M;9^1mqF8snmvO#D@jas<sDat(3>izde#V^x?NsJs);whxPywA(QppHD^7J
z_u{Qq6pp6R38ol|6;!9Q;svup=e}VmboIManG@MfcLPN-D|duF#f`xbU@1UV9Yq*+
zR<Q+lp}^aoH<^OeLLM^1gOKX)dnz+DIQPu&zI_7=g3V{%{x}{U-`{pyJlQy7Q^Z%_
z!mMo<eX@lB>JR7=oH6S}W_1Q3tHzH|^;Q*w`yP26Zuz%`jK{NKM|9~hD?O&zQ#8w#
z)>sT+2;jwzjL+0q$t=6!Z+N1=XF-NyLq0w7@YD-my5>_BMx?V5+AVAvhSh}?EYI7~
zDuf$iFkwuRMSoHX!HO7RHP!{Mtltg2JG)B?py8uoz0Dqy@O>qO2q@4U7bv*`BSH)T
z21A2kh_LspMgfOE@_?nAADT0&q5`_w?|d-cFzq>iu$l>P*d10om$SUCS~<Q5-&{BY
z8JfnBK&g;;0To8cWC9l7_&h)+$Axwc(><6nY$ZSiMR0Os=(<%_3+1lCg|}V6FiT1(
zWq?wQAq4~xrHQ)QzRkZrb*xJPyZ?6c%hBYRYiTzINInKBL(r_@D8W($PU5UHP6P!>
z2~kw?28spIXatgp1O!4cIQNR*!^dy!aVtO(2kmq)OW%oT5KzFffFYtlM1XD~z$$yq
z3Ja`4uqFNy!a2s0@jY$#pL{LjG+&>(#qU#sA=FxrR?IePYPO2yO&0ON1t-ad6$Q3{
z4E0rhXxnyxcYFOxsa-|n2<P_X>K)L%rx&J<jzY99VhIU?<-u)vJ2*;)#k@^u-?SIj
zZ|#9VkdrQYJ*C5jqz^9n`x7umTP#ttjAfKlY+5cWX0wpbq@j?_Y%gT9zb#~Qn@*g2
z{T^lZqE*zdddM2=ujifrd?=c1S_-t_$ovPPXi-$zSqGJ1!PygG<JK<N-kIfYz}R6B
zT|r{aO^OZcwhhASb+5pvxB?9|yrZM(+@Gn)$rp;O+M6*s3IB2Tc_mgT*;LqMLh07x
z2hD{AK@!w*4MR+Q-d!kEB%=Z_>Q6ZN^4B{*b75r1>TBypjhVd^SW8Q13ZTiztTMsJ
zp$2@63-ISJzveXf!QJa&U?jtSZ@0f==yVEoae_hS8r072I6!4Buk1+pT&@7=OqTWe
zxkJ)B?7R(5Wk-dNu5m_43ec^r0J`qDsw?_?w&Sptn_r=Z=!DN)9<Q#S+#QV8I4Ow5
z0i7>6=!WL_qEpicWw`I=c~DbjLMoMpEDB1KBaRSc!bjQKKr$JJ8Vr!5YLaZwc_I<V
z@2YqUJs5BkBg?-{lXsF;iwQF2shXnz7Xm77qM#~JhG=zc{JT%gf9g{e(6M&e8%i*S
zEGf%YSk*$7MP5e<x^BUj^KnzNnjIJqRxFzXE#m?(FgOe&Xwe+PnkG)njbcL(U4zyM
zsCyK)2Q8RbizcjvF7^nl2+u8SGUPCK!BN0bWTZ&15CBV-XO(0T?=A3^p+Goz$>#q$
zWobnhc=L&cjgdstM&r<~wX_cp17kj1U3Y#sR(lq$xJu3*9Uc$J73h6FovK6Bq+fzt
zuAc?lwspgUPj;XpfOU6S|6T%XwU!HGm_pHKRh;x>TWEF!t_0R-(J0%H^7E|hR`EPv
z@H2wM5FoNYA?ni-d3HGUXd##V1m7Q`fpx{`iV8UG%2mi-;9tcrcd!4+)L<lW78tTq
zQPIN<iU~A7JknP*Uj^%P%%IRZvlbp|t%bj>+Xt_1JOuCV8s;lO^h<}-@Bm2elFReB
zpsHf?q?FD`a9Rms+oNcaMJGmRVBqA97{ki|h5ZGD+I%K+_v|I@AAjN1;kTZ=OsO3^
z^J;tF4LCl=UqYW`QUD7|I5C-MG5VX#s05rnuK~`U-vCCg2s?MDV9Wb`&g4vi-PxI-
zu{OZ^`wri*1Ujp=4t}(>g)O6j6%Z*NG}niii*f(ApX=U(NWSk6`k%xLtzUS5z|Q~v
z!L#v(Nf-LCLZr1dPA4VD4eT}(MP;^LLfJv$3h?2%Y#p7PFL~<$qhx8_a0GXPnzQ<2
zdb&Nj<w}NguRZK;5Zf?i(O=B@Fwotz@U*4dR)1~;Y<c2>>G6ii7v|FgOn7|gW+fP|
z4uq>(I6<;Vk);em0ZUI3M+H{~SBh+1qshpU;lvVWG1G9fPPQ&+@B&9<cBWm_*p;7n
zG)n1@{63$~Jcs0`N%qNe7!v%xRfpTpr&Qh^lNlWD=~yu5isv>sh*)#eqe>v$BD0^A
zCd8Fsloa8h!gI8)+xL6Bw@yJL2ya&ECPAs_DfR!XhA71+bdPK*b<eDCwYS@I-|)*R
zUt06Cv4Ow)(ca<_?-ky)cDWf%j^=J)+KUh+S128AC0H(E2`(bWD~#C4bhopO3d>)m
zqr36J6+tV(Lp^<eIOWQ=D~{S$*{y$GbZ$-aH1;wzpJi^LU|y$=5MPlooggVeDOi>i
zVz_#9B2h6-v8ibYfy~n~x1T2nYr6!&o-8l>_=0ON61p6}{9Fq7TpJ~QivRm+J`L&q
z{rX_{u3rxK?5<LCBjrs_(VC)f>xQ#h%NV6@aeG}a3udO!)e(<inyzb3s~ZCz`TS5%
z?>w@6CY8dfU4>2ePrvY}As{!>zbT&?x?%2BFR<Men|`}+R5Vdrx%pt4Wu>TTmebRU
zR<7XhPU<W}gsa+XvV5M#6(qcxFAN{E{}<T&_}6CEj+yp$C{~R=m*Xzs4>&GSagXq4
z3SYUC<NZCOw*+}a4dr>N@zX=YF!ka!NA&*!NAw>fK7Zh=hK@9Is0W4)c0MuwOZQ5}
zT>1+LUtY2vPGIlvsYOoocIeQd$*I2nw<yoM*D{ZT0?_KsBYj<~`}Tbloq5S0**-kl
zvCV=R6-$T;wU9%;qLo7%JX_{J0~yrJQ1dzF*Q^1G&m?X?d&%aHXDnLZN+c&cl4hyy
zxc$dScBpsR+#9yIHXbvEhDs=8QW!G^@5N|*D4M8Q5eSCZcQkQ|;{3lnOegY7V)bVA
z_a%El8n3JQJZon76lF~`9vg4<|DCO?7Q>S$&mT7ge8nR?+c1*PbYup5VX%A8IVWHI
z<V|?KN-q|eMO8#ZcBuc+TzdE;vM9GK+pE)C#I$NMr10HbDD1<zkrcB$DTS_4CujOM
z)=U`g?R%OaFDk(Pt3+~+>pxDW2M%o>JkU91&Q-6lt!SrTy=Di+3EGpB8SLwt`n5lO
zXQc1Ya{5eGEM!KIupFE>(%-v+7A)AcYzC-r-+$mhZFYEwEo5LlzukVvDOYa%$Kjs7
zYp}u_Ia>2RqAc*a|DE>fi-wUo8Yf-+Owys$FJ5W}!XXsC+gYNfwYpF=>`V3cKXuBY
zwQOfMwXUgqix$7PbxHe8$7+tp^q;3`E1D=giytFHFQo_j!4{tWMh5yXNDmG|E|pqg
zUpwR4t$T-idauh24X-+ubA)60uj!S>x?jzlzTy7amw2ylynp7ej`v(>{Eq+w0J0*H
U$@ynO6#xJL07*qoM6N<$f@Zv%aR2}S

literal 0
HcmV?d00001

diff --git a/tutorials/NotepadCodeLab/Notepadv1Solution/res/layout/notepad_list.xml b/tutorials/NotepadCodeLab/Notepadv1Solution/res/layout/notepad_list.xml
new file mode 100755
index 000000000..0c8dbabee
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv1Solution/res/layout/notepad_list.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+      android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+	<ListView android:id="@id/android:list"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+  	<TextView android:id="@id/android:empty"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/no_notes"/>
+        
+</LinearLayout>
\ No newline at end of file
diff --git a/tutorials/NotepadCodeLab/Notepadv1Solution/res/layout/notes_row.xml b/tutorials/NotepadCodeLab/Notepadv1Solution/res/layout/notes_row.xml
new file mode 100755
index 000000000..6b1a65b05
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv1Solution/res/layout/notes_row.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView android:id="@+id/text1"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"/>
\ No newline at end of file
diff --git a/tutorials/NotepadCodeLab/Notepadv1Solution/res/values/strings.xml b/tutorials/NotepadCodeLab/Notepadv1Solution/res/values/strings.xml
new file mode 100755
index 000000000..265bc62e3
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv1Solution/res/values/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Notepad v1</string>
+    <string name="no_notes">No Notes Yet</string>
+    <string name="menu_insert">Add Item</string>
+</resources>
diff --git a/tutorials/NotepadCodeLab/Notepadv1Solution/src/com/android/demo/notepad1/Notepadv1.java b/tutorials/NotepadCodeLab/Notepadv1Solution/src/com/android/demo/notepad1/Notepadv1.java
new file mode 100755
index 000000000..a1819ed0f
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv1Solution/src/com/android/demo/notepad1/Notepadv1.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.demo.notepad1;
+
+import android.app.ListActivity;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.SimpleCursorAdapter;
+
+public class Notepadv1 extends ListActivity {
+	public static final int INSERT_ID = Menu.FIRST;
+	
+	private int mNoteNumber = 1;
+	private NotesDbAdapter mDbHelper;
+    
+    /** Called when the activity is first created. */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.notepad_list);
+        mDbHelper = new NotesDbAdapter(this);
+        mDbHelper.open();
+        fillData();
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+    	boolean result = super.onCreateOptionsMenu(menu);
+        menu.add(0, INSERT_ID, 0, R.string.menu_insert);
+        return result;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+    	switch (item.getItemId()) {
+        case INSERT_ID:
+            createNote();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+    
+    private void createNote() {
+        String noteName = "Note " + mNoteNumber++;
+        mDbHelper.createNote(noteName, "");
+        fillData();
+    }
+    
+    private void fillData() {
+        // Get all of the notes from the database and create the item list
+        Cursor c = mDbHelper.fetchAllNotes();
+        startManagingCursor(c);
+
+        String[] from = new String[] { NotesDbAdapter.KEY_TITLE };
+        int[] to = new int[] { R.id.text1 };
+        
+        // Now create an array adapter and set it to display using our row
+        SimpleCursorAdapter notes =
+            new SimpleCursorAdapter(this, R.layout.notes_row, c, from, to);
+        setListAdapter(notes);
+    }
+}
diff --git a/tutorials/NotepadCodeLab/Notepadv1Solution/src/com/android/demo/notepad1/NotesDbAdapter.java b/tutorials/NotepadCodeLab/Notepadv1Solution/src/com/android/demo/notepad1/NotesDbAdapter.java
new file mode 100755
index 000000000..6f85bbd20
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv1Solution/src/com/android/demo/notepad1/NotesDbAdapter.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright (C) 2008 Google Inc.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.android.demo.notepad1;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.SQLException;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.util.Log;
+
+/**
+ * Simple notes database access helper class. Defines the basic CRUD operations
+ * for the notepad example, and gives the ability to list all notes as well as
+ * retrieve or modify a specific note.
+ * 
+ * This has been improved from the first version of this tutorial through the
+ * addition of better error handling and also using returning a Cursor instead
+ * of using a collection of inner classes (which is less scalable and not
+ * recommended).
+ */
+public class NotesDbAdapter {
+
+    public static final String KEY_TITLE = "title";
+    public static final String KEY_BODY = "body";
+    public static final String KEY_ROWID = "_id";
+
+    private static final String TAG = "NotesDbAdapter";
+    private DatabaseHelper mDbHelper;
+    private SQLiteDatabase mDb;
+    
+    /**
+     * Database creation sql statement
+     */
+    private static final String DATABASE_CREATE =
+            "create table notes (_id integer primary key autoincrement, "
+                    + "title text not null, body text not null);";
+
+    private static final String DATABASE_NAME = "data";
+    private static final String DATABASE_TABLE = "notes";
+    private static final int DATABASE_VERSION = 2;
+
+    private final Context mCtx;
+
+    private static class DatabaseHelper extends SQLiteOpenHelper {
+
+        DatabaseHelper(Context context) {
+            super(context, DATABASE_NAME, null, DATABASE_VERSION);
+        }
+
+        @Override
+        public void onCreate(SQLiteDatabase db) {
+
+            db.execSQL(DATABASE_CREATE);
+        }
+
+        @Override
+        public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+            Log.w(TAG, "Upgrading database from version " + oldVersion + " to "
+                    + newVersion + ", which will destroy all old data");
+            db.execSQL("DROP TABLE IF EXISTS notes");
+            onCreate(db);
+        }
+    }
+
+    /**
+     * Constructor - takes the context to allow the database to be
+     * opened/created
+     * 
+     * @param ctx the Context within which to work
+     */
+    public NotesDbAdapter(Context ctx) {
+        this.mCtx = ctx;
+    }
+
+    /**
+     * Open the notes database. If it cannot be opened, try to create a new
+     * instance of the database. If it cannot be created, throw an exception to
+     * signal the failure
+     * 
+     * @return this (self reference, allowing this to be chained in an
+     *         initialization call)
+     * @throws SQLException if the database could be neither opened or created
+     */
+    public NotesDbAdapter open() throws SQLException {
+        mDbHelper = new DatabaseHelper(mCtx);
+        mDb = mDbHelper.getWritableDatabase();
+        return this;
+    }
+    
+    public void close() {
+        mDbHelper.close();
+    }
+
+
+    /**
+     * Create a new note using the title and body provided. If the note is
+     * successfully created return the new rowId for that note, otherwise return
+     * a -1 to indicate failure.
+     * 
+     * @param title the title of the note
+     * @param body the body of the note
+     * @return rowId or -1 if failed
+     */
+    public long createNote(String title, String body) {
+        ContentValues initialValues = new ContentValues();
+        initialValues.put(KEY_TITLE, title);
+        initialValues.put(KEY_BODY, body);
+
+        return mDb.insert(DATABASE_TABLE, null, initialValues);
+    }
+
+    /**
+     * Delete the note with the given rowId
+     * 
+     * @param rowId id of note to delete
+     * @return true if deleted, false otherwise
+     */
+    public boolean deleteNote(long rowId) {
+
+        return mDb.delete(DATABASE_TABLE, KEY_ROWID + "=" + rowId, null) > 0;
+    }
+
+    /**
+     * Return a Cursor over the list of all notes in the database
+     * 
+     * @return Cursor over all notes
+     */
+    public Cursor fetchAllNotes() {
+
+        return mDb.query(DATABASE_TABLE, new String[] {KEY_ROWID, KEY_TITLE,
+                KEY_BODY}, null, null, null, null, null);
+    }
+
+    /**
+     * Return a Cursor positioned at the note that matches the given rowId
+     * 
+     * @param rowId id of note to retrieve
+     * @return Cursor positioned to matching note, if found
+     * @throws SQLException if note could not be found/retrieved
+     */
+    public Cursor fetchNote(long rowId) throws SQLException {
+
+        Cursor mCursor =
+
+                mDb.query(true, DATABASE_TABLE, new String[] {KEY_ROWID,
+                        KEY_TITLE, KEY_BODY}, KEY_ROWID + "=" + rowId, null,
+                        null, null, null, null);
+        if (mCursor != null) {
+            mCursor.moveToFirst();
+        }
+        return mCursor;
+
+    }
+
+    /**
+     * Update the note using the details provided. The note to be updated is
+     * specified using the rowId, and it is altered to use the title and body
+     * values passed in
+     * 
+     * @param rowId id of note to update
+     * @param title value to set note title to
+     * @param body value to set note body to
+     * @return true if the note was successfully updated, false otherwise
+     */
+    public boolean updateNote(long rowId, String title, String body) {
+        ContentValues args = new ContentValues();
+        args.put(KEY_TITLE, title);
+        args.put(KEY_BODY, body);
+
+        return mDb.update(DATABASE_TABLE, args, KEY_ROWID + "=" + rowId, null) > 0;
+    }
+}
diff --git a/tutorials/NotepadCodeLab/Notepadv2/AndroidManifest.xml b/tutorials/NotepadCodeLab/Notepadv2/AndroidManifest.xml
new file mode 100755
index 000000000..738fb2afc
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv2/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.demo.notepad2">
+    <application android:icon="@drawable/icon">
+        <activity android:name=".Notepadv2" android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest> 
\ No newline at end of file
diff --git a/tutorials/NotepadCodeLab/Notepadv2/res/drawable/icon.png b/tutorials/NotepadCodeLab/Notepadv2/res/drawable/icon.png
new file mode 100755
index 0000000000000000000000000000000000000000..64e3601c234d3818409fb5daad54b099b76e9a04
GIT binary patch
literal 6094
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
U$@ynO6#xJL07*qoM6N<$f@Zv%aR2}S

literal 0
HcmV?d00001

diff --git a/tutorials/NotepadCodeLab/Notepadv2/res/layout/note_edit.xml b/tutorials/NotepadCodeLab/Notepadv2/res/layout/note_edit.xml
new file mode 100755
index 000000000..b254552c3
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv2/res/layout/note_edit.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical" android:layout_width="fill_parent"
+	android:layout_height="fill_parent">
+	
+	<LinearLayout android:orientation="horizontal"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content">
+
+		<TextView android:layout_width="wrap_content"
+			android:layout_height="wrap_content" 
+			android:text="@string/title" />
+		<EditText android:id="@+id/title" 
+		  android:layout_width="wrap_content"
+			android:layout_height="wrap_content" 
+			android:layout_weight="1"/>
+	</LinearLayout>
+
+	<TextView android:layout_width="wrap_content"
+		android:layout_height="wrap_content" 
+		android:text="@string/body" />
+	<EditText android:id="@+id/body" android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_weight="1"
+		android:scrollbars="vertical" />
+	
+	<Button android:id="@+id/confirm" 
+	  android:text="@string/confirm"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/tutorials/NotepadCodeLab/Notepadv2/res/layout/notes_list.xml b/tutorials/NotepadCodeLab/Notepadv2/res/layout/notes_list.xml
new file mode 100755
index 000000000..29ae88631
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv2/res/layout/notes_list.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+      android:layout_width="wrap_content"
+    	android:layout_height="wrap_content">
+    
+    <ListView android:id="@+id/android:list"
+          android:layout_width="wrap_content"
+        	android:layout_height="wrap_content"/>
+  	<TextView android:id="@+id/android:empty"
+          android:layout_width="wrap_content"
+        	android:layout_height="wrap_content"
+        	android:text="No Notes!"/>
+</LinearLayout>
diff --git a/tutorials/NotepadCodeLab/Notepadv2/res/layout/notes_row.xml b/tutorials/NotepadCodeLab/Notepadv2/res/layout/notes_row.xml
new file mode 100755
index 000000000..f28a41bea
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv2/res/layout/notes_row.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView android:id="@+id/text1" xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"/>
diff --git a/tutorials/NotepadCodeLab/Notepadv2/res/values/strings.xml b/tutorials/NotepadCodeLab/Notepadv2/res/values/strings.xml
new file mode 100755
index 000000000..b70c3f843
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv2/res/values/strings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Notepad v2</string>
+    <string name="no_notes">No Notes Yet</string>
+    <string name="menu_insert">Add Note</string>
+    <string name="menu_delete">Delete Note</string>
+    <string name="title">Title</string>
+    <string name="body">Body</string>
+    <string name="confirm">Confirm</string>
+    <string name="edit_note">Edit Note</string>
+</resources>
diff --git a/tutorials/NotepadCodeLab/Notepadv2/src/com/android/demo/notepad2/Notepadv2.java b/tutorials/NotepadCodeLab/Notepadv2/src/com/android/demo/notepad2/Notepadv2.java
new file mode 100755
index 000000000..abfc53864
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv2/src/com/android/demo/notepad2/Notepadv2.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.demo.notepad2;
+
+import android.app.ListActivity;
+import android.content.Intent;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.ListView;
+import android.widget.SimpleCursorAdapter;
+
+public class Notepadv2 extends ListActivity {
+    private static final int ACTIVITY_CREATE=0;
+    private static final int ACTIVITY_EDIT=1;
+    
+    private static final int INSERT_ID = Menu.FIRST;
+    private static final int DELETE_ID = Menu.FIRST + 1;
+
+    private NotesDbAdapter mDbHelper;
+    private Cursor mNotesCursor;
+    
+    /** Called when the activity is first created. */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.notes_list);
+        mDbHelper = new NotesDbAdapter(this);
+        mDbHelper.open();
+        fillData();
+    }
+    
+    private void fillData() {
+        // Get all of the rows from the database and create the item list
+        mNotesCursor = mDbHelper.fetchAllNotes();
+        startManagingCursor(mNotesCursor);
+        
+        // Create an array to specify the fields we want to display in the list (only TITLE)
+        String[] from = new String[]{NotesDbAdapter.KEY_TITLE};
+        
+        // and an array of the fields we want to bind those fields to (in this case just text1)
+        int[] to = new int[]{R.id.text1};
+        
+        // Now create a simple cursor adapter and set it to display
+        SimpleCursorAdapter notes = 
+        	    new SimpleCursorAdapter(this, R.layout.notes_row, mNotesCursor, from, to);
+        setListAdapter(notes);
+    }
+    
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        super.onCreateOptionsMenu(menu);
+        menu.add(0, INSERT_ID,0, R.string.menu_insert);
+        return true;
+    }
+
+    @Override
+    public boolean onMenuItemSelected(int featureId, MenuItem item) {
+        switch(item.getItemId()) {
+        case INSERT_ID:
+            createNote();
+            return true;
+        }
+        
+        return super.onMenuItemSelected(featureId, item);
+    }
+
+    @Override
+	public void onCreateContextMenu(ContextMenu menu, View v,
+			ContextMenuInfo menuInfo) {
+		super.onCreateContextMenu(menu, v, menuInfo);
+		
+        // TODO: fill in rest of method
+	}
+
+    @Override
+	public boolean onContextItemSelected(MenuItem item) {
+		return super.onContextItemSelected(item);
+		
+        // TODO: fill in rest of method
+	}
+
+    private void createNote() {
+        // TODO: fill in implementation
+
+    }
+    
+    @Override
+    protected void onListItemClick(ListView l, View v, int position, long id) {
+        super.onListItemClick(l, v, position, id);
+
+        // TODO: fill in rest of method
+        
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
+        super.onActivityResult(requestCode, resultCode, intent);
+        
+        // TODO: fill in rest of method
+        
+    }
+
+}
diff --git a/tutorials/NotepadCodeLab/Notepadv2/src/com/android/demo/notepad2/NotesDbAdapter.java b/tutorials/NotepadCodeLab/Notepadv2/src/com/android/demo/notepad2/NotesDbAdapter.java
new file mode 100755
index 000000000..5bf51b1e5
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv2/src/com/android/demo/notepad2/NotesDbAdapter.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright (C) 2008 Google Inc.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.android.demo.notepad2;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.SQLException;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.util.Log;
+
+/**
+ * Simple notes database access helper class. Defines the basic CRUD operations
+ * for the notepad example, and gives the ability to list all notes as well as
+ * retrieve or modify a specific note.
+ * 
+ * This has been improved from the first version of this tutorial through the
+ * addition of better error handling and also using returning a Cursor instead
+ * of using a collection of inner classes (which is less scalable and not
+ * recommended).
+ */
+public class NotesDbAdapter {
+
+    public static final String KEY_TITLE = "title";
+    public static final String KEY_BODY = "body";
+    public static final String KEY_ROWID = "_id";
+
+    private static final String TAG = "NotesDbAdapter";
+    private DatabaseHelper mDbHelper;
+    private SQLiteDatabase mDb;
+    
+    /**
+     * Database creation sql statement
+     */
+    private static final String DATABASE_CREATE =
+            "create table notes (_id integer primary key autoincrement, "
+                    + "title text not null, body text not null);";
+
+    private static final String DATABASE_NAME = "data";
+    private static final String DATABASE_TABLE = "notes";
+    private static final int DATABASE_VERSION = 2;
+
+    private final Context mCtx;
+
+    private static class DatabaseHelper extends SQLiteOpenHelper {
+
+        DatabaseHelper(Context context) {
+            super(context, DATABASE_NAME, null, DATABASE_VERSION);
+        }
+
+        @Override
+        public void onCreate(SQLiteDatabase db) {
+
+            db.execSQL(DATABASE_CREATE);
+        }
+
+        @Override
+        public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+            Log.w(TAG, "Upgrading database from version " + oldVersion + " to "
+                    + newVersion + ", which will destroy all old data");
+            db.execSQL("DROP TABLE IF EXISTS notes");
+            onCreate(db);
+        }
+    }
+
+    /**
+     * Constructor - takes the context to allow the database to be
+     * opened/created
+     * 
+     * @param ctx the Context within which to work
+     */
+    public NotesDbAdapter(Context ctx) {
+        this.mCtx = ctx;
+    }
+
+    /**
+     * Open the notes database. If it cannot be opened, try to create a new
+     * instance of the database. If it cannot be created, throw an exception to
+     * signal the failure
+     * 
+     * @return this (self reference, allowing this to be chained in an
+     *         initialization call)
+     * @throws SQLException if the database could be neither opened or created
+     */
+    public NotesDbAdapter open() throws SQLException {
+        mDbHelper = new DatabaseHelper(mCtx);
+        mDb = mDbHelper.getWritableDatabase();
+        return this;
+    }
+    
+    public void close() {
+        mDbHelper.close();
+    }
+
+
+    /**
+     * Create a new note using the title and body provided. If the note is
+     * successfully created return the new rowId for that note, otherwise return
+     * a -1 to indicate failure.
+     * 
+     * @param title the title of the note
+     * @param body the body of the note
+     * @return rowId or -1 if failed
+     */
+    public long createNote(String title, String body) {
+        ContentValues initialValues = new ContentValues();
+        initialValues.put(KEY_TITLE, title);
+        initialValues.put(KEY_BODY, body);
+
+        return mDb.insert(DATABASE_TABLE, null, initialValues);
+    }
+
+    /**
+     * Delete the note with the given rowId
+     * 
+     * @param rowId id of note to delete
+     * @return true if deleted, false otherwise
+     */
+    public boolean deleteNote(long rowId) {
+
+        return mDb.delete(DATABASE_TABLE, KEY_ROWID + "=" + rowId, null) > 0;
+    }
+
+    /**
+     * Return a Cursor over the list of all notes in the database
+     * 
+     * @return Cursor over all notes
+     */
+    public Cursor fetchAllNotes() {
+
+        return mDb.query(DATABASE_TABLE, new String[] {KEY_ROWID, KEY_TITLE,
+                KEY_BODY}, null, null, null, null, null);
+    }
+
+    /**
+     * Return a Cursor positioned at the note that matches the given rowId
+     * 
+     * @param rowId id of note to retrieve
+     * @return Cursor positioned to matching note, if found
+     * @throws SQLException if note could not be found/retrieved
+     */
+    public Cursor fetchNote(long rowId) throws SQLException {
+
+        Cursor mCursor =
+
+                mDb.query(true, DATABASE_TABLE, new String[] {KEY_ROWID,
+                        KEY_TITLE, KEY_BODY}, KEY_ROWID + "=" + rowId, null,
+                        null, null, null, null);
+        if (mCursor != null) {
+            mCursor.moveToFirst();
+        }
+        return mCursor;
+
+    }
+
+    /**
+     * Update the note using the details provided. The note to be updated is
+     * specified using the rowId, and it is altered to use the title and body
+     * values passed in
+     * 
+     * @param rowId id of note to update
+     * @param title value to set note title to
+     * @param body value to set note body to
+     * @return true if the note was successfully updated, false otherwise
+     */
+    public boolean updateNote(long rowId, String title, String body) {
+        ContentValues args = new ContentValues();
+        args.put(KEY_TITLE, title);
+        args.put(KEY_BODY, body);
+
+        return mDb.update(DATABASE_TABLE, args, KEY_ROWID + "=" + rowId, null) > 0;
+    }
+}
diff --git a/tutorials/NotepadCodeLab/Notepadv2Solution/AndroidManifest.xml b/tutorials/NotepadCodeLab/Notepadv2Solution/AndroidManifest.xml
new file mode 100755
index 000000000..dbfc9d0f7
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv2Solution/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.demo.notepad2">
+    <application android:icon="@drawable/icon">
+        <activity android:name=".Notepadv2" android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    	<activity android:name=".NoteEdit"></activity>
+    </application>
+</manifest> 
\ No newline at end of file
diff --git a/tutorials/NotepadCodeLab/Notepadv2Solution/res/drawable/icon.png b/tutorials/NotepadCodeLab/Notepadv2Solution/res/drawable/icon.png
new file mode 100755
index 0000000000000000000000000000000000000000..64e3601c234d3818409fb5daad54b099b76e9a04
GIT binary patch
literal 6094
zcmV;<7cuCGP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00004XF*Lt007q5
z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU}U`a$lRCwCV
zTM3jE<(0lwuipN;-+N6jwA~;(G@?K&3L-fsW9B$wjLVpaior}!XJX=+L=@wgj2aV-
z95Z3`jBz=M#%vyU1vMiivNVkd?ucO9Y)wP&{rc^-&AtC$RqwBQ4;KcQ>2v;5_3G8D
z`tQBpz4yEK{~Juxgkv?{ed(Y4-fN$<{rsBUoA3Lb_xj#9?#ots#yd}6>OYoql;Ifu
zB^pm_M`6D%UaP8~@xx@(oGW*?-!s;}*8T3Icf}iLh4*h=d6jtYzRkaQIW}tI)yHy<
zM@<3mzkHqIy;fB>y|rfS{O3B`?`@*b9UJbDL$Sswk>mtYL>pb}Z2MVltaj>;BJr^h
zNt}4M{o8}@{QALU)9iDj$#JKbz3bU;H2%L+09w0a|Jx7WWPjeZ?k9>8j6<|$GSrNj
zzrX99M-tWbC*Ko@i~=PPg=lhOQ-8+`S0Nf+2v?ne*J2QgH8gf@T^T>H?f$P<*SB07
zu08>Rk(%?w_Z--A_ZzXAaW@^Uc`HZjK`3ZG7;Ctv=c8v@>!)6PS-86Sbe}&AG|<8%
z+@K`;!5^%`yCn!jYVf;L9+M>>$V!kd0VyZhbm}HqR$2m)1jw?F?q}BC{rd8{MB_=_
z@rG%>)WHwd{+}XX`(M5{!+Xsah)xMrkAXzf8Q)AD+_Ed)*m|QM5kQjpln4Z4jZ8qv
z=jSi>1%bZD-+?62G)z=T1j6y=mS9x_eji}>`NIiFee%>pwd3aXRMk%O`B9;!Y2?Ir
zfAqql>F@t}VdHUAK(uDcxBEI?HoHIg{ZE|-;e=(ha3DMiVxy)_iY6yr<U?40_Md4D
zV2Y3s5t1Z1*Zo0smzwcQqlsozWPl+BeJjsm$}8VddbZsDY)#{|4}y{EiAN%fM5*A5
z{_T6~*NaDu`|{(8KML95J)o=E^P)AAR)=CI2ts*|rdbl!G=!re9Cdz9N1$`f8uqyg
zdLa$DRM&=Lc3_u35V|@PjYEE<2dY}WFCDiSpyr3(217?k*MWjQt!stVKJw$kS=a=R
zB1Gjt1*M7i0Y7Jo!Mv>~5U#2_D;$lVCCenUhWaTU+aS2_t%vqu<bEwba^T0~=Puhf
zVcyN}W%{>U&=0XuE=XmV^P^!2C|chvzt8j_2ZzLBir;#S3Wiq1Thz_=n|8l?^|`X*
z|9&pjw`uA{&)j)b6hOjPH_TcRA3b}?(Ebe>ytFcs7;jBV`gGrR1n>%7$px$<7%rjR
zL;Njwl|V3BJ+STHAC+X^w`<4FfMPC%ZZUYnQHuec?Y|h)F!}twk;DWrQ0pcR$qITU
z1(+2qZh9<i9A4;3N5}Vd=KpLMbVSG-GzxfI0a1WM$NMmdn&_IT-o1M5oS!O3EenjF
zd(*yRu0LboOJz)BJ`8?b_)73LOIEal85<f!5BD&=M~&ZSAKC8=;b@Y{1e6%4euMD^
zninMxwUB{qs(0o8Dh6zS_4*kY)xV9o`Yj506VANlJ$(5}Q&(>RmY;2brOH;fCn$+Z
zFa%{7!e`S1dxHx}h>;A>{et_5zc=}H<Odj#RVs3R{Nd9VjY5}bR{X)s)j~Fy9_U^+
zXKB0oxm}>|;}^|Hav~Fe?jX{lgc3~C<$iBkmkhUXA_7eDD5N|G?xKH-@k4Y6ox6Yq
zf6(*nv#F!t2z>*GR>(skI}DmyM30bIkR0yaw|esVe^~g1f}oloyh{m0ZlzS`vNnr*
zrdN$_tJ^|LBK-A|5YD+JoMe<zorok!PzK#&SkIKK-$(+2tY=Z048;<7N=i{7Gk6H{
z>7h%HC<qSid)=(ApMeh*)12f6faLW{kI;wxEGWQ>1k=L>oa=-DjiW%f5TGGKbseFv
zJ18LGX%uoJFmRybiAm=@zW9jJpsr@l)3w}c*&#WSJK9Td7~ut<&ke!$_jbbiws*ki
zlYz*KjG>o~M0sU4fWei{`B4@=%ltE*8>j?b)1X)^LQS;{Up>2-a|6?j0+S6=N)bLy
zcozcRU-ca&(RgY{v}R(S3LE0~N}w9KeGNx|B)EYj3U5{rUWXT-d<Gu>(<`v)%^eU5
zg&-6RK_CzSe*h~&Br=L02f~$~D|n9A%Z~g$y2pq28ion^d=XM385mP9!Ow4QMFb!s
zRP=pJgANLGt^l=2@n8gWJQ6b0e5PZh|KR3XSN`RSG6c+6_=vWD+XD{-qxJWMs+&B)
zjx;M-aF+z(y@Ah!b+5h(-&?i<4)qR0BpQKubu|Q00YN5wfC=UImy|%l+Mk{8tos6_
zEPsG0jufJ!0&=-L&P{<xxM;<ja+1XmfG$Ayg`(A9Mq-HO0wH1|W{H0|tP3=^e)ktW
zAO5iwncp|b@<c3{z!f<=xKmhh2rggz16cKH8$_c~h{d94`7i{7K_&>Zvd;%Tg0w7i
zXj^b+!@4fhJ?JV79jJs5{yrGOXP_cbes)ixsNpjWPYSi6&oc&B0zVqM3c2(!r24wg
zId#cjcYSIMsBc+xS*mN@sY)<5iE4J9k0m$lb#zh^e%^x1;Da5VD0~dU;V@1xh(h?-
zy<|CpDH;W#YJfsRLD*^vsCe{iG&E}<jCGwiEb+a5i}zDZz(ScRhMr4`bnyo(P@1OU
z9{5tNSU_?#aPQ1TtJi#L5Zv|G<x04^>Gb&MneU<6CV|i3(uzuuBscLv;TL@Q3fTEc
z7gSYOIsQsN(=?q4%$c8E@5{`>K7^-_38PrCKw&Nsz(J@9N5T+`7MV{=c5p<-XXsX>
zH$CL3EC`l@A>Oa!dk?+&*g4Zq`_^kaTtV>N=dbc78fUdv)wQ%zY3sv)=MTjh-9;v4
z32ga2g=-giHeku(e}-3HYiCv`$g*fnX^2QFTAr+_qY}n8*TOg)mL_=gmrKy+N|BkH
zkjsP-_R(k<vPDFR5k}=!vv{DY8Vn7OKy54o%fCATb&Ej|T|z^IsfZvA2fdRk%FYHF
zQsf*WA<r^HF`G`M`VOv`drjM&%E=czrtWUL>kbTh&ruW7r-VJVyjfC$tNJtHrKg^T
zzpQ-&s;a7()kt^}R>PO%ayclfDqMZp*|6+i&WHMGC%RdoAu>F%cCg754%vj4pV|S>
zuN&k6EkxwTKqaV5NO#p}xOj!=0yJem&QC$bk`ju!v_Zl<E->!QTc7XTct<l<dHZ9d
zCb8Zemr)YZpX5%3#S|>NZ6y<)tnWk1vB_a&MuG=}3aowlHkdZ|B&)z7@}gOSizG-d
zFM}n!9xx!6&%;PM%`yq+0>CV7=z4icT?T()=o|&<!M?7OE`FxDtQs6Y|HobFzK@bx
zepp~<6((n$zr1QKkb6_a4_WXh<&fWpgMR4T{s;;`oePcy3bGd*cvQVZvvN7l=j@z>
zGdM~L1q@)>9ON<m(RmS{p}7!HVv?qi21RAixsD3RrBjcH!n+jE@wer2Ae^|B`Mu5L
z%Ai?#>4U#{jz#=PB*Jn$4^TK^oZ!Y6?*PnSoU)b)YMtAk+0ePrx+T0l7~C}^KLsW{
zJzK>hhptg@tOS44tgHlyy3Rh|f^EM$=R#K&=v;r>H5dSY*f8mwDS>bjNl3&JT;%?u
z|4WeV>4uLxyCD&eBh-1Fpjr`s@g?)2Zt9ql<!u2CP4Ig+Y+bd!Bo;!zEJs!+w^EBm
z7MNAdg8-o<_NGF+wxBE$ibkg@{u7?v`QoLJ9T|FQq`&uO1u5@>K&Wa;C{~9-B4VXI
zUC8&6FgRc~Y<ipdeJIT7Em2UKgNBp3{l-hU&uhZ4Azi8X5xc~;?@M+g6j&rDpQpe_
zLy|Gb5(0F?WqlLu1<!K-=ZzCY0P+V}rdVP^G4DSgv(Imp6VJSD@$U7v-Kyq?+oH*_
zO@sn_QNq!JX$f!g$#r%2I{cn;c#*7)C^>mrGx!^kK~k4i7kycG2fwm@py@_|2~H(Q
zY))ee;DZ#vgP=fxD@1<Nqi9kN^#<}-8)SwC9+-9cYuA^uz=AvX5)<y<{+p|O4K0t!
zvQH@dECsNKaRgAl<`g&JM1P9VW1DKY^=+XKo9;|E^vzP#w=M554PtUue&+~~Ed+qe
z1zZ%^69;SsV+!m|5A@HQedU^tvLM*``tn+zKX@Gxl=1}$y>yNNa`V=Y7%8D)S9Qef
zW=<dDNpT|N&BF`ta))w$Pnm_efTnUJPz+!SHY?<Q-LZJ7ufSaZ<3JtOB-fQ?f$ld~
z+*LbvPH!wZW*!lak^)2}XgrXih0i>FDyOh^CFkeW+Xp)jxUFq^dU>W<9=OW-eQt&D
zKA+~efri3s4i6{^Z+QK_f{RfpUR6_b<Bn&~*S0)5kF7c@`!@b08z0>g4p(6i^oL6A
zDQ^rghz84+JD3cLWOXWMiSm+59PCYdy0;Y?rDehkR=0m6tR%5wM%NuTpjv{{T@X;C
z^UBXC`M;9^1mqF8snmvO#D@jas<sDat(3>izde#V^x?NsJs);whxPywA(QppHD^7J
z_u{Qq6pp6R38ol|6;!9Q;svup=e}VmboIManG@MfcLPN-D|duF#f`xbU@1UV9Yq*+
zR<Q+lp}^aoH<^OeLLM^1gOKX)dnz+DIQPu&zI_7=g3V{%{x}{U-`{pyJlQy7Q^Z%_
z!mMo<eX@lB>JR7=oH6S}W_1Q3tHzH|^;Q*w`yP26Zuz%`jK{NKM|9~hD?O&zQ#8w#
z)>sT+2;jwzjL+0q$t=6!Z+N1=XF-NyLq0w7@YD-my5>_BMx?V5+AVAvhSh}?EYI7~
zDuf$iFkwuRMSoHX!HO7RHP!{Mtltg2JG)B?py8uoz0Dqy@O>qO2q@4U7bv*`BSH)T
z21A2kh_LspMgfOE@_?nAADT0&q5`_w?|d-cFzq>iu$l>P*d10om$SUCS~<Q5-&{BY
z8JfnBK&g;;0To8cWC9l7_&h)+$Axwc(><6nY$ZSiMR0Os=(<%_3+1lCg|}V6FiT1(
zWq?wQAq4~xrHQ)QzRkZrb*xJPyZ?6c%hBYRYiTzINInKBL(r_@D8W($PU5UHP6P!>
z2~kw?28spIXatgp1O!4cIQNR*!^dy!aVtO(2kmq)OW%oT5KzFffFYtlM1XD~z$$yq
z3Ja`4uqFNy!a2s0@jY$#pL{LjG+&>(#qU#sA=FxrR?IePYPO2yO&0ON1t-ad6$Q3{
z4E0rhXxnyxcYFOxsa-|n2<P_X>K)L%rx&J<jzY99VhIU?<-u)vJ2*;)#k@^u-?SIj
zZ|#9VkdrQYJ*C5jqz^9n`x7umTP#ttjAfKlY+5cWX0wpbq@j?_Y%gT9zb#~Qn@*g2
z{T^lZqE*zdddM2=ujifrd?=c1S_-t_$ovPPXi-$zSqGJ1!PygG<JK<N-kIfYz}R6B
zT|r{aO^OZcwhhASb+5pvxB?9|yrZM(+@Gn)$rp;O+M6*s3IB2Tc_mgT*;LqMLh07x
z2hD{AK@!w*4MR+Q-d!kEB%=Z_>Q6ZN^4B{*b75r1>TBypjhVd^SW8Q13ZTiztTMsJ
zp$2@63-ISJzveXf!QJa&U?jtSZ@0f==yVEoae_hS8r072I6!4Buk1+pT&@7=OqTWe
zxkJ)B?7R(5Wk-dNu5m_43ec^r0J`qDsw?_?w&Sptn_r=Z=!DN)9<Q#S+#QV8I4Ow5
z0i7>6=!WL_qEpicWw`I=c~DbjLMoMpEDB1KBaRSc!bjQKKr$JJ8Vr!5YLaZwc_I<V
z@2YqUJs5BkBg?-{lXsF;iwQF2shXnz7Xm77qM#~JhG=zc{JT%gf9g{e(6M&e8%i*S
zEGf%YSk*$7MP5e<x^BUj^KnzNnjIJqRxFzXE#m?(FgOe&Xwe+PnkG)njbcL(U4zyM
zsCyK)2Q8RbizcjvF7^nl2+u8SGUPCK!BN0bWTZ&15CBV-XO(0T?=A3^p+Goz$>#q$
zWobnhc=L&cjgdstM&r<~wX_cp17kj1U3Y#sR(lq$xJu3*9Uc$J73h6FovK6Bq+fzt
zuAc?lwspgUPj;XpfOU6S|6T%XwU!HGm_pHKRh;x>TWEF!t_0R-(J0%H^7E|hR`EPv
z@H2wM5FoNYA?ni-d3HGUXd##V1m7Q`fpx{`iV8UG%2mi-;9tcrcd!4+)L<lW78tTq
zQPIN<iU~A7JknP*Uj^%P%%IRZvlbp|t%bj>+Xt_1JOuCV8s;lO^h<}-@Bm2elFReB
zpsHf?q?FD`a9Rms+oNcaMJGmRVBqA97{ki|h5ZGD+I%K+_v|I@AAjN1;kTZ=OsO3^
z^J;tF4LCl=UqYW`QUD7|I5C-MG5VX#s05rnuK~`U-vCCg2s?MDV9Wb`&g4vi-PxI-
zu{OZ^`wri*1Ujp=4t}(>g)O6j6%Z*NG}niii*f(ApX=U(NWSk6`k%xLtzUS5z|Q~v
z!L#v(Nf-LCLZr1dPA4VD4eT}(MP;^LLfJv$3h?2%Y#p7PFL~<$qhx8_a0GXPnzQ<2
zdb&Nj<w}NguRZK;5Zf?i(O=B@Fwotz@U*4dR)1~;Y<c2>>G6ii7v|FgOn7|gW+fP|
z4uq>(I6<;Vk);em0ZUI3M+H{~SBh+1qshpU;lvVWG1G9fPPQ&+@B&9<cBWm_*p;7n
zG)n1@{63$~Jcs0`N%qNe7!v%xRfpTpr&Qh^lNlWD=~yu5isv>sh*)#eqe>v$BD0^A
zCd8Fsloa8h!gI8)+xL6Bw@yJL2ya&ECPAs_DfR!XhA71+bdPK*b<eDCwYS@I-|)*R
zUt06Cv4Ow)(ca<_?-ky)cDWf%j^=J)+KUh+S128AC0H(E2`(bWD~#C4bhopO3d>)m
zqr36J6+tV(Lp^<eIOWQ=D~{S$*{y$GbZ$-aH1;wzpJi^LU|y$=5MPlooggVeDOi>i
zVz_#9B2h6-v8ibYfy~n~x1T2nYr6!&o-8l>_=0ON61p6}{9Fq7TpJ~QivRm+J`L&q
z{rX_{u3rxK?5<LCBjrs_(VC)f>xQ#h%NV6@aeG}a3udO!)e(<inyzb3s~ZCz`TS5%
z?>w@6CY8dfU4>2ePrvY}As{!>zbT&?x?%2BFR<Men|`}+R5Vdrx%pt4Wu>TTmebRU
zR<7XhPU<W}gsa+XvV5M#6(qcxFAN{E{}<T&_}6CEj+yp$C{~R=m*Xzs4>&GSagXq4
z3SYUC<NZCOw*+}a4dr>N@zX=YF!ka!NA&*!NAw>fK7Zh=hK@9Is0W4)c0MuwOZQ5}
zT>1+LUtY2vPGIlvsYOoocIeQd$*I2nw<yoM*D{ZT0?_KsBYj<~`}Tbloq5S0**-kl
zvCV=R6-$T;wU9%;qLo7%JX_{J0~yrJQ1dzF*Q^1G&m?X?d&%aHXDnLZN+c&cl4hyy
zxc$dScBpsR+#9yIHXbvEhDs=8QW!G^@5N|*D4M8Q5eSCZcQkQ|;{3lnOegY7V)bVA
z_a%El8n3JQJZon76lF~`9vg4<|DCO?7Q>S$&mT7ge8nR?+c1*PbYup5VX%A8IVWHI
z<V|?KN-q|eMO8#ZcBuc+TzdE;vM9GK+pE)C#I$NMr10HbDD1<zkrcB$DTS_4CujOM
z)=U`g?R%OaFDk(Pt3+~+>pxDW2M%o>JkU91&Q-6lt!SrTy=Di+3EGpB8SLwt`n5lO
zXQc1Ya{5eGEM!KIupFE>(%-v+7A)AcYzC-r-+$mhZFYEwEo5LlzukVvDOYa%$Kjs7
zYp}u_Ia>2RqAc*a|DE>fi-wUo8Yf-+Owys$FJ5W}!XXsC+gYNfwYpF=>`V3cKXuBY
zwQOfMwXUgqix$7PbxHe8$7+tp^q;3`E1D=giytFHFQo_j!4{tWMh5yXNDmG|E|pqg
zUpwR4t$T-idauh24X-+ubA)60uj!S>x?jzlzTy7amw2ylynp7ej`v(>{Eq+w0J0*H
U$@ynO6#xJL07*qoM6N<$f@Zv%aR2}S

literal 0
HcmV?d00001

diff --git a/tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/note_edit.xml b/tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/note_edit.xml
new file mode 100755
index 000000000..b254552c3
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/note_edit.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical" android:layout_width="fill_parent"
+	android:layout_height="fill_parent">
+	
+	<LinearLayout android:orientation="horizontal"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content">
+
+		<TextView android:layout_width="wrap_content"
+			android:layout_height="wrap_content" 
+			android:text="@string/title" />
+		<EditText android:id="@+id/title" 
+		  android:layout_width="wrap_content"
+			android:layout_height="wrap_content" 
+			android:layout_weight="1"/>
+	</LinearLayout>
+
+	<TextView android:layout_width="wrap_content"
+		android:layout_height="wrap_content" 
+		android:text="@string/body" />
+	<EditText android:id="@+id/body" android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_weight="1"
+		android:scrollbars="vertical" />
+	
+	<Button android:id="@+id/confirm" 
+	  android:text="@string/confirm"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/notes_list.xml b/tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/notes_list.xml
new file mode 100755
index 000000000..29ae88631
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/notes_list.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+      android:layout_width="wrap_content"
+    	android:layout_height="wrap_content">
+    
+    <ListView android:id="@+id/android:list"
+          android:layout_width="wrap_content"
+        	android:layout_height="wrap_content"/>
+  	<TextView android:id="@+id/android:empty"
+          android:layout_width="wrap_content"
+        	android:layout_height="wrap_content"
+        	android:text="No Notes!"/>
+</LinearLayout>
diff --git a/tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/notes_row.xml b/tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/notes_row.xml
new file mode 100755
index 000000000..f28a41bea
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/notes_row.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView android:id="@+id/text1" xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"/>
diff --git a/tutorials/NotepadCodeLab/Notepadv2Solution/res/values/strings.xml b/tutorials/NotepadCodeLab/Notepadv2Solution/res/values/strings.xml
new file mode 100755
index 000000000..b70c3f843
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv2Solution/res/values/strings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Notepad v2</string>
+    <string name="no_notes">No Notes Yet</string>
+    <string name="menu_insert">Add Note</string>
+    <string name="menu_delete">Delete Note</string>
+    <string name="title">Title</string>
+    <string name="body">Body</string>
+    <string name="confirm">Confirm</string>
+    <string name="edit_note">Edit Note</string>
+</resources>
diff --git a/tutorials/NotepadCodeLab/Notepadv2Solution/src/com/android/demo/notepad2/NoteEdit.java b/tutorials/NotepadCodeLab/Notepadv2Solution/src/com/android/demo/notepad2/NoteEdit.java
new file mode 100755
index 000000000..6c5e664b5
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv2Solution/src/com/android/demo/notepad2/NoteEdit.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.savedInstanceState
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.demo.notepad2;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+
+public class NoteEdit extends Activity {
+
+	private EditText mTitleText;
+    private EditText mBodyText;
+    private Long mRowId;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.note_edit);
+       
+        mTitleText = (EditText) findViewById(R.id.title);
+        mBodyText = (EditText) findViewById(R.id.body);
+      
+        Button confirmButton = (Button) findViewById(R.id.confirm);
+       
+        mRowId = null;
+        Bundle extras = getIntent().getExtras();
+        if (extras != null) {
+            String title = extras.getString(NotesDbAdapter.KEY_TITLE);
+            String body = extras.getString(NotesDbAdapter.KEY_BODY);
+            mRowId = extras.getLong(NotesDbAdapter.KEY_ROWID);
+          
+            if (title != null) {
+                mTitleText.setText(title);
+            }
+            if (body != null) {
+                mBodyText.setText(body);
+            }
+        }
+       
+        confirmButton.setOnClickListener(new View.OnClickListener() {
+
+            public void onClick(View view) {
+                Bundle bundle = new Bundle();
+               
+                bundle.putString(NotesDbAdapter.KEY_TITLE, mTitleText.getText().toString());
+                bundle.putString(NotesDbAdapter.KEY_BODY, mBodyText.getText().toString());
+                if (mRowId != null) {
+                    bundle.putLong(NotesDbAdapter.KEY_ROWID, mRowId);
+                }
+                
+                Intent mIntent = new Intent();
+                mIntent.putExtras(bundle);
+                setResult(RESULT_OK, mIntent);
+                finish();
+            }
+            
+        });
+    }
+}
diff --git a/tutorials/NotepadCodeLab/Notepadv2Solution/src/com/android/demo/notepad2/Notepadv2.java b/tutorials/NotepadCodeLab/Notepadv2Solution/src/com/android/demo/notepad2/Notepadv2.java
new file mode 100755
index 000000000..1b3398291
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv2Solution/src/com/android/demo/notepad2/Notepadv2.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright (C) 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.demo.notepad2;
+
+import android.app.ListActivity;
+import android.content.Intent;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.view.ContextMenu;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ContextMenu.ContextMenuInfo;
+import android.widget.ListView;
+import android.widget.SimpleCursorAdapter;
+import android.widget.AdapterView.AdapterContextMenuInfo;
+
+public class Notepadv2 extends ListActivity {
+    private static final int ACTIVITY_CREATE=0;
+    private static final int ACTIVITY_EDIT=1;
+    
+    private static final int INSERT_ID = Menu.FIRST;
+    private static final int DELETE_ID = Menu.FIRST + 1;
+
+    private NotesDbAdapter mDbHelper;
+    private Cursor mNotesCursor;
+    
+    /** Called when the activity is first created. */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.notes_list);
+        mDbHelper = new NotesDbAdapter(this);
+        mDbHelper.open();
+        fillData();
+        registerForContextMenu(getListView());
+    }
+    
+    private void fillData() {
+        // Get all of the rows from the database and create the item list
+        mNotesCursor = mDbHelper.fetchAllNotes();
+        startManagingCursor(mNotesCursor);
+        
+        // Create an array to specify the fields we want to display in the list (only TITLE)
+        String[] from = new String[]{NotesDbAdapter.KEY_TITLE};
+        
+        // and an array of the fields we want to bind those fields to (in this case just text1)
+        int[] to = new int[]{R.id.text1};
+        
+        // Now create a simple cursor adapter and set it to display
+        SimpleCursorAdapter notes = 
+        	    new SimpleCursorAdapter(this, R.layout.notes_row, mNotesCursor, from, to);
+        setListAdapter(notes);
+    }
+    
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        super.onCreateOptionsMenu(menu);
+        menu.add(0, INSERT_ID,0, R.string.menu_insert);
+        return true;
+    }
+    
+    @Override
+    public boolean onMenuItemSelected(int featureId, MenuItem item) {
+        switch(item.getItemId()) {
+        case INSERT_ID:
+            createNote();
+            return true;
+	    }        
+        return super.onMenuItemSelected(featureId, item);
+    }
+
+    @Override
+	public void onCreateContextMenu(ContextMenu menu, View v,
+			ContextMenuInfo menuInfo) {
+		super.onCreateContextMenu(menu, v, menuInfo);
+        menu.add(0, DELETE_ID, 0, R.string.menu_delete);
+	}
+
+    @Override
+	public boolean onContextItemSelected(MenuItem item) {
+		switch(item.getItemId()) {
+    	case DELETE_ID:
+    		AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();
+	        mDbHelper.deleteNote(info.id);
+	        fillData();
+	        return true;
+		}
+		return super.onContextItemSelected(item);
+	}
+
+	private void createNote() {
+    	Intent i = new Intent(this, NoteEdit.class);
+    	 startActivityForResult(i, ACTIVITY_CREATE);
+    }
+    
+    @Override
+    protected void onListItemClick(ListView l, View v, int position, long id) {
+    	super.onListItemClick(l, v, position, id);
+        Cursor c = mNotesCursor;
+        c.moveToPosition(position);
+        Intent i = new Intent(this, NoteEdit.class);
+        i.putExtra(NotesDbAdapter.KEY_ROWID, id);
+        i.putExtra(NotesDbAdapter.KEY_TITLE, c.getString(
+                c.getColumnIndexOrThrow(NotesDbAdapter.KEY_TITLE)));
+        i.putExtra(NotesDbAdapter.KEY_BODY, c.getString(
+                c.getColumnIndexOrThrow(NotesDbAdapter.KEY_BODY)));
+        startActivityForResult(i, ACTIVITY_EDIT);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
+        super.onActivityResult(requestCode, resultCode, intent);
+        Bundle extras = intent.getExtras();
+        switch(requestCode) {
+        case ACTIVITY_CREATE:
+            String title = extras.getString(NotesDbAdapter.KEY_TITLE);
+            String body = extras.getString(NotesDbAdapter.KEY_BODY);
+            mDbHelper.createNote(title, body);
+            fillData();
+            break;
+        case ACTIVITY_EDIT:
+            Long rowId = extras.getLong(NotesDbAdapter.KEY_ROWID);
+            if (rowId != null) {
+                String editTitle = extras.getString(NotesDbAdapter.KEY_TITLE);
+                String editBody = extras.getString(NotesDbAdapter.KEY_BODY);
+                mDbHelper.updateNote(rowId, editTitle, editBody);
+            }
+            fillData();
+            break;
+        }
+    }
+}
diff --git a/tutorials/NotepadCodeLab/Notepadv2Solution/src/com/android/demo/notepad2/NotesDbAdapter.java b/tutorials/NotepadCodeLab/Notepadv2Solution/src/com/android/demo/notepad2/NotesDbAdapter.java
new file mode 100755
index 000000000..5bf51b1e5
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv2Solution/src/com/android/demo/notepad2/NotesDbAdapter.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright (C) 2008 Google Inc.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.android.demo.notepad2;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.SQLException;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.util.Log;
+
+/**
+ * Simple notes database access helper class. Defines the basic CRUD operations
+ * for the notepad example, and gives the ability to list all notes as well as
+ * retrieve or modify a specific note.
+ * 
+ * This has been improved from the first version of this tutorial through the
+ * addition of better error handling and also using returning a Cursor instead
+ * of using a collection of inner classes (which is less scalable and not
+ * recommended).
+ */
+public class NotesDbAdapter {
+
+    public static final String KEY_TITLE = "title";
+    public static final String KEY_BODY = "body";
+    public static final String KEY_ROWID = "_id";
+
+    private static final String TAG = "NotesDbAdapter";
+    private DatabaseHelper mDbHelper;
+    private SQLiteDatabase mDb;
+    
+    /**
+     * Database creation sql statement
+     */
+    private static final String DATABASE_CREATE =
+            "create table notes (_id integer primary key autoincrement, "
+                    + "title text not null, body text not null);";
+
+    private static final String DATABASE_NAME = "data";
+    private static final String DATABASE_TABLE = "notes";
+    private static final int DATABASE_VERSION = 2;
+
+    private final Context mCtx;
+
+    private static class DatabaseHelper extends SQLiteOpenHelper {
+
+        DatabaseHelper(Context context) {
+            super(context, DATABASE_NAME, null, DATABASE_VERSION);
+        }
+
+        @Override
+        public void onCreate(SQLiteDatabase db) {
+
+            db.execSQL(DATABASE_CREATE);
+        }
+
+        @Override
+        public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+            Log.w(TAG, "Upgrading database from version " + oldVersion + " to "
+                    + newVersion + ", which will destroy all old data");
+            db.execSQL("DROP TABLE IF EXISTS notes");
+            onCreate(db);
+        }
+    }
+
+    /**
+     * Constructor - takes the context to allow the database to be
+     * opened/created
+     * 
+     * @param ctx the Context within which to work
+     */
+    public NotesDbAdapter(Context ctx) {
+        this.mCtx = ctx;
+    }
+
+    /**
+     * Open the notes database. If it cannot be opened, try to create a new
+     * instance of the database. If it cannot be created, throw an exception to
+     * signal the failure
+     * 
+     * @return this (self reference, allowing this to be chained in an
+     *         initialization call)
+     * @throws SQLException if the database could be neither opened or created
+     */
+    public NotesDbAdapter open() throws SQLException {
+        mDbHelper = new DatabaseHelper(mCtx);
+        mDb = mDbHelper.getWritableDatabase();
+        return this;
+    }
+    
+    public void close() {
+        mDbHelper.close();
+    }
+
+
+    /**
+     * Create a new note using the title and body provided. If the note is
+     * successfully created return the new rowId for that note, otherwise return
+     * a -1 to indicate failure.
+     * 
+     * @param title the title of the note
+     * @param body the body of the note
+     * @return rowId or -1 if failed
+     */
+    public long createNote(String title, String body) {
+        ContentValues initialValues = new ContentValues();
+        initialValues.put(KEY_TITLE, title);
+        initialValues.put(KEY_BODY, body);
+
+        return mDb.insert(DATABASE_TABLE, null, initialValues);
+    }
+
+    /**
+     * Delete the note with the given rowId
+     * 
+     * @param rowId id of note to delete
+     * @return true if deleted, false otherwise
+     */
+    public boolean deleteNote(long rowId) {
+
+        return mDb.delete(DATABASE_TABLE, KEY_ROWID + "=" + rowId, null) > 0;
+    }
+
+    /**
+     * Return a Cursor over the list of all notes in the database
+     * 
+     * @return Cursor over all notes
+     */
+    public Cursor fetchAllNotes() {
+
+        return mDb.query(DATABASE_TABLE, new String[] {KEY_ROWID, KEY_TITLE,
+                KEY_BODY}, null, null, null, null, null);
+    }
+
+    /**
+     * Return a Cursor positioned at the note that matches the given rowId
+     * 
+     * @param rowId id of note to retrieve
+     * @return Cursor positioned to matching note, if found
+     * @throws SQLException if note could not be found/retrieved
+     */
+    public Cursor fetchNote(long rowId) throws SQLException {
+
+        Cursor mCursor =
+
+                mDb.query(true, DATABASE_TABLE, new String[] {KEY_ROWID,
+                        KEY_TITLE, KEY_BODY}, KEY_ROWID + "=" + rowId, null,
+                        null, null, null, null);
+        if (mCursor != null) {
+            mCursor.moveToFirst();
+        }
+        return mCursor;
+
+    }
+
+    /**
+     * Update the note using the details provided. The note to be updated is
+     * specified using the rowId, and it is altered to use the title and body
+     * values passed in
+     * 
+     * @param rowId id of note to update
+     * @param title value to set note title to
+     * @param body value to set note body to
+     * @return true if the note was successfully updated, false otherwise
+     */
+    public boolean updateNote(long rowId, String title, String body) {
+        ContentValues args = new ContentValues();
+        args.put(KEY_TITLE, title);
+        args.put(KEY_BODY, body);
+
+        return mDb.update(DATABASE_TABLE, args, KEY_ROWID + "=" + rowId, null) > 0;
+    }
+}
diff --git a/tutorials/NotepadCodeLab/Notepadv3/AndroidManifest.xml b/tutorials/NotepadCodeLab/Notepadv3/AndroidManifest.xml
new file mode 100755
index 000000000..adb07ffdb
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv3/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.demo.notepad3">
+    <application android:icon="@drawable/icon">
+        <activity android:name=".Notepadv3" android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity android:name=".NoteEdit"/>
+    </application>
+</manifest> 
\ No newline at end of file
diff --git a/tutorials/NotepadCodeLab/Notepadv3/res/drawable/icon.png b/tutorials/NotepadCodeLab/Notepadv3/res/drawable/icon.png
new file mode 100755
index 0000000000000000000000000000000000000000..64e3601c234d3818409fb5daad54b099b76e9a04
GIT binary patch
literal 6094
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
U$@ynO6#xJL07*qoM6N<$f@Zv%aR2}S

literal 0
HcmV?d00001

diff --git a/tutorials/NotepadCodeLab/Notepadv3/res/layout/note_edit.xml b/tutorials/NotepadCodeLab/Notepadv3/res/layout/note_edit.xml
new file mode 100755
index 000000000..b254552c3
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv3/res/layout/note_edit.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical" android:layout_width="fill_parent"
+	android:layout_height="fill_parent">
+	
+	<LinearLayout android:orientation="horizontal"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content">
+
+		<TextView android:layout_width="wrap_content"
+			android:layout_height="wrap_content" 
+			android:text="@string/title" />
+		<EditText android:id="@+id/title" 
+		  android:layout_width="wrap_content"
+			android:layout_height="wrap_content" 
+			android:layout_weight="1"/>
+	</LinearLayout>
+
+	<TextView android:layout_width="wrap_content"
+		android:layout_height="wrap_content" 
+		android:text="@string/body" />
+	<EditText android:id="@+id/body" android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_weight="1"
+		android:scrollbars="vertical" />
+	
+	<Button android:id="@+id/confirm" 
+	  android:text="@string/confirm"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/tutorials/NotepadCodeLab/Notepadv3/res/layout/notes_list.xml b/tutorials/NotepadCodeLab/Notepadv3/res/layout/notes_list.xml
new file mode 100755
index 000000000..29ae88631
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv3/res/layout/notes_list.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+      android:layout_width="wrap_content"
+    	android:layout_height="wrap_content">
+    
+    <ListView android:id="@+id/android:list"
+          android:layout_width="wrap_content"
+        	android:layout_height="wrap_content"/>
+  	<TextView android:id="@+id/android:empty"
+          android:layout_width="wrap_content"
+        	android:layout_height="wrap_content"
+        	android:text="No Notes!"/>
+</LinearLayout>
diff --git a/tutorials/NotepadCodeLab/Notepadv3/res/layout/notes_row.xml b/tutorials/NotepadCodeLab/Notepadv3/res/layout/notes_row.xml
new file mode 100755
index 000000000..f28a41bea
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv3/res/layout/notes_row.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView android:id="@+id/text1" xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"/>
diff --git a/tutorials/NotepadCodeLab/Notepadv3/res/values/strings.xml b/tutorials/NotepadCodeLab/Notepadv3/res/values/strings.xml
new file mode 100755
index 000000000..ae63b837d
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv3/res/values/strings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Notepad v3</string>
+    <string name="no_notes">No Notes Yet</string>
+    <string name="menu_insert">Add Note</string>
+    <string name="menu_delete">Delete Note</string>
+    <string name="title">Title</string>
+    <string name="body">Body</string>
+    <string name="confirm">Confirm</string>
+    <string name="edit_note">Edit Note</string>
+</resources>
diff --git a/tutorials/NotepadCodeLab/Notepadv3/src/com/android/demo/notepad3/NoteEdit.java b/tutorials/NotepadCodeLab/Notepadv3/src/com/android/demo/notepad3/NoteEdit.java
new file mode 100755
index 000000000..af3a2340d
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv3/src/com/android/demo/notepad3/NoteEdit.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.demo.notepad3;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+
+public class NoteEdit extends Activity {
+
+	private EditText mTitleText;
+    private EditText mBodyText;
+    private Long mRowId;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.note_edit);
+       
+        mTitleText = (EditText) findViewById(R.id.title);
+        mBodyText = (EditText) findViewById(R.id.body);
+      
+        Button confirmButton = (Button) findViewById(R.id.confirm);
+       
+        mRowId = null;
+        Bundle extras = getIntent().getExtras();
+        if (extras != null) {
+            String title = extras.getString(NotesDbAdapter.KEY_TITLE);
+            String body = extras.getString(NotesDbAdapter.KEY_BODY);
+            mRowId = extras.getLong(NotesDbAdapter.KEY_ROWID);
+          
+            if (title != null) {
+                mTitleText.setText(title);
+            }
+            if (body != null) {
+                mBodyText.setText(body);
+            }
+        }
+       
+        confirmButton.setOnClickListener(new View.OnClickListener() {
+
+            public void onClick(View view) {
+                Bundle bundle = new Bundle();
+               
+                bundle.putString(NotesDbAdapter.KEY_TITLE, mTitleText.getText().toString());
+                bundle.putString(NotesDbAdapter.KEY_BODY, mBodyText.getText().toString());
+                if (mRowId != null) {
+                    bundle.putLong(NotesDbAdapter.KEY_ROWID, mRowId);
+                }
+               
+                Intent mIntent = new Intent();
+                mIntent.putExtras(bundle);
+                setResult(RESULT_OK, mIntent);
+                finish();
+            }
+          
+        });
+    }
+}
diff --git a/tutorials/NotepadCodeLab/Notepadv3/src/com/android/demo/notepad3/Notepadv3.java b/tutorials/NotepadCodeLab/Notepadv3/src/com/android/demo/notepad3/Notepadv3.java
new file mode 100755
index 000000000..f50f371d8
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv3/src/com/android/demo/notepad3/Notepadv3.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright (C) 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License")savedInstanceState;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.demo.notepad3;
+
+import android.app.ListActivity;
+import android.content.Intent;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.view.ContextMenu;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ContextMenu.ContextMenuInfo;
+import android.widget.ListView;
+import android.widget.SimpleCursorAdapter;
+import android.widget.AdapterView.AdapterContextMenuInfo;
+
+public class Notepadv3 extends ListActivity {
+    private static final int ACTIVITY_CREATE=0;
+    private static final int ACTIVITY_EDIT=1;
+    
+    private static final int INSERT_ID = Menu.FIRST;
+    private static final int DELETE_ID = Menu.FIRST + 1;
+
+    private NotesDbAdapter mDbHelper;
+    private Cursor mNotesCursor;
+    
+    /** Called when the activity is first created. */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.notes_list);
+        mDbHelper = new NotesDbAdapter(this);
+        mDbHelper.open();
+        fillData();
+        registerForContextMenu(getListView());
+    }
+    
+    private void fillData() {
+        // Get all of the rows from the database and create the item list
+        mNotesCursor = mDbHelper.fetchAllNotes();
+        startManagingCursor(mNotesCursor);
+        
+        // Create an array to specify the fields we want to display in the list (only TITLE)
+        String[] from = new String[]{NotesDbAdapter.KEY_TITLE};
+        
+        // and an array of the fields we want to bind those fields to (in this case just text1)
+        int[] to = new int[]{R.id.text1};
+        
+        // Now create a simple cursor adapter and set it to display
+        SimpleCursorAdapter notes = 
+        	    new SimpleCursorAdapter(this, R.layout.notes_row, mNotesCursor, from, to);
+        setListAdapter(notes);
+    }
+    
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        super.onCreateOptionsMenu(menu);
+        menu.add(0, INSERT_ID, 0, R.string.menu_insert);
+        return true;
+    }
+
+    @Override
+    public boolean onMenuItemSelected(int featureId, MenuItem item) {
+        switch(item.getItemId()) {
+        case INSERT_ID:
+            createNote();
+            return true;
+        }
+       
+        return super.onMenuItemSelected(featureId, item);
+    }
+	
+    @Override
+	public void onCreateContextMenu(ContextMenu menu, View v,
+			ContextMenuInfo menuInfo) {
+		super.onCreateContextMenu(menu, v, menuInfo);
+        menu.add(0, DELETE_ID, 0, R.string.menu_delete);
+	}
+
+    @Override
+	public boolean onContextItemSelected(MenuItem item) {
+		switch(item.getItemId()) {
+    	case DELETE_ID:
+    		AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();
+	        mDbHelper.deleteNote(info.id);
+	        fillData();
+	        return true;
+		}
+		return super.onContextItemSelected(item);
+	}
+	
+    private void createNote() {
+        Intent i = new Intent(this, NoteEdit.class);
+        startActivityForResult(i, ACTIVITY_CREATE);
+    }
+    
+    @Override
+    protected void onListItemClick(ListView l, View v, int position, long id) {
+        super.onListItemClick(l, v, position, id);
+        Cursor c = mNotesCursor;
+        c.moveToPosition(position);
+        Intent i = new Intent(this, NoteEdit.class);
+        i.putExtra(NotesDbAdapter.KEY_ROWID, id);
+        i.putExtra(NotesDbAdapter.KEY_TITLE, c.getString(
+        		c.getColumnIndexOrThrow(NotesDbAdapter.KEY_TITLE)));
+        i.putExtra(NotesDbAdapter.KEY_BODY, c.getString(
+        		c.getColumnIndexOrThrow(NotesDbAdapter.KEY_BODY)));
+        startActivityForResult(i, ACTIVITY_EDIT);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
+        super.onActivityResult(requestCode, resultCode, intent);
+        Bundle extras = intent.getExtras();
+        switch(requestCode) {
+        case ACTIVITY_CREATE:
+            String title = extras.getString(NotesDbAdapter.KEY_TITLE);
+            String body = extras.getString(NotesDbAdapter.KEY_BODY);
+            mDbHelper.createNote(title, body);
+            fillData();
+            break;
+        case ACTIVITY_EDIT:
+            Long rowId = extras.getLong(NotesDbAdapter.KEY_ROWID);
+            if (rowId != null) {
+                String editTitle = extras.getString(NotesDbAdapter.KEY_TITLE);
+                String editBody = extras.getString(NotesDbAdapter.KEY_BODY);
+                mDbHelper.updateNote(rowId, editTitle, editBody);
+            }
+            fillData();
+            break;
+        }
+    }
+}
diff --git a/tutorials/NotepadCodeLab/Notepadv3/src/com/android/demo/notepad3/NotesDbAdapter.java b/tutorials/NotepadCodeLab/Notepadv3/src/com/android/demo/notepad3/NotesDbAdapter.java
new file mode 100755
index 000000000..61ad04623
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv3/src/com/android/demo/notepad3/NotesDbAdapter.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright (C) 2008 Google Inc.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.android.demo.notepad3;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.SQLException;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.util.Log;
+
+/**
+ * Simple notes database access helper class. Defines the basic CRUD operations
+ * for the notepad example, and gives the ability to list all notes as well as
+ * retrieve or modify a specific note.
+ * 
+ * This has been improved from the first version of this tutorial through the
+ * addition of better error handling and also using returning a Cursor instead
+ * of using a collection of inner classes (which is less scalable and not
+ * recommended).
+ */
+public class NotesDbAdapter {
+
+    public static final String KEY_TITLE = "title";
+    public static final String KEY_BODY = "body";
+    public static final String KEY_ROWID = "_id";
+
+    private static final String TAG = "NotesDbAdapter";
+    private DatabaseHelper mDbHelper;
+    private SQLiteDatabase mDb;
+    
+    /**
+     * Database creation sql statement
+     */
+    private static final String DATABASE_CREATE =
+            "create table notes (_id integer primary key autoincrement, "
+                    + "title text not null, body text not null);";
+
+    private static final String DATABASE_NAME = "data";
+    private static final String DATABASE_TABLE = "notes";
+    private static final int DATABASE_VERSION = 2;
+
+    private final Context mCtx;
+
+    private static class DatabaseHelper extends SQLiteOpenHelper {
+
+        DatabaseHelper(Context context) {
+            super(context, DATABASE_NAME, null, DATABASE_VERSION);
+        }
+
+        @Override
+        public void onCreate(SQLiteDatabase db) {
+
+            db.execSQL(DATABASE_CREATE);
+        }
+
+        @Override
+        public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+            Log.w(TAG, "Upgrading database from version " + oldVersion + " to "
+                    + newVersion + ", which will destroy all old data");
+            db.execSQL("DROP TABLE IF EXISTS notes");
+            onCreate(db);
+        }
+    }
+
+    /**
+     * Constructor - takes the context to allow the database to be
+     * opened/created
+     * 
+     * @param ctx the Context within which to work
+     */
+    public NotesDbAdapter(Context ctx) {
+        this.mCtx = ctx;
+    }
+
+    /**
+     * Open the notes database. If it cannot be opened, try to create a new
+     * instance of the database. If it cannot be created, throw an exception to
+     * signal the failure
+     * 
+     * @return this (self reference, allowing this to be chained in an
+     *         initialization call)
+     * @throws SQLException if the database could be neither opened or created
+     */
+    public NotesDbAdapter open() throws SQLException {
+        mDbHelper = new DatabaseHelper(mCtx);
+        mDb = mDbHelper.getWritableDatabase();
+        return this;
+    }
+    
+    public void close() {
+        mDbHelper.close();
+    }
+
+
+    /**
+     * Create a new note using the title and body provided. If the note is
+     * successfully created return the new rowId for that note, otherwise return
+     * a -1 to indicate failure.
+     * 
+     * @param title the title of the note
+     * @param body the body of the note
+     * @return rowId or -1 if failed
+     */
+    public long createNote(String title, String body) {
+        ContentValues initialValues = new ContentValues();
+        initialValues.put(KEY_TITLE, title);
+        initialValues.put(KEY_BODY, body);
+
+        return mDb.insert(DATABASE_TABLE, null, initialValues);
+    }
+
+    /**
+     * Delete the note with the given rowId
+     * 
+     * @param rowId id of note to delete
+     * @return true if deleted, false otherwise
+     */
+    public boolean deleteNote(long rowId) {
+
+        return mDb.delete(DATABASE_TABLE, KEY_ROWID + "=" + rowId, null) > 0;
+    }
+
+    /**
+     * Return a Cursor over the list of all notes in the database
+     * 
+     * @return Cursor over all notes
+     */
+    public Cursor fetchAllNotes() {
+
+        return mDb.query(DATABASE_TABLE, new String[] {KEY_ROWID, KEY_TITLE,
+                KEY_BODY}, null, null, null, null, null);
+    }
+
+    /**
+     * Return a Cursor positioned at the note that matches the given rowId
+     * 
+     * @param rowId id of note to retrieve
+     * @return Cursor positioned to matching note, if found
+     * @throws SQLException if note could not be found/retrieved
+     */
+    public Cursor fetchNote(long rowId) throws SQLException {
+
+        Cursor mCursor =
+
+                mDb.query(true, DATABASE_TABLE, new String[] {KEY_ROWID,
+                        KEY_TITLE, KEY_BODY}, KEY_ROWID + "=" + rowId, null,
+                        null, null, null, null);
+        if (mCursor != null) {
+            mCursor.moveToFirst();
+        }
+        return mCursor;
+
+    }
+
+    /**
+     * Update the note using the details provided. The note to be updated is
+     * specified using the rowId, and it is altered to use the title and body
+     * values passed in
+     * 
+     * @param rowId id of note to update
+     * @param title value to set note title to
+     * @param body value to set note body to
+     * @return true if the note was successfully updated, false otherwise
+     */
+    public boolean updateNote(long rowId, String title, String body) {
+        ContentValues args = new ContentValues();
+        args.put(KEY_TITLE, title);
+        args.put(KEY_BODY, body);
+
+        return mDb.update(DATABASE_TABLE, args, KEY_ROWID + "=" + rowId, null) > 0;
+    }
+}
diff --git a/tutorials/NotepadCodeLab/Notepadv3Solution/AndroidManifest.xml b/tutorials/NotepadCodeLab/Notepadv3Solution/AndroidManifest.xml
new file mode 100755
index 000000000..adb07ffdb
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv3Solution/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.demo.notepad3">
+    <application android:icon="@drawable/icon">
+        <activity android:name=".Notepadv3" android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity android:name=".NoteEdit"/>
+    </application>
+</manifest> 
\ No newline at end of file
diff --git a/tutorials/NotepadCodeLab/Notepadv3Solution/res/drawable/icon.png b/tutorials/NotepadCodeLab/Notepadv3Solution/res/drawable/icon.png
new file mode 100755
index 0000000000000000000000000000000000000000..64e3601c234d3818409fb5daad54b099b76e9a04
GIT binary patch
literal 6094
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
U$@ynO6#xJL07*qoM6N<$f@Zv%aR2}S

literal 0
HcmV?d00001

diff --git a/tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/note_edit.xml b/tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/note_edit.xml
new file mode 100755
index 000000000..b254552c3
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/note_edit.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical" android:layout_width="fill_parent"
+	android:layout_height="fill_parent">
+	
+	<LinearLayout android:orientation="horizontal"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content">
+
+		<TextView android:layout_width="wrap_content"
+			android:layout_height="wrap_content" 
+			android:text="@string/title" />
+		<EditText android:id="@+id/title" 
+		  android:layout_width="wrap_content"
+			android:layout_height="wrap_content" 
+			android:layout_weight="1"/>
+	</LinearLayout>
+
+	<TextView android:layout_width="wrap_content"
+		android:layout_height="wrap_content" 
+		android:text="@string/body" />
+	<EditText android:id="@+id/body" android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_weight="1"
+		android:scrollbars="vertical" />
+	
+	<Button android:id="@+id/confirm" 
+	  android:text="@string/confirm"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/notes_list.xml b/tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/notes_list.xml
new file mode 100755
index 000000000..29ae88631
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/notes_list.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+      android:layout_width="wrap_content"
+    	android:layout_height="wrap_content">
+    
+    <ListView android:id="@+id/android:list"
+          android:layout_width="wrap_content"
+        	android:layout_height="wrap_content"/>
+  	<TextView android:id="@+id/android:empty"
+          android:layout_width="wrap_content"
+        	android:layout_height="wrap_content"
+        	android:text="No Notes!"/>
+</LinearLayout>
diff --git a/tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/notes_row.xml b/tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/notes_row.xml
new file mode 100755
index 000000000..f28a41bea
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/notes_row.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView android:id="@+id/text1" xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"/>
diff --git a/tutorials/NotepadCodeLab/Notepadv3Solution/res/values/strings.xml b/tutorials/NotepadCodeLab/Notepadv3Solution/res/values/strings.xml
new file mode 100755
index 000000000..ae63b837d
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv3Solution/res/values/strings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Notepad v3</string>
+    <string name="no_notes">No Notes Yet</string>
+    <string name="menu_insert">Add Note</string>
+    <string name="menu_delete">Delete Note</string>
+    <string name="title">Title</string>
+    <string name="body">Body</string>
+    <string name="confirm">Confirm</string>
+    <string name="edit_note">Edit Note</string>
+</resources>
diff --git a/tutorials/NotepadCodeLab/Notepadv3Solution/src/com/android/demo/notepad3/NoteEdit.java b/tutorials/NotepadCodeLab/Notepadv3Solution/src/com/android/demo/notepad3/NoteEdit.java
new file mode 100755
index 000000000..710ea339d
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv3Solution/src/com/android/demo/notepad3/NoteEdit.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.demo.notepad3;
+
+import android.app.Activity;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+
+public class NoteEdit extends Activity {
+
+	private EditText mTitleText;
+    private EditText mBodyText;
+    private Long mRowId;
+    private NotesDbAdapter mDbHelper;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mDbHelper = new NotesDbAdapter(this);
+        mDbHelper.open();
+        setContentView(R.layout.note_edit);
+        
+       
+        mTitleText = (EditText) findViewById(R.id.title);
+        mBodyText = (EditText) findViewById(R.id.body);
+      
+        Button confirmButton = (Button) findViewById(R.id.confirm);
+       
+        mRowId = savedInstanceState != null ? savedInstanceState.getLong(NotesDbAdapter.KEY_ROWID) 
+                							: null;
+		if (mRowId == null) {
+			Bundle extras = getIntent().getExtras();            
+			mRowId = extras != null ? extras.getLong(NotesDbAdapter.KEY_ROWID) 
+									: null;
+		}
+
+		populateFields();
+		
+        confirmButton.setOnClickListener(new View.OnClickListener() {
+
+        	public void onClick(View view) {
+        	    setResult(RESULT_OK);
+        	    finish();
+        	}
+          
+        });
+    }
+    
+    private void populateFields() {
+        if (mRowId != null) {
+            Cursor note = mDbHelper.fetchNote(mRowId);
+            startManagingCursor(note);
+            mTitleText.setText(note.getString(
+    	            note.getColumnIndexOrThrow(NotesDbAdapter.KEY_TITLE)));
+            mBodyText.setText(note.getString(
+                    note.getColumnIndexOrThrow(NotesDbAdapter.KEY_BODY)));
+        }
+    }
+    
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putLong(NotesDbAdapter.KEY_ROWID, mRowId);
+    }
+    
+    @Override
+    protected void onPause() {
+        super.onPause();
+        saveState();
+    }
+    
+    @Override
+    protected void onResume() {
+        super.onResume();
+        populateFields();
+    }
+    
+    private void saveState() {
+        String title = mTitleText.getText().toString();
+        String body = mBodyText.getText().toString();
+
+        if (mRowId == null) {
+            long id = mDbHelper.createNote(title, body);
+            if (id > 0) {
+                mRowId = id;
+            }
+        } else {
+            mDbHelper.updateNote(mRowId, title, body);
+        }
+    }
+    
+}
diff --git a/tutorials/NotepadCodeLab/Notepadv3Solution/src/com/android/demo/notepad3/Notepadv3.java b/tutorials/NotepadCodeLab/Notepadv3Solution/src/com/android/demo/notepad3/Notepadv3.java
new file mode 100755
index 000000000..7f9903750
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv3Solution/src/com/android/demo/notepad3/Notepadv3.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License")savedInstanceState;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.demo.notepad3;
+
+import android.app.ListActivity;
+import android.content.Intent;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.view.ContextMenu;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ContextMenu.ContextMenuInfo;
+import android.widget.ListView;
+import android.widget.SimpleCursorAdapter;
+import android.widget.AdapterView.AdapterContextMenuInfo;
+
+public class Notepadv3 extends ListActivity {
+    private static final int ACTIVITY_CREATE=0;
+    private static final int ACTIVITY_EDIT=1;
+    
+    private static final int INSERT_ID = Menu.FIRST;
+    private static final int DELETE_ID = Menu.FIRST + 1;
+
+    private NotesDbAdapter mDbHelper;
+    
+    /** Called when the activity is first created. */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.notes_list);
+        mDbHelper = new NotesDbAdapter(this);
+        mDbHelper.open();
+        fillData();
+        registerForContextMenu(getListView());
+    }
+    
+    private void fillData() {
+        Cursor notesCursor = mDbHelper.fetchAllNotes();
+        startManagingCursor(notesCursor);
+        
+        // Create an array to specify the fields we want to display in the list (only TITLE)
+        String[] from = new String[]{NotesDbAdapter.KEY_TITLE};
+        
+        // and an array of the fields we want to bind those fields to (in this case just text1)
+        int[] to = new int[]{R.id.text1};
+        
+        // Now create a simple cursor adapter and set it to display
+        SimpleCursorAdapter notes = 
+        	    new SimpleCursorAdapter(this, R.layout.notes_row, notesCursor, from, to);
+        setListAdapter(notes);
+    }
+    
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        super.onCreateOptionsMenu(menu);
+        menu.add(0, INSERT_ID, 0, R.string.menu_insert);
+        return true;
+    }
+
+    @Override
+    public boolean onMenuItemSelected(int featureId, MenuItem item) {
+        switch(item.getItemId()) {
+        case INSERT_ID:
+            createNote();
+            return true;
+        }
+       
+        return super.onMenuItemSelected(featureId, item);
+    }
+	
+    @Override
+	public void onCreateContextMenu(ContextMenu menu, View v,
+			ContextMenuInfo menuInfo) {
+		super.onCreateContextMenu(menu, v, menuInfo);
+        menu.add(0, DELETE_ID, 0, R.string.menu_delete);
+	}
+
+    @Override
+	public boolean onContextItemSelected(MenuItem item) {
+		switch(item.getItemId()) {
+    	case DELETE_ID:
+    		AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();
+	        mDbHelper.deleteNote(info.id);
+	        fillData();
+	        return true;
+		}
+		return super.onContextItemSelected(item);
+	}
+	
+    private void createNote() {
+        Intent i = new Intent(this, NoteEdit.class);
+        startActivityForResult(i, ACTIVITY_CREATE);
+    }
+    
+    @Override
+    protected void onListItemClick(ListView l, View v, int position, long id) {
+        super.onListItemClick(l, v, position, id);
+        Intent i = new Intent(this, NoteEdit.class);
+        i.putExtra(NotesDbAdapter.KEY_ROWID, id);
+        startActivityForResult(i, ACTIVITY_EDIT);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, 
+                                    Intent intent) {
+        super.onActivityResult(requestCode, resultCode, intent);
+        fillData();
+    }
+}
diff --git a/tutorials/NotepadCodeLab/Notepadv3Solution/src/com/android/demo/notepad3/NotesDbAdapter.java b/tutorials/NotepadCodeLab/Notepadv3Solution/src/com/android/demo/notepad3/NotesDbAdapter.java
new file mode 100755
index 000000000..61ad04623
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv3Solution/src/com/android/demo/notepad3/NotesDbAdapter.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright (C) 2008 Google Inc.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.android.demo.notepad3;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.SQLException;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.util.Log;
+
+/**
+ * Simple notes database access helper class. Defines the basic CRUD operations
+ * for the notepad example, and gives the ability to list all notes as well as
+ * retrieve or modify a specific note.
+ * 
+ * This has been improved from the first version of this tutorial through the
+ * addition of better error handling and also using returning a Cursor instead
+ * of using a collection of inner classes (which is less scalable and not
+ * recommended).
+ */
+public class NotesDbAdapter {
+
+    public static final String KEY_TITLE = "title";
+    public static final String KEY_BODY = "body";
+    public static final String KEY_ROWID = "_id";
+
+    private static final String TAG = "NotesDbAdapter";
+    private DatabaseHelper mDbHelper;
+    private SQLiteDatabase mDb;
+    
+    /**
+     * Database creation sql statement
+     */
+    private static final String DATABASE_CREATE =
+            "create table notes (_id integer primary key autoincrement, "
+                    + "title text not null, body text not null);";
+
+    private static final String DATABASE_NAME = "data";
+    private static final String DATABASE_TABLE = "notes";
+    private static final int DATABASE_VERSION = 2;
+
+    private final Context mCtx;
+
+    private static class DatabaseHelper extends SQLiteOpenHelper {
+
+        DatabaseHelper(Context context) {
+            super(context, DATABASE_NAME, null, DATABASE_VERSION);
+        }
+
+        @Override
+        public void onCreate(SQLiteDatabase db) {
+
+            db.execSQL(DATABASE_CREATE);
+        }
+
+        @Override
+        public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+            Log.w(TAG, "Upgrading database from version " + oldVersion + " to "
+                    + newVersion + ", which will destroy all old data");
+            db.execSQL("DROP TABLE IF EXISTS notes");
+            onCreate(db);
+        }
+    }
+
+    /**
+     * Constructor - takes the context to allow the database to be
+     * opened/created
+     * 
+     * @param ctx the Context within which to work
+     */
+    public NotesDbAdapter(Context ctx) {
+        this.mCtx = ctx;
+    }
+
+    /**
+     * Open the notes database. If it cannot be opened, try to create a new
+     * instance of the database. If it cannot be created, throw an exception to
+     * signal the failure
+     * 
+     * @return this (self reference, allowing this to be chained in an
+     *         initialization call)
+     * @throws SQLException if the database could be neither opened or created
+     */
+    public NotesDbAdapter open() throws SQLException {
+        mDbHelper = new DatabaseHelper(mCtx);
+        mDb = mDbHelper.getWritableDatabase();
+        return this;
+    }
+    
+    public void close() {
+        mDbHelper.close();
+    }
+
+
+    /**
+     * Create a new note using the title and body provided. If the note is
+     * successfully created return the new rowId for that note, otherwise return
+     * a -1 to indicate failure.
+     * 
+     * @param title the title of the note
+     * @param body the body of the note
+     * @return rowId or -1 if failed
+     */
+    public long createNote(String title, String body) {
+        ContentValues initialValues = new ContentValues();
+        initialValues.put(KEY_TITLE, title);
+        initialValues.put(KEY_BODY, body);
+
+        return mDb.insert(DATABASE_TABLE, null, initialValues);
+    }
+
+    /**
+     * Delete the note with the given rowId
+     * 
+     * @param rowId id of note to delete
+     * @return true if deleted, false otherwise
+     */
+    public boolean deleteNote(long rowId) {
+
+        return mDb.delete(DATABASE_TABLE, KEY_ROWID + "=" + rowId, null) > 0;
+    }
+
+    /**
+     * Return a Cursor over the list of all notes in the database
+     * 
+     * @return Cursor over all notes
+     */
+    public Cursor fetchAllNotes() {
+
+        return mDb.query(DATABASE_TABLE, new String[] {KEY_ROWID, KEY_TITLE,
+                KEY_BODY}, null, null, null, null, null);
+    }
+
+    /**
+     * Return a Cursor positioned at the note that matches the given rowId
+     * 
+     * @param rowId id of note to retrieve
+     * @return Cursor positioned to matching note, if found
+     * @throws SQLException if note could not be found/retrieved
+     */
+    public Cursor fetchNote(long rowId) throws SQLException {
+
+        Cursor mCursor =
+
+                mDb.query(true, DATABASE_TABLE, new String[] {KEY_ROWID,
+                        KEY_TITLE, KEY_BODY}, KEY_ROWID + "=" + rowId, null,
+                        null, null, null, null);
+        if (mCursor != null) {
+            mCursor.moveToFirst();
+        }
+        return mCursor;
+
+    }
+
+    /**
+     * Update the note using the details provided. The note to be updated is
+     * specified using the rowId, and it is altered to use the title and body
+     * values passed in
+     * 
+     * @param rowId id of note to update
+     * @param title value to set note title to
+     * @param body value to set note body to
+     * @return true if the note was successfully updated, false otherwise
+     */
+    public boolean updateNote(long rowId, String title, String body) {
+        ContentValues args = new ContentValues();
+        args.put(KEY_TITLE, title);
+        args.put(KEY_BODY, body);
+
+        return mDb.update(DATABASE_TABLE, args, KEY_ROWID + "=" + rowId, null) > 0;
+    }
+}