am b94df620: cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: edit manifest samples to indicate <application> element is always last

* commit 'b94df620959de658990c1ed1263e2e1c42df7f6b':
  cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: edit manifest samples to indicate <application> element is always last
This commit is contained in:
Scott Main
2010-12-14 16:22:56 -08:00
committed by Android Git Automerger
12 changed files with 14 additions and 29 deletions

View File

@@ -160,7 +160,6 @@ documentation for more information about how the system handles this attribute.<
element might look like this: </p>
<pre>&lt;manifest&gt;
...
&lt;uses-sdk android:minSdkVersion="5" /&gt;
...
&lt;/manifest&gt;</pre>

View File

@@ -541,7 +541,6 @@ example library project declares the Activity <code>GameActivity</code>: </p>
&lt;activity android:name="GameActivity" /&gt;
...
&lt;/application&gt;
...
&lt;/manifest&gt;</pre>
@@ -611,7 +610,6 @@ like this: </p>
&lt;activity android:name="com.example.android.tictactoe.library.GameActivity" /&gt;
...
&lt;/application&gt;
...
&lt;/manifest&gt;</pre>
<p>For more information about the manifest file, see the documentation for <a

View File

@@ -700,7 +700,6 @@ example library project declares the Activity <code>GameActivity</code>: </p>
&lt;activity android:name="GameActivity" /&gt;
...
&lt;/application&gt;
...
&lt;/manifest&gt;</pre>
<h4>Updating a library project</h4>
@@ -796,7 +795,6 @@ like this: </p>
&lt;activity android:name="com.example.android.tictactoe.library.GameActivity" /&gt;
...
&lt;/application&gt;
...
&lt;/manifest&gt;</pre>
<p>For more information about the manifest file, see the documentation for <a

View File

@@ -693,13 +693,13 @@ nine-patch images, which always takes place by default. </p>
<pre>
&lt;manifest xmlns:android="http://schemas.android.com/apk/res/android"&gt;
...
&lt;supports-screens
android:smallScreens="true"
android:normalScreens="true"
android:largeScreens="true"
android:xlargeScreens="true"
android:anyDensity="true" /&gt;
...
&lt;/manifest&gt;
</pre>
<!-- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; android:resizeable="true" -->

View File

@@ -784,7 +784,6 @@ android:name="com.android.vending.CHECK_LICENSE"&gt;</code></p>
<pre>&lt;?xml version="1.0" encoding="utf-8"?&gt;
&lt;manifest xmlns:android="http://schemas.android.com/apk/res/android" ..."&gt;
...
&lt;!-- Devices &gt;= 3 have version of Android Market that supports licensing. --&gt;
&lt;uses-sdk android:minSdkVersion="3" /&gt;
&lt;!-- Required permission to check licensing. --&gt;

View File

