diff --git a/docs/html/guide/topics/resources/layout-resource.jd b/docs/html/guide/topics/resources/layout-resource.jd
index 366ddc89c9102..cff2038126949 100644
--- a/docs/html/guide/topics/resources/layout-resource.jd
+++ b/docs/html/guide/topics/resources/layout-resource.jd
@@ -33,16 +33,17 @@ In XML: @[package:]layout/filename
-<?xml version="1.0" encoding="utf-8"?>
-<ViewGroup xmlns:android="http://schemas.android.com/apk/res/android"
+<?xml version="1.0" encoding="utf-8"?>
+<ViewGroup
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@[+][package:]id/resource_name"
- android:layout_height=["dimension" | "fill_parent" | "wrap_content"]
- android:layout_width=["dimension" | "fill_parent" | "wrap_content"]
+ android:layout_height=["dimension" | "match_parent" | "wrap_content"]
+ android:layout_width=["dimension" | "match_parent" | "wrap_content"]
[ViewGroup-specific attributes] >
<View
android:id="@[+][package:]id/resource_name"
- android:layout_height=["dimension" | "fill_parent" | "wrap_content"]
- android:layout_width=["dimension" | "fill_parent" | "wrap_content"]
+ android:layout_height=["dimension" | "match_parent" | "wrap_content"]
+ android:layout_width=["dimension" | "match_parent" | "wrap_content"]
[View-specific attributes] >
<requestFocus/>
</View>
@@ -82,15 +83,17 @@ about the value for {@code android:id} below.
android:layout_heightandroid:layout_widthMore attributes are supported by the {@link android.view.ViewGroup} @@ -114,15 +117,17 @@ the value for {@code android:id} below.
android:layout_heightandroid:layout_widthMore attributes are supported by the {@link android.view.View}
@@ -221,9 +226,6 @@ plus symbol in the android:id value.
fill_parent.
fill_parentwrap_content
<?xml version="1.0" encoding="utf-8"?>
<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" >
<TextView android:id="@+id/text"
android:layout_width="wrap_content"
@@ -279,4 +281,4 @@ public void onCreate(Bundle savedInstanceState) {
-
+
\ No newline at end of file