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 /tutorials | |
| 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 'tutorials')
4 files changed, 16 insertions, 16 deletions
diff --git a/tutorials/NotepadCodeLab/Notepadv2/res/layout/note_edit.xml b/tutorials/NotepadCodeLab/Notepadv2/res/layout/note_edit.xml index b254552c3..4af975410 100755 --- a/tutorials/NotepadCodeLab/Notepadv2/res/layout/note_edit.xml +++ b/tutorials/NotepadCodeLab/Notepadv2/res/layout/note_edit.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-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:orientation="vertical" android:layout_width="match_parent" + android:layout_height="match_parent"> <LinearLayout android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <TextView android:layout_width="wrap_content" @@ -20,7 +20,7 @@ <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/body" /> - <EditText android:id="@+id/body" android:layout_width="fill_parent" + <EditText android:id="@+id/body" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" android:scrollbars="vertical" /> diff --git a/tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/note_edit.xml b/tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/note_edit.xml index b254552c3..4af975410 100755 --- a/tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/note_edit.xml +++ b/tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/note_edit.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-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:orientation="vertical" android:layout_width="match_parent" + android:layout_height="match_parent"> <LinearLayout android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <TextView android:layout_width="wrap_content" @@ -20,7 +20,7 @@ <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/body" /> - <EditText android:id="@+id/body" android:layout_width="fill_parent" + <EditText android:id="@+id/body" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" android:scrollbars="vertical" /> diff --git a/tutorials/NotepadCodeLab/Notepadv3/res/layout/note_edit.xml b/tutorials/NotepadCodeLab/Notepadv3/res/layout/note_edit.xml index b254552c3..4af975410 100755 --- a/tutorials/NotepadCodeLab/Notepadv3/res/layout/note_edit.xml +++ b/tutorials/NotepadCodeLab/Notepadv3/res/layout/note_edit.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-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:orientation="vertical" android:layout_width="match_parent" + android:layout_height="match_parent"> <LinearLayout android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <TextView android:layout_width="wrap_content" @@ -20,7 +20,7 @@ <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/body" /> - <EditText android:id="@+id/body" android:layout_width="fill_parent" + <EditText android:id="@+id/body" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" android:scrollbars="vertical" /> diff --git a/tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/note_edit.xml b/tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/note_edit.xml index b254552c3..4af975410 100755 --- a/tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/note_edit.xml +++ b/tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/note_edit.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-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:orientation="vertical" android:layout_width="match_parent" + android:layout_height="match_parent"> <LinearLayout android:orientation="horizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <TextView android:layout_width="wrap_content" @@ -20,7 +20,7 @@ <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/body" /> - <EditText android:id="@+id/body" android:layout_width="fill_parent" + <EditText android:id="@+id/body" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" android:scrollbars="vertical" /> |