diff --git a/res/layout-finger/call_detail.xml b/res/layout-finger/call_detail.xml
index ad151c1..3b230b5 100644
--- a/res/layout-finger/call_detail.xml
+++ b/res/layout-finger/call_detail.xml
@@ -15,13 +15,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:background="@android:drawable/title_bar_tall"
         android:orientation="horizontal"
@@ -70,22 +70,22 @@
 
     <FrameLayout
         android:layout_height="0dip"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         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:scrollbarStyle="outsideOverlay"
         />
 
         <ScrollView android:id="@android:id/empty"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
                 android:fillViewport="true">
 
             <TextView android:id="@+id/emptyText"
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/unknown"
                 android:textSize="20sp"
@@ -99,7 +99,7 @@
         </ScrollView>
 
         <View
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@drawable/title_bar_shadow"
         />
diff --git a/res/layout-finger/call_detail_list_item.xml b/res/layout-finger/call_detail_list_item.xml
index 6c61690..e476de1 100644
--- a/res/layout-finger/call_detail_list_item.xml
+++ b/res/layout-finger/call_detail_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/res/layout-finger/contact_card_layout.xml b/res/layout-finger/contact_card_layout.xml
index 6e70561..38ce17e 100644
--- a/res/layout-finger/contact_card_layout.xml
+++ b/res/layout-finger/contact_card_layout.xml
@@ -17,27 +17,27 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/card_root_view"
     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.internal.widget.ContactHeaderWidget
         android:id="@+id/contact_header_widget"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"/>
         
     <ListView android:id="@+id/contact_data"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:background="@drawable/title_bar_shadow"
     />
     
     <ScrollView android:id="@android:id/empty"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:fillViewport="true"
     >
         <TextView android:id="@+id/emptyText"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/no_contact_details"
             android:textSize="20sp"
diff --git a/res/layout-finger/contact_options.xml b/res/layout-finger/contact_options.xml
index e484324..6b29e65 100644
--- a/res/layout-finger/contact_options.xml
+++ b/res/layout-finger/contact_options.xml
@@ -15,14 +15,14 @@
 -->
 
 <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"
 >
 
     <include layout="@layout/edit_contact_entry_ringtone" android:id="@+id/ringtone" />
     <View
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="1dip"
         android:background="?android:attr/listDivider"
     />
diff --git a/res/layout-finger/contacts_list_content.xml b/res/layout-finger/contacts_list_content.xml
index f736efd..cae4762 100644
--- a/res/layout-finger/contacts_list_content.xml
+++ b/res/layout-finger/contacts_list_content.xml
@@ -15,23 +15,23 @@
 -->
 
 <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.contacts.FocusRequestingListView 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:fastScrollEnabled="true"
     />
 
     <ScrollView android:id="@android:id/empty"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:fillViewport="true"
     >
         <TextView android:id="@+id/emptyText"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/noContacts"
             android:textSize="20sp"
diff --git a/res/layout-finger/contacts_list_content_join.xml b/res/layout-finger/contacts_list_content_join.xml
index b59c1b7..b50713b 100644
--- a/res/layout-finger/contacts_list_content_join.xml
+++ b/res/layout-finger/contacts_list_content_join.xml
@@ -16,12 +16,12 @@
 
 
 <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"
             android:background="@*android:drawable/title_bar_medium"
@@ -38,12 +38,12 @@
             android:scaleType="fitCenter"
         />
         <LinearLayout
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:paddingLeft="10dip">
             <TextView
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/titleJoinContactDataWith"
                 android:textAppearance="?android:attr/textAppearanceMedium"
@@ -52,7 +52,7 @@
             />
             <TextView
                 android:id="@+id/join_contact_blurb"
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="-2dip"
                 android:maxLines="2"
@@ -62,8 +62,8 @@
     </LinearLayout>
 
     <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:fastScrollEnabled="true"
     />
 </LinearLayout>
diff --git a/res/layout-finger/contacts_list_item.xml b/res/layout-finger/contacts_list_item.xml
index 61cc839..7520334 100644
--- a/res/layout-finger/contacts_list_item.xml
+++ b/res/layout-finger/contacts_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:orientation="vertical"
 >
@@ -28,14 +28,14 @@
     />
 
     <RelativeLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="?android:attr/listPreferredItemHeight"
         android:paddingLeft="14dip"
     >
 
         <LinearLayout android:id="@+id/right_side"
             android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
+            android:layout_height="match_parent"
             android:orientation="horizontal"
             android:layout_marginLeft="11dip"
             android:layout_alignParentRight="true">
@@ -52,12 +52,12 @@
 
             <LinearLayout android:id="@+id/call_view"
                 android:layout_width="wrap_content"
