Deprecate fill_parent and introduce match_parent.

Bug: #2361749.

61 files changed, 200 insertions, 200 deletions

diff --git a/tests/FrameworkTest/res/layout/add_column_in_table.xml b/tests/FrameworkTest/res/layout/add_column_in_table.xml
index 62c27f3..05f55a8 100644
--- a/tests/FrameworkTest/res/layout/add_column_in_table.xml
+++ b/tests/FrameworkTest/res/layout/add_column_in_table.xml
@@ -16,11 +16,11 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <TableLayout android:id="@+id/table"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="0dip"
         android:layout_weight="1.0">
 
diff --git a/tests/FrameworkTest/res/layout/autocompletetextview_simple.xml b/tests/FrameworkTest/res/layout/autocompletetextview_simple.xml
index d408a86..1a20076 100644
--- a/tests/FrameworkTest/res/layout/autocompletetextview_simple.xml
+++ b/tests/FrameworkTest/res/layout/autocompletetextview_simple.xml
@@ -20,12 +20,12 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/layout"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <AutoCompleteTextView
         android:id="@+id/autocompletetextview1"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:inputType="text|textAutoComplete"
         android:completionThreshold="1" />
diff --git a/tests/FrameworkTest/res/layout/baseline_0width_and_weight.xml b/tests/FrameworkTest/res/layout/baseline_0width_and_weight.xml
index 83f3fcb..aa3132d 100644
--- a/tests/FrameworkTest/res/layout/baseline_0width_and_weight.xml
+++ b/tests/FrameworkTest/res/layout/baseline_0width_and_weight.xml
@@ -19,10 +19,10 @@
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
     <LinearLayout android:id="@+id/layout"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
             android:visibility="gone">
diff --git a/tests/FrameworkTest/res/layout/baseline_buttons.xml b/tests/FrameworkTest/res/layout/baseline_buttons.xml
index ae94201..3e364bd 100644
--- a/tests/FrameworkTest/res/layout/baseline_buttons.xml
+++ b/tests/FrameworkTest/res/layout/baseline_buttons.xml
@@ -19,7 +19,7 @@
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:id="@+id/layout"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal">
 
diff --git a/tests/FrameworkTest/res/layout/baseline_center_gravity.xml b/tests/FrameworkTest/res/layout/baseline_center_gravity.xml
index 9793ab4..dd1318d 100644
--- a/tests/FrameworkTest/res/layout/baseline_center_gravity.xml
+++ b/tests/FrameworkTest/res/layout/baseline_center_gravity.xml
@@ -19,7 +19,7 @@
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="horizontal"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content">
     <Button android:id="@+id/button1"
         android:layout_height="wrap_content"
diff --git a/tests/FrameworkTest/res/layout/descendant_focusability.xml b/tests/FrameworkTest/res/layout/descendant_focusability.xml
index 6a30d50..0cb75fd 100644
--- a/tests/FrameworkTest/res/layout/descendant_focusability.xml
+++ b/tests/FrameworkTest/res/layout/descendant_focusability.xml
@@ -20,19 +20,19 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
         >
 
     <LinearLayout
         android:id="@+id/beforeDescendants"
         android:orientation="vertical"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:descendantFocusability="beforeDescendants"
             >
         <Button
-          android:layout_width="fill_parent"
+          android:layout_width="match_parent"
           android:layout_height="wrap_content"
                 />
     </LinearLayout>
@@ -40,12 +40,12 @@
     <LinearLayout
         android:id="@+id/afterDescendants"
         android:orientation="vertical"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:descendantFocusability="afterDescendants"
             >
         <Button
-          android:layout_width="fill_parent"
+          android:layout_width="match_parent"
           android:layout_height="wrap_content"
                 />
     </LinearLayout>
@@ -53,12 +53,12 @@
     <LinearLayout
         android:id="@+id/blocksDescendants"
         android:orientation="vertical"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:descendantFocusability="blocksDescendants"
             >
         <Button
-          android:layout_width="fill_parent"
+          android:layout_width="match_parent"
           android:layout_height="wrap_content"
                 />
     </LinearLayout>
diff --git a/tests/FrameworkTest/res/layout/disabled.xml b/tests/FrameworkTest/res/layout/disabled.xml
index ed7ff06..4b41248 100644
--- a/tests/FrameworkTest/res/layout/disabled.xml
+++ b/tests/FrameworkTest/res/layout/disabled.xml
@@ -23,8 +23,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/clickableParent"
     android:orientation="horizontal"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <Button android:id="@+id/disabledButton"
         android:layout_width="wrap_content"
diff --git a/tests/FrameworkTest/res/layout/fill_in_wrap.xml b/tests/FrameworkTest/res/layout/fill_in_wrap.xml
index b61fd30..1c3f811 100644
--- a/tests/FrameworkTest/res/layout/fill_in_wrap.xml
+++ b/tests/FrameworkTest/res/layout/fill_in_wrap.xml
@@ -15,7 +15,7 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="?android:attr/listPreferredItemHeight"
     android:orientation="horizontal"
     android:baselineAligned="false"
@@ -28,7 +28,7 @@
     />
 
     <LinearLayout android:id="@+id/layout"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingLeft="0dip"
         android:paddingRight="0dip"
@@ -43,7 +43,7 @@
         <EditText android:id="@+id/data"
             android:layout_width="0dip"
             android:layout_weight="1"
-            android:layout_height="fill_parent"
+            android:layout_height="match_parent"
             android:layout_marginLeft="8dip"
             android:paddingBottom="4dip"
             android:layout_gravity="center_vertical"
