Deprecate fill_parent and introduce match_parent.

Bug: #2361749.

37 files changed, 233 insertions, 234 deletions

diff --git a/apps/CustomLocale/res/layout/list_item.xml b/apps/CustomLocale/res/layout/list_item.xml
index 8c59f92c7..0ffb8b064 100644
--- a/apps/CustomLocale/res/layout/list_item.xml
+++ b/apps/CustomLocale/res/layout/list_item.xml
@@ -15,12 +15,12 @@
 -->
 <LinearLayout
     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:padding="5dip">
     <TextView
         android:id="@+id/locale_code"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textAppearance="?android:textAppearanceLarge"
         android:layout_weight="1"
@@ -28,7 +28,7 @@
     <TextView
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/locale_name"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textAppearance="?android:textAppearance"
         android:layout_weight="1" />
diff --git a/apps/CustomLocale/res/layout/main.xml b/apps/CustomLocale/res/layout/main.xml
index b1eaa51ba..55bd90cc6 100644
--- a/apps/CustomLocale/res/layout/main.xml
+++ b/apps/CustomLocale/res/layout/main.xml
@@ -16,10 +16,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">
     <TextView
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_weight="0"
         android:text="@string/header_current_locale"
@@ -28,12 +28,12 @@
         android:background="@color/header_background" />
     <TextView
         android:id="@+id/current_locale"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_weight="0"
         android:padding="5dip" />
     <TextView
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_weight="0"
         android:text="@string/header_locale_list"
@@ -42,18 +42,18 @@
         android:background="@color/header_background" />
     <ListView
         android:id="@id/android:list"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:layout_weight="1"
         android:padding="8dip" />
     <TextView
         android:id="@id/android:empty"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:text="@string/no_data_label" />
     <Button
         android:id="@+id/new_locale"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_weight="0"
         android:paddingLeft="8dip"
diff --git a/apps/CustomLocale/res/layout/new_locale.xml b/apps/CustomLocale/res/layout/new_locale.xml
index fafb16e92..e5be408ff 100644
--- a/apps/CustomLocale/res/layout/new_locale.xml
+++ b/apps/CustomLocale/res/layout/new_locale.xml
@@ -16,32 +16,32 @@
 <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"
     android:paddingLeft="8dip"
     android:paddingRight="8dip">
     <TextView
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/new_locale_label" />
     <EditText
         android:id="@+id/value"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="@string/locale_default" android:inputType="text"/>
     <LinearLayout
         android:orientation="horizontal"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content">
         <Button
             android:id="@+id/add"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/add_button" android:layout_gravity="center_vertical"/>
         <Button
             android:id="@+id/add_and_select"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/add_select_button" android:layout_gravity="center_vertical"/>
diff --git a/apps/Development/res/layout/account_list_view.xml b/apps/Development/res/layout/account_list_view.xml
index d25567266..47484edf6 100644
--- a/apps/Development/res/layout/account_list_view.xml
+++ b/apps/Development/res/layout/account_list_view.xml
@@ -16,5 +16,5 @@
 
 <ListView
    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"/>
diff --git a/apps/Development/res/layout/accounts_tester.xml b/apps/Development/res/layout/accounts_tester.xml
index e69f505b5..e3dee5314 100644
--- a/apps/Development/res/layout/accounts_tester.xml
+++ b/apps/Development/res/layout/accounts_tester.xml
@@ -17,20 +17,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">
 
     <LinearLayout
        android:orientation="vertical"
-       android:layout_width="fill_parent"
+       android:layout_width="match_parent"
        android:layout_height="wrap_content">
 
         <ListView android:id="@+id/accounts_tester_authenticators_list"
-           android:layout_width="fill_parent" android:layout_height="fill_parent"/>
+           android:layout_width="match_parent" android:layout_height="match_parent"/>
 
       <LinearLayout
          android:orientation="horizontal"
-         android:layout_width="fill_parent"
+         android:layout_width="match_parent"
          android:layout_height="wrap_content">
 
           <TextView android:id="@+id/accounts_tester_account_types_spinner_label"
@@ -45,11 +45,11 @@
 
       <LinearLayout
          android:orientation="vertical"
-         android:layout_width="fill_parent"
+         android:layout_width="match_parent"
          android:layout_height="wrap_content">
           <LinearLayout
              android:orientation="horizontal"
-             android:layout_width="fill_parent"
+             android:layout_width="match_parent"
              android:layout_height="wrap_content">
          <Button
             android:id="@+id/accounts_tester_get_accounts_by_type"
@@ -75,7 +75,7 @@
 
           <LinearLayout
              android:orientation="horizontal"
-             android:layout_width="fill_parent"
+             android:layout_width="match_parent"
              android:layout_height="wrap_content">
               <TextView android:id="@+id/accounts_tester_desiredFeatures"
                        android:layout_width="wrap_content"
@@ -89,7 +89,7 @@
           </LinearLayout>
           <LinearLayout
              android:orientation="horizontal"
-             android:layout_width="fill_parent"
+             android:layout_width="match_parent"
              android:layout_height="wrap_content">
               <TextView android:id="@+id/accounts_tester_desiredFeatures"
                        android:layout_width="wrap_content"
@@ -106,11 +106,11 @@
 
     <LinearLayout
        android:orientation="horizontal"
-       android:layout_width="fill_parent"
+       android:layout_width="match_parent"
        android:layout_height="wrap_content">
 
        <ListView android:id="@+id/accounts_tester_accounts_list"
-           android:layout_width="fill_parent" android:layout_height="fill_parent"/>
+           android:layout_width="match_parent" android:layout_height="match_parent"/>
 
     </LinearLayout>
 
