summaryrefslogtreecommitdiffstats
path: root/docs/html/guide/topics
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2010-06-17 18:55:19 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-17 18:55:19 -0700
commit0d049e5f6282cfb889960942ac2dceb3b586701f (patch)
treea38029d50eb8fe10349b15ee4cb079c3f57df564 /docs/html/guide/topics
parent8698da75f77274254d5774c018866870e62bef9a (diff)
parent0b16e6a0347c519ccf56b3b956c086889856fec3 (diff)
downloadframeworks_base-0d049e5f6282cfb889960942ac2dceb3b586701f.zip
frameworks_base-0d049e5f6282cfb889960942ac2dceb3b586701f.tar.gz
frameworks_base-0d049e5f6282cfb889960942ac2dceb3b586701f.tar.bz2
am 0b16e6a0: am 7f0a1f62: am 5f11e95f: docs: small edits to catchup to edits made in html pushed live
Merge commit '0b16e6a0347c519ccf56b3b956c086889856fec3' * commit '0b16e6a0347c519ccf56b3b956c086889856fec3': docs: small edits to catchup to edits made in html pushed live
Diffstat (limited to 'docs/html/guide/topics')
-rw-r--r--docs/html/guide/topics/resources/providing-resources.jd10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/html/guide/topics/resources/providing-resources.jd b/docs/html/guide/topics/resources/providing-resources.jd
index 66154cb..cac85e8 100644
--- a/docs/html/guide/topics/resources/providing-resources.jd
+++ b/docs/html/guide/topics/resources/providing-resources.jd
@@ -785,7 +785,7 @@ compatibility for these versions.</p>
<h3 id="ScreenCompatibility">Providing screen resource compatibility for Android 1.5</h3>
-<p>Android 1.5 (and lower) does not support the following resource qualifers:</p>
+<p>Android 1.5 (and lower) does not support the following configuration qualifers:</p>
<dl>
<dt><a href="#DensityQualifier">Density</a></dt>
<dd>{@code ldpi}, {@code mdpi}, {@code ldpi}, and {@code nodpi}</dd>
@@ -795,11 +795,11 @@ compatibility for these versions.</p>
<dd>{@code long} and {@code notlong}</dd>
</dl>
-<p>These resource qualifiers were introduced in Android 1.6, so Android 1.5 (API Level 3) and lower
-does not support them. If you use these configuration qualifiers and do not provide
+<p>These configuration qualifiers were introduced in Android 1.6, so Android 1.5 (API Level 3) and
+lower does not support them. If you use these configuration qualifiers and do not provide
corresponding default resources, then an Android 1.5 device might use any one of the resource
-directories named with the above screen qualifiers, because it ignores the screen qualifiers and
-uses whichever otherwise-matching drawable resource it finds first.</p>
+directories named with the above screen configuration qualifiers, because it ignores these
+qualifiers and uses whichever otherwise-matching drawable resource it finds first.</p>
<p>For example, if your application supports Android 1.5 and includes drawable resources for
each density type ({@code drawable-ldpi/}, {@code drawable-mdpi/}, and {@code drawable-ldpi/}),