diff --git a/samples/ApiDemos/AndroidManifest.xml b/samples/ApiDemos/AndroidManifest.xml
index 84af770ff..bbeed2089 100644
--- a/samples/ApiDemos/AndroidManifest.xml
+++ b/samples/ApiDemos/AndroidManifest.xml
@@ -209,7 +209,14 @@
 
         <!-- Fragment Samples -->
 
-        <activity android:name=".app.SimpleFragment" android:label="@string/simple_fragment">
+        <activity android:name=".app.FragmentStack" 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>
+
+        <activity android:name=".app.FragmentLayout" android:label="@string/layout_fragment">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.SAMPLE_CODE" />
diff --git a/samples/ApiDemos/res/layout/fragment_layout.xml b/samples/ApiDemos/res/layout/fragment_layout.xml
new file mode 100644
index 000000000..99781777b
--- /dev/null
+++ b/samples/ApiDemos/res/layout/fragment_layout.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<!-- Top-level content view for the layout 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">
+
+    <fragment android:name="com.example.android.apis.app.FragmentLayout$FirstFragment"
+            android:id="@+id/fragment1"
+            android:layout_width="wrap_content" android:layout_height="wrap_content"
+            android:layout_weight="1" />
+    
+    <fragment android:name="com.example.android.apis.app.FragmentLayout$SecondFragment"
+            android:id="@+id/fragment2"
+            android:layout_width="wrap_content" android:layout_height="wrap_content"
+            android:layout_weight="1" />
+    
+</LinearLayout>
diff --git a/samples/ApiDemos/res/layout/simple_fragment.xml b/samples/ApiDemos/res/layout/fragment_stack.xml
similarity index 96%
rename from samples/ApiDemos/res/layout/simple_fragment.xml
rename to samples/ApiDemos/res/layout/fragment_stack.xml
index d0fbb9f1c..6e3a49f50 100644
--- a/samples/ApiDemos/res/layout/simple_fragment.xml
+++ b/samples/ApiDemos/res/layout/fragment_stack.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!-- 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.
diff --git a/samples/ApiDemos/res/values/strings.xml b/samples/ApiDemos/res/values/strings.xml
index ce3bf7469..615d5cb3d 100644
--- a/samples/ApiDemos/res/values/strings.xml
+++ b/samples/ApiDemos/res/values/strings.xml
@@ -83,9 +83,11 @@
     <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="simple_fragment">App/Fragment/Stack</string>
     <string name="next">Next</string>
 
+    <string name="layout_fragment">App/Fragment/Layout</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/FragmentLayout.java b/samples/ApiDemos/src/com/example/android/apis/app/FragmentLayout.java
new file mode 100644
index 000000000..0b7446d42
--- /dev/null
+++ b/samples/ApiDemos/src/com/example/android/apis/app/FragmentLayout.java
@@ -0,0 +1,66 @@
+/*
+ * 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 FragmentLayout extends Activity {
+    View mFirstFragmentView;
+    View mSecondFragmentView;
+    
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.fragment_layout);
+        mFirstFragmentView = findViewById(R.id.fragment1);
+        mSecondFragmentView = findViewById(R.id.fragment2);
+    }
+    
+    static class FirstFragment extends Fragment {
+        // Explicit constructor needed for inflation.
+        public FirstFragment() {
+        }
+        
+        public View onCreateView(LayoutInflater inflater, ViewGroup container) {
+            return inflater.inflate(R.layout.hello_world, container, false);
+        }
+    }
+    
+    static class SecondFragment extends Fragment {
+        // Explicit constructor needed for inflation.
+        public SecondFragment() {
+        }
+        
+        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;
+        }
+    }
+}
diff --git a/samples/ApiDemos/src/com/example/android/apis/app/SimpleFragment.java b/samples/ApiDemos/src/com/example/android/apis/app/FragmentStack.java
similarity index 68%
rename from samples/ApiDemos/src/com/example/android/apis/app/SimpleFragment.java
rename to samples/ApiDemos/src/com/example/android/apis/app/FragmentStack.java
index d3fda7e2e..568ea93b8 100644
--- a/samples/ApiDemos/src/com/example/android/apis/app/SimpleFragment.java
+++ b/samples/ApiDemos/src/com/example/android/apis/app/FragmentStack.java
@@ -29,49 +29,49 @@ import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.TextView;
 
-public class SimpleFragment extends Activity {
-    int mWhichFragment;
-    Fragment mCurFragment;
+public class FragmentStack extends Activity {
+    int mStackLevel;
+    Fragment mLastFragment;
     
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.simple_fragment);
-        switchToFragment(0);
+        setContentView(R.layout.fragment_stack);
+        addFragmentToStack();
         
         // 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);
+                addFragmentToStack();
             }
         });
     }
     
-    void switchToFragment(int which) {
-        mWhichFragment = which;
-        Fragment newFragment = which == 0
-                ? new FirstFragment() : new SecondFragment();
+    void addFragmentToStack() {
+        mStackLevel++;
+        Fragment newFragment = new CountingFragment(mStackLevel);
         FragmentTransaction ft = openFragmentTransaction();
-        if (mCurFragment != null) {
-            ft.remove(mCurFragment);
+        if (mLastFragment != null) {
+            ft.remove(mLastFragment);
         }
         ft.add(newFragment, R.id.simple_fragment);
-        mCurFragment = newFragment;
+        mLastFragment = newFragment;
+        ft.addToBackStack();
         ft.commit();
     }
     
-    class FirstFragment extends Fragment {
-        public View onCreateView(LayoutInflater inflater, ViewGroup container) {
-            return inflater.inflate(R.layout.hello_world, container, false);
+    class CountingFragment extends Fragment {
+        final int mNum;
+        
+        public CountingFragment(int num) {
+            mNum = num;
         }
-    }
-    
-    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!");
+            ((TextView)tv).setText("Fragment #" + mNum);
             return v;
         }
     }