diff --git a/tests/FrameworkTest/res/layout/focus_after_removal.xml b/tests/FrameworkTest/res/layout/focus_after_removal.xml
index 7cf6cbe..f4e388d 100644
--- a/tests/FrameworkTest/res/layout/focus_after_removal.xml
+++ b/tests/FrameworkTest/res/layout/focus_after_removal.xml
@@ -20,7 +20,7 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="horizontal"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout android:id="@+id/leftLayout"
diff --git a/tests/FrameworkTest/res/layout/focus_listener.xml b/tests/FrameworkTest/res/layout/focus_listener.xml
index a838205..6faa21c 100644
--- a/tests/FrameworkTest/res/layout/focus_listener.xml
+++ b/tests/FrameworkTest/res/layout/focus_listener.xml
@@ -20,7 +20,7 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="horizontal"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <Button android:id="@+id/left"
diff --git a/tests/FrameworkTest/res/layout/framelayout_gravity.xml b/tests/FrameworkTest/res/layout/framelayout_gravity.xml
index ce48825..e89fce5 100644
--- a/tests/FrameworkTest/res/layout/framelayout_gravity.xml
+++ b/tests/FrameworkTest/res/layout/framelayout_gravity.xml
@@ -16,8 +16,8 @@
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/parent"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <Button android:id="@+id/left"
         android:layout_gravity="left"
diff --git a/tests/FrameworkTest/res/layout/framelayout_margin.xml b/tests/FrameworkTest/res/layout/framelayout_margin.xml
index 1e14899..9120bcb 100644
--- a/tests/FrameworkTest/res/layout/framelayout_margin.xml
+++ b/tests/FrameworkTest/res/layout/framelayout_margin.xml
@@ -16,8 +16,8 @@
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/parent"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <Button android:id="@+id/left"
         android:layout_gravity="left"
diff --git a/tests/FrameworkTest/res/layout/grid_in_horizontal.xml b/tests/FrameworkTest/res/layout/grid_in_horizontal.xml
index 835dce3..62d7bcb 100644
--- a/tests/FrameworkTest/res/layout/grid_in_horizontal.xml
+++ b/tests/FrameworkTest/res/layout/grid_in_horizontal.xml
@@ -16,12 +16,12 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:orientation="horizontal"
-	android:layout_width="fill_parent" 
-    android:layout_height="fill_parent">
+	android:layout_width="match_parent" 
+    android:layout_height="match_parent">
 	
 	<GridView android:id="@+id/grid"
 	    android:layout_width="0dip" 
-	    android:layout_height="fill_parent"
+	    android:layout_height="match_parent"
 	    android:layout_weight="1"
 	    android:padding="10dip"
 	    android:verticalSpacing="10dp"    
diff --git a/tests/FrameworkTest/res/layout/grid_in_vertical.xml b/tests/FrameworkTest/res/layout/grid_in_vertical.xml
index 731bc54..fea459a 100644
--- a/tests/FrameworkTest/res/layout/grid_in_vertical.xml
+++ b/tests/FrameworkTest/res/layout/grid_in_vertical.xml
@@ -16,8 +16,8 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:orientation="vertical"
-	android:layout_width="fill_parent" 
-    android:layout_height="fill_parent">
+	android:layout_width="match_parent" 
+    android:layout_height="match_parent">
 	
 	<GridView android:id="@+id/grid"
 	    android:layout_width="wrap_content" 
diff --git a/tests/FrameworkTest/res/layout/grid_scroll_listener.xml b/tests/FrameworkTest/res/layout/grid_scroll_listener.xml
index c02aed9..82b1058 100644
--- a/tests/FrameworkTest/res/layout/grid_scroll_listener.xml
+++ b/tests/FrameworkTest/res/layout/grid_scroll_listener.xml
@@ -16,11 +16,11 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:orientation="vertical"
-	android:layout_width="fill_parent" 
-    android:layout_height="fill_parent">
+	android:layout_width="match_parent" 
+    android:layout_height="match_parent">
 	
 	<GridView android:id="@+id/grid"
-	    android:layout_width="fill_parent" 
+	    android:layout_width="match_parent" 
 	    android:layout_height="0dip"
 	    android:layout_weight="1"
 	    android:padding="10dip"
@@ -32,7 +32,7 @@
 	    android:gravity="center"/>
 	    
     <TextView android:id="@+id/text"
-    	android:layout_width="fill_parent" 
+    	android:layout_width="match_parent" 
     	android:layout_height="wrap_content"
     	android:gravity="center_horizontal"/>
     	
diff --git a/tests/FrameworkTest/res/layout/grid_thrasher.xml b/tests/FrameworkTest/res/layout/grid_thrasher.xml
index 1a260df..346acff 100644
--- a/tests/FrameworkTest/res/layout/grid_thrasher.xml
+++ b/tests/FrameworkTest/res/layout/grid_thrasher.xml
@@ -16,12 +16,12 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:orientation="vertical"
-	android:layout_width="fill_parent" 
-    android:layout_height="fill_parent">
+	android:layout_width="match_parent" 
+    android:layout_height="match_parent">
 	
 	<GridView android:id="@+id/grid"
-	    android:layout_width="fill_parent" 
-		android:layout_height="fill_parent"
+	    android:layout_width="match_parent" 
+		android:layout_height="match_parent"
 	    android:padding="10dip"
 	    android:verticalSpacing="10dp"    
 	    android:horizontalSpacing="10dp"
@@ -31,7 +31,7 @@
 	    android:gravity="center"/>
 	    
     <TextView android:id="@+id/text"
-    	android:layout_width="fill_parent" 
+    	android:layout_width="match_parent" 
     	android:layout_height="wrap_content"
     	android:gravity="center_horizontal"/>
     	