diff --git a/apps/Development/res/layout/application_hw_pref.xml b/apps/Development/res/layout/application_hw_pref.xml
index c38a0cb1e..c0011e5d1 100755
--- a/apps/Development/res/layout/application_hw_pref.xml
+++ b/apps/Development/res/layout/application_hw_pref.xml
@@ -15,75 +15,75 @@
 -->
 
 <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_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:padding="4dip" >
     
         <TextView android:id="@+id/attr_package_label"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/package_label"
             android:textStyle="bold" />
         <TextView android:id="@+id/attr_package"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
 
         <TextView android:id="@+id/attr_touchscreen_label"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/touchscreen_label"
             android:textStyle="bold" />
         <TextView android:id="@+id/attr_touchscreen"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
 
         <TextView android:id="@+id/attr_input_method_label"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/input_method_label"
             android:textStyle="bold" />
         <TextView android:id="@+id/attr_input_method"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
 
         <TextView android:id="@+id/attr_hard_keyboard_label"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/hard_keyboard_label"
             android:textStyle="bold" />
         <TextView android:id="@+id/attr_hard_keyboard"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
 
         <TextView android:id="@+id/attr_navigation_label"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/navigation_label"
             android:textStyle="bold" />
         <TextView android:id="@+id/attr_navigation"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
 
         <TextView android:id="@+id/attr_five_way_nav_label"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/five_way_nav_label"
             android:textStyle="bold" />
         <TextView android:id="@+id/attr_five_way_nav"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
         <TextView android:id="@+id/attr_gles_version_label"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/gles_version_label"
             android:textStyle="bold" />
         <TextView android:id="@+id/attr_gles_version"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
     </LinearLayout>
 </ScrollView>
diff --git a/apps/Development/res/layout/authenticators_list_item.xml b/apps/Development/res/layout/authenticators_list_item.xml
index 309a81887..25e1daefe 100644
--- a/apps/Development/res/layout/authenticators_list_item.xml
+++ b/apps/Development/res/layout/authenticators_list_item.xml
@@ -19,7 +19,7 @@
 -->
 
 <LinearLayout 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:minHeight="?android:attr/listPreferredItemHeight"
     android:paddingTop="1dip"
@@ -35,7 +35,7 @@
 
     <TextView android:id="@+id/accounts_tester_authenticator_label"
         android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
+        android:layout_height="match_parent"
         android:gravity="center_vertical"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:layout_gravity="center_horizontal|center_vertical" />
diff --git a/apps/Development/res/layout/bad_behavior.xml b/apps/Development/res/layout/bad_behavior.xml
index 72275aeb1..e7477ec8d 100644
--- a/apps/Development/res/layout/bad_behavior.xml
+++ b/apps/Development/res/layout/bad_behavior.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">
 
     <Button android:id="@+id/bad_behavior_crash_system"
             android:layout_width="wrap_content"
diff --git a/apps/Development/res/layout/connectivity.xml b/apps/Development/res/layout/connectivity.xml
index b60349659..612304fa7 100644
--- a/apps/Development/res/layout/connectivity.xml
+++ b/apps/Development/res/layout/connectivity.xml
@@ -20,12 +20,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">
 
     <LinearLayout
       android:orientation="horizontal"
-      android:layout_width="fill_parent"
+      android:layout_width="match_parent"
       android:layout_height="wrap_content">
         <Button android:id="@+id/enableWifi"
           android:layout_width="wrap_content"
@@ -39,13 +39,13 @@
 
     <!-- divider line -->
     <View android:background="#FFFFFFFF"
-      android:layout_width="fill_parent"
+      android:layout_width="match_parent"
       android:layout_height="3dip" />
 
     <LinearLayout
       android:orientation="horizontal"
       android:paddingTop="4dip"
-      android:layout_width="fill_parent"
+      android:layout_width="match_parent"
       android:layout_height="wrap_content">
         <Button android:id="@+id/startDelayedCycle"
           android:layout_width="wrap_content"
@@ -59,7 +59,7 @@
 
     <LinearLayout
       android:orientation="horizontal"
-      android:layout_width="fill_parent"
+      android:layout_width="match_parent"
       android:layout_height="wrap_content">
         <TextView
           android:layout_width="wrap_content"
@@ -73,7 +73,7 @@
 
     <LinearLayout
       android:orientation="horizontal"
-      android:layout_width="fill_parent"
+      android:layout_width="match_parent"
       android:layout_height="wrap_content">
         <TextView
           android:layout_width="wrap_content"
@@ -87,7 +87,7 @@
 
     <LinearLayout
       android:orientation="horizontal"
-      android:layout_width="fill_parent"
+      android:layout_width="match_parent"
       android:layout_height="wrap_content">
         <TextView
           android:layout_width="wrap_content"
@@ -101,13 +101,13 @@
 
     <!-- divider line -->
     <View android:background="#FFFFFFFF"
-      android:layout_width="fill_parent"
+      android:layout_width="match_parent"
       android:layout_height="3dip" />
 
     <LinearLayout
       android:orientation="horizontal"
       android:paddingTop="4dip"
-      android:layout_width="fill_parent"
+      android:layout_width="match_parent"
       android:layout_height="wrap_content">
         <Button android:id="@+id/startScreenCycle"
           android:layout_width="wrap_content"
@@ -121,7 +121,7 @@
 
     <LinearLayout
       android:orientation="horizontal"
-      android:layout_width="fill_parent"
+      android:layout_width="match_parent"
       android:layout_height="wrap_content">
         <TextView
           android:layout_width="wrap_content"
@@ -135,7 +135,7 @@
 
     <LinearLayout
       android:orientation="horizontal"
-      android:layout_width="fill_parent"
+      android:layout_width="match_parent"
       android:layout_height="wrap_content">
         <TextView
           android:layout_width="wrap_content"