@@ -166,6 +166,7 @@ href="{@docRoot}guide/topics/manifest/application-element.html">{@code
<pre>
&lt;manifest ... &gt;
...
&lt;application android:label="MyApplication"
<b>android:backupAgent="MyBackupAgent"</b>&gt;
&lt;activity ... &gt;

View File

@@ -441,6 +441,7 @@ element. For example, an activity could be protected as follows:
<pre>
&lt;manifest . . . &gt;
&lt;permission android:name="com.example.project.DEBIT_ACCT" . . . /&gt;
&lt;uses-permission android:name="com.example.project.DEBIT_ACCT" /&gt;
. . .
&lt;application . . .&gt;
&lt;activity android:name="com.example.project.FreneticActivity"
@@ -449,9 +450,6 @@ element. For example, an activity could be protected as follows:
. . .
&lt;/activity&gt;
&lt;/application&gt;
. . .
&lt;uses-permission android:name="com.example.project.DEBIT_ACCT" /&gt;
. . .
&lt;/manifest&gt;
</pre>

View File

@@ -42,7 +42,7 @@ when the application is ready to be published, it should be set as a
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

View File

@@ -403,10 +403,9 @@ declares a Bluetooth permission, but does not declare the Bluetooth feature in a
</dl>
<pre>&lt;manifest ...>
...
&lt;uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
&lt;uses-sdk android:minSdkVersion="3" />
...
...
&lt;/manifest></pre>
<dl>
@@ -418,10 +417,9 @@ including devices running older versions of the platform. </dd>
</dl>
<pre>&lt;manifest ...>
...
&lt;uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
&lt;uses-sdk android:minSdkVersion="3" android:targetSdkVersion="5" />
...
...
&lt;/manifest></pre>
<dl>
@@ -430,11 +428,10 @@ including devices running older versions of the platform. </dd>
</dl>
<pre>&lt;manifest ...>
...
&lt;uses-feature android:name="android.hardware.bluetooth" />
&lt;uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
&lt;uses-sdk android:minSdkVersion="3" android:targetSdkVersion="5" />
...
...
&lt;/manifest></pre>
<dl>
@@ -445,11 +442,10 @@ feature support, for all devices.</dd>
</dl>
<pre>&lt;manifest ...>
...
&lt;uses-feature android:name="android.hardware.bluetooth" android:required="false" />
&lt;uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
&lt;uses-sdk android:minSdkVersion="3" android:targetSdkVersion="5" />
...
...
&lt;/manifest></pre>

View File

@@ -120,9 +120,8 @@ specify:</p>
<pre>&lt;manifest xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;
package=&quot;com.android.app.myapp&quot; &gt;
&lt;uses-permission android:name=&quot;android.permission.RECEIVE_SMS&quot; /&gt;
...
&lt;/manifest&gt;</pre>
<p>At application install time, permissions requested by the application are
@@ -175,13 +174,12 @@ of its activities could declare a permission for this operation as follows:</p>
<pre>&lt;manifest xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;
package=&quot;com.me.app.myapp&quot; &gt;
&lt;permission android:name=&quot;com.me.app.myapp.permission.DEADLY_ACTIVITY&quot;
android:label=&quot;&#64;string/permlab_deadlyActivity&quot;
android:description=&quot;&#64;string/permdesc_deadlyActivity&quot;
android:permissionGroup=&quot;android.permission-group.COST_MONEY&quot;
android:protectionLevel=&quot;dangerous&quot; /&gt;
...
&lt;/manifest&gt;</pre>
<p>The {@link android.R.styleable#AndroidManifestPermission_protectionLevel

View File

@@ -368,14 +368,14 @@ page.title=Activity Testing
package="com.android.example.spinner.test"
android:versionCode="1"
android:versionName="1.0"&gt;
&lt;application android:icon="@drawable/icon" android:label="@string/app_name"&gt;
&lt;uses-library android:name="android.test.runner" /&gt;
&lt;/application&gt;
&lt;uses-sdk android:minSdkVersion="3" /&gt;
&lt;instrumentation
android:targetPackage="com.android.example.spinner"
android:name="android.test.InstrumentationTestRunner" /&gt;
&lt;application android:icon="@drawable/icon" android:label="@string/app_name"&gt;
&lt;uses-library android:name="android.test.runner" /&gt;
...
&lt;/application&gt;
&lt;/manifest&gt;
</pre>
<p>

View File

@@ -489,7 +489,6 @@ adb install bin/NativeActivity-debug.apk
<code>android:minSdkVersion</code> attribute value of "3" or higher. For example:
<pre style="margin:1em;">
&lt;manifest&gt;
...
&lt;uses-sdk android:minSdkVersion="3" /&gt;
...
&lt;/manifest&gt;
@@ -540,7 +539,6 @@ adb install bin/NativeActivity-debug.apk
to users whose devices are capable of supporting your application. For example:
<pre style="margin:1em;">
&lt;manifest&gt;
...
<!-- 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. -->
&lt;uses-feature android:glEsVersion="0x00020000" /&gt;