diff options
| author | Romain Guy <romainguy@android.com> | 2010-01-08 15:05:33 -0800 |
|---|---|---|
| committer | Romain Guy <romainguy@android.com> | 2010-01-08 15:11:18 -0800 |
| commit | 74192eafec8408417114d77784cd35eda5df573c (patch) | |
| tree | fac15940efc0fdc38b8bdc44d4c3dc6efa474aab /samples/Home | |
| parent | b4e39aebf6b27aa0ed094a75bde8b2bacda28d98 (diff) | |
| download | android_development-74192eafec8408417114d77784cd35eda5df573c.tar.gz android_development-74192eafec8408417114d77784cd35eda5df573c.tar.bz2 android_development-74192eafec8408417114d77784cd35eda5df573c.zip | |
Deprecate fill_parent and introduce match_parent.
Bug: #2361749.
Diffstat (limited to 'samples/Home')
| -rw-r--r-- | samples/Home/res/layout-land/home.xml | 8 | ||||
| -rw-r--r-- | samples/Home/res/layout-port/home.xml | 8 | ||||
| -rw-r--r-- | samples/Home/res/layout/all_applications_button.xml | 2 | ||||
| -rw-r--r-- | samples/Home/res/layout/wallpaper.xml | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/samples/Home/res/layout-land/home.xml b/samples/Home/res/layout-land/home.xml index d723c69a2..8eecbdb2f 100644 --- a/samples/Home/res/layout-land/home.xml +++ b/samples/Home/res/layout-land/home.xml @@ -17,8 +17,8 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:home="http://schemas.android.com/apk/res/com.example.android.home" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <!-- All applications on the top side of the screen --> <GridView android:id="@+id/all_apps" @@ -33,7 +33,7 @@ android:stretchMode="spacingWidth" android:layout_weight="1.0" android:layout_height="0dip" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:stackFromBottom="true" android:visibility="invisible" /> @@ -43,7 +43,7 @@ home:marginLeft="1dip" home:marginRight="1dip" android:layout_marginTop="0dip" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="65dip" android:background="@drawable/application_background" /> diff --git a/samples/Home/res/layout-port/home.xml b/samples/Home/res/layout-port/home.xml index d723c69a2..8eecbdb2f 100644 --- a/samples/Home/res/layout-port/home.xml +++ b/samples/Home/res/layout-port/home.xml @@ -17,8 +17,8 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:home="http://schemas.android.com/apk/res/com.example.android.home" android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <!-- All applications on the top side of the screen --> <GridView android:id="@+id/all_apps" @@ -33,7 +33,7 @@ android:stretchMode="spacingWidth" android:layout_weight="1.0" android:layout_height="0dip" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:stackFromBottom="true" android:visibility="invisible" /> @@ -43,7 +43,7 @@ home:marginLeft="1dip" home:marginRight="1dip" android:layout_marginTop="0dip" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="65dip" android:background="@drawable/application_background" /> diff --git a/samples/Home/res/layout/all_applications_button.xml b/samples/Home/res/layout/all_applications_button.xml index 88430b355..bed98dd9c 100644 --- a/samples/Home/res/layout/all_applications_button.xml +++ b/samples/Home/res/layout/all_applications_button.xml @@ -28,7 +28,7 @@ android:id="@+id/show_all_apps_check" android:focusable="false" android:clickable="false" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/all_applications_background" android:button="@drawable/all_applications" diff --git a/samples/Home/res/layout/wallpaper.xml b/samples/Home/res/layout/wallpaper.xml index 92dc65e00..76f5af7d6 100644 --- a/samples/Home/res/layout/wallpaper.xml +++ b/samples/Home/res/layout/wallpaper.xml @@ -19,8 +19,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"> <TextView android:layout_width="wrap_content" @@ -34,7 +34,7 @@ <Gallery android:id="@+id/gallery" android:background="#70000000" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="60dip" android:layout_alignParentBottom="true" android:layout_alignParentLeft="true" |