@@ -149,7 +149,7 @@
 
     <LinearLayout
       android:orientation="horizontal"
-      android:layout_width="fill_parent"
+      android:layout_width="match_parent"
       android:layout_height="wrap_content">
         <TextView
           android:layout_width="wrap_content"
@@ -163,13 +163,13 @@
 
     <!-- divider line -->
     <View android:background="#FFFFFFFF"
-      android:layout_width="fill_parent"
+      android:layout_width="match_parent"
       android:layout_height="3dip" />
 
     <LinearLayout
       android:orientation="horizontal"
       android:paddingTop="4dip"
-      android:layout_width="fill_parent"
+      android:layout_width="match_parent"
       android:layout_height="wrap_content">
         <Button android:id="@+id/start_mms"
           android:layout_width="wrap_content"
@@ -182,7 +182,7 @@
     </LinearLayout>
     <LinearLayout
       android:orientation="horizontal"
-      android:layout_width="fill_parent"
+      android:layout_width="match_parent"
       android:layout_height="wrap_content">
         <Button android:id="@+id/start_hipri"
           android:layout_width="wrap_content"
@@ -195,7 +195,7 @@
     </LinearLayout>
     <LinearLayout
       android:orientation="horizontal"
-      android:layout_width="fill_parent"
+      android:layout_width="match_parent"
       android:layout_height="wrap_content">
         <Button android:id="@+id/crash"
           android:layout_width="wrap_content"
diff --git a/apps/Development/res/layout/development_settings.xml b/apps/Development/res/layout/development_settings.xml
index 7bad3bb42..9c04f5d6a 100644
--- a/apps/Development/res/layout/development_settings.xml
+++ b/apps/Development/res/layout/development_settings.xml
@@ -18,12 +18,12 @@
 */
 -->
 <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">
 
     <RelativeLayout 
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
         <TextView android:id="@+id/debug_app_label"
             android:layout_width="wrap_content"
@@ -76,7 +76,7 @@
             android:text="@string/development_settings_compatibility_mode_text" />
 
         <Spinner android:id="@+id/max_procs"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/compatibility_mode"
             android:layout_alignParentLeft="true" />
@@ -123,21 +123,21 @@
             android:text="@string/development_settings_show_sleep_text" />
             
         <Spinner android:id="@+id/window_animation_scale"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/show_sleep"
             android:layout_alignParentLeft="true">
         </Spinner>
 
         <Spinner android:id="@+id/transition_animation_scale"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/window_animation_scale"
             android:layout_alignParentLeft="true">
         </Spinner>
 
         <Spinner android:id="@+id/font_hinting"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/transition_animation_scale"
             android:layout_alignParentLeft="true">
diff --git a/apps/Development/res/layout/enter_url.xml b/apps/Development/res/layout/enter_url.xml
index 062c67efc..586800648 100644
--- a/apps/Development/res/layout/enter_url.xml
+++ b/apps/Development/res/layout/enter_url.xml
@@ -15,19 +15,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">          	
     <com.android.development.UrlEditText android:id="@+id/url_edit_text"
         android:textSize="13sp"
         android:autoText="false"
         android:capitalize="none"
-        android:layout_width="fill_parent" android:layout_height="wrap_content"/>
+        android:layout_width="match_parent" android:layout_height="wrap_content"/>
     <com.android.development.DisplayEditText android:id="@+id/display_edit_text"
         android:textSize="13sp"
         android:autoText="false"
         android:capitalize="none"
-        android:layout_width="fill_parent" android:layout_height="wrap_content"/>
+        android:layout_width="match_parent" android:layout_height="wrap_content"/>
     <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"/>
 </LinearLayout>
 
 
diff --git a/apps/Development/res/layout/get_auth_token_view.xml b/apps/Development/res/layout/get_auth_token_view.xml
index f371523ce..c014cad60 100644
--- a/apps/Development/res/layout/get_auth_token_view.xml
+++ b/apps/Development/res/layout/get_auth_token_view.xml
@@ -17,16 +17,16 @@
 <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:id="@+id/accounts_tester_get_auth_token_dialog_message"
-        android:layout_width="fill_parent" android:layout_height="wrap_content"
+        android:layout_width="match_parent" android:layout_height="wrap_content"
         android:text="@string/accounts_tester_enter_auth_token_type" />
 
     <EditText android:id="@+id/accounts_tester_auth_token_type"
               android:singleLine="true"
-              android:layout_width="fill_parent"
+              android:layout_width="match_parent"
               android:layout_height="wrap_content"
               android:minWidth="250dip"
               android:scrollHorizontally="true"
diff --git a/apps/Development/res/layout/log_viewer.xml b/apps/Development/res/layout/log_viewer.xml
index 98fe14eac..7075d5fe7 100644
--- a/apps/Development/res/layout/log_viewer.xml
+++ b/apps/Development/res/layout/log_viewer.xml
@@ -15,6 +15,6 @@
 -->
 
 <com.android.development.LogTextBox 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"
     />
diff --git a/apps/Development/res/layout/media_scanner_activity.xml b/apps/Development/res/layout/media_scanner_activity.xml
index 53f2b15a3..974f68378 100644
--- a/apps/Development/res/layout/media_scanner_activity.xml
+++ b/apps/Development/res/layout/media_scanner_activity.xml
@@ -15,11 +15,11 @@
 -->
 
 <LinearLayout 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"
 	android:orientation="horizontal">
 
     <TextView android:id="@+id/title" android:textSize="16sp" android:textStyle="bold"
-        android:layout_width="fill_parent" android:layout_height="wrap_content" />
+        android:layout_width="match_parent" android:layout_height="wrap_content" />
 
 </LinearLayout>
