From e40d35ee030031d04dc6f8d53af5710ae16b351e Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@android.com>
Date: Fri, 8 Jan 2010 15:07:05 -0800
Subject: Deprecate fill_parent and introduce match_parent. Bug: #2361749.

---
 res/layout/app_details.xml        |  2 +-
 res/layout/install_confirm.xml    | 10 +++++-----
 res/layout/install_start.xml      |  4 ++--
 res/layout/op_progress.xml        | 14 +++++++-------
 res/layout/uninstall_confirm.xml  |  8 ++++----
 res/layout/uninstall_progress.xml | 12 ++++++------
 6 files changed, 25 insertions(+), 25 deletions(-)

(limited to 'res')

diff --git a/res/layout/app_details.xml b/res/layout/app_details.xml
index 3ea84309..0b047922 100755
--- a/res/layout/app_details.xml
+++ b/res/layout/app_details.xml
@@ -22,7 +22,7 @@ installation screens
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/app_snippet"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="65dip"
     android:background="@color/title_background">
     <ImageView android:id="@+id/app_icon"
diff --git a/res/layout/install_confirm.xml b/res/layout/install_confirm.xml
index 96340988..8039e5d3 100755
--- a/res/layout/install_confirm.xml
+++ b/res/layout/install_confirm.xml
@@ -25,7 +25,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_weight="1"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <TextView
@@ -39,7 +39,7 @@
         android:paddingBottom="20dip"/>
 
     <ScrollView
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:fillViewport="true"
         android:layout_weight="1">
@@ -47,7 +47,7 @@
         <!-- Security settings description. -->
         <LinearLayout
             android:id="@+id/permissions_section"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginRight = "2dip"
             android:orientation="vertical">
@@ -63,7 +63,7 @@
 
             <LinearLayout
                 android:id="@+id/security_settings_list"
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1.0"
                 android:orientation="vertical"/>
@@ -73,7 +73,7 @@
     <!-- OK confirm and cancel buttons.  -->
     <LinearLayout
         android:background="@color/title_background"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="bottom"
         android:paddingTop="4dip"
diff --git a/res/layout/install_start.xml b/res/layout/install_start.xml
index d95daa64..8f861cc6 100755
--- a/res/layout/install_start.xml
+++ b/res/layout/install_start.xml
@@ -17,8 +17,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">
 
     <include
         layout="@layout/app_details"
diff --git a/res/layout/op_progress.xml b/res/layout/op_progress.xml
index aaab8686..03fcaf69 100755
--- a/res/layout/op_progress.xml
+++ b/res/layout/op_progress.xml
@@ -16,18 +16,18 @@
 
 <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"
     android:fillViewport="true">
     <RelativeLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
         <include
             layout="@layout/app_details"
             android:id="@+id/app_snippet"/>
         <TextView
             android:id="@+id/center_text"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_centerHorizontal="true"
             android:layout_centerVertical="true"
@@ -37,7 +37,7 @@
         <ProgressBar
             android:id="@+id/progress_bar"
             style="?android:attr/progressBarStyleHorizontal"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingTop="24dip"
             android:paddingLeft="16dip"
@@ -48,7 +48,7 @@
         <LinearLayout
             android:id="@+id/buttons_panel"
             android:background="@color/title_background"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
             android:orientation="horizontal">
diff --git a/res/layout/uninstall_confirm.xml b/res/layout/uninstall_confirm.xml
index 32d3dadc..e84d04a6 100755
--- a/res/layout/uninstall_confirm.xml
+++ b/res/layout/uninstall_confirm.xml
@@ -23,8 +23,8 @@
 
 <RelativeLayout
     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">
 
     <!-- The snippet about the application - title, icon, description.  -->
     <include
@@ -35,7 +35,7 @@
     <!-- uninstall application confirmation question -->
     <TextView
         android:id="@+id/uninstall_question"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textStyle="bold"
         android:paddingTop="16dip"
@@ -57,7 +57,7 @@
     <!-- OK confirm and cancel buttons.  -->
     <LinearLayout
         android:background="@color/title_background"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:paddingTop="4dip"
diff --git a/res/layout/uninstall_progress.xml b/res/layout/uninstall_progress.xml
index d5fdd737..cd754057 100755
--- a/res/layout/uninstall_progress.xml
+++ b/res/layout/uninstall_progress.xml
@@ -16,13 +16,13 @@
 
 <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"
     android:fillViewport="true" >
     <RelativeLayout
         android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
         <include
             layout="@layout/app_details"
             android:id="@+id/app_snippet"/>
@@ -36,14 +36,14 @@
         <ProgressBar
             android:id="@+id/progress_bar"
             style="?android:attr/progressBarStyleHorizontal"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingTop="24dip"
             android:layout_below="@id/center_text"
             android:max="100" />
         <RelativeLayout
             android:id="@+id/ok_panel"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/title_background"
             android:paddingTop="4dip"
-- 
cgit v1.2.3