cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee
docs: edit manifest samples to indicate <application> element is always last
Change-Id: I993d130c26efd87147913d5607a2e7f15bd12fe8
diff --git a/docs/html/guide/appendix/api-levels.jd b/docs/html/guide/appendix/api-levels.jd
index 50e5149..5898fe5 100644
--- a/docs/html/guide/appendix/api-levels.jd
+++ b/docs/html/guide/appendix/api-levels.jd
@@ -160,7 +160,6 @@
element might look like this: </p>
<pre><manifest>
- ...
<uses-sdk android:minSdkVersion="5" />
...
</manifest></pre>
diff --git a/docs/html/guide/developing/eclipse-adt.jd b/docs/html/guide/developing/eclipse-adt.jd
index 1594159..e8d2416 100644
--- a/docs/html/guide/developing/eclipse-adt.jd
+++ b/docs/html/guide/developing/eclipse-adt.jd
@@ -541,7 +541,6 @@
<activity android:name="GameActivity" />
...
</application>
- ...
</manifest></pre>
@@ -611,7 +610,6 @@
<activity android:name="com.example.android.tictactoe.library.GameActivity" />
...
</application>
- ...
</manifest></pre>
<p>For more information about the manifest file, see the documentation for <a
diff --git a/docs/html/guide/developing/other-ide.jd b/docs/html/guide/developing/other-ide.jd
index 8c61771a..95b3680 100644
--- a/docs/html/guide/developing/other-ide.jd
+++ b/docs/html/guide/developing/other-ide.jd
@@ -700,7 +700,6 @@
<activity android:name="GameActivity" />
...
</application>
- ...
</manifest></pre>
<h4>Updating a library project</h4>
@@ -796,7 +795,6 @@
<activity android:name="com.example.android.tictactoe.library.GameActivity" />
...
</application>
- ...
</manifest></pre>
<p>For more information about the manifest file, see the documentation for <a
diff --git a/docs/html/guide/practices/screens_support.jd b/docs/html/guide/practices/screens_support.jd
index 7811d90..b70be07 100644
--- a/docs/html/guide/practices/screens_support.jd
+++ b/docs/html/guide/practices/screens_support.jd
@@ -693,13 +693,13 @@
<pre>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
- ...
<supports-screens
android:smallScreens="true"
android:normalScreens="true"
android:largeScreens="true"
android:xlargeScreens="true"
android:anyDensity="true" />
+ ...
</manifest>
</pre>
<!-- android:resizeable="true" -->
diff --git a/docs/html/guide/publishing/licensing.jd b/docs/html/guide/publishing/licensing.jd
index fc83ec0..40439f0 100644
--- a/docs/html/guide/publishing/licensing.jd
+++ b/docs/html/guide/publishing/licensing.jd
@@ -784,7 +784,6 @@
<pre><?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" ...">
- ...
<!-- Devices >= 3 have version of Android Market that supports licensing. -->
<uses-sdk android:minSdkVersion="3" />
<!-- Required permission to check licensing. -->
diff --git a/docs/html/guide/topics/data/backup.jd b/docs/html/guide/topics/data/backup.jd
index 623ee22..7661a0e 100644
--- a/docs/html/guide/topics/data/backup.jd
+++ b/docs/html/guide/topics/data/backup.jd
@@ -166,6 +166,7 @@
<pre>
<manifest ... >
+ ...
<application android:label="MyApplication"
<b>android:backupAgent="MyBackupAgent"</b>>
<activity ... >
diff --git a/docs/html/guide/topics/manifest/manifest-intro.jd b/docs/html/guide/topics/manifest/manifest-intro.jd
index efbfa5a..d7a3e3e 100644
--- a/docs/html/guide/topics/manifest/manifest-intro.jd
+++ b/docs/html/guide/topics/manifest/manifest-intro.jd
@@ -441,6 +441,7 @@
<pre>
<manifest . . . >
<permission android:name="com.example.project.DEBIT_ACCT" . . . />
+ <uses-permission android:name="com.example.project.DEBIT_ACCT" />
. . .
<application . . .>
<activity android:name="com.example.project.FreneticActivity"
@@ -449,9 +450,6 @@
. . .
</activity>
</application>
- . . .
- <uses-permission android:name="com.example.project.DEBIT_ACCT" />
- . . .
</manifest>
</pre>
diff --git a/docs/html/guide/topics/manifest/permission-tree-element.jd b/docs/html/guide/topics/manifest/permission-tree-element.jd
index aecc930..6d6cd0a 100644
--- a/docs/html/guide/topics/manifest/permission-tree-element.jd
+++ b/docs/html/guide/topics/manifest/permission-tree-element.jd
@@ -42,7 +42,7 @@
reference to a string resource, so that it can be localized like other
strings in the user interface.</dd>
-<dt><a name="nm"</a>{@code android:name}</dt>
+<dt><a name="nm"></a>{@code android:name}</dt>
<dd>The name that's at the base of the permission tree. It serves as
a prefix to all permission names in the tree. Java-style scoping should
be used to ensure that the name is unique. The name must have more than
diff --git a/docs/html/guide/topics/manifest/uses-feature-element.jd b/docs/html/guide/topics/manifest/uses-feature-element.jd
index 6652aff..2e43c30 100644
--- a/docs/html/guide/topics/manifest/uses-feature-element.jd
+++ b/docs/html/guide/topics/manifest/uses-feature-element.jd
@@ -403,10 +403,9 @@
</dl>
<pre><manifest ...>
-...
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-sdk android:minSdkVersion="3" />
-...
+ ...
</manifest></pre>
<dl>
@@ -418,10 +417,9 @@
</dl>
<pre><manifest ...>
-...
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="5" />
-...
+ ...
</manifest></pre>
<dl>
@@ -430,11 +428,10 @@
</dl>
<pre><manifest ...>
-...
<uses-feature android:name="android.hardware.bluetooth" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="5" />
-...
+ ...
</manifest></pre>
<dl>
@@ -445,11 +442,10 @@
</dl>
<pre><manifest ...>
-...
<uses-feature android:name="android.hardware.bluetooth" android:required="false" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="5" />
-...
+ ...
</manifest></pre>
diff --git a/docs/html/guide/topics/security/security.jd b/docs/html/guide/topics/security/security.jd
index de0c6e5..2e31940 100644
--- a/docs/html/guide/topics/security/security.jd
+++ b/docs/html/guide/topics/security/security.jd
@@ -120,9 +120,8 @@
<pre><manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.app.myapp" >
-
<uses-permission android:name="android.permission.RECEIVE_SMS" />
-
+ ...
</manifest></pre>
<p>At application install time, permissions requested by the application are
@@ -175,13 +174,12 @@
<pre><manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.me.app.myapp" >
-
<permission android:name="com.me.app.myapp.permission.DEADLY_ACTIVITY"
android:label="@string/permlab_deadlyActivity"
android:description="@string/permdesc_deadlyActivity"
android:permissionGroup="android.permission-group.COST_MONEY"
android:protectionLevel="dangerous" />
-
+ ...
</manifest></pre>
<p>The {@link android.R.styleable#AndroidManifestPermission_protectionLevel
diff --git a/docs/html/resources/tutorials/testing/activity_test.jd b/docs/html/resources/tutorials/testing/activity_test.jd
index 87dd183..ec878d2 100644
--- a/docs/html/resources/tutorials/testing/activity_test.jd
+++ b/docs/html/resources/tutorials/testing/activity_test.jd
@@ -368,14 +368,14 @@
package="com.android.example.spinner.test"
android:versionCode="1"
android:versionName="1.0">
- <application android:icon="@drawable/icon" android:label="@string/app_name">
-
- <uses-library android:name="android.test.runner" />
- </application>
<uses-sdk android:minSdkVersion="3" />
<instrumentation
android:targetPackage="com.android.example.spinner"
android:name="android.test.InstrumentationTestRunner" />
+ <application android:icon="@drawable/icon" android:label="@string/app_name">
+ <uses-library android:name="android.test.runner" />
+ ...
+ </application>
</manifest>
</pre>
<p>
diff --git a/docs/html/sdk/ndk/overview.jd b/docs/html/sdk/ndk/overview.jd
index f6d148a..56b9201 100644
--- a/docs/html/sdk/ndk/overview.jd
+++ b/docs/html/sdk/ndk/overview.jd
@@ -489,7 +489,6 @@
<code>android:minSdkVersion</code> attribute value of "3" or higher. For example:
<pre style="margin:1em;">
<manifest>
- ...
<uses-sdk android:minSdkVersion="3" />
...
</manifest>
@@ -540,7 +539,6 @@
to users whose devices are capable of supporting your application. For example:
<pre style="margin:1em;">
<manifest>
- ...
<!-- Declare that the application uses the OpenGL ES 2.0 API and is designed
to run only on devices that support OpenGL ES 2.0 or higher. -->
<uses-feature android:glEsVersion="0x00020000" />