diff --git a/apps/Development/res/layout/monkey_screen.xml b/apps/Development/res/layout/monkey_screen.xml
index c5083381c..fc4a9d0bd 100644
--- a/apps/Development/res/layout/monkey_screen.xml
+++ b/apps/Development/res/layout/monkey_screen.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">
 
     <LinearLayout
         android:orientation="horizontal"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingTop="10dip" >
 
@@ -32,14 +32,14 @@
             android:text="@string/monkey_screen_initial_activity_label" />
 
         <Button android:id="@+id/initialActivity"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/monkey_screen_initialActivity_text" />
     </LinearLayout>
 
     <LinearLayout
         android:orientation="horizontal"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingTop="5dip" >
 
@@ -51,7 +51,7 @@
 
         <EditText android:id="@+id/numberOfEvents"
             android:layout_marginLeft="2dip"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@android:drawable/editbox_background"
             android:numeric="integer"
diff --git a/apps/Development/res/layout/package_item.xml b/apps/Development/res/layout/package_item.xml
index 7860f9b76..5a26496e1 100644
--- a/apps/Development/res/layout/package_item.xml
+++ b/apps/Development/res/layout/package_item.xml
@@ -15,6 +15,6 @@
 -->
 
 <Button 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:background="@android:drawable/list_highlight"-->
diff --git a/apps/Development/res/layout/package_list_item.xml b/apps/Development/res/layout/package_list_item.xml
index 6a0faeed4..3041bcc13 100644
--- a/apps/Development/res/layout/package_list_item.xml
+++ b/apps/Development/res/layout/package_list_item.xml
@@ -18,14 +18,14 @@
 -->
 
 <LinearLayout 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:minHeight="?android:attr/listPreferredItemHeight"
     android:orientation="vertical"
     android:gravity="fill" >
 
     <LinearLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:orientation="horizontal"
@@ -43,7 +43,7 @@
     
         <LinearLayout
             android:orientation="vertical"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content" >
             <TextView android:id="@+id/name"
                 android:layout_width="wrap_content"
diff --git a/apps/Development/res/layout/package_summary.xml b/apps/Development/res/layout/package_summary.xml
index 99717e6c1..e02ab3ce5 100644
--- a/apps/Development/res/layout/package_summary.xml
+++ b/apps/Development/res/layout/package_summary.xml
@@ -15,21 +15,21 @@
 -->
 
 <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_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:padding="4dip" >
     
         <TextView android:id="@+id/packageView"
-            android:layout_width="fill_parent" android:layout_height="wrap_content"
+            android:layout_width="match_parent" android:layout_height="wrap_content"
             android:textStyle="bold" />
 
         <LinearLayout
-            android:layout_width="fill_parent" android:layout_height="wrap_content"
+            android:layout_width="match_parent" android:layout_height="wrap_content"
             android:orientation="horizontal"
             android:paddingTop="4dip"
             android:paddingBottom="6dip"
@@ -44,29 +44,29 @@
                 android:orientation="vertical">
 
                 <TextView android:id="@+id/classView"
-                    android:layout_width="fill_parent" android:layout_height="wrap_content" />
+                    android:layout_width="match_parent" android:layout_height="wrap_content" />
 
                 <TextView android:id="@+id/label"
-                    android:layout_width="fill_parent" android:layout_height="wrap_content" />
+                    android:layout_width="match_parent" android:layout_height="wrap_content" />
 
                 <TextView android:id="@+id/disabled"
-                    android:layout_width="fill_parent" android:layout_height="wrap_content"
+                    android:layout_width="match_parent" android:layout_height="wrap_content"
                     android:text="@string/disabled" />
 
                 <TextView android:id="@+id/system"
-                    android:layout_width="fill_parent" android:layout_height="wrap_content"
+                    android:layout_width="match_parent" android:layout_height="wrap_content"
                     android:text="@string/system" />
 
                 <TextView android:id="@+id/debuggable"
-                    android:layout_width="fill_parent" android:layout_height="wrap_content"
+                    android:layout_width="match_parent" android:layout_height="wrap_content"
                     android:text="@string/debuggable" />
 
                 <TextView android:id="@+id/nocode"
-                    android:layout_width="fill_parent" android:layout_height="wrap_content"
+                    android:layout_width="match_parent" android:layout_height="wrap_content"
                     android:text="@string/nocode" />
 
                 <TextView android:id="@+id/persistent"
-                    android:layout_width="fill_parent" android:layout_height="wrap_content"
+                    android:layout_width="match_parent" android:layout_height="wrap_content"
                     android:text="@string/persistent" />
 
             </LinearLayout>
@@ -80,46 +80,46 @@
         </LinearLayout>
 
         <TextView style="@style/SummaryCategoryLayout"
-            android:layout_width="fill_parent" android:layout_height="wrap_content"
+            android:layout_width="match_parent" android:layout_height="wrap_content"
             android:textStyle="bold" android:text="@string/package_summary_process_label" />
 
         <TextView android:id="@+id/process"
-            android:layout_width="fill_parent" android:layout_height="wrap_content" />
+            android:layout_width="match_parent" android:layout_height="wrap_content" />
 
         <TextView style="@style/SummaryCategoryLayout"
-            android:layout_width="fill_parent" android:layout_height="wrap_content"
+            android:layout_width="match_parent" android:layout_height="wrap_content"
             android:textStyle="bold" android:text="@string/package_summary_uid_label" />
 
         <TextView android:id="@+id/uid"
-            android:layout_width="fill_parent" android:layout_height="wrap_content" />
+            android:layout_width="match_parent" android:layout_height="wrap_content" />
 
         <TextView style="@style/SummaryCategoryLayout"