-                android:layout_height="fill_parent"
+                android:layout_height="match_parent"
                 android:orientation="horizontal">
 
                 <View android:id="@+id/divider"
                     android:layout_width="1px"
-                    android:layout_height="fill_parent"
+                    android:layout_height="match_parent"
                     android:layout_marginTop="5dip"
                     android:layout_marginBottom="5dip"
                     android:background="@drawable/divider_vertical_dark"
@@ -65,7 +65,7 @@
 
                 <com.android.contacts.ui.widget.DontPressWithParentImageView android:id="@+id/call_button"
                     android:layout_width="wrap_content"
-                    android:layout_height="fill_parent"
+                    android:layout_height="match_parent"
                     android:paddingLeft="14dip"
                     android:paddingRight="14dip"
                     android:layout_centerVertical="true"
@@ -124,7 +124,7 @@
     </RelativeLayout>
 
     <View android:id="@+id/list_divider"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@*android:drawable/divider_horizontal_dark_opaque"
     />
diff --git a/res/layout-finger/contacts_list_item_photo.xml b/res/layout-finger/contacts_list_item_photo.xml
index 73f5ec1..9dfeb80 100644
--- a/res/layout-finger/contacts_list_item_photo.xml
+++ b/res/layout-finger/contacts_list_item_photo.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:orientation="vertical"
 >
@@ -28,14 +28,14 @@
     />
 
     <RelativeLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="?android:attr/listPreferredItemHeight"
         android:paddingLeft="4dip"
     >
 
         <LinearLayout android:id="@+id/right_side"
             android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
+            android:layout_height="match_parent"
             android:orientation="horizontal"
             android:layout_marginLeft="11dip"
             android:layout_alignParentRight="true">
@@ -52,12 +52,12 @@
 
             <LinearLayout android:id="@+id/call_view"
                 android:layout_width="wrap_content"
-                android:layout_height="fill_parent"
+                android:layout_height="match_parent"
                 android:orientation="horizontal">
 
                 <View android:id="@+id/divider"
                     android:layout_width="1px"
-                    android:layout_height="fill_parent"
+                    android:layout_height="match_parent"
                     android:layout_marginTop="5dip"
                     android:layout_marginBottom="5dip"
                     android:background="@drawable/divider_vertical_dark"
@@ -65,7 +65,7 @@
 
                 <com.android.contacts.ui.widget.DontPressWithParentImageView android:id="@+id/call_button"
                     android:layout_width="wrap_content"
-                    android:layout_height="fill_parent"
+                    android:layout_height="match_parent"
                     android:paddingLeft="14dip"
                     android:paddingRight="14dip"
                     android:layout_centerVertical="true"
@@ -138,7 +138,7 @@
     </RelativeLayout>
 
     <View android:id="@+id/list_divider"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@*android:drawable/divider_horizontal_dark_opaque"
     />
diff --git a/res/layout-finger/contacts_list_show_all_item.xml b/res/layout-finger/contacts_list_show_all_item.xml
index 5937b9f..4111a8f 100644
--- a/res/layout-finger/contacts_list_show_all_item.xml
+++ b/res/layout-finger/contacts_list_show_all_item.xml
@@ -18,12 +18,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:orientation="vertical"
 >
     <TextView
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="?android:attr/listPreferredItemHeight"
         android:gravity="center_vertical|left"
         android:textAppearance="?android:attr/textAppearanceLarge"
@@ -32,7 +32,7 @@
     />
 
     <View android:id="@+id/list_divider"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@*android:drawable/divider_horizontal_dark_opaque"
     />
diff --git a/res/layout-finger/create_new_contact.xml b/res/layout-finger/create_new_contact.xml
index 776c482..2c36017 100644
--- a/res/layout-finger/create_new_contact.xml
+++ b/res/layout-finger/create_new_contact.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:minHeight="?android:attr/listPreferredItemHeight"
         android:orientation="horizontal"
diff --git a/res/layout-finger/dialer_activity.xml b/res/layout-finger/dialer_activity.xml
index 29189c7..14a6b39 100644
--- a/res/layout-finger/dialer_activity.xml
+++ b/res/layout-finger/dialer_activity.xml
@@ -16,21 +16,21 @@
 
 <TabHost xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@android:id/tabhost"
-    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">
 
         <TabWidget android:id="@android:id/tabs"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
         />
 
         <FrameLayout android:id="@android:id/tabcontent"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="0dip"
             android:layout_weight="1"
         />
diff --git a/res/layout-finger/dialpad_chooser_list_item.xml b/res/layout-finger/dialpad_chooser_list_item.xml
index c836f5d..853ca47 100644
--- a/res/layout-finger/dialpad_chooser_list_item.xml
+++ b/res/layout-finger/dialpad_chooser_list_item.xml
@@ -17,8 +17,8 @@
 <!-- Layout of a single item in the Dialer's "Dialpad chooser" UI. -->
 <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">
 
     <ImageView android:id="@+id/icon"
         android:layout_width="64dp"
