docs: Migrating icu4j-framework to permanent home
Bug: 30224272
Change-Id: I2d52a686f813d7299918abeb66be0a479ed49b70
diff --git a/docs/html/_redirects.yaml b/docs/html/_redirects.yaml
index 0dd1c89..1e6f216 100644
--- a/docs/html/_redirects.yaml
+++ b/docs/html/_redirects.yaml
@@ -1202,8 +1202,8 @@
- from: /r/studio-ui/menu-start.html
to: /training/index.html?utm_medium=android-studio
-# N Preview redirects
-
+- from: /preview/features/icu4j-framework.html
+ to: /guide/topics/resources/icu4j-framework.html
- from: /preview/features/key-attestation.html
to: /training/articles/security-key-attestation.html
- from: /preview/features/security-config.html
diff --git a/docs/html/guide/_book.yaml b/docs/html/guide/_book.yaml
index 6d6686b..b788c38 100644
--- a/docs/html/guide/_book.yaml
+++ b/docs/html/guide/_book.yaml
@@ -69,6 +69,9 @@
path: /guide/topics/resources/runtime-changes.html
- title: Localization
path: /guide/topics/resources/localization.html
+ section:
+ - title: ICU4J Android Framework APIs
+ path: /guide/topics/resources/icu4j-framework.html
- title: Resource Types
path: /guide/topics/resources/available-resources.html
section:
diff --git a/docs/html/preview/features/icu4j-framework.jd b/docs/html/guide/topics/resources/icu4j-framework.jd
similarity index 92%
rename from docs/html/preview/features/icu4j-framework.jd
rename to docs/html/guide/topics/resources/icu4j-framework.jd
index 839c077..e7cbe72e 100644
--- a/docs/html/preview/features/icu4j-framework.jd
+++ b/docs/html/guide/topics/resources/icu4j-framework.jd
@@ -30,14 +30,16 @@
<p>
ICU4J is an open-source, widely used set of Java libraries providing Unicode
- and globalization support for software applications. Android N
- exposes a subset of the ICU4J APIs in the Android framework for app developers
+ and globalization support for software applications. Starting in Android 7.0
+ (API level 24), Android
+ exposes a subset of the ICU4J APIs for app developers
to use under the {@code android.icu} package. These APIs use
localization data present on the device. As a result, you can reduce your APK
footprint by not compiling the ICU4J libraries into your APK; instead, you can
simply call out to them in the framework. (In this case, you may want to provide
<a href="{@docRoot}google/play/publishing/multiple-apks.html">multiple versions
- of your APK</a>, so users running versions of Android lower than Android N
+ of your APK</a>, so users running versions of Android lower than
+ Android 7.0 (API level 24)
can download a version of the app that contains the ICU4J libraries.)
</p>
@@ -51,17 +53,17 @@
<h2 id="relation">Relationship to ICU4J</h2>
<p>
- Android N exposes a subset of the ICU4J APIs via the
+ Android exposes a subset of the ICU4J APIs via the
<code>android.icu</code> package, rather than <code>com.ibm.icu</code>. The
Android framework may choose not to
- expose ICU4J APIs for various reasons; for example, Android N does not expose
+ expose ICU4J APIs for various reasons; for example, Android does not expose
some deprecated APIs or those that the ICU team have not yet declared as
stable. As the ICU team deprecates APIs in the future, Android will also mark
them as deprecated but will continue to include them.
</p>
<p class="table-caption"><strong>Table 1.</strong> ICU and CLDR versions used
- in Android N.</p>
+ in Android].</p>
<table>
<tr>
<th>Android API level</th>
@@ -69,7 +71,7 @@
<th>CLDR version</th>
</tr>
<tr>
-<td>Android N</td>
+<td>Android 7.0 (API level 24)</td>
<td>56</td>
<td>28</td>
</tr>
