Deprecate fill_parent and introduce match_parent.

Bug: #2361749.

2 files changed, 18 insertions, 18 deletions

diff --git a/samples/MultiResolution/res/layout-land/main.xml b/samples/MultiResolution/res/layout-land/main.xml
index f704425c3..515349fed 100644
--- a/samples/MultiResolution/res/layout-land/main.xml
+++ b/samples/MultiResolution/res/layout-land/main.xml
@@ -16,28 +16,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="horizontal"
   android:background="@drawable/background">
 
   <LinearLayout
     android:layout_weight="1"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <!-- Notice that widget sizes are expressed in dip, or device-independent
          pixels, while text sizes are expressed in sp, or scale-independent
          pixels, to factor in user-chosen font sizes. -->
     <FrameLayout
       android:background="@drawable/image_container"
-      android:layout_width="fill_parent"
-      android:layout_height="fill_parent"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
       android:id="@+id/image_container">
       <ImageView
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:id="@+id/image_view"
         android:scaleType="fitCenter"/>
       <TextView
@@ -57,7 +57,7 @@
 
   <LinearLayout
     android:layout_width="wrap_content"
-    android:layout_height="fill_parent"
+    android:layout_height="match_parent"
     android:orientation="vertical"
     android:layout_marginLeft="10dip"
     android:gravity="top">
diff --git a/samples/MultiResolution/res/layout/main.xml b/samples/MultiResolution/res/layout/main.xml
index 4c01e8238..991084984 100644
--- a/samples/MultiResolution/res/layout/main.xml
+++ b/samples/MultiResolution/res/layout/main.xml
@@ -16,27 +16,27 @@
 
 <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:background="@drawable/background">
 
   <LinearLayout
     android:layout_weight="1"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <!-- Notice that widget sizes are expressed in dip, or device-independent
          pixels, while text sizes are expressed in sp, or scale-independent
          pixels, to factor in user-chosen font sizes. -->
     <FrameLayout
-      android:layout_width="fill_parent"
-      android:layout_height="fill_parent"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
       android:id="@+id/image_container"
       android:background="@drawable/image_container">
       <ImageView
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:id="@+id/image_view"
         android:scaleType="fitCenter"/>
       <TextView
@@ -55,7 +55,7 @@
   </LinearLayout>
 
   <LinearLayout
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginTop="10dip"
     android:gravity="center">