summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Aurimas Liutikas <aurimas@google.com> 2016-06-14 00:48:50 +0000
committer android-build-merger <android-build-merger@google.com> 2016-06-14 00:48:50 +0000
commit1729c75f73ac9f1c58ff33a64b7a3c3fb472f091 (patch)
tree2552e1f79ae2ae2a0547985c061356946c7d6d8a
parentce2e9d8716a0c56f7a7dae0eadbd014dd8b83b23 (diff)
parentdf4528fbe8a68b5b2dc8354105e59b36e21f38e3 (diff)
Merge \"Swap fill_parent with match_parent in best practices doc.\" into mnc-io-docs
am: df4528fbe8 Change-Id: Ie2039cf96c3591b6fc2c0cb8ec1097707edcc76b
-rw-r--r--docs/html/guide/practices/screens_support.jd6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/html/guide/practices/screens_support.jd b/docs/html/guide/practices/screens_support.jd
index 9faa6a6f05d4..1f5f472704e2 100644
--- a/docs/html/guide/practices/screens_support.jd
+++ b/docs/html/guide/practices/screens_support.jd
@@ -988,7 +988,7 @@ configurations.</p>
on different screens:</p>
<ol>
- <li>Use {@code wrap_content}, {@code fill_parent}, or {@code dp} units when specifying
+ <li>Use {@code wrap_content}, {@code match_parent}, or {@code dp} units when specifying
dimensions in an XML layout file</li>
<li>Do not use hard coded pixel values in your application code</li>
<li>Do not use {@code AbsoluteLayout} (it's deprecated)</li>
@@ -998,7 +998,7 @@ dimensions in an XML layout file</li>
<p>The following sections provide more details.</p>
-<h3 id="use-relative">1. Use wrap_content, fill_parent, or the dp unit for layout dimensions</h3>
+<h3 id="use-relative">1. Use wrap_content, match_parent, or the dp unit for layout dimensions</h3>
<p>When defining the <a
href="{@docRoot}reference/android/view/ViewGroup.LayoutParams.html#attr_android:layout_width"
@@ -1006,7 +1006,7 @@ href="{@docRoot}reference/android/view/ViewGroup.LayoutParams.html#attr_android:
href="{@docRoot}reference/android/view/ViewGroup.LayoutParams.html#attr_android:layout_height"
>{@code android:layout_height}</a> for
views in an XML layout file, using <code>"wrap_content"</code>,
-<code>"fill_parent"</code> or <code>dp</code> units guarantees that the view is
+<code>"match_parent"</code> or <code>dp</code> units guarantees that the view is
given an appropriate size on the current device screen.</p>
<p>For instance, a view with a <code>layout_width="100dp"</code> measures 100 pixels wide on