-            android:layout_width="fill_parent" android:layout_height="wrap_content"
+            android:layout_width="match_parent" android:layout_height="wrap_content"
             android:textStyle="bold" android:text="@string/package_summary_task_label" />
 
         <TextView android:id="@+id/task"
-            android:layout_width="fill_parent" android:layout_height="wrap_content" />
+            android:layout_width="match_parent" android:layout_height="wrap_content" />
 
         <TextView style="@style/SummaryCategoryLayout"
-            android:layout_width="fill_parent" android:layout_height="wrap_content"
+            android:layout_width="match_parent" android:layout_height="wrap_content"
             android:textStyle="bold" android:text="@string/package_summary_version_label" />
 
         <TextView android:id="@+id/version"
-            android:layout_width="fill_parent" android:layout_height="wrap_content" />
+            android:layout_width="match_parent" android:layout_height="wrap_content" />
 
         <TextView style="@style/SummaryCategoryLayout"
-            android:layout_width="fill_parent" android:layout_height="wrap_content"
+            android:layout_width="match_parent" android:layout_height="wrap_content"
             android:textStyle="bold" android:text="@string/package_summary_source_label" />
 
         <TextView android:id="@+id/source"
-            android:layout_width="fill_parent" android:layout_height="wrap_content" />
+            android:layout_width="match_parent" android:layout_height="wrap_content" />
 
         <TextView style="@style/SummaryCategoryLayout"
-            android:layout_width="fill_parent" android:layout_height="wrap_content"
+            android:layout_width="match_parent" android:layout_height="wrap_content"
             android:textStyle="bold" android:text="@string/package_summary_data_label" />
 
         <TextView android:id="@+id/data"
-            android:layout_width="fill_parent" android:layout_height="wrap_content" />
+            android:layout_width="match_parent" android:layout_height="wrap_content" />
 
         <LinearLayout android:id="@+id/activities" style="@style/SummaryCategoryLayout">
             <TextView style="@style/SummaryCategoryHeader"
diff --git a/apps/Development/res/layout/permission_details.xml b/apps/Development/res/layout/permission_details.xml
index d6635f851..b19ee0beb 100755
--- a/apps/Development/res/layout/permission_details.xml
+++ b/apps/Development/res/layout/permission_details.xml
@@ -16,16 +16,16 @@
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:fillViewport="true"
-    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_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:padding="4dip" >
 
         <LinearLayout android:orientation="horizontal"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="4dip" >
             <TextView android:id="@+id/perm_name_label"
@@ -39,7 +39,7 @@
         </LinearLayout>
 
         <LinearLayout android:orientation="horizontal"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="4dip" >
             <TextView android:id="@+id/perm_desc_label"
@@ -53,7 +53,7 @@
         </LinearLayout>
 
         <LinearLayout android:orientation="horizontal"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="4dip" >
             <TextView android:id="@+id/perm_group_label"
@@ -67,7 +67,7 @@
         </LinearLayout>
 
         <LinearLayout android:orientation="horizontal"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="4dip" >
             <TextView android:id="@+id/perm_protection_label"
@@ -81,7 +81,7 @@
         </LinearLayout>
 
         <LinearLayout android:orientation="horizontal"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="4dip" >
             <TextView android:id="@+id/perm_source_label"
@@ -95,7 +95,7 @@
         </LinearLayout>
 
         <LinearLayout android:orientation="horizontal"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="4dip" >
             <TextView android:id="@+id/source_uid_label"
@@ -109,7 +109,7 @@
         </LinearLayout>
         <LinearLayout android:id="@+id/shared_pkgs_panel"
             android:orientation="vertical"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="4dip" >
             <TextView android:id="@+id/shared_pkgs_label"
@@ -128,7 +128,7 @@
             android:text="@string/perm_list_header_text"
             android:textStyle="bold" />
         <ListView android:id="@android:id/list"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
         </LinearLayout>
 </ScrollView>
diff --git a/apps/Development/res/layout/pkg_list_item.xml b/apps/Development/res/layout/pkg_list_item.xml
index 29de4232d..585e2f15d 100755
--- a/apps/Development/res/layout/pkg_list_item.xml
+++ b/apps/Development/res/layout/pkg_list_item.xml
@@ -18,7 +18,7 @@
 -->
 
 <LinearLayout 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:minHeight="?android:attr/listPreferredItemHeight"
     android:orientation="horizontal"
diff --git a/apps/Development/res/layout/process_info.xml b/apps/Development/res/layout/process_info.xml
index b25f223e1..311e81b00 100755
--- a/apps/Development/res/layout/process_info.xml
+++ b/apps/Development/res/layout/process_info.xml
@@ -15,31 +15,31 @@
 -->
 
 <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_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:padding="4dip" >
     
         <TextView android:id="@+id/process_name_header"
-            android:layout_width="fill_parent" 
+            android:layout_width="match_parent" 
             android:layout_height="wrap_content"
             android:text="@string/process_name_header"
             android:textStyle="bold" />
         <TextView android:id="@+id/process_name"
-            android:layout_width="fill_parent" 
+            android:layout_width="match_parent" 
             android:layout_height="wrap_content" />
         <TextView android:id="@+id/package_list_header"
-            android:layout_width="fill_parent" 
+            android:layout_width="match_parent" 
             android:layout_height="wrap_content"
             android:text="@string/package_list_header"
             android:textStyle="bold" />
 
         <LinearLayout android:id="@+id/package_list"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:paddingTop="4dip"
diff --git a/apps/Development/res/layout/show_activity.xml b/apps/Development/res/layout/show_activity.xml
index 6a7617c97..c09ac45dc 100644
--- a/apps/Development/res/layout/show_activity.xml
+++ b/apps/Development/res/layout/show_activity.xml
@@ -19,20 +19,20 @@
 -->
 
 <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:layout_width="fill_parent" android:layout_height="fill_parent"