diff --git a/res/layout-finger/display_child.xml b/res/layout-finger/display_child.xml
index ed4856a..65ef405 100644
--- a/res/layout-finger/display_child.xml
+++ b/res/layout-finger/display_child.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:minHeight="?android:attr/listPreferredItemHeight"
     android:gravity="center_vertical"
diff --git a/res/layout-finger/display_group.xml b/res/layout-finger/display_group.xml
index 7d36450..b19ae2d 100644
--- a/res/layout-finger/display_group.xml
+++ b/res/layout-finger/display_group.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:minHeight="?android:attr/listPreferredItemHeight"
     android:gravity="center_vertical"
diff --git a/res/layout-finger/display_header.xml b/res/layout-finger/display_header.xml
index 65f82aa..210eb1b 100644
--- a/res/layout-finger/display_header.xml
+++ b/res/layout-finger/display_header.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:minHeight="?android:attr/listPreferredItemHeight"
     android:gravity="center_vertical"
diff --git a/res/layout-finger/edit_contact.xml b/res/layout-finger/edit_contact.xml
index e91f7e9..cf0537b 100644
--- a/res/layout-finger/edit_contact.xml
+++ b/res/layout-finger/edit_contact.xml
@@ -14,25 +14,25 @@
      limitations under the License.
 -->
 <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"
     android:fillViewport="true">
 
     <ScrollView
-        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:orientation="vertical">
 
         <LinearLayout
-            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:id="@+id/banner"
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
                 android:padding="0dip"
@@ -49,8 +49,8 @@
                     android:layout_marginRight="2dip"
                 >
                     <ImageView android:id="@+id/photoImage"
-                        android:layout_width="fill_parent"
-                        android:layout_height="fill_parent"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
                         android:clickable="true"
                         android:focusable="true"
                         android:src="@drawable/ic_menu_add_picture"
@@ -80,7 +80,7 @@
             <include layout="@layout/edit_phonetic_name"/>
 
             <LinearLayout
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="0dip"
                 android:layout_weight="1"
                 android:orientation="vertical"
@@ -88,7 +88,7 @@
 
                 <!-- The edit items -->
                 <LinearLayout android:id="@+id/list"
-                    android:layout_width="fill_parent"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
                 />
@@ -98,7 +98,7 @@
     </ScrollView>
 
     <LinearLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         style="@android:style/ButtonBar"
diff --git a/res/layout-finger/edit_contact_entry.xml b/res/layout-finger/edit_contact_entry.xml
index d17fdf7..cf9edda 100644
--- a/res/layout-finger/edit_contact_entry.xml
+++ b/res/layout-finger/edit_contact_entry.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:layout_marginLeft="4dip"
     android:layout_marginBottom="3dip"
diff --git a/res/layout-finger/edit_contact_entry_group.xml b/res/layout-finger/edit_contact_entry_group.xml
index b233ca8..eeab395 100644
--- a/res/layout-finger/edit_contact_entry_group.xml
+++ b/res/layout-finger/edit_contact_entry_group.xml
@@ -16,7 +16,7 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/entry_group"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingRight="?android:attr/scrollbarSize"
     android:minHeight="?android:attr/listPreferredItemHeight"
diff --git a/res/layout-finger/edit_contact_entry_org.xml b/res/layout-finger/edit_contact_entry_org.xml
index 9daf3d1..6b16998 100644
--- a/res/layout-finger/edit_contact_entry_org.xml
+++ b/res/layout-finger/edit_contact_entry_org.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:orientation="horizontal"
     android:baselineAligned="false"
@@ -39,13 +39,13 @@
         >
 
         <EditText android:id="@+id/data"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="4dip"
             />
 
         <EditText android:id="@+id/data2"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="4dip"
             />
diff --git a/res/layout-finger/edit_contact_entry_ringtone.xml b/res/layout-finger/edit_contact_entry_ringtone.xml
index f2a171f..727580a 100644
--- a/res/layout-finger/edit_contact_entry_ringtone.xml
+++ b/res/layout-finger/edit_contact_entry_ringtone.xml
@@ -16,7 +16,7 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/entry_ringtone"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingRight="?android:attr/scrollbarSize"
     android:minHeight="?android:attr/listPreferredItemHeight"
diff --git a/res/layout-finger/edit_contact_entry_static_label.xml b/res/layout-finger/edit_contact_entry_static_label.xml
index 5e40631..c0e89bb 100644
--- a/res/layout-finger/edit_contact_entry_static_label.xml
+++ b/res/layout-finger/edit_contact_entry_static_label.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:layout_marginLeft="4dip"
     android:layout_marginBottom="3dip"
