diff options
| author | Scott Main <smain@google.com> | 2010-12-02 15:43:02 -0800 |
|---|---|---|
| committer | Scott Main <smain@google.com> | 2010-12-14 16:11:02 -0800 |
| commit | b94df620959de658990c1ed1263e2e1c42df7f6b (patch) | |
| tree | 8332e6df6e34ca5282bcc3bab182ebdaf5241c92 /docs/html/guide/topics/manifest | |
| parent | 2bd83c00a0c72d3f6bd929c4df5fe83ee31b4704 (diff) | |
| download | frameworks_base-b94df620959de658990c1ed1263e2e1c42df7f6b.zip frameworks_base-b94df620959de658990c1ed1263e2e1c42df7f6b.tar.gz frameworks_base-b94df620959de658990c1ed1263e2e1c42df7f6b.tar.bz2 | |
cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee
docs: edit manifest samples to indicate <application> element is always last
Change-Id: I993d130c26efd87147913d5607a2e7f15bd12fe8
Diffstat (limited to 'docs/html/guide/topics/manifest')
| -rw-r--r-- | docs/html/guide/topics/manifest/manifest-intro.jd | 4 | ||||
| -rw-r--r-- | docs/html/guide/topics/manifest/permission-tree-element.jd | 2 | ||||
| -rw-r--r-- | docs/html/guide/topics/manifest/uses-feature-element.jd | 12 |
3 files changed, 6 insertions, 12 deletions
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 @@ element. For example, an activity could be protected as follows: <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 @@ element. For example, an activity could be protected as follows: . . . </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 @@ 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 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 @@ declares a Bluetooth permission, but does not declare the Bluetooth feature in a </dl> <pre><manifest ...> -... <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> <uses-sdk android:minSdkVersion="3" /> -... + ... </manifest></pre> <dl> @@ -418,10 +417,9 @@ including devices running older versions of the platform. </dd> </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 @@ including devices running older versions of the platform. </dd> </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 @@ feature support, for all devices.</dd> </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> |