Deprecate fill_parent and introduce match_parent.

Bug: #2361749.

2 files changed, 26 insertions, 26 deletions

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/>