diff --git a/res/layout-finger/edit_contact_entry_voicemail.xml b/res/layout-finger/edit_contact_entry_voicemail.xml
index 7b66500..73c65d9 100644
--- a/res/layout-finger/edit_contact_entry_voicemail.xml
+++ b/res/layout-finger/edit_contact_entry_voicemail.xml
@@ -16,7 +16,7 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/checkable"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingRight="?android:attr/scrollbarSize"
     android:minHeight="?android:attr/listPreferredItemHeight"
@@ -62,7 +62,7 @@
 
     <CheckBox android:id="@+id/checkbox"
         android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
+        android:layout_height="match_parent"
         android:focusable="false"
         android:clickable="false"
         />
diff --git a/res/layout-finger/edit_divider.xml b/res/layout-finger/edit_divider.xml
index 1dbb563..eb2a49a 100644
--- a/res/layout-finger/edit_divider.xml
+++ b/res/layout-finger/edit_divider.xml
@@ -15,7 +15,7 @@
 -->
 
 <View 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:attr/listDivider"
     />
diff --git a/res/layout-finger/edit_phonetic_name.xml b/res/layout-finger/edit_phonetic_name.xml
index afbbb1d..418f8fa 100644
--- a/res/layout-finger/edit_phonetic_name.xml
+++ b/res/layout-finger/edit_phonetic_name.xml
@@ -32,7 +32,7 @@
      by temporarily removing the visibility="gone" attribute below.
 -->
 <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:padding="0dip"
@@ -42,7 +42,7 @@
     >
     <TextView
         android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
+        android:layout_height="match_parent"
         android:paddingLeft="4dip"
         android:gravity="left|center_vertical"
         android:text="@string/label_phonetic_name"
diff --git a/res/layout-finger/edit_separator.xml b/res/layout-finger/edit_separator.xml
index 1fe799d..62e1c64 100644
--- a/res/layout-finger/edit_separator.xml
+++ b/res/layout-finger/edit_separator.xml
@@ -17,7 +17,7 @@
 <!-- Layout used for edit separators. -->
 
 <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:layout_marginBottom="3dip"
     android:orientation="vertical"
@@ -25,7 +25,7 @@
 
     <LinearLayout
         android:id="@+id/separator"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="14dip"
         android:layout_marginTop="3dip"
diff --git a/res/layout-finger/edit_separator_alone.xml b/res/layout-finger/edit_separator_alone.xml
index 7d4aa88..dbe293e 100644
--- a/res/layout-finger/edit_separator_alone.xml
+++ b/res/layout-finger/edit_separator_alone.xml
@@ -18,7 +18,7 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/separator"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingLeft="14dip"
     android:paddingRight="?android:attr/scrollbarSize"
diff --git a/res/layout-finger/list_item_text_icons.xml b/res/layout-finger/list_item_text_icons.xml
index 8d4b7a8..69e064e 100644
--- a/res/layout-finger/list_item_text_icons.xml
+++ b/res/layout-finger/list_item_text_icons.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"
@@ -95,7 +95,7 @@
     
     <View android:id="@+id/divider"
         android:layout_width="1px"
-        android:layout_height="fill_parent"
+        android:layout_height="match_parent"
         android:layout_marginTop="5dip"
         android:layout_marginBottom="5dip"
         android:background="@drawable/divider_vertical_dark"
@@ -103,7 +103,7 @@
 
     <ImageView android:id="@+id/secondary_action_button"
         android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
+        android:layout_height="match_parent"
         android:layout_centerVertical="true"
         android:paddingLeft="14dip"
         android:paddingRight="14dip"
diff --git a/res/layout-finger/list_section.xml b/res/layout-finger/list_section.xml
index 06a9ffe..f7ba693 100644
--- a/res/layout-finger/list_section.xml
+++ b/res/layout-finger/list_section.xml
@@ -17,7 +17,7 @@
 <!-- Layout used for list section separators. -->
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="25dip"
     android:background="@*android:drawable/dark_header"
     >
diff --git a/res/layout-finger/quickcontact.xml b/res/layout-finger/quickcontact.xml
index 13b5c20..a895a54 100644
--- a/res/layout-finger/quickcontact.xml
+++ b/res/layout-finger/quickcontact.xml
@@ -16,7 +16,7 @@
 
 <RelativeLayout
     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:paddingLeft="@dimen/quickcontact_shadow_horiz"
     android:paddingRight="@dimen/quickcontact_shadow_horiz"
