summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2010-04-12 12:19:08 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-04-12 12:19:08 -0700
commit290a48b365479eccd16023b5de0d92063bb68b4d (patch)
tree733e2a7f7b7170be187c0580c0ebf2adf1a15ba1 /docs
parent12221b6f7c86349e3dcf89f814355e41f9e58cbf (diff)
parentf538b0ba7ef4499765cfb5e365c8ca37ea6aa1f0 (diff)
downloadframeworks_base-290a48b365479eccd16023b5de0d92063bb68b4d.zip
frameworks_base-290a48b365479eccd16023b5de0d92063bb68b4d.tar.gz
frameworks_base-290a48b365479eccd16023b5de0d92063bb68b4d.tar.bz2
Merge "Fix typos in name of density-independent pixels" into froyo
Diffstat (limited to 'docs')
-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 0fad4c6..5e61e6c 100644
--- a/docs/html/guide/practices/screens_support.jd
+++ b/docs/html/guide/practices/screens_support.jd
@@ -116,7 +116,7 @@ screen. </p>
generalized densities: high, medium, and low. Applications can provide custom
resources for each of these three densities &mdash; the platform handles the
scaling of the resources up or down to meet the actual screen density. </p></dd>
-<dt><em>Density independent pixel (dip)</em></dt>
+<dt><em>Density-independent pixel (dip)</em></dt>
<dd>A virtual pixel unit that applications can use in defining their UI, to
express layout dimensions or position in a density-independent way.
<p>The density-independent pixel is equivalent to one physical pixel on a 160
@@ -432,7 +432,7 @@ does this in three ways: </p>
<ul>
<li>Through pre-scaling of drawable resources (scaled at resource loading
time)</li>
-<li>Through auto-scaling of device-independent pixel (dip) values used in
+<li>Through auto-scaling of density-independent pixel (dip) values used in
layouts</li>
<li>Through auto-scaling of absolute pixel values used in the application (only
needed if the application has set <code>android:anyDensity="false"</code> in its
@@ -573,7 +573,7 @@ installing the application on small-screen devices. </li>
are signaling to the platform that your application wants to manage its UI by
itself, for all screen densities, using the actual screen dimensions and pixels.
In this case, the application must ensure that it declares its UI dimensions
-using device-independent pixels and scales any actual pixel values or math by
+using density-independent pixels and scales any actual pixel values or math by
the scaling factor available from
{@link android.util.DisplayMetrics#density android.util.DisplayMetrics.density}.</p>