aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeidi von Markham <hvm@google.com>2015-06-05 22:21:56 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-05 22:21:56 +0000
commit683532b114104429ed6ec6209fbd0f25cf989cf6 (patch)
tree196e43f7fc81bfd5f6628ff883b231d505aeb9d2
parent0e2364961aa8b67f739afeae7450b009295bd9f1 (diff)
parent74c574cec14dccb7fece289af9377bdf6e927c58 (diff)
downloadsource.android.com-683532b114104429ed6ec6209fbd0f25cf989cf6.tar.gz
Merge "Docs: NEW CHANGE#8 for Android automotive changes to cdd Changing input to SHOUlD (all devices) and render to MUST (all devices)" into lmp-mr1-dev
-rw-r--r--src/compatibility/5.1/android-5.1-cdd.html11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/compatibility/5.1/android-5.1-cdd.html b/src/compatibility/5.1/android-5.1-cdd.html
index 4ed3a61f..29b3f14f 100644
--- a/src/compatibility/5.1/android-5.1-cdd.html
+++ b/src/compatibility/5.1/android-5.1-cdd.html
@@ -1458,9 +1458,8 @@ within Settings [<a href="http://developer.android.com/reference/android/provide
<p>Android includes support for color emoji characters. When Android device
-implementations include an IME, devices MUST provide an input method to the
-user for the Emoji characters defined in Unicode 6.1 [<a href="http://www.unicode.org/versions/Unicode6.1.0/">Resources, 38</a>]. All devices MUST be capable of rendering these emoji characters in color
-glyph.</p>
+implementations include an IME, devices SHOULD provide an input method to the
+user for the Emoji characters defined in Unicode 6.1 [<a href="http://www.unicode.org/versions/Unicode6.1.0/">Resources, 38</a>]. All devices MUST be capable of rendering these emoji characters in color glyph.</p>
<p>Android includes support for Roboto 2 font with different
weights&mdash;sans-serif-thin, sans-serif-light, sans-serif-medium, sans-serif-black,
@@ -4425,11 +4424,11 @@ Template</td>
<td>Optional for Android Watch devices. Required for all other device types.</td>
</tr>
<tr>
- <td>3.8.13 Unicode and font</td>
- <td>MUST support Roboto 2 in addition to existing requirements.</td>
+ <td>3.8.13. Unicode and font</td>
+ <td>MUST support Roboto 2 in addition to existing requirements. Added Android automotive requirements.</td>
</tr>
<tr>
- <td>3.11 Text-To-Speech</td>
+ <td>3.11. Text-To-Speech</td>
<td>Added Android automotive requirements.</td>
</tr>
<tr>