diff --git a/samples/ApiDemos/res/layout/transition_scene1.xml b/samples/ApiDemos/res/layout/transition_scene1.xml
index 19fbe890a..a98da60b9 100644
--- a/samples/ApiDemos/res/layout/transition_scene1.xml
+++ b/samples/ApiDemos/res/layout/transition_scene1.xml
@@ -18,40 +18,36 @@
               android:layout_height="match_parent"
               android:id="@+id/container">
 
-    <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+    <View
+            android:layout_width="100dip"
+            android:layout_height="50dip"
             android:layout_alignParentTop="true"
             android:layout_alignParentLeft="true"
             android:background="#f00"
-            android:text="Hello"
             android:id="@+id/view1"/>
 
-    <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+    <View
+            android:layout_width="100dip"
+            android:layout_height="50dip"
             android:layout_alignParentTop="true"
             android:layout_alignParentRight="true"
             android:background="#0f0"
-            android:text="World"
             android:id="@+id/view2"/>
 
-    <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+    <View
+            android:layout_width="100dip"
+            android:layout_height="50dip"
             android:background="#00f"
             android:layout_alignParentBottom="true"
             android:layout_alignParentLeft="true"
-            android:text="Foo"
             android:id="@+id/view3"/>
 
-    <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+    <View
+            android:layout_width="100dip"
+            android:layout_height="50dip"
             android:background="#0ff"
             android:layout_alignParentBottom="true"
             android:layout_alignParentRight="true"
-            android:text="Bar"
             android:id="@+id/view4"/>
 
 </RelativeLayout>
diff --git a/samples/ApiDemos/res/layout/transition_scene2.xml b/samples/ApiDemos/res/layout/transition_scene2.xml
index 2d7e546f7..fda227651 100644
--- a/samples/ApiDemos/res/layout/transition_scene2.xml
+++ b/samples/ApiDemos/res/layout/transition_scene2.xml
@@ -18,40 +18,36 @@
                 android:layout_height="match_parent"
                 android:id="@+id/container">
 
-    <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+    <View
+            android:layout_width="100dip"
+            android:layout_height="100dip"
             android:layout_alignParentTop="true"
             android:layout_alignParentRight="true"
             android:background="#f00"
-            android:text="Hello"
             android:id="@+id/view1"/>
 
-    <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+    <View
+            android:layout_width="100dip"
+            android:layout_height="100dip"
             android:layout_alignParentBottom="true"
             android:layout_alignParentLeft="true"
             android:background="#0f0"
-            android:text="World"
             android:id="@+id/view2"/>
 
-    <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+    <View
+            android:layout_width="100dip"
+            android:layout_height="100dip"
             android:background="#00f"
             android:layout_alignParentBottom="true"
             android:layout_alignParentRight="true"
-            android:text="Foo"
             android:id="@+id/view3"/>
 
-    <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+    <View
+            android:layout_width="100dip"
+            android:layout_height="100dip"
             android:background="#0ff"
             android:layout_alignParentTop="true"
             android:layout_alignParentLeft="true"
-            android:text="Bar"
             android:id="@+id/view4"/>
 
 </RelativeLayout>
diff --git a/samples/ApiDemos/res/layout/transition_scene3.xml b/samples/ApiDemos/res/layout/transition_scene3.xml
index 43ffc386e..39c4da770 100644
--- a/samples/ApiDemos/res/layout/transition_scene3.xml
+++ b/samples/ApiDemos/res/layout/transition_scene3.xml
@@ -18,40 +18,36 @@
                 android:layout_height="match_parent"
                 android:id="@+id/container">
 
-    <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+    <View
+            android:layout_width="100dip"
+            android:layout_height="50dip"
             android:layout_alignParentTop="true"
             android:layout_alignParentLeft="true"
             android:background="#f00"
-            android:text="Hello"
             android:id="@+id/view1"/>
 
-    <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+    <View
+            android:layout_width="100dip"
+            android:layout_height="50dip"
             android:layout_alignParentTop="true"
             android:layout_alignParentRight="true"
             android:background="#0f0"
-            android:text="World"
             android:id="@+id/view2"/>
 
-    <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+    <View
+            android:layout_width="100dip"
+            android:layout_height="50dip"
             android:background="#00f"
             android:layout_alignParentBottom="true"
             android:layout_alignParentLeft="true"
-            android:text="Foo"
             android:id="@+id/view3"/>
 
-    <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+    <View
+            android:layout_width="100dip"
+            android:layout_height="50dip"
             android:background="#0ff"
             android:layout_alignParentBottom="true"
             android:layout_alignParentRight="true"
-            android:text="Bar"
             android:id="@+id/view4"/>
 
     <LinearLayout