am 6b04d5c7: am 4981863d: Merge "docs: revisions to the installLocation documentation" into froyo

Merge commit '6b04d5c735df7fa05c705f979eff8821989ab73d' into kraken

* commit '6b04d5c735df7fa05c705f979eff8821989ab73d':
  docs: revisions to the installLocation documentation
This commit is contained in:
Scott Main
2010-04-08 11:29:19 -07:00
committed by Android Git Automerger

View File

@@ -109,7 +109,7 @@ the significant version number used internally.
</dd> </dd>
<dt><a name="install"></a>{@code android:installLocation}</dt> <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>This attribute was introduced in API Level 8.</p>
<p>The following keyword strings are accepted:</p> <p>The following keyword strings are accepted:</p>
@@ -124,15 +124,15 @@ the significant version number used internally.
saved preference.</td> saved preference.</td>
</tr><tr> </tr><tr>
<td>"{@code internalOnly}"</td> <td>"{@code internalOnly}"</td>
<td>Request to be installed only on the internal device storage. If this is set, then <td>The application requests to be installed on the internal device storage only. If this is set,
the application will never be installed on the external storage (SD card). If the internal storage then the application will never be installed on the external storage (SD card). If the internal
is full, then the application will not install.</td> storage is full, then the system will not install the application.</td>
</tr><tr> </tr><tr>
<td>"{@code preferExternal}"</td> <td>"{@code preferExternal}"</td>
<td>Prefer to be installed on external storage (SD card). There is no guarantee that the system <td>The application prefers to be installed on the external storage (SD card). There is no
will honor this request. The application might be installed on internal storage if the guarantee that the system will honor this request. The application might be installed on internal
external media is unavailable or full, or if the application uses the forward-locking mechanism storage if the external media is unavailable or full, or if the application uses the forward-locking
(not supported on external storage).</td> mechanism (not supported on external storage).</td>
</tr> </tr>
</table> </table>
@@ -149,7 +149,8 @@ multiple SD cards can be used with the same device.</li>
</ul> </ul>
<p>The user may also request to move an application from the internal storage to the external <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> </p>
</dd> </dd>
@@ -159,9 +160,7 @@ storage. However, this will not be allowed if this attribute is set to {@code in
<!-- ##api level indication## --> <!-- ##api level indication## -->
<dt>introduced in:</dt> <dt>introduced in:</dt>
<dd>API Level 1 for all attributes except for <dd>API Level 1 for all attributes, unless noted otherwise in the attribute description.</dd>
<code><a href="#uidlabel">sharedUserLabel</a></code>, which was added in
level 3.</dd>
<p> <p>
<dt>see also:</dt> <dt>see also:</dt>