@@ -24,28 +24,28 @@
 
     <FrameLayout
         android:id="@+id/header"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dip">
 
         <ViewStub
             android:id="@+id/header_small"
             android:inflatedId="@+id/header_small"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout="@layout/quickcontact_header_small" />
 
         <ViewStub
             android:id="@+id/header_medium"
             android:inflatedId="@+id/header_medium"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout="@layout/quickcontact_header_med" />
 
         <ViewStub
             android:id="@+id/header_large"
             android:inflatedId="@+id/header_large"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout="@layout/quickcontact_header_large" />
 
@@ -53,7 +53,7 @@
 
     <HorizontalScrollView
         android:id="@+id/scroll"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/header"
         android:fadingEdgeLength="0dip"
@@ -84,14 +84,14 @@
 
     <FrameLayout
         android:id="@+id/footer"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/scroll"
         android:background="@drawable/quickcontact_bottom_frame" />
 
     <LinearLayout
         android:id="@+id/footer_disambig"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/scroll"
         android:background="@drawable/quickcontact_disambig_bottom_bg"
@@ -100,7 +100,7 @@
 
         <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:background="@color/quickcontact_disambig"
@@ -109,7 +109,7 @@
 
         <CheckBox
             android:id="@android:id/checkbox"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="19dip"
             android:layout_marginRight="19dip"
diff --git a/res/layout-finger/quickcontact_header_large.xml b/res/layout-finger/quickcontact_header_large.xml
index 2271ff1..d9d4875 100644
--- a/res/layout-finger/quickcontact_header_large.xml
+++ b/res/layout-finger/quickcontact_header_large.xml
@@ -17,7 +17,7 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/header_large"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="87dip"
     android:background="@drawable/quickcontact_top_frame"
@@ -41,7 +41,7 @@
 
         <TextView
             android:id="@+id/name"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:singleLine="true"
             android:ellipsize="end"
@@ -51,7 +51,7 @@
 
         <TextView
             android:id="@+id/status"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:singleLine="true"
             android:ellipsize="end"
@@ -61,7 +61,7 @@
 
         <TextView
             android:id="@+id/timestamp"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:singleLine="true"
             android:ellipsize="end"
diff --git a/res/layout-finger/quickcontact_header_med.xml b/res/layout-finger/quickcontact_header_med.xml
index c9ef2be..bed886d 100644
--- a/res/layout-finger/quickcontact_header_med.xml
+++ b/res/layout-finger/quickcontact_header_med.xml
@@ -17,7 +17,7 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/header_medium"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="51dip"
     android:background="@drawable/quickcontact_top_frame"
@@ -34,7 +34,7 @@
 
         <TextView
             android:id="@+id/status"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:singleLine="true"
             android:ellipsize="end"
@@ -43,7 +43,7 @@
 
         <TextView
             android:id="@+id/timestamp"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:singleLine="true"
             android:ellipsize="end"
diff --git a/res/layout-finger/quickcontact_header_small.xml b/res/layout-finger/quickcontact_header_small.xml
index 3711dcc..9dfe0a1 100644
--- a/res/layout-finger/quickcontact_header_small.xml
+++ b/res/layout-finger/quickcontact_header_small.xml
@@ -17,7 +17,7 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/header_small"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/quickcontact_top_frame"
     android:orientation="horizontal" />
diff --git a/res/layout-finger/quickcontact_resolve_item.xml b/res/layout-finger/quickcontact_resolve_item.xml
index 9156a59..db683a0 100755
--- a/res/layout-finger/quickcontact_resolve_item.xml
+++ b/res/layout-finger/quickcontact_resolve_item.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:orientation="vertical"
     android:paddingLeft="30dip"
diff --git a/res/layout-finger/recent_calls.xml b/res/layout-finger/recent_calls.xml
index 986d913..f054b70 100644
--- a/res/layout-finger/recent_calls.xml
+++ b/res/layout-finger/recent_calls.xml
@@ -15,18 +15,18 @@
 -->
 
 <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:layout_width="fill_parent" 
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent" 
+        android:layout_height="match_parent"
         android:scrollbarStyle="outsideOverlay"
     />
     
     <TextView android:id="@android:id/empty"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:text="@string/recentCalls_empty"
         android:gravity="center"
         android:textAppearance="?android:attr/textAppearanceLarge"
diff --git a/res/layout-finger/recent_calls_list_item.xml b/res/layout-finger/recent_calls_list_item.xml
index 5439ff3..00691c9 100644
--- a/res/layout-finger/recent_calls_list_item.xml
+++ b/res/layout-finger/recent_calls_list_item.xml
@@ -15,14 +15,14 @@
 -->
 
 <RelativeLayout 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:paddingLeft="7dip"
 >
 
     <com.android.contacts.ui.widget.DontPressWithParentImageView android:id="@+id/call_icon"
         android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