diff --git a/tests/FrameworkTest/res/layout/include_tag.xml b/tests/FrameworkTest/res/layout/include_tag.xml
index d1047f1..b2f6ab1 100644
--- a/tests/FrameworkTest/res/layout/include_tag.xml
+++ b/tests/FrameworkTest/res/layout/include_tag.xml
@@ -16,8 +16,8 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <TextView
         android:text="@string/include_label"
diff --git a/tests/FrameworkTest/res/layout/inflated_expandablelistview.xml b/tests/FrameworkTest/res/layout/inflated_expandablelistview.xml
index d01e7c5..6f683e5 100644
--- a/tests/FrameworkTest/res/layout/inflated_expandablelistview.xml
+++ b/tests/FrameworkTest/res/layout/inflated_expandablelistview.xml
@@ -16,5 +16,5 @@
 
 <ExpandableListView xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/elv"
-        android:layout_height="fill_parent"
-        android:layout_width="fill_parent" />
+        android:layout_height="match_parent"
+        android:layout_width="match_parent" />
diff --git a/tests/FrameworkTest/res/layout/linear_layout_buttons.xml b/tests/FrameworkTest/res/layout/linear_layout_buttons.xml
index f60692a..bcb28e7 100644
--- a/tests/FrameworkTest/res/layout/linear_layout_buttons.xml
+++ b/tests/FrameworkTest/res/layout/linear_layout_buttons.xml
@@ -20,26 +20,26 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/layout"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <Button
         android:id="@+id/button1"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="0sp"
         android:layout_weight="1"
         android:text="@string/keypad_one"/>
 
     <Button
         android:id="@+id/button2"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="0sp"
         android:layout_weight="1"
         android:text="@string/keypad_two"/>
 
     <Button
         android:id="@+id/button3"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="0sp"
         android:layout_weight="1"
         android:text="@string/keypad_three"/>
diff --git a/tests/FrameworkTest/res/layout/linear_layout_edittext_then_button.xml b/tests/FrameworkTest/res/layout/linear_layout_edittext_then_button.xml
index 21e7399..ab76e29 100644
--- a/tests/FrameworkTest/res/layout/linear_layout_edittext_then_button.xml
+++ b/tests/FrameworkTest/res/layout/linear_layout_edittext_then_button.xml
@@ -20,18 +20,18 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/layout"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <EditText
         android:id="@+id/editText"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="0sp"
         android:layout_weight="1"/>
 
     <Button
         android:id="@+id/button"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="0sp"
         android:layout_weight="1"
         android:text="@string/keypad_one"/>
diff --git a/tests/FrameworkTest/res/layout/linear_layout_grid.xml b/tests/FrameworkTest/res/layout/linear_layout_grid.xml
index 81f7b15..67b6877 100644
--- a/tests/FrameworkTest/res/layout/linear_layout_grid.xml
+++ b/tests/FrameworkTest/res/layout/linear_layout_grid.xml
@@ -20,80 +20,80 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/layout"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <LinearLayout android:id="@+id/column1"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="0sp"
         android:layout_weight="1"
         android:orientation="horizontal">
 
         <Button
             android:layout_width="0sp"
-            android:layout_height="fill_parent"
+            android:layout_height="match_parent"
             android:layout_weight="1"
             android:text="@string/keypad_one"/>
 
         <Button
             android:layout_width="0sp"
-            android:layout_height="fill_parent"
+            android:layout_height="match_parent"
             android:layout_weight="1"
             android:text="@string/keypad_two"/>
 
         <Button
             android:layout_width="0sp"
-            android:layout_height="fill_parent"
+            android:layout_height="match_parent"
             android:layout_weight="1"
             android:text="@string/keypad_three"/>
     </LinearLayout>
 
     <LinearLayout android:id="@+id/column2"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="0sp"
         android:layout_weight="1"
         android:orientation="horizontal">
 
         <Button
             android:layout_width="0sp"
-            android:layout_height="fill_parent"
+            android:layout_height="match_parent"
             android:layout_weight="1"
             android:text="@string/keypad_four"/>
 
         <Button
             android:layout_width="0sp"
-            android:layout_height="fill_parent"
+            android:layout_height="match_parent"
             android:layout_weight="1"
             android:text="@string/keypad_five"/>
 
         <Button
             android:layout_width="0sp"
-            android:layout_height="fill_parent"
+            android:layout_height="match_parent"
             android:layout_weight="1"
             android:text="@string/keypad_six"/>
     </LinearLayout>
 
     <LinearLayout android:id="@+id/column3"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="0sp"
         android:layout_weight="1"
         android:orientation="horizontal">
 
         <Button
             android:layout_width="0sp"
-            android:layout_height="fill_parent"
+            android:layout_height="match_parent"
             android:layout_weight="1"
             android:text="@string/keypad_seven"/>
 
         <Button
             android:layout_width="0sp"
-            android:layout_height="fill_parent"
+            android:layout_height="match_parent"
             android:layout_weight="1"
             android:text="@string/keypad_eight"/>
 
         <Button
             android:layout_width="0sp"
-            android:layout_height="fill_parent"
+            android:layout_height="match_parent"
             android:layout_weight="1"
             android:text="@string/keypad_nine"/>
     </LinearLayout>
diff --git a/tests/FrameworkTest/res/layout/linear_layout_listview_height.xml b/tests/FrameworkTest/res/layout/linear_layout_listview_height.xml
index 10ef2ce..873b2d2 100644
--- a/tests/FrameworkTest/res/layout/linear_layout_listview_height.xml
+++ b/tests/FrameworkTest/res/layout/linear_layout_listview_height.xml
@@ -20,19 +20,19 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/layout"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
     
     <!-- Outer linear layout providing vertical layout -->
     <LinearLayout
         android:orientation="vertical"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content" >
         
         <!-- The control buttons -->
         <LinearLayout
             android:orientation="horizontal"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content" >
             
             <Button