+        android:layout_width="match_parent" android:layout_height="match_parent"
         android:orientation="vertical"
         android:paddingTop="8dip" android:paddingLeft="2dip" android:paddingRight="2dip" >
     
         <TextView android:id="@+id/packageView"
-            android:layout_width="fill_parent" android:layout_height="wrap_content"
+            android:layout_width="match_parent" android:layout_height="wrap_content"
             android:textStyle="bold" />
     
         <LinearLayout
-            android:layout_width="fill_parent" android:layout_height="wrap_content"
+            android:layout_width="match_parent" android:layout_height="wrap_content"
             android:orientation="horizontal"
             android:paddingTop="4dip"
             android:paddingBottom="6dip" >
@@ -42,63 +42,63 @@
                 android:paddingRight="8dip" />
                  
             <LinearLayout
-                android:layout_width="fill_parent" android:layout_height="wrap_content"
+                android:layout_width="match_parent" android:layout_height="wrap_content"
                 android:orientation="vertical">
     
                 <TextView android:id="@+id/classView"
-                    android:layout_width="fill_parent" android:layout_height="wrap_content" />
+                    android:layout_width="match_parent" android:layout_height="wrap_content" />
     
                 <TextView android:id="@+id/label"
-                    android:layout_width="fill_parent" android:layout_height="wrap_content" />
+                    android:layout_width="match_parent" android:layout_height="wrap_content" />
     
                 <TextView android:id="@+id/launch"
-                    android:layout_width="fill_parent" android:layout_height="wrap_content" />
+                    android:layout_width="match_parent" android:layout_height="wrap_content" />
 
             </LinearLayout>
     
         </LinearLayout>
     
         <TextView style="@style/SummaryCategoryLayout"
-            android:layout_width="fill_parent" android:layout_height="wrap_content"
+            android:layout_width="match_parent" android:layout_height="wrap_content"
             android:textStyle="bold" android:text="@string/show_activity_process_label" />
     
         <TextView android:id="@+id/process"
-            android:layout_width="fill_parent" android:layout_height="wrap_content" />
+            android:layout_width="match_parent" android:layout_height="wrap_content" />
     
         <TextView style="@style/SummaryCategoryLayout"
-            android:layout_width="fill_parent" android:layout_height="wrap_content"
+            android:layout_width="match_parent" android:layout_height="wrap_content"
             android:textStyle="bold" android:text="@string/show_activity_task_affinity_label" />
     
         <TextView android:id="@+id/taskAffinity"
-            android:layout_width="fill_parent" android:layout_height="wrap_content" />
+            android:layout_width="match_parent" android:layout_height="wrap_content" />
     
         <TextView style="@style/SummaryCategoryLayout"
-            android:layout_width="fill_parent" android:layout_height="wrap_content"
+            android:layout_width="match_parent" android:layout_height="wrap_content"
             android:textStyle="bold" android:text="@string/show_activity_required_permission_label" />
     
         <TextView android:id="@+id/permission"
-            android:layout_width="fill_parent" android:layout_height="wrap_content" />
+            android:layout_width="match_parent" android:layout_height="wrap_content" />
     
         <TextView style="@style/SummaryCategoryLayout"
-            android:layout_width="fill_parent" android:layout_height="wrap_content"
+            android:layout_width="match_parent" android:layout_height="wrap_content"
             android:textStyle="bold" android:text="@string/show_activity_multiprocess_label" />
     
         <TextView android:id="@+id/multiprocess"
-            android:layout_width="fill_parent" android:layout_height="wrap_content" />
+            android:layout_width="match_parent" android:layout_height="wrap_content" />
     
         <TextView style="@style/SummaryCategoryLayout"
-            android:layout_width="fill_parent" android:layout_height="wrap_content"
+            android:layout_width="match_parent" android:layout_height="wrap_content"
             android:textStyle="bold" android:text="@string/show_activity_clear_on_background_label" />
     
         <TextView android:id="@+id/clearOnBackground"
-            android:layout_width="fill_parent" android:layout_height="wrap_content" />
+            android:layout_width="match_parent" android:layout_height="wrap_content" />
     
         <TextView style="@style/SummaryCategoryLayout"
-            android:layout_width="fill_parent" android:layout_height="wrap_content"
+            android:layout_width="match_parent" android:layout_height="wrap_content"
             android:textStyle="bold" android:text="@string/show_activity_state_not_needed_label" />
     
         <TextView android:id="@+id/stateNotNeeded"
-            android:layout_width="fill_parent" android:layout_height="wrap_content" />
+            android:layout_width="match_parent" android:layout_height="wrap_content" />
     
     </LinearLayout>
 
diff --git a/apps/Development/res/layout/sync_adapter_driver.xml b/apps/Development/res/layout/sync_adapter_driver.xml
index 58c0ebb34..9e99e9958 100644
--- a/apps/Development/res/layout/sync_adapter_driver.xml
+++ b/apps/Development/res/layout/sync_adapter_driver.xml
@@ -17,11 +17,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">
 
     <LinearLayout android:orientation="vertical"
-		  android:layout_width="fill_parent"
+		  android:layout_width="match_parent"
 		  android:layout_height="wrap_content">
         <TextView android:id="@+id/sync_adapters_spinner_label"
 		android:layout_width="wrap_content"
@@ -34,7 +34,7 @@
                  android:layout_height="wrap_content"/>
         <LinearLayout
 	   android:orientation="horizontal"
-           android:layout_width="fill_parent"
+           android:layout_width="match_parent"
            android:layout_height="52dip">
             <Button
 	       android:id="@+id/bind_button"
