diff --git a/samples/ApiDemos/AndroidManifest.xml b/samples/ApiDemos/AndroidManifest.xml
index d0d80eb01..6a2455325 100644
--- a/samples/ApiDemos/AndroidManifest.xml
+++ b/samples/ApiDemos/AndroidManifest.xml
@@ -1406,6 +1406,13 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".view.List17" android:label="Views/Lists/17. Activate items">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.SAMPLE_CODE" />
+            </intent-filter>
+        </activity>
+
         <activity android:name=".view.ExpandableList1" android:label="Views/Expandable Lists/1. Custom Adapter">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/samples/ApiDemos/src/com/example/android/apis/content/ClipboardSample.java b/samples/ApiDemos/src/com/example/android/apis/content/ClipboardSample.java
index e369ca9eb..6b840507f 100644
--- a/samples/ApiDemos/src/com/example/android/apis/content/ClipboardSample.java
+++ b/samples/ApiDemos/src/com/example/android/apis/content/ClipboardSample.java
@@ -118,7 +118,7 @@ public class ClipboardSample extends Activity {
 
     void updateClipData() {
         ClipData clip = mClipboard.getPrimaryClip();
-        String[] mimeTypes = clip != null ? clip.filterMimeTypes("*/*") : null;
+        String[] mimeTypes = clip != null ? clip.getDescription().filterMimeTypes("*/*") : null;
         mMimeTypes.setText("");
         if (mimeTypes != null) {
             for (int i=0; i<mimeTypes.length; i++) {
diff --git a/samples/ApiDemos/src/com/example/android/apis/view/List17.java b/samples/ApiDemos/src/com/example/android/apis/view/List17.java
new file mode 100644
index 000000000..67fa0bdee
--- /dev/null
+++ b/samples/ApiDemos/src/com/example/android/apis/view/List17.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * 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.example.android.apis.view;
+
+import android.app.ListActivity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+
+
+/**
+ * A list view where the last item the user clicked is placed in
+ * the "activated" state, causing its background to highlight.
+ */
+public class List17 extends ListActivity {
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        // Use the built-in layout for showing a list item with a single
+        // line of text whose background is changes when activated.
+        setListAdapter(new ArrayAdapter<String>(this,
+                android.R.layout.simple_list_item_activated_1, mStrings));
+        getListView().setTextFilterEnabled(true);
+        
+        // Tell the list view to show one checked/activated item at a time.
+        getListView().setChoiceMode(ListView.CHOICE_MODE_SINGLE);
+        
+        // Start with first item activated.
+        // Make the newly clicked item the currently selected one.
+        getListView().setItemChecked(0, true);
+    }
+
+    @Override
+    protected void onListItemClick(ListView l, View v, int position, long id) {
+        // Make the newly clicked item the currently selected one.
+        getListView().setItemChecked(position, true);
+    }
+
+    private String[] mStrings = Cheeses.sCheeseStrings;
+}