diff options
| author | Scott Main <smain@google.com> | 2010-04-08 11:22:42 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-04-08 11:22:42 -0700 |
| commit | 4981863de52941f053bf002ae2f9c8f705534599 (patch) | |
| tree | 3d19060a5cfa9e57d84ae8cd99da7d11219dc0d0 /docs | |
| parent | d1a95f975b03371a937da87735359c286a6de7f3 (diff) | |
| parent | 76aafa4b2656333cc10c9c9fffdbad90c10031cb (diff) | |
| download | frameworks_base-4981863de52941f053bf002ae2f9c8f705534599.zip frameworks_base-4981863de52941f053bf002ae2f9c8f705534599.tar.gz frameworks_base-4981863de52941f053bf002ae2f9c8f705534599.tar.bz2 | |
Merge "docs: revisions to the installLocation documentation" into froyo
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/guide/topics/manifest/manifest-element.jd | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/docs/html/guide/topics/manifest/manifest-element.jd b/docs/html/guide/topics/manifest/manifest-element.jd index 1255949..734a79d 100644 --- a/docs/html/guide/topics/manifest/manifest-element.jd +++ b/docs/html/guide/topics/manifest/manifest-element.jd @@ -109,7 +109,7 @@ the significant version number used internally. </dd> <dt><a name="install"></a>{@code android:installLocation}</dt> -<dd>The default install location for your application. +<dd>The default install location for the application. <p>This attribute was introduced in API Level 8.</p> <p>The following keyword strings are accepted:</p> @@ -124,15 +124,15 @@ the significant version number used internally. saved preference.</td> </tr><tr> <td>"{@code internalOnly}"</td> - <td>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.</td> + <td>The application requests to be installed on the internal device storage only. 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 system will not install the application.</td> </tr><tr> <td>"{@code preferExternal}"</td> - <td>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).</td> + <td>The application prefers to be installed on the 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).</td> </tr> </table> @@ -149,7 +149,8 @@ multiple SD cards can be used with the same device.</li> </ul> <p>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}. +storage. However, the system will not allow the user to move the application to external storage if +this attribute is set to {@code internalOnly}. </p> </dd> @@ -159,9 +160,7 @@ storage. However, this will not be allowed if this attribute is set to {@code in <!-- ##api level indication## --> <dt>introduced in:</dt> -<dd>API Level 1 for all attributes except for -<code><a href="#uidlabel">sharedUserLabel</a></code>, which was added in -level 3.</dd> +<dd>API Level 1 for all attributes, unless noted otherwise in the attribute description.</dd> <p> <dt>see also:</dt> |