diff --git a/docs/html/guide/topics/manifest/manifest-element.jd b/docs/html/guide/topics/manifest/manifest-element.jd index 266948746f4a8..02023909fee4c 100644 --- a/docs/html/guide/topics/manifest/manifest-element.jd +++ b/docs/html/guide/topics/manifest/manifest-element.jd @@ -25,7 +25,8 @@ page.title=<manifest>
<permission>
<permission-group>
<permission-tree> -
<uses-permission> +
<uses-permission> +
<uses-sdk>

description:
diff --git a/docs/html/guide/topics/manifest/uses-sdk-element.jd b/docs/html/guide/topics/manifest/uses-sdk-element.jd index a88635a3c174f..e62af68b45399 100644 --- a/docs/html/guide/topics/manifest/uses-sdk-element.jd +++ b/docs/html/guide/topics/manifest/uses-sdk-element.jd @@ -9,10 +9,10 @@ page.title=<uses-sdk>
<manifest>
description:
-
Declares which levels of the Android API the application can run against. -The level is incremented when there are additions to the API and resource tree, -so an application developed using level 3 of the API may not run against level -1 or 2, but should run against level 3, 4, 5, and above. +
Lets you express an application's compatibility with one or more versions of the Android platform, +by means of an API Level integer. The API Level expressed by an application will be compared to the +API Level of a given Android system, which may vary among different Android devices. To declare your +application's minimum API Level compatibility, use the minSdkVersion attribute.

@@ -35,15 +35,27 @@ Applications. for the application to run.

-Despite its name, this attribute is set to the API level, not to the -version number of the SDK (software development kit). The API level is always +Despite its name, this attribute specifies the API Level, not the +version number of the SDK (software development kit). The API Level is always a single integer; the SDK version may be split into major and minor components -(such as 1.2). You cannot derive the API level from the SDK version number +(such as 1.5). You cannot derive the API Level from the SDK version number (for example, it is not the same as the major version or the sum of the major -and minor versions). To learn what the API level is, check the notes that -came with the SDK you're using. -

+and minor versions). To learn what the API Level is, check the notes that +came with the SDK you're using.

+ +

Prior to installing an application, the Android system checks the value of this +attribute and allows the installation only if the +API Level is less than or equal to the API Level used by the system itself.

+ +

If you do not declare this attribute, then a value of "1" is assumed, which +indicates that your application is compatible with all versions of Android. If your +application is not universally compatible (for instance if it uses APIs +introduced in Android 1.5) and you have not declared the proper minSdkVersion, +then when installed on a system with a lower API Level, the application +will crash during runtime. For this reason, be certain to declare the appropriate API Level +in the minSdkVersion attribute.

+ - + \ No newline at end of file diff --git a/docs/html/sdk/android-1.1.jd b/docs/html/sdk/android-1.1.jd index f70ad262a5145..ce75e60fdee62 100644 --- a/docs/html/sdk/android-1.1.jd +++ b/docs/html/sdk/android-1.1.jd @@ -32,24 +32,21 @@ API. As with the Android 1.0 API, the Android 1.1 API is assigned an integer identifier — 2 — that is stored in the system itself. This identifier, called the "API Level", allows the system to correctly determine whether an application is compatible with -the system, prior to installing the application.

+the system, prior to installing the application.

-

Applications can reference a specific API Level value in their -manifest files, to indicate the minimum version of the Android system -required to run the app. To reference a minimum API Level, applications -can add a minSdkVersion attribute in their manifest files. +

Applications indicate the lowest system API Level that they are compatible with by adding +a value to the minSdkVersion attribute. The value of the attribute is an integer corresponding to an API Level -identifier. Prior to installing an application, the system then checks the value of +identifier. Prior to installing an application, the system checks the value of minSdkVersion and allows the install only if the referenced integer is less than or equal to the API Level integer stored in the system itself.

If you use the Android 1.1 system image to build an application compatible with Android-powered devices running the Android 1.1 -platform, please note that you must set the the -android:minSdkVersion attribute in the application's -manifest to "2", which is the API strictly associated with Android 1.1. +platform, you must set the +minSdkVersion attribute to "2" in order to specify that your application +is compatible only with devices using the Android 1.1 (or greater) system image.

Specifically, you specify the android:minSdkVersion @@ -59,7 +56,7 @@ attribute looks like this:

<manifest>
   ...
-  <uses-sdk minSdkVersion="2" />
+  <uses-sdk android:minSdkVersion="2" />
   ...
 </manifest>