@@ -58,7 +58,7 @@
         <ListView 
             android:id="@+id/inner_list"
             android:layout_width="200dip"
-            android:layout_height="fill_parent"
+            android:layout_height="match_parent"
             android:background="@android:drawable/spinner_dropdown_background"
             android:divider="@android:drawable/divider_horizontal_bright" />
  
diff --git a/tests/FrameworkTest/res/layout/linear_layout_spinner_then_button.xml b/tests/FrameworkTest/res/layout/linear_layout_spinner_then_button.xml
index 7ed245b..53c0280 100644
--- a/tests/FrameworkTest/res/layout/linear_layout_spinner_then_button.xml
+++ b/tests/FrameworkTest/res/layout/linear_layout_spinner_then_button.xml
@@ -20,7 +20,7 @@
         
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:orientation="horizontal"
-   android:layout_width="fill_parent"
+   android:layout_width="match_parent"
    android:layout_height="wrap_content">
 
    <Spinner android:id="@+id/reminder_value"
diff --git a/tests/FrameworkTest/res/layout/linear_layout_textviews.xml b/tests/FrameworkTest/res/layout/linear_layout_textviews.xml
index 84a898c..ccec213 100644
--- a/tests/FrameworkTest/res/layout/linear_layout_textviews.xml
+++ b/tests/FrameworkTest/res/layout/linear_layout_textviews.xml
@@ -21,7 +21,7 @@
     android:id="@+id/layout"
     android:background="#FFFF0000"
     android:orientation="horizontal"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <EditText
diff --git a/tests/FrameworkTest/res/layout/list_dividers.xml b/tests/FrameworkTest/res/layout/list_dividers.xml
index b56511e..93810b4 100644
--- a/tests/FrameworkTest/res/layout/list_dividers.xml
+++ b/tests/FrameworkTest/res/layout/list_dividers.xml
@@ -16,8 +16,8 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="horizontal"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <Button
         android:layout_width="wrap_content"
diff --git a/tests/FrameworkTest/res/layout/list_filter.xml b/tests/FrameworkTest/res/layout/list_filter.xml
index cea518c..0ab7101 100644
--- a/tests/FrameworkTest/res/layout/list_filter.xml
+++ b/tests/FrameworkTest/res/layout/list_filter.xml
@@ -16,24 +16,24 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="fill_parent" 
-    android:layout_height="fill_parent">
+    android:layout_width="match_parent" 
+    android:layout_height="match_parent">
     
     <FrameLayout android:id="@+id/frame"
-        android:layout_width="fill_parent" 
+        android:layout_width="match_parent" 
         android:layout_height="0dip"
         android:layout_weight="1">
 
         <ListView android:id="@android:id/list"
-            android:layout_width="fill_parent" 
-            android:layout_height="fill_parent"
+            android:layout_width="match_parent" 
+            android:layout_height="match_parent"
             android:drawSelectorOnTop="false" />
             
     </FrameLayout>
     
     <LinearLayout
         android:orientation="horizontal"
-        android:layout_width="fill_parent" 
+        android:layout_width="match_parent" 
         android:layout_height="wrap_content">
         
         <Button android:id="@+id/hide"
diff --git a/tests/FrameworkTest/res/layout/list_in_horizontal.xml b/tests/FrameworkTest/res/layout/list_in_horizontal.xml
index 371cb84..b770628 100644
--- a/tests/FrameworkTest/res/layout/list_in_horizontal.xml
+++ b/tests/FrameworkTest/res/layout/list_in_horizontal.xml
@@ -15,8 +15,8 @@
 -->
 
 <TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <TableRow>
 
diff --git a/tests/FrameworkTest/res/layout/list_in_vertical.xml b/tests/FrameworkTest/res/layout/list_in_vertical.xml
index 0ea2475..f951cb7 100644
--- a/tests/FrameworkTest/res/layout/list_in_vertical.xml
+++ b/tests/FrameworkTest/res/layout/list_in_vertical.xml
@@ -15,16 +15,16 @@
 -->
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <LinearLayout
         android:orientation="vertical"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
         <ListView android:id="@+id/list"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
         <ImageButton
diff --git a/tests/FrameworkTest/res/layout/list_recycler_profiling.xml b/tests/FrameworkTest/res/layout/list_recycler_profiling.xml
index 9678eb7..3fc6bd6 100644
--- a/tests/FrameworkTest/res/layout/list_recycler_profiling.xml
+++ b/tests/FrameworkTest/res/layout/list_recycler_profiling.xml
@@ -16,11 +16,11 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <ListView android:id="@+id/list"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="0dip"
         android:layout_weight="1.0" />
 
diff --git a/tests/FrameworkTest/res/layout/list_scroll_listener.xml b/tests/FrameworkTest/res/layout/list_scroll_listener.xml
index 001296a..58ab55f 100644
--- a/tests/FrameworkTest/res/layout/list_scroll_listener.xml
+++ b/tests/FrameworkTest/res/layout/list_scroll_listener.xml
@@ -16,17 +16,17 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:orientation="vertical"
-	android:layout_width="fill_parent" 
-    android:layout_height="fill_parent">
+	android:layout_width="match_parent" 
+    android:layout_height="match_parent">
 	
 	<ListView android:id="@android:id/list"
-	    android:layout_width="fill_parent" 
+	    android:layout_width="match_parent" 
 	    android:layout_height="0dip"
 	    android:layout_weight="1"
 	    android:drawSelectorOnTop="false"/>
 	    
     <TextView android:id="@+id/text"
