diff --git a/samples/ApiDemos/AndroidManifest.xml b/samples/ApiDemos/AndroidManifest.xml
index 1e3f66be5..84af770ff 100644
--- a/samples/ApiDemos/AndroidManifest.xml
+++ b/samples/ApiDemos/AndroidManifest.xml
@@ -207,6 +207,15 @@
             </intent-filter>
         </activity>
 
+        <!-- Fragment Samples -->
+
+        <activity android:name=".app.SimpleFragment" android:label="@string/simple_fragment">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.SAMPLE_CODE" />
+            </intent-filter>
+        </activity>
+
         <!-- Intent Samples -->
 
         <activity android:name=".app.Intents" android:label="@string/activity_intents">
diff --git a/samples/ApiDemos/res/layout/simple_fragment.xml b/samples/ApiDemos/res/layout/simple_fragment.xml
new file mode 100644
index 000000000..d0fbb9f1c
--- /dev/null
+++ b/samples/ApiDemos/res/layout/simple_fragment.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 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.
+-->
+
+<!-- Top-level content view for the simple fragment sample. -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:padding="4dip"
+    android:gravity="center_horizontal"
+    android:layout_width="match_parent" android:layout_height="match_parent">
+
+    <FrameLayout
+            android:id="@+id/simple_fragment"
+            android:layout_width="match_parent"
+            android:layout_height="0px"
+            android:layout_weight="1" />
+            
+    <Button android:id="@+id/next"
+        android:layout_width="wrap_content" android:layout_height="wrap_content"
+        android:layout_weight="0" 
+        android:text="@string/next">
+        <requestFocus />
+    </Button>
+
+</LinearLayout>
diff --git a/samples/ApiDemos/res/values/strings.xml b/samples/ApiDemos/res/values/strings.xml
index 802fc805d..ce3bf7469 100644
--- a/samples/ApiDemos/res/values/strings.xml
+++ b/samples/ApiDemos/res/values/strings.xml
@@ -83,6 +83,9 @@
     <string name="redirect_getter">Enter the text that will be used by the main activity.  Press back to cancel.</string>
     <string name="apply">Apply</string>
 
+    <string name="simple_fragment">App/Fragment/Simple</string>
+    <string name="next">Next</string>
+
     <string name="activity_menu">App/Activity/Menu</string>
     <string name="open_menu">Open menu</string>
     <string name="close_menu">Close menu</string>
diff --git a/samples/ApiDemos/src/com/example/android/apis/app/SimpleFragment.java b/samples/ApiDemos/src/com/example/android/apis/app/SimpleFragment.java
new file mode 100644
index 000000000..d3fda7e2e
--- /dev/null
+++ b/samples/ApiDemos/src/com/example/android/apis/app/SimpleFragment.java
@@ -0,0 +1,78 @@
+/*
+ * 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.app;
+
+import com.example.android.apis.R;
+
+import android.app.Activity;
+import android.app.Fragment;
+import android.app.FragmentTransaction;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.TextView;
+
+public class SimpleFragment extends Activity {
+    int mWhichFragment;
+    Fragment mCurFragment;
+    
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.simple_fragment);
+        switchToFragment(0);
+        
+        // Watch for button clicks.
+        Button button = (Button)findViewById(R.id.next);
+        button.setOnClickListener(new OnClickListener() {
+            public void onClick(View v) {
+                switchToFragment(mWhichFragment == 0 ? 1 : 0);
+            }
+        });
+    }
+    
+    void switchToFragment(int which) {
+        mWhichFragment = which;
+        Fragment newFragment = which == 0
+                ? new FirstFragment() : new SecondFragment();
+        FragmentTransaction ft = openFragmentTransaction();
+        if (mCurFragment != null) {
+            ft.remove(mCurFragment);
+        }
+        ft.add(newFragment, R.id.simple_fragment);
+        mCurFragment = newFragment;
+        ft.commit();
+    }
+    
+    class FirstFragment extends Fragment {
+        public View onCreateView(LayoutInflater inflater, ViewGroup container) {
+            return inflater.inflate(R.layout.hello_world, container, false);
+        }
+    }
+    
+    class SecondFragment extends Fragment {
+        public View onCreateView(LayoutInflater inflater, ViewGroup container) {
+            View v = inflater.inflate(R.layout.hello_world, container, false);
+            View tv = v.findViewById(R.id.text);
+            ((TextView)tv).setText("Second Hello World!");
+            return v;
+        }
+    }
+}