diff --git a/docs/html/guide/topics/manifest/manifest-element.jd b/docs/html/guide/topics/manifest/manifest-element.jd
index 48e598a4ef4ac..1255949b36997 100644
--- a/docs/html/guide/topics/manifest/manifest-element.jd
+++ b/docs/html/guide/topics/manifest/manifest-element.jd
@@ -8,7 +8,8 @@ page.title=<manifest>
android:sharedUserId="string"
android:sharedUserLabel="string resource"
android:versionCode="integer"
- android:versionName="string" >
+ android:versionName="string"
+ android:installLocation=["auto" | "internalOnly" | "preferExternal"] >
. . .
</manifest>
@@ -37,7 +38,8 @@ contain an
-The package name serves as a unique identifier for the application.
-It's also the default name for the application process (see the
-
+ attribute) and the default task affinity of an activity
-(see the
-
com.google.app.application_name.
-<application>
-element's
-process
-process<activity>
-element's
-taskAffinity attribute).
-
+ The package name serves as a unique identifier for the application.
+ It's also the default name for the application process (see the
+ <application>
+ element's
+ process
+ process attribute) and the default task affinity of an activity
+ (see the
+ <activity>
+ element's
+ taskAffinity attribute).
+
-
-This attribute was introduced in API Level 3. It is meaningful only if the
-sharedUserId attribute is also set.
-
+
+ This attribute was introduced in API Level 3. It is meaningful only if the
+ sharedUserId attribute is also set.
+
-The value must be set as an integer, such as "100". You can define it however -you want, as long as each successive version has a higher number. For example, -it could be a build number. Or you could translate a version number in "x.y" -format to an integer by encoding the "x" and "y" separately in the lower and -upper 16 bits. Or you could simply increase the number by one each time a new -version is released. -
+ The value must be set as an integer, such as "100". You can define it however + you want, as long as each successive version has a higher number. For example, + it could be a build number. Or you could translate a version number in "x.y" + format to an integer by encoding the "x" and "y" separately in the lower and + upper 16 bits. Or you could simply increase the number by one each time a new + version is released. +
+This attribute was introduced in API Level 8.
+ +The following keyword strings are accepted:
+ +| Value | +Description | +
|---|---|
| "{@code auto}" | +Let the system decide the ideal install location. This will usually be based on the user's +saved preference. | +
| "{@code internalOnly}" | +Request to be installed only on the internal device storage. If this is set, then +the application will never be installed on the external storage (SD card). If the internal storage +is full, then the application will not install. | +
| "{@code preferExternal}" | +Prefer to be installed on external storage (SD card). There is no guarantee that the system +will honor this request. The application might be installed on internal storage if the +external media is unavailable or full, or if the application uses the forward-locking mechanism +(not supported on external storage). | +
When an application is installed on the external storage:
+The user may also request to move an application from the internal storage to the external +storage. However, this will not be allowed if this attribute is set to {@code internalOnly}. +
+ +