diff options
| author | Rich Slogar <rslogar@google.com> | 2015-02-18 00:13:07 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-02-18 00:13:07 +0000 |
| commit | 502f303c6108515a86d2826d1e87d474ffdb0945 (patch) | |
| tree | b13ff85f3c88fe110b39a4b6904876d0fc00b3ed /docs/html/guide/topics | |
| parent | 6cdde6718c36851e136e7358ba2ac1fd32f6aae5 (diff) | |
| parent | 797c989e3be0d081098866206b0e5829a7fe2ce2 (diff) | |
| download | frameworks_base-502f303c6108515a86d2826d1e87d474ffdb0945.zip frameworks_base-502f303c6108515a86d2826d1e87d474ffdb0945.tar.gz frameworks_base-502f303c6108515a86d2826d1e87d474ffdb0945.tar.bz2 | |
am d72bea9d: am 40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs
automerge: 797c989
* commit '797c989e3be0d081098866206b0e5829a7fe2ce2':
docs: site mipmap folder updates
Diffstat (limited to 'docs/html/guide/topics')
| -rw-r--r-- | docs/html/guide/topics/resources/available-resources.jd | 1 | ||||
| -rw-r--r-- | docs/html/guide/topics/resources/providing-resources.jd | 18 |
2 files changed, 17 insertions, 2 deletions
diff --git a/docs/html/guide/topics/resources/available-resources.jd b/docs/html/guide/topics/resources/available-resources.jd index 19babee..db1bf8d 100644 --- a/docs/html/guide/topics/resources/available-resources.jd +++ b/docs/html/guide/topics/resources/available-resources.jd @@ -29,6 +29,7 @@ Saved in {@code res/color/} and accessed from the {@code R.color} class.</dd> <dt><a href="{@docRoot}guide/topics/resources/drawable-resource.html">Drawable Resources</a></dt> <dd>Define various graphics with bitmaps or XML.<br/> Saved in {@code res/drawable/} and accessed from the {@code R.drawable} class.</dd> + <dt><a href="{@docRoot}guide/topics/resources/layout-resource.html">Layout Resource</a></dt> <dd>Define the layout for your application UI.<br/> Saved in {@code res/layout/} and accessed from the {@code R.layout} class.</dd> diff --git a/docs/html/guide/topics/resources/providing-resources.jd b/docs/html/guide/topics/resources/providing-resources.jd index 6d9527f..98e7c96 100644 --- a/docs/html/guide/topics/resources/providing-resources.jd +++ b/docs/html/guide/topics/resources/providing-resources.jd @@ -60,18 +60,24 @@ MyProject/ MyActivity.java </span> res/ drawable/ <span style="color:black"> - icon.png </span> + graphic.png </span> layout/ <span style="color:black"> main.xml info.xml</span> + mipmap/ <span style="color:black"> + icon.png </span> values/ <span style="color:black"> strings.xml </span> </pre> <p>As you can see in this example, the {@code res/} directory contains all the resources (in -subdirectories): an image resource, two layout resources, and a string resource file. The resource +subdirectories): an image resource, two layout resources, {@code mipmap/} directories for launcher +icons, and a string resource file. The resource directory names are important and are described in table 1.</p> +<p class="note"><strong>Note:</strong> For more information about using the mipmap folders, see +<a href="{@docRoot}tools/project/index.html#mipmap">Managing Projects Overview</a>.</p> + <p class="table-caption" id="table1"><strong>Table 1.</strong> Resource directories supported inside project {@code res/} directory.</p> @@ -104,6 +110,7 @@ State List Resource</a></td> <tr> <td><code>drawable/</code></td> + <td><p>Bitmap files ({@code .png}, {@code .9.png}, {@code .jpg}, {@code .gif}) or XML files that are compiled into the following drawable resource subtypes:</p> <ul> @@ -119,6 +126,13 @@ are compiled into the following drawable resource subtypes:</p> </tr> <tr> + <td><code>mipmap/</code></td> + <td>Drawable files for different launcher icon densities. For more information on managing + launcher icons with {@code mipmap/} folders, see + <a href="{@docRoot}tools/project/index.html#mipmap">Managing Projects Overview</a>.</td> + </tr> + + <tr> <td><code>layout/</code></td> <td>XML files that define a user interface layout. See <a href="layout-resource.html">Layout Resource</a>.</td> |