-    	android:layout_width="fill_parent" 
+    	android:layout_width="match_parent" 
     	android:layout_height="wrap_content"
     	android:gravity="center_horizontal"/>
     	
diff --git a/tests/FrameworkTest/res/layout/list_take_focus_from_side.xml b/tests/FrameworkTest/res/layout/list_take_focus_from_side.xml
index cf141cc..ee40019 100644
--- a/tests/FrameworkTest/res/layout/list_take_focus_from_side.xml
+++ b/tests/FrameworkTest/res/layout/list_take_focus_from_side.xml
@@ -16,19 +16,19 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="horizontal"
-    android:layout_width="fill_parent" 
-    android:layout_height="fill_parent">
+    android:layout_width="match_parent" 
+    android:layout_height="match_parent">
     
     <ListView android:id="@android:id/list"
         android:layout_width="0dip" 
         android:layout_weight="1"
-        android:layout_height="fill_parent"
+        android:layout_height="match_parent"
         android:drawSelectorOnTop="false"/>
         
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="wrap_content" 
-        android:layout_height="fill_parent">
+        android:layout_height="match_parent">
         <Button
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/tests/FrameworkTest/res/layout/list_thrasher.xml b/tests/FrameworkTest/res/layout/list_thrasher.xml
index 001296a..58ab55f 100644
--- a/tests/FrameworkTest/res/layout/list_thrasher.xml
+++ b/tests/FrameworkTest/res/layout/list_thrasher.xml
@@ -16,17 +16,17 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:orientation="vertical"
-	android:layout_width="fill_parent" 
-    android:layout_height="fill_parent">
+	android:layout_width="match_parent" 
+    android:layout_height="match_parent">
 	
 	<ListView android:id="@android:id/list"
-	    android:layout_width="fill_parent" 
+	    android:layout_width="match_parent" 
 	    android:layout_height="0dip"
 	    android:layout_weight="1"
 	    android:drawSelectorOnTop="false"/>
 	    
     <TextView android:id="@+id/text"
-    	android:layout_width="fill_parent" 
+    	android:layout_width="match_parent" 
     	android:layout_height="wrap_content"
     	android:gravity="center_horizontal"/>
     	
diff --git a/tests/FrameworkTest/res/layout/list_with_button_above.xml b/tests/FrameworkTest/res/layout/list_with_button_above.xml
index 25db016..18bcf6b 100644
--- a/tests/FrameworkTest/res/layout/list_with_button_above.xml
+++ b/tests/FrameworkTest/res/layout/list_with_button_above.xml
@@ -19,18 +19,18 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/layout"
         android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
 
     <Button android:id="@+id/button"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/button_above_list_label"/>
 
 
     <ListView android:id="@android:id/list"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="0dip"
         android:layout_weight="1"
         android:paddingTop="2dip"
diff --git a/tests/FrameworkTest/res/layout/list_with_disappearing_item_bug_item.xml b/tests/FrameworkTest/res/layout/list_with_disappearing_item_bug_item.xml
index 0163d96..82af6ca 100644
--- a/tests/FrameworkTest/res/layout/list_with_disappearing_item_bug_item.xml
+++ b/tests/FrameworkTest/res/layout/list_with_disappearing_item_bug_item.xml
@@ -16,13 +16,13 @@
 
 <!-- A layout is needed to reprod the bug. -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="?android:attr/listPreferredItemHeight">
 
     <TextView 
         android:id="@+id/text1"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:gravity="center_vertical"
         android:paddingLeft="27dip"
diff --git a/tests/FrameworkTest/res/layout/list_with_empty_view.xml b/tests/FrameworkTest/res/layout/list_with_empty_view.xml
index 00d81a7..23bb658 100644
--- a/tests/FrameworkTest/res/layout/list_with_empty_view.xml
+++ b/tests/FrameworkTest/res/layout/list_with_empty_view.xml
@@ -16,17 +16,17 @@
 
  
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent" >
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
 
     <ListView android:id="@android:id/list"
         android:drawSelectorOnTop="false"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"/>
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
 
     <TextView android:id="@+id/empty"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:gravity="center"
         android:textSize="36sp"
         android:textColor="#999"
diff --git a/tests/FrameworkTest/res/layout/longpress.xml b/tests/FrameworkTest/res/layout/longpress.xml
index ef3672c..3a69fae 100644
--- a/tests/FrameworkTest/res/layout/longpress.xml
+++ b/tests/FrameworkTest/res/layout/longpress.xml
@@ -20,8 +20,8 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <View android:id="@+id/simple_view"
         android:background="@drawable/blue"
diff --git a/tests/FrameworkTest/res/layout/mail_message.xml b/tests/FrameworkTest/res/layout/mail_message.xml
index ed52751..7f15e4f 100644
--- a/tests/FrameworkTest/res/layout/mail_message.xml
+++ b/tests/FrameworkTest/res/layout/mail_message.xml
@@ -18,11 +18,11 @@
  a list with a list of messages.-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:orientation="vertical"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <TextView android:id="@+id/subject"
-              android:layout_width="fill_parent"
+              android:layout_width="match_parent"
               android:layout_height="wrap_content"/>
 
     <WebView android:id="@+id/body"
diff --git a/tests/FrameworkTest/res/layout/popup_window_visibility.xml b/tests/FrameworkTest/res/layout/popup_window_visibility.xml
index 21c94bb..3aa714d 100644
--- a/tests/FrameworkTest/res/layout/popup_window_visibility.xml
+++ b/tests/FrameworkTest/res/layout/popup_window_visibility.xml
@@ -16,25 +16,25 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="fill_parent" 
-    android:layout_height="fill_parent">
+    android:layout_width="match_parent" 
+    android:layout_height="match_parent">
     
     <FrameLayout android:id="@+id/frame"
