summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Guy <romainguy@android.com>2010-01-08 15:07:21 -0800
committerRomain Guy <romainguy@android.com>2010-01-08 15:12:05 -0800
commita7c785cf1150588ed531da4b81fb6f9a50c8ac26 (patch)
tree4c63a8ba5580ebecac047af98bafdb4e38eef848
parente5312bfd596a2803f3ab57d51f95654019c23e06 (diff)
downloadandroid_packages_wallpapers_LivePicker-a7c785cf1150588ed531da4b81fb6f9a50c8ac26.zip
android_packages_wallpapers_LivePicker-a7c785cf1150588ed531da4b81fb6f9a50c8ac26.tar.gz
android_packages_wallpapers_LivePicker-a7c785cf1150588ed531da4b81fb6f9a50c8ac26.tar.bz2
Deprecate fill_parent and introduce match_parent.
Bug: #2361749.
-rw-r--r--res/layout/live_wallpaper_entry.xml6
-rw-r--r--res/layout/live_wallpaper_list.xml8
-rw-r--r--res/layout/live_wallpaper_loading.xml4
-rw-r--r--src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java6
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();
}