+        android:layout_height="match_parent"
         android:paddingLeft="14dip"
         android:paddingRight="14dip"
         android:layout_alignParentRight="true"
@@ -34,7 +34,7 @@
 
     <View android:id="@+id/divider"
         android:layout_width="1px"
-        android:layout_height="fill_parent"
+        android:layout_height="match_parent"
         android:layout_marginTop="5dip"
         android:layout_marginBottom="5dip"
         android:layout_toLeftOf="@id/call_icon"
diff --git a/res/layout-finger/set_primary_checkbox.xml b/res/layout-finger/set_primary_checkbox.xml
index bba8cf9..00b0865 100644
--- a/res/layout-finger/set_primary_checkbox.xml
+++ b/res/layout-finger/set_primary_checkbox.xml
@@ -16,7 +16,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:paddingLeft="14dip"
     android:paddingRight="15dip"
diff --git a/res/layout-finger/split_aggregate_list_item.xml b/res/layout-finger/split_aggregate_list_item.xml
index 5bd4270..5c72eda 100644
--- a/res/layout-finger/split_aggregate_list_item.xml
+++ b/res/layout-finger/split_aggregate_list_item.xml
@@ -16,7 +16,7 @@
 -->
 
 <RelativeLayout 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:paddingLeft="12dip"
     android:paddingRight="12dip"
diff --git a/res/layout-finger/sync_settings.xml b/res/layout-finger/sync_settings.xml
index 50d0d47..01ed000 100644
--- a/res/layout-finger/sync_settings.xml
+++ b/res/layout-finger/sync_settings.xml
@@ -18,19 +18,19 @@
 -->
 
 <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"
     />
 
     <LinearLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@android:drawable/bottom_bar"
         android:orientation="horizontal"
diff --git a/res/layout-finger/tab_account_name.xml b/res/layout-finger/tab_account_name.xml
index dc99af1..8707d98 100644
--- a/res/layout-finger/tab_account_name.xml
+++ b/res/layout-finger/tab_account_name.xml
@@ -18,7 +18,7 @@
 <TextView  xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/account_name"
     android:background="@drawable/bg_infobar_new"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="@dimen/account_name_height"
     android:layout_below="@+id/tab_scroll_view"
     android:textStyle="normal"
diff --git a/res/layout-finger/tab_layout.xml b/res/layout-finger/tab_layout.xml
index 9a793c3..42461f6 100644
--- a/res/layout-finger/tab_layout.xml
+++ b/res/layout-finger/tab_layout.xml
@@ -16,7 +16,7 @@
 
 <HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/tab_scroll_view"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_alignParentLeft="true"
     android:scrollbars="none"
@@ -24,7 +24,7 @@
     
     <com.android.contacts.TabStripView
         android:id="@android:id/tabs"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
     />
 </HorizontalScrollView>
\ No newline at end of file
diff --git a/res/layout-finger/total_contacts.xml b/res/layout-finger/total_contacts.xml
index 12badb6..e1588d4 100644
--- a/res/layout-finger/total_contacts.xml
+++ b/res/layout-finger/total_contacts.xml
@@ -16,7 +16,7 @@
 
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/totalContactsText"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="25dip"
     android:textColor="#ffbfbfbf"
     android:textSize="14sp"
diff --git a/res/layout-finger/twelve_key_dialer.xml b/res/layout-finger/twelve_key_dialer.xml
index bd2c7a8..b1dce24 100644
--- a/res/layout-finger/twelve_key_dialer.xml
+++ b/res/layout-finger/twelve_key_dialer.xml
@@ -16,8 +16,8 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/top"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:orientation="vertical"
 >
 
@@ -27,7 +27,7 @@
     -->
     <!-- TODO: Use a textAppearance to control the display of the number -->
     <EditText android:id="@+id/digits"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="67dip"
         android:gravity="center"
         android:maxLines="1"
@@ -53,7 +53,7 @@
          When this UI is visible, the other Dialer elements
          (the textfield/button and the dialpad) are hidden. -->
     <ListView android:id="@+id/dialpadChooser"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="1dip"
         android:layout_weight="1"
     />
diff --git a/res/layout-ja-finger/edit_phonetic_name.xml b/res/layout-ja-finger/edit_phonetic_name.xml
index 41a4059..012f85f 100644
--- a/res/layout-ja-finger/edit_phonetic_name.xml
+++ b/res/layout-ja-finger/edit_phonetic_name.xml
@@ -17,7 +17,7 @@
 <!-- "Phonetic name" field on the Edit contact screen, for
      Japanese-language locales (i.e. the "furigana" or "yomi" field.) -->
 <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:padding="0dip"
@@ -26,7 +26,7 @@
     >
     <TextView
         android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
