diff options
| author | Scott Main <smain@google.com> | 2010-10-19 17:43:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-19 17:43:37 -0700 |
| commit | b619e3332d36a8b5c56da6530834be8cc69272df (patch) | |
| tree | e74f1e433b7d744a4f8ec68941ec20977b9433b5 /docs | |
| parent | 2cead908f4ff7692e46e20aa2a8c4c2f0c0a9102 (diff) | |
| parent | 218bf88446d01fb2f8d79eec3be59bee995f9cb0 (diff) | |
| download | frameworks_base-b619e3332d36a8b5c56da6530834be8cc69272df.zip frameworks_base-b619e3332d36a8b5c56da6530834be8cc69272df.tar.gz frameworks_base-b619e3332d36a8b5c56da6530834be8cc69272df.tar.bz2 | |
am 218bf884: am a6df4b1b: docs: add note to froyo platform doc that not all locales are included in the sdk image
Merge commit '218bf88446d01fb2f8d79eec3be59bee995f9cb0' into gingerbread-plus-aosp
* commit '218bf88446d01fb2f8d79eec3be59bee995f9cb0':
docs: add note to froyo platform doc that not all locales are included in the sdk image
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/sdk/android-2.2.jd | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/docs/html/sdk/android-2.2.jd b/docs/html/sdk/android-2.2.jd index 495fd80..063a10f 100644 --- a/docs/html/sdk/android-2.2.jd +++ b/docs/html/sdk/android-2.2.jd @@ -42,7 +42,7 @@ Differences Report »</a> </li> <p>Android {@sdkPlatformVersion} is a {@sdkPlatformMajorMinor} platform release including user features, developer features, API changes, and bug -fixes. For information on developer features and API changes, see the +fixes. For information on developer features and API changes, see the <a href="#api">Framework API</a> section.</p> <p>For developers, the Android {@sdkPlatformVersion} platform is available as a @@ -62,7 +62,7 @@ first.</p> <h2 id="features">Platform Highlights</h2> -<p>For a list of new user features and platform highlights, see the <a +<p>For a list of new user features and platform highlights, see the <a href="http://developer.android.com/sdk/android-2.2-highlights.html">Android 2.2 Platform Highlights</a> document.</p> @@ -316,8 +316,8 @@ href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/Devi <ul> <li> New <code>android:backupAgent</code> attribute of the -<code><application></code> element. Specifies the component name of the -BackupAgent subclass provided by the application to handle backup/restore +<code><application></code> element. Specifies the component name of the +BackupAgent subclass provided by the application to handle backup/restore operations, if any.</li> <li> New <code>android:restoreAnyVersion</code> attribute of the <code><application></code> element. Boolean value that indicates whether @@ -436,6 +436,11 @@ descriptor).</p> <p>Localized UI strings match the locales that are accessible through Settings.</p> +<p class="note"><strong>Note:</strong> Android supports more locales than are listed above. However, +the entire collection of locale strings cannot fit on a single system image, so the above list is +only what's included in the system image for the SDK. All of Android's supported locales are +available in the <a href="http://source.android.com/">Android Open Source Project</a>.</p> + <h2 id="skins">Emulator Skins</h2> <p>The downloadable platform includes a set of emulator skins that you can use |