-        android:layout_width="fill_parent" 
+        android:layout_width="match_parent" 
         android:layout_height="0dip"
         android:layout_weight="1">
 
         <LinearLayout
             android:orientation="vertical"
-            android:layout_width="fill_parent" 
-            android:layout_height="fill_parent">
+            android:layout_width="match_parent" 
+            android:layout_height="match_parent">
                 
             <Spinner android:id="@+id/spinner"
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
         
             <AutoCompleteTextView android:id="@+id/auto"
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"/>
                 
         </LinearLayout>
@@ -43,7 +43,7 @@
     
     <LinearLayout
         android:orientation="horizontal"
-        android:layout_width="fill_parent" 
+        android:layout_width="match_parent" 
         android:layout_height="wrap_content">
         
         <Button android:id="@+id/hide"
diff --git a/tests/FrameworkTest/res/layout/pre_draw_listener.xml b/tests/FrameworkTest/res/layout/pre_draw_listener.xml
index d348d9f..7a8f33f 100644
--- a/tests/FrameworkTest/res/layout/pre_draw_listener.xml
+++ b/tests/FrameworkTest/res/layout/pre_draw_listener.xml
@@ -16,20 +16,20 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="fill_parent" 
-    android:layout_height="fill_parent">
+    android:layout_width="match_parent" 
+    android:layout_height="match_parent">
     
 
 	<ScrollView 
 		android:orientation="vertical"
-        android:layout_width="fill_parent" 
+        android:layout_width="match_parent" 
         android:layout_height="0dip"
         android:layout_weight="1">
         
         <view class="com.android.frameworktest.view.PreDrawListener$MyLinearLayout" android:id="@+id/frame"
             android:orientation="vertical"
-            android:layout_width="fill_parent" 
-            android:layout_height="fill_parent" />
+            android:layout_width="match_parent" 
+            android:layout_height="match_parent" />
 
     </ScrollView>
         
diff --git a/tests/FrameworkTest/res/layout/radiogroup_checkedchild.xml b/tests/FrameworkTest/res/layout/radiogroup_checkedchild.xml
index 7724729..db88f4d 100644
--- a/tests/FrameworkTest/res/layout/radiogroup_checkedchild.xml
+++ b/tests/FrameworkTest/res/layout/radiogroup_checkedchild.xml
@@ -21,23 +21,23 @@
 
       <RadioButton
           android:id="@+id/value_one"
-          android:layout_width="fill_parent"
-          android:layout_height="fill_parent"
+          android:layout_width="match_parent"
+          android:layout_height="match_parent"
           android:textColor="#555555"
           android:checked="true"
           android:text="@string/visibility_1_view_1" />
 
       <RadioButton
           android:id="@+id/value_two"
-          android:layout_width="fill_parent"
-          android:layout_height="fill_parent"
+          android:layout_width="match_parent"
+          android:layout_height="match_parent"
           android:textColor="#555555"
           android:text="@string/visibility_1_view_2" />
 
       <RadioButton
           android:id="@+id/value_three"
-          android:layout_width="fill_parent"
-          android:layout_height="fill_parent"
+          android:layout_width="match_parent"
+          android:layout_height="match_parent"
           android:textColor="#555555"
           android:text="@string/visibility_1_view_3" />
 
diff --git a/tests/FrameworkTest/res/layout/remote_view_host.xml b/tests/FrameworkTest/res/layout/remote_view_host.xml
index dc52181..19d0a73 100644
--- a/tests/FrameworkTest/res/layout/remote_view_host.xml
+++ b/tests/FrameworkTest/res/layout/remote_view_host.xml
@@ -20,6 +20,6 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 </LinearLayout>
diff --git a/tests/FrameworkTest/res/layout/remote_view_test_bad_1.xml b/tests/FrameworkTest/res/layout/remote_view_test_bad_1.xml
index 6a65976..bdac697 100644
--- a/tests/FrameworkTest/res/layout/remote_view_test_bad_1.xml
+++ b/tests/FrameworkTest/res/layout/remote_view_test_bad_1.xml
@@ -21,8 +21,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/linear"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <EditText android:id="@+id/edit"
         android:layout_width="wrap_content"
diff --git a/tests/FrameworkTest/res/layout/remote_view_test_bad_2.xml b/tests/FrameworkTest/res/layout/remote_view_test_bad_2.xml
index 70613c3..630e603 100644
--- a/tests/FrameworkTest/res/layout/remote_view_test_bad_2.xml
+++ b/tests/FrameworkTest/res/layout/remote_view_test_bad_2.xml
@@ -21,8 +21,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/linear"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <WebView android:id="@+id/web"
         android:layout_width="wrap_content"
diff --git a/tests/FrameworkTest/res/layout/remote_view_test_good.xml b/tests/FrameworkTest/res/layout/remote_view_test_good.xml
index 54f4db9..ce9755b 100644
--- a/tests/FrameworkTest/res/layout/remote_view_test_good.xml
+++ b/tests/FrameworkTest/res/layout/remote_view_test_good.xml
@@ -21,8 +21,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/linear"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <TextView android:id="@+id/text"
         android:layout_width="wrap_content"
diff --git a/tests/FrameworkTest/res/layout/scroll_to_rect_with_internal_scroll.xml b/tests/FrameworkTest/res/layout/scroll_to_rect_with_internal_scroll.xml
index d22122d..b6ec479 100644
--- a/tests/FrameworkTest/res/layout/scroll_to_rect_with_internal_scroll.xml
+++ b/tests/FrameworkTest/res/layout/scroll_to_rect_with_internal_scroll.xml
@@ -22,24 +22,24 @@
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/scrollView"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:scrollbars="none">
 
     <LinearLayout
         android:id="@+id/layout"
         android:orientation="vertical"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
 
         <Button android:id="@+id/scrollToBlob"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/scroll_top_button"/>
 
         <TextView android:id="@+id/blob"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="80dip"
             android:layout_marginTop="500dip"
             android:layout_marginBottom="5dip"/>
