Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "docs: Fixed name of uses-permission-sdk-23" into mnc-docs

Browse Source
This commit is contained in:
Andrew Solovay
2015-10-29 00:10:07 +00:00
committed by Android (Google) Code Review
parent 8888964bb0 04c0d1d7dd
commit c8668cd3eb
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/html/guide/guide_toc.cs
View File

@@ -183,7 +183,7 @@
<li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-feature-element.html">&lt;uses-feature&gt;</a></li> <!-- ##api level 4## -->
<li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-library-element.html">&lt;uses-library&gt;</a></li>
<li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-permission-element.html">&lt;uses-permission&gt;</a></li>
<li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-permission-sdk23-element.html">&lt;uses-permission-sdk23&gt;</a></li>
<li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-permission-sdk-23-element.html">&lt;uses-permission-sdk-23&gt;</a></li>
<li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-sdk-element.html">&lt;uses-sdk&gt;</a></li>
</ul>
</li><!-- end of the manifest file -->

2
docs/html/guide/topics/manifest/manifest-element.jd
View File

@@ -35,7 +35,7 @@ parent.link=manifest-intro.html
<br/><code><a href="{@docRoot}guide/topics/manifest/uses-configuration-element.html">&lt;uses-configuration&gt;</a></code> <!-- ##api level 3## -->
<br/><code><a href="{@docRoot}guide/topics/manifest/uses-feature-element.html">&lt;uses-feature&gt;</a></code>
<br/><code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html">&lt;uses-permission&gt;</a></code>
<br/><code><a href="{@docRoot}guide/topics/manifest/uses-permission-sdk23-element.html">&lt;uses-permission-sdk23&gt;</a></code>
<br/><code><a href="{@docRoot}guide/topics/manifest/uses-permission-sdk-23-element.html">&lt;uses-permission-sdk-23&gt;</a></code>
<br/><code><a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html">&lt;uses-sdk&gt;</a></code></dd>
<p>

4
docs/html/guide/topics/manifest/uses-permission-element.jd
View File

@@ -97,8 +97,8 @@ permission is needed only up to API level 18 with a declaration such as this:
<dd>
<ul>
<li><code><a href="{@docRoot}guide/topics/manifest/permission-element.html">&lt;permission&gt;</a></code></li>
<li><a href="uses-permission-sdk23-element.html"
><code>&lt;uses-permission-sdk23&gt;</code></a></li>
<li><a href="uses-permission-sdk-23-element.html"
><code>&lt;uses-permission-sdk-23&gt;</code></a></li>
<li><code><a href="{@docRoot}guide/topics/manifest/uses-feature-element.html">&lt;uses-feature&gt;</a></code></li>
</ul>
</dd>

8
docs/html/guide/topics/manifest/uses-permission-sdk23-element.jd → docs/html/guide/topics/manifest/uses-permission-sdk-23-element.jd
View File

@@ -1,5 +1,5 @@
page.title=&lt;uses-permission-sdk23&gt;
page.tags="uses-permission-sdk23","permissions"
page.title=&lt;uses-permission-sdk-23&gt;
page.tags="uses-permission-sdk-23","permissions","uses-permission-sdk23"
parent.title=The AndroidManifest.xml File
parent.link=manifest-intro.html
@jd:body
@@ -7,7 +7,7 @@ parent.link=manifest-intro.html
<dl class="xml">
<dt>syntax:</dt>
<dd><pre class="stx">&lt;uses-permission-sdk23 android:<a href="#nm">name</a>="<i>string</i>"
<dd><pre class="stx">&lt;uses-permission-sdk-23 android:<a href="#nm">name</a>="<i>string</i>"
android:<a href="#maxSdk">maxSdkVersion</a>="<i>integer</i>" /&gt;</pre></dd>
<dt>Contained in:</dt>
@@ -31,7 +31,7 @@ parent.link=manifest-intro.html
update. If a new feature is minor enough, you may prefer to disable
the feature altogether on those devices, so the user does not have to grant
additional permissions to update the app. By using the
<code>&lt;uses-permission-sdk23&gt;</code> element instead of <a href=
<code>&lt;uses-permission-sdk-23&gt;</code> element instead of <a href=
"uses-permission-element.html"><code>&lt;uses-permission&gt;</code></a>,
you can request the permission <em>only</em> if the app is running on
platforms that support the runtime permissions model, in which the user