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

---
 res/layout/live_wallpaper_entry.xml                            | 6 +++---
 res/layout/live_wallpaper_list.xml                             | 8 ++++----
 res/layout/live_wallpaper_loading.xml                          | 4 ++--
 src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/res/layout/live_wallpaper_entry.xml b/res/layout/live_wallpaper_entry.xml
index 529371e..cce484f 100644
--- a/res/layout/live_wallpaper_entry.xml
+++ b/res/layout/live_wallpaper_entry.xml
@@ -15,7 +15,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="6dip"
@@ -49,7 +49,7 @@
         <TextView
             android:id="@+id/title_author"
 
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
 
             android:textAppearance="?android:attr/textAppearanceMedium"
@@ -60,7 +60,7 @@
         <TextView
             android:id="@+id/description"
 
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
 
             android:textAppearance="?android:attr/textAppearanceSmall"
diff --git a/res/layout/live_wallpaper_list.xml b/res/layout/live_wallpaper_list.xml
index bab79ff..9ac8c66 100644
--- a/res/layout/live_wallpaper_list.xml
+++ b/res/layout/live_wallpaper_list.xml
@@ -19,15 +19,15 @@
     <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:drawSelectorOnTop="false" />
     
     <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:gravity="center"
         android:visibility="gone"
diff --git a/res/layout/live_wallpaper_loading.xml b/res/layout/live_wallpaper_loading.xml
index 7dd375e..dff8b86 100644
--- a/res/layout/live_wallpaper_loading.xml
+++ b/res/layout/live_wallpaper_loading.xml
@@ -15,8 +15,8 @@
 -->
         
 <TextView 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:gravity="center"
 
diff --git a/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java b/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
index f63d5a0..a8c91be 100644
--- a/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
+++ b/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
@@ -161,12 +161,12 @@ public class LiveWallpaperPreview extends Activity {
         Window window = mDialog.getWindow();
         WindowManager.LayoutParams lp = window.getAttributes();
 
-        lp.width = WindowManager.LayoutParams.FILL_PARENT;
-        lp.height = WindowManager.LayoutParams.FILL_PARENT;
+        lp.width = WindowManager.LayoutParams.MATCH_PARENT;
+        lp.height = WindowManager.LayoutParams.MATCH_PARENT;
         window.setType(WindowManager.LayoutParams.TYPE_APPLICATION_MEDIA);
 
         mDialog.setContentView(content, new ViewGroup.LayoutParams(
-                ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.FILL_PARENT
+                ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT
         ));
         mDialog.show();
     }
-- 
cgit v1.2.3