@@ -60,7 +60,7 @@
 
         <LinearLayout
            android:orientation="horizontal"
-           android:layout_width="fill_parent"
+           android:layout_width="match_parent"
            android:layout_height="52dip">
             <Button
                android:id="@+id/start_sync_button"
diff --git a/apps/Development/res/layout/sync_adapter_item.xml b/apps/Development/res/layout/sync_adapter_item.xml
index d818c789a..15a25e087 100644
--- a/apps/Development/res/layout/sync_adapter_item.xml
+++ b/apps/Development/res/layout/sync_adapter_item.xml
@@ -21,6 +21,6 @@
     android:id="@android:id/text1"
 	style="?android:attr/spinnerItemStyle"
     android:singleLine="true"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="52dip"
     android:ellipsize="marquee" />
diff --git a/apps/Development/res/layout/url_list.xml b/apps/Development/res/layout/url_list.xml
index f004efff3..5364d6107 100644
--- a/apps/Development/res/layout/url_list.xml
+++ b/apps/Development/res/layout/url_list.xml
@@ -15,7 +15,7 @@
 -->
 
 <TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" 
-	android:layout_width="fill_parent"
+	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:textColor="#FF000000"
 	android:textSize="13sp"
diff --git a/apps/Development/res/values/styles.xml b/apps/Development/res/values/styles.xml
index 591eed8af..0af882c6e 100644
--- a/apps/Development/res/values/styles.xml
+++ b/apps/Development/res/values/styles.xml
@@ -16,7 +16,7 @@
 
 <resources>
     <style name="SummaryCategoryLayout">
-        <item name="android:layout_width">fill_parent</item>
+        <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:orientation">vertical</item>
     </style>
@@ -34,8 +34,8 @@
         <item name="android:paddingTop">10dip</item>
         <item name="android:paddingRight">10dip</item>
         <item name="android:paddingBottom">10dip</item>
-        <item name="android:layout_width">fill_parent</item>
-        <item name="android:layout_height">fill_parent</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
     </style>
     <style name="entry_layout">
         <item name="android:orientation">horizontal</item>
diff --git a/apps/Development/src/com/android/development/Details.java b/apps/Development/src/com/android/development/Details.java
index 16722a3ab..e0da96148 100644
--- a/apps/Development/src/com/android/development/Details.java
+++ b/apps/Development/src/com/android/development/Details.java
@@ -27,7 +27,6 @@ import android.widget.ScrollView;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
@@ -75,8 +74,8 @@ public class Details extends Activity
         }
         mLinearLayout = new LinearLayout(this);
         mScrollView.addView(mLinearLayout, new ViewGroup.LayoutParams(
-                                        ViewGroup.LayoutParams.FILL_PARENT,
-                                        ViewGroup.LayoutParams.FILL_PARENT));
+                                        ViewGroup.LayoutParams.MATCH_PARENT,
+                                        ViewGroup.LayoutParams.MATCH_PARENT));
         mLinearLayout.setOrientation(LinearLayout.VERTICAL);
 
         // Here in onStart, we're given data.  We use that because some
@@ -109,7 +108,7 @@ public class Details extends Activity
     
     LinearLayout.LayoutParams lazy()
     {
-        return new LinearLayout.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT,
+        return new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
                                  ViewGroup.LayoutParams.WRAP_CONTENT, 0);
     }
 
diff --git a/apps/FontLab/res/layout/font_lab.xml b/apps/FontLab/res/layout/font_lab.xml
index 1a79add49..ff9db319a 100644
--- a/apps/FontLab/res/layout/font_lab.xml
+++ b/apps/FontLab/res/layout/font_lab.xml
@@ -16,14 +16,14 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/content"
-    android:layout_width="fill_parent" android:layout_height="fill_parent"
+    android:layout_width="match_parent" android:layout_height="match_parent"
     android:orientation="vertical"
     android:paddingLeft="4dip" android:paddingRight="4dip"
     android:paddingTop="4dip" android:paddingBottom="4dip">
         
-    <TextView android:id="@+id/column1" android:layout_width="fill_parent" android:layout_height="0dip" android:layout_weight="1"
+    <TextView android:id="@+id/column1" android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1"
         android:layout_marginBottom="8dip" />
-    <TextView android:id="@+id/column2" android:layout_width="fill_parent" android:layout_height="0dip" android:layout_weight="1" />
+    <TextView android:id="@+id/column2" android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" />
         
 </LinearLayout>
 
diff --git a/apps/GestureBuilder/res/layout/create_gesture.xml b/apps/GestureBuilder/res/layout/create_gesture.xml
index ad58ab3d2..89e64c61c 100644
--- a/apps/GestureBuilder/res/layout/create_gesture.xml
+++ b/apps/GestureBuilder/res/layout/create_gesture.xml
@@ -17,13 +17,13 @@
 <LinearLayout
     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"
     
     android:orientation="vertical">
 
     <LinearLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
 
         android:orientation="horizontal">
@@ -49,7 +49,7 @@
     
     <android.gesture.GestureOverlayView
         android:id="@+id/gestures_overlay"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="0dip"
         android:layout_weight="1.0"
 
@@ -58,7 +58,7 @@
     <LinearLayout
         style="@android:style/ButtonBar"
 
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
 
         android:orientation="horizontal">
diff --git a/apps/GestureBuilder/res/layout/dialog_rename.xml b/apps/GestureBuilder/res/layout/dialog_rename.xml
index 496894493..49df8066e 100644
--- a/apps/GestureBuilder/res/layout/dialog_rename.xml
+++ b/apps/GestureBuilder/res/layout/dialog_rename.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="wrap_content"
     android:padding="20dip"
     android:orientation="vertical">