+        android:layout_height="match_parent"
         android:paddingLeft="4dip"
         android:gravity="left|center_vertical"
         android:text="@string/label_phonetic_name"
diff --git a/res/layout-land-finger/twelve_key_dialer.xml b/res/layout-land-finger/twelve_key_dialer.xml
index 92906ba..985d047 100644
--- a/res/layout-land-finger/twelve_key_dialer.xml
+++ b/res/layout-land-finger/twelve_key_dialer.xml
@@ -16,8 +16,8 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/top"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:orientation="vertical"
 >
 
@@ -27,7 +27,7 @@
     -->
     <!-- TODO: Use a textAppearance to control the display of the number -->
     <EditText android:id="@+id/digits"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="66dip"
         android:layout_marginBottom="50dip"
         android:layout_marginTop="1dip"
@@ -49,7 +49,7 @@
          When this UI is visible, the other Dialer elements
          (the textfield and button) are hidden. -->
     <ListView android:id="@+id/dialpadChooser"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:footerDividersEnabled="true"
     />
diff --git a/res/layout-long-finger/twelve_key_dialer.xml b/res/layout-long-finger/twelve_key_dialer.xml
index 07771cc..bd90df4 100644
--- a/res/layout-long-finger/twelve_key_dialer.xml
+++ b/res/layout-long-finger/twelve_key_dialer.xml
@@ -16,8 +16,8 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/top"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:orientation="vertical"
 >
 
@@ -27,7 +27,7 @@
     -->
     <!-- TODO: Use a textAppearance to control the display of the number -->
     <EditText android:id="@+id/digits"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="74dip"
         android:gravity="center"
         android:maxLines="1"
@@ -53,7 +53,7 @@
          When this UI is visible, the other Dialer elements
          (the textfield/button and the dialpad) are hidden. -->
     <ListView android:id="@+id/dialpadChooser"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="1dip"
         android:layout_weight="1"
     />
diff --git a/res/layout-long-land-finger/twelve_key_dialer.xml b/res/layout-long-land-finger/twelve_key_dialer.xml
index 18c9a0f..1cf9690 100644
--- a/res/layout-long-land-finger/twelve_key_dialer.xml
+++ b/res/layout-long-land-finger/twelve_key_dialer.xml
@@ -16,8 +16,8 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/top"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:orientation="vertical"
 >
 
@@ -27,7 +27,7 @@
     -->
     <!-- TODO: Use a textAppearance to control the display of the number -->
     <EditText android:id="@+id/digits"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="74dip"
         android:layout_marginBottom="30dip"
         android:layout_marginTop="1dip"
@@ -49,7 +49,7 @@
          When this UI is visible, the other Dialer elements
          (the textfield and button) are hidden. -->
     <ListView android:id="@+id/dialpadChooser"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:footerDividersEnabled="true"
     />
diff --git a/res/layout/act_display_groups.xml b/res/layout/act_display_groups.xml
index 5ee93e7..c8a1bcf 100644
--- a/res/layout/act_display_groups.xml
+++ b/res/layout/act_display_groups.xml
@@ -16,19 +16,19 @@
 
 <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"
     android:fillViewport="true">
 
     <ExpandableListView
         android:id="@android:id/list"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="0dip"
         android:layout_weight="1" />
 
     <LinearLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         style="@android:style/ButtonBar">
diff --git a/res/layout/act_edit.xml b/res/layout/act_edit.xml
index e56ec20..2a71717 100644
--- a/res/layout/act_edit.xml
+++ b/res/layout/act_edit.xml
@@ -15,28 +15,28 @@
 -->
 
 <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"
 >
 
     <ScrollView 
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="1px"
         android:layout_weight="1"
         android:fillViewport="true"
     >
 
         <LinearLayout android:id="@+id/editors"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:orientation="vertical"
         />
 
     </ScrollView>
 
     <LinearLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         style="@android:style/ButtonBar"
diff --git a/res/layout/item_contact_editor.xml b/res/layout/item_contact_editor.xml
index a7d5df5..f5e7bd3 100644
--- a/res/layout/item_contact_editor.xml
+++ b/res/layout/item_contact_editor.xml
@@ -17,7 +17,7 @@
 <!-- placed inside act_edit as tabcontent -->
 <com.android.contacts.ui.widget.ContactEditorView
     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:orientation="horizontal"
 >
@@ -26,7 +26,7 @@
     <ImageView
         android:id="@+id/color_bar"
         android:layout_width="4dip"
-        android:layout_height="fill_parent"
+        android:layout_height="match_parent"
         android:visibility="gone"
     />
 