diff --git a/tests/FrameworkTest/res/layout/scroll_to_rectangle.xml b/tests/FrameworkTest/res/layout/scroll_to_rectangle.xml
index 0839b1a..55d057d 100644
--- a/tests/FrameworkTest/res/layout/scroll_to_rectangle.xml
+++ b/tests/FrameworkTest/res/layout/scroll_to_rectangle.xml
@@ -22,55 +22,55 @@
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/scrollView"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:scrollbars="none">
 
     <LinearLayout
         android:id="@+id/layout"
         android:orientation="vertical"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
 
         <Button android:id="@+id/scrollToRectFromTop"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/scroll_top_button"/>
 
         <Button android:id="@+id/scrollToRectFromTop2"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingBottom="10dip"
             android:text="@string/scroll_top_button2"/>
 
         <TextView android:id="@+id/topBlob"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="5dip"
             android:layout_marginBottom="5dip"/>
 
         <TextView android:id="@+id/childToMakeVisible"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="5dip"
             android:layout_marginBottom="5dip"
             android:text="@string/scroll_to_me"/>
 
         <TextView android:id="@+id/bottomBlob"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="5dip"
             android:layout_marginBottom="5dip"/>
 
         <Button android:id="@+id/scrollToRectFromBottom2"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingTop="10dip"
             android:text="@string/scroll_bottom_button2"/>
 
         <Button android:id="@+id/scrollToRectFromBottom"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/scroll_bottom_button"/>
 
diff --git a/tests/FrameworkTest/res/layout/scrollview_linear_layout.xml b/tests/FrameworkTest/res/layout/scrollview_linear_layout.xml
index 536d2ed..a3c12ce 100644
--- a/tests/FrameworkTest/res/layout/scrollview_linear_layout.xml
+++ b/tests/FrameworkTest/res/layout/scrollview_linear_layout.xml
@@ -16,14 +16,14 @@
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/scrollView"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:scrollbars="none">
 
     <LinearLayout
         android:id="@+id/layout"
         android:orientation="vertical"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
     </LinearLayout>
diff --git a/tests/FrameworkTest/res/layout/scrollview_with_webviews.xml b/tests/FrameworkTest/res/layout/scrollview_with_webviews.xml
index 7963475..e0c0c66 100644
--- a/tests/FrameworkTest/res/layout/scrollview_with_webviews.xml
+++ b/tests/FrameworkTest/res/layout/scrollview_with_webviews.xml
@@ -16,27 +16,27 @@
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/scrollView"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:scrollbars="none">
 
     <LinearLayout
         android:id="@+id/layout"
         android:orientation="vertical"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
 
         <WebView android:id="@+id/wb1"
-             android:layout_width="fill_parent"
+             android:layout_width="match_parent"
              android:layout_height="wrap_content"/>
 
         <Button android:id="@+id/button"
-             android:layout_width="fill_parent"
+             android:layout_width="match_parent"
              android:layout_height="wrap_content"/>
 
         <WebView android:id="@+id/wb2"
-             android:layout_width="fill_parent"
+             android:layout_width="match_parent"
              android:layout_height="wrap_content"/>
 
     </LinearLayout>
diff --git a/tests/FrameworkTest/res/layout/table_layout_cell_span.xml b/tests/FrameworkTest/res/layout/table_layout_cell_span.xml
index 26831e4..fceef0a 100644
--- a/tests/FrameworkTest/res/layout/table_layout_cell_span.xml
+++ b/tests/FrameworkTest/res/layout/table_layout_cell_span.xml
@@ -18,7 +18,7 @@
 -->
 
 <TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <TableRow>
diff --git a/tests/FrameworkTest/res/layout/table_layout_fixed_width.xml b/tests/FrameworkTest/res/layout/table_layout_fixed_width.xml
index 91d9128..507701e 100644
--- a/tests/FrameworkTest/res/layout/table_layout_fixed_width.xml
+++ b/tests/FrameworkTest/res/layout/table_layout_fixed_width.xml
@@ -19,7 +19,7 @@
 -->
 
 <TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <TableRow>
diff --git a/tests/FrameworkTest/res/layout/table_layout_horizontal_gravity.xml b/tests/FrameworkTest/res/layout/table_layout_horizontal_gravity.xml
index dee81a5..fb72d81 100644
--- a/tests/FrameworkTest/res/layout/table_layout_horizontal_gravity.xml
+++ b/tests/FrameworkTest/res/layout/table_layout_horizontal_gravity.xml
@@ -19,7 +19,7 @@
 -->
 
 <TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:stretchColumns="1">
 
diff --git a/tests/FrameworkTest/res/layout/table_layout_vertical_gravity.xml b/tests/FrameworkTest/res/layout/table_layout_vertical_gravity.xml
index 6a8b784..ae17ada 100644
--- a/tests/FrameworkTest/res/layout/table_layout_vertical_gravity.xml
+++ b/tests/FrameworkTest/res/layout/table_layout_vertical_gravity.xml
@@ -19,7 +19,7 @@
 -->
 
 <TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <TableRow>
diff --git a/tests/FrameworkTest/res/layout/table_layout_weight.xml b/tests/FrameworkTest/res/layout/table_layout_weight.xml
index 432c04a..ba4fade 100644
--- a/tests/FrameworkTest/res/layout/table_layout_weight.xml
+++ b/tests/FrameworkTest/res/layout/table_layout_weight.xml
@@ -19,7 +19,7 @@
 -->
 
 <TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <TableRow android:id="@+id/row"
