summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2015-10-06 01:03:49 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-10-06 01:03:49 +0000
commit42efe5b333c1f28127da57a44b39bd72cfbe81b2 (patch)
tree0f6f674b989e3f37edf6cdbcfd95adbbd96ccca8 /docs
parent7f33f6e92fa22f47af2f8d61883197013fae4c66 (diff)
parentc87996e5382a5e9bc4ae400e1879d7c655d8b46a (diff)
downloadframeworks_base-42efe5b333c1f28127da57a44b39bd72cfbe81b2.zip
frameworks_base-42efe5b333c1f28127da57a44b39bd72cfbe81b2.tar.gz
frameworks_base-42efe5b333c1f28127da57a44b39bd72cfbe81b2.tar.bz2
am c87996e5: am 8461f2fa: am 46684d2c: Merge "Add anydpi to the providing-resources docs" into mnc-dev
* commit 'c87996e5382a5e9bc4ae400e1879d7c655d8b46a': Add anydpi to the providing-resources docs
Diffstat (limited to 'docs')
-rw-r--r--docs/html/guide/topics/resources/providing-resources.jd9
1 files changed, 7 insertions, 2 deletions
diff --git a/docs/html/guide/topics/resources/providing-resources.jd b/docs/html/guide/topics/resources/providing-resources.jd
index 6f9545d..68c44a4 100644
--- a/docs/html/guide/topics/resources/providing-resources.jd
+++ b/docs/html/guide/topics/resources/providing-resources.jd
@@ -646,7 +646,8 @@ application during runtime.</p>
<code>xxhdpi</code><br/>
<code>xxxhdpi</code><br/>
<code>nodpi</code><br/>
- <code>tvdpi</code>
+ <code>tvdpi</code><br/>
+ <code>anydpi</code>
</td>
<td>
<ul class="nolist">
@@ -667,7 +668,11 @@ to match the device density.</li>
<li>{@code tvdpi}: Screens somewhere between mdpi and hdpi; approximately 213dpi. This is
not considered a "primary" density group. It is mostly intended for televisions and most
apps shouldn't need it&mdash;providing mdpi and hdpi resources is sufficient for most apps and
-the system will scale them as appropriate. This qualifier was introduced with API level 13.</li>
+the system will scale them as appropriate. <em>Added in API Level 13</em></li>
+ <li>{@code anydpi}: This qualifier matches all screen densities and takes precedence over
+other qualifiers. This is useful for
+<a href="{@docRoot}training/material/drawables.html#VectorDrawables">vector drawables</a>.
+<em>Added in API Level 21</em></li>
</ul>
<p>There is a 3:4:6:8:12:16 scaling ratio between the six primary densities (ignoring the
tvdpi density). So, a 9x9 bitmap in ldpi is 12x12 in mdpi, 18x18 in hdpi, 24x24 in xhdpi and so on.