diff options
| author | Rich Slogar <rslogar@google.com> | 2015-02-19 19:06:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-19 19:06:32 +0000 |
| commit | cc883a1ff3d46ffc3cb59915d6d292f91bd984a2 (patch) | |
| tree | 819c772e0e9641989f83210c949cde030610966b | |
| parent | f213a8c980109f9be940236f19a5b79b9be2b007 (diff) | |
| parent | 1e0face2f77ddc7d9eb8fe6708386bfbfc167ec9 (diff) | |
| download | frameworks_base-cc883a1ff3d46ffc3cb59915d6d292f91bd984a2.zip frameworks_base-cc883a1ff3d46ffc3cb59915d6d292f91bd984a2.tar.gz frameworks_base-cc883a1ff3d46ffc3cb59915d6d292f91bd984a2.tar.bz2 | |
am 1e0face2: am b87aa6cb: Merge "docs: mipmap link updates" into lmp-docs
* commit '1e0face2f77ddc7d9eb8fe6708386bfbfc167ec9':
docs: mipmap link updates
| -rw-r--r-- | docs/html/design/style/iconography.jd | 2 | ||||
| -rw-r--r-- | docs/html/guide/practices/screens_support.jd | 2 | ||||
| -rw-r--r-- | docs/html/guide/topics/resources/providing-resources.jd | 2 | ||||
| -rw-r--r-- | docs/html/training/multiscreen/screendensities.jd | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/docs/html/design/style/iconography.jd b/docs/html/design/style/iconography.jd index 1a92753..75f541a 100644 --- a/docs/html/design/style/iconography.jd +++ b/docs/html/design/style/iconography.jd @@ -536,7 +536,7 @@ see <a href="{@docRoot}guide/topics/resources/providing-resources.html">Providin </p> <p> For more information about using the mipmap folders, see -<a href="{@docRoot}tools/project/index.html#mipmap">Managing Projects Overview</a>.</p> +<a href="{@docRoot}tools/projects/index.html#mipmap">Managing Projects Overview</a>.</p> <h3 id="xxxhdpi-launcher">Provide an xxx-high-density launcher icon</h3> diff --git a/docs/html/guide/practices/screens_support.jd b/docs/html/guide/practices/screens_support.jd index 7c963dd..b6f1c49 100644 --- a/docs/html/guide/practices/screens_support.jd +++ b/docs/html/guide/practices/screens_support.jd @@ -368,7 +368,7 @@ folders. The Android system retains the resources in these density-specific fold mipmap-xxxhdpi, regardless of the screen resolution of the device where your app is installed. This behavior allows launcher apps to pick the best resolution icon for your app to display on the home screen. For more information about using the mipmap folders, see -<a href="{@docRoot}tools/project/index.html#mipmap">Managing Projects Overview</a>. +<a href="{@docRoot}tools/projects/index.html#mipmap">Managing Projects Overview</a>. </p> diff --git a/docs/html/guide/topics/resources/providing-resources.jd b/docs/html/guide/topics/resources/providing-resources.jd index 98e7c96..fc79970 100644 --- a/docs/html/guide/topics/resources/providing-resources.jd +++ b/docs/html/guide/topics/resources/providing-resources.jd @@ -76,7 +76,7 @@ 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> +<a href="{@docRoot}tools/projects/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> diff --git a/docs/html/training/multiscreen/screendensities.jd b/docs/html/training/multiscreen/screendensities.jd index 1fc5904..64e70fd 100644 --- a/docs/html/training/multiscreen/screendensities.jd +++ b/docs/html/training/multiscreen/screendensities.jd @@ -154,7 +154,7 @@ appropriate bitmap based on the screen's dpi.</p> <p class="note"><strong>Note:</strong> You should place all launcher icons in the <code>res/mipmap-[density]/</code> folders, rather than <code>drawable/</code> folders to ensure launcher apps use the best resolution icon. For more information about using the mipmap folders, see -<a href="{@docRoot}tools/project/index.html#mipmap">Managing Projects Overview</a>.</p> +<a href="{@docRoot}tools/projects/index.html#mipmap">Managing Projects Overview</a>.</p> <p>For more tips and guidelines for creating icon assets for your application, see the <a href="{@docRoot}guide/practices/ui_guidelines/icon_design.html">Icon Design |