@@ -31,7 +31,7 @@
     <EditText
         android:id="@+id/name"
         android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:scrollHorizontally="true"
         android:autoText="false"
         android:capitalize="none"
diff --git a/apps/GestureBuilder/res/layout/gestures_item.xml b/apps/GestureBuilder/res/layout/gestures_item.xml
index 1563dfe50..36c93b8d6 100644
--- a/apps/GestureBuilder/res/layout/gestures_item.xml
+++ b/apps/GestureBuilder/res/layout/gestures_item.xml
@@ -16,7 +16,7 @@
 
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@android:id/text1"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
 
     android:gravity="center_vertical"
diff --git a/apps/GestureBuilder/res/layout/gestures_list.xml b/apps/GestureBuilder/res/layout/gestures_list.xml
index 7e5b94acc..d0b5e3df3 100644
--- a/apps/GestureBuilder/res/layout/gestures_list.xml
+++ b/apps/GestureBuilder/res/layout/gestures_list.xml
@@ -16,21 +16,21 @@
 <LinearLayout
     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"
 
     android:orientation="vertical">
 
     <ListView
         android:id="@android:id/list"
 
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="0dip"
         android:layout_weight="1.0" />
 
     <TextView
         android:id="@android:id/empty"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="0dip"
         android:layout_weight="1.0"
 
@@ -42,7 +42,7 @@
     <LinearLayout
         style="@android:style/ButtonBar"
 
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
 
         android:orientation="horizontal">
diff --git a/apps/GraphicsLab/res/layout/graphics_lab.xml b/apps/GraphicsLab/res/layout/graphics_lab.xml
index 50778313a..7c0e5d9f6 100644
--- a/apps/GraphicsLab/res/layout/graphics_lab.xml
+++ b/apps/GraphicsLab/res/layout/graphics_lab.xml
@@ -16,7 +16,7 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/content"
-    android:layout_width="fill_parent" android:layout_height="fill_parent"
+    android:layout_width="match_parent" android:layout_height="match_parent"
     android:orientation="vertical"
     android:paddingLeft="4dip" android:paddingRight="4dip"
     android:paddingTop="4dip" android:paddingBottom="4dip">        
diff --git a/apps/SpareParts/res/layout/spare_parts.xml b/apps/SpareParts/res/layout/spare_parts.xml
index f39298b4e..6ef40d2ca 100644
--- a/apps/SpareParts/res/layout/spare_parts.xml
+++ b/apps/SpareParts/res/layout/spare_parts.xml
@@ -18,21 +18,21 @@
 */
 -->
 <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">
 
     <RelativeLayout 
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
         <Spinner android:id="@+id/window_animation_scale"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true">
         </Spinner>
 
         <Spinner android:id="@+id/transition_animation_scale"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/window_animation_scale"
             android:layout_alignParentLeft="true">
diff --git a/apps/Term/res/layout/term_activity.xml b/apps/Term/res/layout/term_activity.xml
index 7d93d1659..6ce77197a 100644
--- a/apps/Term/res/layout/term_activity.xml
+++ b/apps/Term/res/layout/term_activity.xml
@@ -17,8 +17,8 @@
 -->
 
 <LinearLayout 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"
     android:orientation="vertical">
 
     <com.android.term.EmulatorView android:id="@+id/emulatorView"
diff --git a/apps/launchperf/res/layout/complex_layout.xml b/apps/launchperf/res/layout/complex_layout.xml
index 4e585b98e..291b2fe72 100644
--- a/apps/launchperf/res/layout/complex_layout.xml
+++ b/apps/launchperf/res/layout/complex_layout.xml
@@ -23,36 +23,36 @@
  -->
 
 <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">
 
 <!--    <TabHost
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="200dip">
     </TabHost>
 
     <GridView
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="200dip"
         android:numColumns="5">
     </GridView> -->
 
     <LinearLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="200dip"
         android:orientation="vertical">
         
         <TextView
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/header_absolute"/>
 
         <AbsoluteLayout
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
             <TextView
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_x="0dip"
                 android:layout_y="0dip"
@@ -175,12 +175,12 @@
         </AbsoluteLayout>
 
         <TextView
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/header_relative"/>
 
         <RelativeLayout
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
             <Button android:id="@+id/relative_button1"
@@ -238,17 +238,17 @@
         </RelativeLayout>
 
         <TextView
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/header_linear"/>
 
         <LinearLayout
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
             <LinearLayout
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
@@ -272,11 +272,11 @@
             </LinearLayout>
 
             <EditText
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"/>
 
             <TextView
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@color/blue"
                 android:text="@string/test_long_paragraph"/>
diff --git a/apps/launchperf/res/layout/simple_layout.xml b/apps/launchperf/res/layout/simple_layout.xml
index 3a6172410..46244ffa3 100644
--- a/apps/launchperf/res/layout/simple_layout.xml
+++ b/apps/launchperf/res/layout/simple_layout.xml
@@ -26,28 +26,28 @@
      a row, here set to be vertical (so the first is at the top) -->
 
 <LinearLayout 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"
     android:orientation="vertical">
     
     <RelativeLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
 
         <RelativeLayout android:id="@+id/replay_pane"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="True"
             android:background="@color/replay_background">
 
             <TextView android:id="@+id/instructions"
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/response" />
 
             <EditText android:id="@+id/entry"
-                android:layout_width="fill_parent" 
+                android:layout_width="match_parent" 
                 android:layout_height="44dip" 
                 android:layout_below="@id/instructions"/>
   
@@ -68,13 +68,13 @@
         </RelativeLayout>
 
         <ScrollView android:id="@+id/scroll_pane"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:layout_above="@id/replay_pane">
 
             <TextView android:id="@+id/text_field"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
                 android:text="@string/text"/>
             
             <requestFocus/>