summaryrefslogtreecommitdiffstats
path: root/samples/NotePad
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-01-17 20:00:58 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-17 20:00:58 -0800
commit44af4c2b30cd8fbf0a09a3bb340c4ca4ef855aaa (patch)
tree6d510af118add1758f7b3f716ef6d24a93114ac3 /samples/NotePad
parent80ea3ea8e1ad5e9d5189a1136b380d162999e2a8 (diff)
parent0d11c9c34501a9a9dedee1092fd63af218dc28c8 (diff)
downloadandroid_development-44af4c2b30cd8fbf0a09a3bb340c4ca4ef855aaa.tar.gz
android_development-44af4c2b30cd8fbf0a09a3bb340c4ca4ef855aaa.tar.bz2
android_development-44af4c2b30cd8fbf0a09a3bb340c4ca4ef855aaa.zip
am 0d11c9c3: Follow API changes.
* commit '0d11c9c34501a9a9dedee1092fd63af218dc28c8': Follow API changes.
Diffstat (limited to 'samples/NotePad')
-rw-r--r--samples/NotePad/src/com/example/android/notepad/NoteEditor.java2
-rw-r--r--samples/NotePad/src/com/example/android/notepad/NotesList.java1
2 files changed, 1 insertions, 2 deletions
diff --git a/samples/NotePad/src/com/example/android/notepad/NoteEditor.java b/samples/NotePad/src/com/example/android/notepad/NoteEditor.java
index a3b8b38f9..59d6f1290 100644
--- a/samples/NotePad/src/com/example/android/notepad/NoteEditor.java
+++ b/samples/NotePad/src/com/example/android/notepad/NoteEditor.java
@@ -470,7 +470,7 @@ public class NoteEditor extends Activity {
String title=null;
// Gets the first item from the clipboard data
- ClipData.Item item = clip.getItem(0);
+ ClipData.Item item = clip.getItemAt(0);
// Tries to get the item's contents as a URI pointing to a note
Uri uri = item.getUri();
diff --git a/samples/NotePad/src/com/example/android/notepad/NotesList.java b/samples/NotePad/src/com/example/android/notepad/NotesList.java
index 8f0b2cb02..7e91f646c 100644
--- a/samples/NotePad/src/com/example/android/notepad/NotesList.java
+++ b/samples/NotePad/src/com/example/android/notepad/NotesList.java
@@ -406,7 +406,6 @@ public class NotesList extends ListActivity {
clipboard.setPrimaryClip(ClipData.newUri( // new clipboard item holding a URI
getContentResolver(), // resolver to retrieve URI info
"Note", // label for the clip
- null, // icon for the clip
noteUri) // the URI
);