diff --git a/samples/ApiDemos/res/layout/layout_animations_by_default.xml b/samples/ApiDemos/res/layout/layout_animations_by_default.xml
index a5062bb7f..6236088ee 100644
--- a/samples/ApiDemos/res/layout/layout_animations_by_default.xml
+++ b/samples/ApiDemos/res/layout/layout_animations_by_default.xml
@@ -24,18 +24,11 @@
         android:text="Add Button"
         android:id="@+id/addNewButton"
         />
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/horizontalContainer"
-        android:animateLayoutChanges="true"
-        />
-    <LinearLayout
-        android:orientation="vertical"
+    <GridLayout
+        android:columnCount="4"
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:id="@+id/verticalContainer"
+        android:layout_height="wrap_content"
+        android:id="@+id/gridContainer"
         android:animateLayoutChanges="true"
         />
 </LinearLayout>
diff --git a/samples/ApiDemos/src/com/example/android/apis/animation/LayoutAnimationsByDefault.java b/samples/ApiDemos/src/com/example/android/apis/animation/LayoutAnimationsByDefault.java
index 67b9b5160..8898b5519 100644
--- a/samples/ApiDemos/src/com/example/android/apis/animation/LayoutAnimationsByDefault.java
+++ b/samples/ApiDemos/src/com/example/android/apis/animation/LayoutAnimationsByDefault.java
@@ -21,11 +21,11 @@ package com.example.android.apis.animation;
 import com.example.android.apis.R;
 
 import android.view.View;
-import android.view.ViewGroup;
 
 import android.app.Activity;
 import android.os.Bundle;
 import android.widget.Button;
+import android.widget.GridLayout;
 
 /**
  * This application demonstrates how to use the animateLayoutChanges tag in XML to automate
@@ -35,36 +35,25 @@ public class LayoutAnimationsByDefault extends Activity {
 
     private int numButtons = 1;
 
-    /** Called when the activity is first created. */
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
         setContentView(R.layout.layout_animations_by_default);
 
-        final ViewGroup horizontalContainer = (ViewGroup) findViewById(R.id.horizontalContainer);
-        final ViewGroup verticalContainer = (ViewGroup) findViewById(R.id.verticalContainer);
+        final GridLayout gridContainer = (GridLayout) findViewById(R.id.gridContainer);
 
         Button addButton = (Button) findViewById(R.id.addNewButton);
         addButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
                 Button newButton = new Button(LayoutAnimationsByDefault.this);
-                newButton.setText("Click To Remove " + (numButtons++));
+                newButton.setText(String.valueOf(numButtons++));
                 newButton.setOnClickListener(new View.OnClickListener() {
                     public void onClick(View v) {
-                        horizontalContainer.removeView(v);
+                        gridContainer.removeView(v);
                     }
                 });
-                horizontalContainer.addView(newButton, Math.min(1, horizontalContainer.getChildCount()));
-
-                newButton = new Button(LayoutAnimationsByDefault.this);
-                newButton.setText("Click To Remove " + (numButtons++));
-                newButton.setOnClickListener(new View.OnClickListener() {
-                    public void onClick(View v) {
-                        verticalContainer.removeView(v);
-                    }
-                });
-                verticalContainer.addView(newButton, Math.min(1, verticalContainer.getChildCount()));
+                gridContainer.addView(newButton, Math.min(1, gridContainer.getChildCount()));
             }
         });
     }