Merge "docs: Continue CL of emoji section in api-overview" into mnc-io-docs

1 files changed, 44 insertions, 39 deletions

diff --git a/docs/html/preview/api-overview.jd b/docs/html/preview/api-overview.jd
index dc78bb944ab6..5d93198cae96 100644
--- a/docs/html/preview/api-overview.jd
+++ b/docs/html/preview/api-overview.jd
@@ -24,6 +24,7 @@ page.image=images/cards/card-n-apis_2x.png
         <li><a href="#number-blocking">Number-blocking</a></li>
         <li><a href="#call_screening">Call screening</a></li>
         <li><a href="#multi-locale_languages">Locales and languages</a></li>
+        <li><a href="#emoji">New Emojis</a></li>
         <li><a href="#icu4">ICU4J APIs in Android</a></li>
         <li><a href="#gles_32">OpenGL ES 3.2 API</a></li>
         <li><a href="#android_tv_recording">Android TV recording</a></li>
@@ -37,7 +38,6 @@ page.image=images/cards/card-n-apis_2x.png
         <li><a href="#scoped_directory_access">Scoped directory access</a></li>
         <li><a href="#print_svc">Print service enhancements</a></li>
         <li><a href="#virtual_files">Virtual Files</a></li>
-        <li><a href="#emoji">New Emojis</a></li>
       </ol>
 </div>
 </div>
@@ -479,6 +479,49 @@ working as expected with the new resource resolution logic.</p>
 should follow, see <a href="{@docRoot}preview/features/multilingual-support.html"
 >Multilingual Support</a>.</p>
 
+
+<h2 id="emoji">New Emojis</h2>
+
+<p>
+  Android N introduces additional emojis and emoji-related features including
+  skin tone emojis and support for variation
+  selectors. If your app supports emojis,
+  follow the guidelines below to take advantage of these emoji-related features.
+</p>
+
+<ul>
+  <li>
+    <strong>Check that a device contains an emoji before inserting it.</strong>
+    To check which emojis are present in the
+    system font, use the {@link android.graphics.Paint#hasGlyph(String)} method.
+  </li>
+  <li>
+    <strong>Check that an emoji supports variation selectors.</strong>
+    Variation selectors allow you to
+    present certain emojis in color or in black-and-white.
+    On mobile devices, apps should represent emojis in color rather than black-and-white. However,
+    if your app displays emojis inline with text, then it should use the black-and-white variation.
+    To determine whether an emoji has a variation, use the variation selector.
+    For a complete list of characters with variations, review the
+    <em>emoji variation sequences</em> section of the
+    <a class="external-link"
+    href="http://www.unicode.org/Public/9.0.0/ucd/StandardizedVariants-9.0.0d1.txt">
+      Unicode documentation on variations</a>.
+  </li>
+  <li>
+    <strong>Check that an emoji supports skin tone.</strong> Android N allows users to modify the
+    rendered skin tone of emojis to their preference. Keyboard apps should provide visual
+    indications for emojis that have multiple skin tones and should allow users to
+    select the skin tone that they prefer. To determine which system emojis have
+    skin tone modifiers, use the {@link android.graphics.Paint#hasGlyph(String)}
+    method. You can determine which emojis use skin tones by reading the
+    <a class="external-link"
+    href="http://unicode.org/emoji/charts/full-emoji-list.html">
+     Unicode documentation</a>.
+  </li>
+</ul>
+
+
 <h2 id="icu4">ICU4J APIs in Android</h2>
 
 <p>
@@ -924,41 +967,3 @@ Directory Access</a> developer documentation.</p>
   <a href="{@docRoot}guide/topics/providers/document-provider.html">Storage
   Access Frameworks guide</a>.
 </p>
-
-<h2 id="emoji">New Emojis</h2>
-
-<p>
-  Android N introduces new emojis, including skin tone emojis, support
-  for variation
-  selectors, and other improvements. For a good user experience, observe the
-  following guidelines for using the new emojis and emoji features in your apps.
-</p>
-
-<ul>
-  <li>
-    <strong>New emojis</strong>: To check which emojis are present in the
-    system font, use the {@link android.graphics.Paint#hasGlyph(String)} method
-    and the dynamic layout in the emoji picker to place the glyphs.
-  </li>
-  <li>
-    <strong>Variation selectors</strong>: Variation selectors allow certain
-    emojis to be represented in color or in text presentation, which is used in
-    documents. For mobile devices, emojis should use their color representation.
-    To determine whether an emoji has a variation, use the variation selector.
-    You can view the complete list of characters with variations in the
-    <em>emoji variation sequences</em> section of the
-    <a href="http://www.unicode.org/Public/9.0.0/ucd/StandardizedVariants-9.0.0d1.txt">
-      Unicode documentation on variations</a>.
-  </li>
-  <li>
-    <strong>Skin tone modifiers</strong>: In Android N, users can modify the
-    rendered skin tone of emojis. This allows users to customize the presentation
-    of emojis to their preference. Keyboard apps should provide visual
-    indications for emojis that have multiple skin tones and should allow users to
-    select the skin tone that they prefer. To determine which system emojis have
-    skin tone modifiers, use the {@link android.graphics.Paint#hasGlyph(String)}
-    method. You can determine which emojis use skin tones by reading the
-    <a href="http://unicode.org/emoji/charts/full-emoji-list.html">
-     Unicode documentation</a>.
-  </li>
-</ul>
\ No newline at end of file