diff --git a/tests/FrameworkTest/res/layout/translucent_background.xml b/tests/FrameworkTest/res/layout/translucent_background.xml
index 6b6e1cf..c4a1acf 100644
--- a/tests/FrameworkTest/res/layout/translucent_background.xml
+++ b/tests/FrameworkTest/res/layout/translucent_background.xml
@@ -19,6 +19,6 @@
 
 <!-- This screen consists of a single text field that displays some text. -->
 <TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/text"
-    android:layout_width="fill_parent" android:layout_height="fill_parent"
+    android:layout_width="match_parent" android:layout_height="match_parent"
     android:gravity="center_vertical|center_horizontal"
     android:text="@string/translucent_background"/>
diff --git a/tests/FrameworkTest/res/layout/viewgroupchildren.xml b/tests/FrameworkTest/res/layout/viewgroupchildren.xml
index a5bb7cb..22595ed 100644
--- a/tests/FrameworkTest/res/layout/viewgroupchildren.xml
+++ b/tests/FrameworkTest/res/layout/viewgroupchildren.xml
@@ -23,7 +23,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/group"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
 </LinearLayout>
diff --git a/tests/FrameworkTest/res/layout/viewstub.xml b/tests/FrameworkTest/res/layout/viewstub.xml
index 9a6f376..8b32d8f 100644
--- a/tests/FrameworkTest/res/layout/viewstub.xml
+++ b/tests/FrameworkTest/res/layout/viewstub.xml
@@ -20,8 +20,8 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <Button android:id="@+id/vis"
         android:layout_width="wrap_content"
diff --git a/tests/FrameworkTest/res/layout/visibility.xml b/tests/FrameworkTest/res/layout/visibility.xml
index b4f9d8b..7edfa33 100644
--- a/tests/FrameworkTest/res/layout/visibility.xml
+++ b/tests/FrameworkTest/res/layout/visibility.xml
@@ -22,30 +22,30 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <LinearLayout
       android:orientation="vertical"
       android:background="@drawable/box"
-      android:layout_width="fill_parent"
+      android:layout_width="match_parent"
       android:layout_height="wrap_content">
 
       <TextView android:id="@+id/refUp"
           android:background="@drawable/red"
-          android:layout_width="fill_parent"
+          android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:text="@string/visibility_1_view_1"/>
 
       <TextView android:id="@+id/victim"
           android:background="@drawable/green"
-          android:layout_width="fill_parent"
+          android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:text="@string/visibility_1_view_2"/>
 
       <TextView android:id="@+id/refDown"
           android:background="@drawable/blue"
-          android:layout_width="fill_parent"
+          android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:text="@string/visibility_1_view_3"/>
 
diff --git a/tests/FrameworkTest/res/layout/visibility_callback.xml b/tests/FrameworkTest/res/layout/visibility_callback.xml
index 8fd7c8f..322b640 100644
--- a/tests/FrameworkTest/res/layout/visibility_callback.xml
+++ b/tests/FrameworkTest/res/layout/visibility_callback.xml
@@ -22,35 +22,35 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <LinearLayout
       android:orientation="vertical"
       android:background="@drawable/box"
-      android:layout_width="fill_parent"
+      android:layout_width="match_parent"
       android:layout_height="wrap_content">
 
       <TextView android:id="@+id/refUp"
           android:background="@drawable/red"
-          android:layout_width="fill_parent"
+          android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:text="@string/visibility_1_view_1"/>
 
       <FrameLayout android:id="@+id/parent"
-                   android:layout_width="fill_parent"
+                   android:layout_width="match_parent"
                    android:layout_height="wrap_content">
           <view class="com.android.frameworktest.view.VisibilityCallback$MonitoredTextView"
                 android:id="@+id/victim"
                 android:background="@drawable/green"
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/visibility_1_view_2"/>
       </FrameLayout>
 
       <TextView android:id="@+id/refDown"
           android:background="@drawable/blue"
-          android:layout_width="fill_parent"
+          android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:text="@string/visibility_1_view_3"/>
 
diff --git a/tests/FrameworkTest/res/layout/weight_sum.xml b/tests/FrameworkTest/res/layout/weight_sum.xml
index 249dc68..f8921ec 100644
--- a/tests/FrameworkTest/res/layout/weight_sum.xml
+++ b/tests/FrameworkTest/res/layout/weight_sum.xml
@@ -22,8 +22,8 @@
     android:orientation="horizontal"
     android:weightSum="1.0"
     android:gravity="center_horizontal"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <Button android:id="@+id/child"
         android:layout_width="0dip"
diff --git a/tests/FrameworkTest/res/layout/with_bitmap_background.xml b/tests/FrameworkTest/res/layout/with_bitmap_background.xml
index b32d99e..01605d5 100644
--- a/tests/FrameworkTest/res/layout/with_bitmap_background.xml
+++ b/tests/FrameworkTest/res/layout/with_bitmap_background.xml
@@ -20,8 +20,8 @@
 
 <LinearLayout android:id="@+id/container" xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="horizontal"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:background="@drawable/bitmap_drawable">
 
 </LinearLayout>
diff --git a/tests/FrameworkTest/res/layout/zero_sized.xml b/tests/FrameworkTest/res/layout/zero_sized.xml
index c837bf9..f1c94f8 100644
--- a/tests/FrameworkTest/res/layout/zero_sized.xml
+++ b/tests/FrameworkTest/res/layout/zero_sized.xml
@@ -22,8 +22,8 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <View android:id="@+id/dimension"
         android:background="#ffff0000"