diff --git a/samples/ApiDemos/res/layout/drag_layout.xml b/samples/ApiDemos/res/layout/drag_layout.xml
index 0dd193d..4e509c4 100644
--- a/samples/ApiDemos/res/layout/drag_layout.xml
+++ b/samples/ApiDemos/res/layout/drag_layout.xml
@@ -62,18 +62,6 @@
         dot:anr="drop"
         />
 
-    <com.example.android.apis.view.DraggableDot
-        android:id="@+id/drag_dot_4"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        dot:radius="64dp"
-        android:padding="15dp"
-        android:layout_below="@id/drag_dot_1"
-        android:layout_toRightOf="@id/drag_dot_3"
-        dot:legend="Local"
-        dot:localOnly="true"
-        />
-
     <TextView android:id="@+id/drag_result_text"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
diff --git a/samples/ApiDemos/res/values/attrs.xml b/samples/ApiDemos/res/values/attrs.xml
index 4654d7e..e397e40 100644
--- a/samples/ApiDemos/res/values/attrs.xml
+++ b/samples/ApiDemos/res/values/attrs.xml
@@ -38,7 +38,6 @@
     <declare-styleable name="DraggableDot">
         <attr name="radius" format="dimension" />
         <attr name="legend" format="string" />
-        <attr name="localOnly" format="boolean" />
         <attr name="anr">
             <enum name="none" value="0" />
             <enum name="thumbnail" value="1" />
diff --git a/samples/ApiDemos/src/com/example/android/apis/view/DragAndDropDemo.java b/samples/ApiDemos/src/com/example/android/apis/view/DragAndDropDemo.java
index 7e8c076..f3a3521 100644
--- a/samples/ApiDemos/src/com/example/android/apis/view/DragAndDropDemo.java
+++ b/samples/ApiDemos/src/com/example/android/apis/view/DragAndDropDemo.java
@@ -39,8 +39,6 @@
         dot.setReportView(text);
         dot = (DraggableDot) findViewById(R.id.drag_dot_3);
         dot.setReportView(text);
-        dot = (DraggableDot) findViewById(R.id.drag_dot_4);
-        dot.setReportView(text);
 
         mResultText = (TextView) findViewById(R.id.drag_result_text);
         mResultText.setOnDragListener(new View.OnDragListener() {
diff --git a/samples/ApiDemos/src/com/example/android/apis/view/DraggableDot.java b/samples/ApiDemos/src/com/example/android/apis/view/DraggableDot.java
index 6d6e758..d1adca4 100644
--- a/samples/ApiDemos/src/com/example/android/apis/view/DraggableDot.java
+++ b/samples/ApiDemos/src/com/example/android/apis/view/DraggableDot.java
@@ -48,7 +48,6 @@
 
     int mRadius;
     int mAnrType;
-    boolean mLocalOnly;
     CharSequence mLegend;
 
     static final int ANR_NONE = 0;
@@ -123,21 +122,17 @@
             case R.styleable.DraggableDot_anr: {
                 mAnrType = a.getInt(attr, 0);
             } break;
-
-            case R.styleable.DraggableDot_localOnly: {
-                mLocalOnly = a.getBoolean(attr, false);
-            } break;
             }
         }
 
         Log.i(TAG, "DraggableDot @ " + this + " : radius=" + mRadius + " legend='" + mLegend
-                + "' anr=" + mAnrType + " local=" + mLocalOnly);
+                + "' anr=" + mAnrType);
 
         setOnLongClickListener(new View.OnLongClickListener() {
             public boolean onLongClick(View v) {
                 ClipData data = ClipData.newPlainText("dot", null, "Dot : " + v.toString());
                 v.startDrag(data, new ANRShadowBuilder(v, mAnrType == ANR_SHADOW),
-                        mLocalOnly, (Object)v);
+                        (Object)v, 0);
                 return true;
             }
         });
