Merge "docs: Fixed name of uses-permission-sdk-23" into mnc-docs (c8668cd3) · Commits · e / os / android_frameworks_base

docs/html/guide/guide_toc.cs

+1 −1

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

+1 −1

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

		<p>

+2 −2

Original line number	Diff line number	Diff line
		@@ -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"><permission></a></code></li>
		<li><a href="uses-permission-sdk23-element.html"
		><code><uses-permission-sdk23></code></a></li>
		<li><a href="uses-permission-sdk-23-element.html"
		><code><uses-permission-sdk-23></code></a></li>
		<li><code><a href="{@docRoot}guide/topics/manifest/uses-feature-element.html"><uses-feature></a></code></li>
		</ul>
		</dd>

+4 −4

Original line number	Diff line number	Diff line
		page.title=<uses-permission-sdk23>
		page.tags="uses-permission-sdk23","permissions"
		page.title=<uses-permission-sdk-23>
		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"><uses-permission-sdk23 android:<a href="#nm">name</a>="<i>string</i>"
		<dd><pre class="stx"><uses-permission-sdk-23 android:<a href="#nm">name</a>="<i>string</i>"
		android:<a href="#maxSdk">maxSdkVersion</a>="<i>integer</i>" /></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><uses-permission-sdk23></code> element instead of <a href=
		<code><uses-permission-sdk-23></code> element instead of <a href=
		"uses-permission-element.html"><code><uses-permission></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