diff options
| author | Romain Guy <romainguy@android.com> | 2010-01-08 15:06:28 -0800 |
|---|---|---|
| committer | Romain Guy <romainguy@android.com> | 2010-01-08 15:11:38 -0800 |
| commit | 980a938c1c9a6a5791a8240e5a1e6638ab28dc77 (patch) | |
| tree | 75a3a1347b5423cc98859d3976076cea3dc22564 /media/tests | |
| parent | 0a0289420227fee51406cf4cc508f09d8ecdd2f4 (diff) | |
| download | frameworks_base-980a938c1c9a6a5791a8240e5a1e6638ab28dc77.zip frameworks_base-980a938c1c9a6a5791a8240e5a1e6638ab28dc77.tar.gz frameworks_base-980a938c1c9a6a5791a8240e5a1e6638ab28dc77.tar.bz2 | |
Deprecate fill_parent and introduce match_parent.
Bug: #2361749.
Diffstat (limited to 'media/tests')
| -rw-r--r-- | media/tests/MediaFrameworkTest/res/layout/movie_view.xml | 10 | ||||
| -rw-r--r-- | media/tests/MediaFrameworkTest/res/layout/surface_view.xml | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/media/tests/MediaFrameworkTest/res/layout/movie_view.xml b/media/tests/MediaFrameworkTest/res/layout/movie_view.xml index 35fedfa..cfd86bb 100644 --- a/media/tests/MediaFrameworkTest/res/layout/movie_view.xml +++ b/media/tests/MediaFrameworkTest/res/layout/movie_view.xml @@ -15,12 +15,12 @@ --> <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"> <FrameLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0px" android:layout_weight="1"> @@ -32,12 +32,12 @@ </FrameLayout> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> <EditText android:id="@+id/url" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="0" android:singleLine="true" diff --git a/media/tests/MediaFrameworkTest/res/layout/surface_view.xml b/media/tests/MediaFrameworkTest/res/layout/surface_view.xml index cbd1ff8..a72c283 100644 --- a/media/tests/MediaFrameworkTest/res/layout/surface_view.xml +++ b/media/tests/MediaFrameworkTest/res/layout/surface_view.xml @@ -15,18 +15,18 @@ --> <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"> <FrameLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <SurfaceView android:id="@+id/surface_view" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:layout_centerInParent="true" /> |