@@ -41,11 +41,11 @@
         <!-- Account info header -->
         <RelativeLayout android:id="@+id/header"
             android:layout_height="64dip"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
         >
 
             <ImageView android:id="@+id/header_color_bar"
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="4dip"
                 android:layout_marginBottom="5dip"
                 android:background="@color/edit_divider"
@@ -85,7 +85,7 @@
             />
 
             <View
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="1px"
                 android:layout_alignParentBottom="true"
 
@@ -96,7 +96,7 @@
 
         <FrameLayout
             android:id="@+id/stub_photo"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingLeft="12dip"
             android:paddingTop="10dip">
@@ -109,7 +109,7 @@
 
         <include
             android:id="@+id/edit_name"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/stub_photo"
             android:layout_marginTop="6dip"
@@ -117,7 +117,7 @@
             layout="@layout/item_generic_editor" />
 
         <TextView android:id="@+id/read_only_name"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dip"
             android:layout_marginBottom="6dip"
@@ -128,19 +128,19 @@
 
         <LinearLayout
             android:id="@+id/sect_general"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
         />
 
         <View android:id="@+id/head_secondary_divider"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="1px"
             android:background="?android:attr/listDivider" />
 
         <TextView
             android:id="@+id/head_secondary"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
 
             android:gravity="center_vertical"
@@ -157,13 +157,13 @@
 
         <LinearLayout
             android:id="@+id/sect_secondary"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical" />
 
         <TextView
             android:id="@+id/edit_read_only"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="10dip"
             android:layout_marginBottom="10dip"
diff --git a/res/layout/item_editor_field.xml b/res/layout/item_editor_field.xml
index 1e77068..9ad8689 100644
--- a/res/layout/item_editor_field.xml
+++ b/res/layout/item_editor_field.xml
@@ -16,5 +16,5 @@
 
 <EditText
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content" />
diff --git a/res/layout/item_kind_section.xml b/res/layout/item_kind_section.xml
index 73912aa..ebfeddf 100644
--- a/res/layout/item_kind_section.xml
+++ b/res/layout/item_kind_section.xml
@@ -18,19 +18,19 @@
 
 <com.android.contacts.ui.widget.KindSectionView
     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">
 
     <View
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?android:attr/listDivider" />
 
     <LinearLayout
         android:id="@+id/kind_header"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:layout_marginLeft="14dip"
@@ -63,7 +63,7 @@
 
     <LinearLayout
         android:id="@+id/kind_editors"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingBottom="6dip"
         android:orientation="vertical" />
diff --git a/res/layout/item_read_only_contact_editor.xml b/res/layout/item_read_only_contact_editor.xml
index 0b1dc14..df442c8 100644
--- a/res/layout/item_read_only_contact_editor.xml
+++ b/res/layout/item_read_only_contact_editor.xml
@@ -17,7 +17,7 @@
 <!-- placed inside act_edit as tabcontent -->
 <com.android.contacts.ui.widget.ReadOnlyContactEditorView
     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:orientation="horizontal"
 >
@@ -26,7 +26,7 @@
     <ImageView
         android:id="@+id/color_bar"
         android:layout_width="4dip"
-        android:layout_height="fill_parent"
+        android:layout_height="match_parent"
         android:visibility="gone"
     />
 
@@ -41,11 +41,11 @@
         <!-- Account info header -->
         <RelativeLayout android:id="@+id/header"
             android:layout_height="64dip"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
         >
 
             <ImageView android:id="@+id/header_color_bar"
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="4dip"
                 android:layout_marginBottom="5dip"
                 android:background="@color/edit_divider"
@@ -85,7 +85,7 @@
             />
 
             <View
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="1px"
                 android:layout_alignParentBottom="true"
 
@@ -96,7 +96,7 @@
 
         <FrameLayout
             android:id="@+id/stub_photo"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingLeft="12dip"
             android:paddingTop="10dip">
@@ -108,7 +108,7 @@
         </FrameLayout>
 
         <TextView android:id="@+id/read_only_name"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dip"
             android:layout_marginBottom="6dip"
@@ -118,14 +118,14 @@
         />
 
         <View
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="1px"
             android:background="?android:attr/listDivider"
         />
 
         <TextView
             android:id="@+id/read_only_warning"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="13dip"
             android:layout_marginBottom="13dip"
@@ -138,13 +138,13 @@
         />
 
         <View
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="1px"
             android:background="?android:attr/listDivider"
         />
 
         <LinearLayout android:id="@+id/sect_general"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
         />
diff --git a/res/layout/item_read_only_field.xml b/res/layout/item_read_only_field.xml
index a0b20c4..9e0967e 100644
--- a/res/layout/item_read_only_field.xml
+++ b/res/layout/item_read_only_field.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="vertical"
@@ -43,7 +43,7 @@
     />
 
     <View
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="1px"
 
         android:background="?android:attr/listDivider"