aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/res/values-fr/donottranslate-config-spacing-and-punctuations.xml2
-rw-r--r--java/res/values/donottranslate-config-spacing-and-punctuations.xml2
-rw-r--r--java/res/values/strings-emoji-descriptions.xml1667
-rw-r--r--java/src/com/android/inputmethod/accessibility/AccessibilityUtils.java1
-rw-r--r--java/src/com/android/inputmethod/accessibility/MainKeyboardAccessibilityDelegate.java (renamed from java/src/com/android/inputmethod/accessibility/AccessibleKeyboardViewProxy.java)66
-rw-r--r--java/src/com/android/inputmethod/accessibility/MainKeyboardAccessibilityNodeProvider.java (renamed from java/src/com/android/inputmethod/accessibility/AccessibilityEntityProvider.java)17
-rw-r--r--java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java7
-rw-r--r--java/src/com/android/inputmethod/keyboard/MainKeyboardView.java19
-rw-r--r--java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java17
-rw-r--r--java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java259
-rw-r--r--java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java29
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java5
-rw-r--r--java/src/com/android/inputmethod/latin/UserBinaryDictionary.java69
-rw-r--r--java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java23
-rw-r--r--java/src/com/android/inputmethod/latin/personalization/DecayingExpandableBinaryDictionaryBase.java16
-rw-r--r--java/src/com/android/inputmethod/latin/personalization/PersonalizationDictionary.java13
-rw-r--r--java/src/com/android/inputmethod/latin/personalization/UserHistoryDictionary.java11
-rw-r--r--java/src/com/android/inputmethod/latin/settings/SpacingAndPunctuations.java7
18 files changed, 1927 insertions, 303 deletions
diff --git a/java/res/values-fr/donottranslate-config-spacing-and-punctuations.xml b/java/res/values-fr/donottranslate-config-spacing-and-punctuations.xml
index d72f72b92..5a4914245 100644
--- a/java/res/values-fr/donottranslate-config-spacing-and-punctuations.xml
+++ b/java/res/values-fr/donottranslate-config-spacing-and-punctuations.xml
@@ -22,6 +22,8 @@
<string name="symbols_preceded_by_space">([{&amp;;:!?</string>
<!-- Symbols that are normally followed by a space (used to add an auto-space after these) -->
<string name="symbols_followed_by_space">.,;:!?)]}&amp;</string>
+ <!-- Symbols that behave like a single punctuation when typed next to each other -->
+ <string name="symbols_clustering_together">!?</string>
<!-- Symbols that separate words -->
<!-- Don't remove the enclosing double quotes, they protect whitespace (not just U+0020) -->
<string name="symbols_word_separators">"&#x0009;&#x0020;&#x000A;&#x00A0;"()[]{}*&amp;&lt;&gt;+=|.,;:!?/_\"</string>
diff --git a/java/res/values/donottranslate-config-spacing-and-punctuations.xml b/java/res/values/donottranslate-config-spacing-and-punctuations.xml
index 1be5cf888..2faf578d2 100644
--- a/java/res/values/donottranslate-config-spacing-and-punctuations.xml
+++ b/java/res/values/donottranslate-config-spacing-and-punctuations.xml
@@ -26,6 +26,8 @@
<string name="symbols_preceded_by_space">([{&amp;</string>
<!-- Symbols that are normally followed by a space (used to add an auto-space after these) -->
<string name="symbols_followed_by_space">.,;:!?)]}&amp;</string>
+ <!-- Symbols that behave like a single punctuation when typed next to each other -->
+ <string name="symbols_clustering_together"></string>
<!-- Symbols that separate words -->
<!-- Don't remove the enclosing double quotes, they protect whitespace (not just U+0020) -->
<string name="symbols_word_separators">"&#x0009;&#x0020;&#x000A;&#x00A0;"()[]{}*&amp;&lt;&gt;+=|.,;:!?/_\"</string>
diff --git a/java/res/values/strings-emoji-descriptions.xml b/java/res/values/strings-emoji-descriptions.xml
new file mode 100644
index 000000000..baec23221
--- /dev/null
+++ b/java/res/values/strings-emoji-descriptions.xml
@@ -0,0 +1,1667 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Spoken description for Unicode code point U+00A9 -->
+ <string name="spoken_emoji_00A9">Copyright sign</string>
+ <!-- Spoken description for Unicode code point U+00AE -->
+ <string name="spoken_emoji_00AE">Registered sign</string>
+ <!-- Spoken description for Unicode code point U+203C -->
+ <string name="spoken_emoji_203C">Double exclamation mark</string>
+ <!-- Spoken description for Unicode code point U+2049 -->
+ <string name="spoken_emoji_2049">Exclamation question mark</string>
+ <!-- Spoken description for Unicode code point U+2122 -->
+ <string name="spoken_emoji_2122">Trade mark sign</string>
+ <!-- Spoken description for Unicode code point U+2139 -->
+ <string name="spoken_emoji_2139">Information source</string>
+ <!-- Spoken description for Unicode code point U+2194 -->
+ <string name="spoken_emoji_2194">Left right arrow</string>
+ <!-- Spoken description for Unicode code point U+2195 -->
+ <string name="spoken_emoji_2195">Up down arrow</string>
+ <!-- Spoken description for Unicode code point U+2196 -->
+ <string name="spoken_emoji_2196">North west arrow</string>
+ <!-- Spoken description for Unicode code point U+2197 -->
+ <string name="spoken_emoji_2197">North east arrow</string>
+ <!-- Spoken description for Unicode code point U+2198 -->
+ <string name="spoken_emoji_2198">South east arrow</string>
+ <!-- Spoken description for Unicode code point U+2199 -->
+ <string name="spoken_emoji_2199">South west arrow</string>
+ <!-- Spoken description for Unicode code point U+21A9 -->
+ <string name="spoken_emoji_21A9">Leftwards arrow with hook</string>
+ <!-- Spoken description for Unicode code point U+21AA -->
+ <string name="spoken_emoji_21AA">Rightwards arrow with hook</string>
+ <!-- Spoken description for Unicode code point U+231A -->
+ <string name="spoken_emoji_231A">Watch</string>
+ <!-- Spoken description for Unicode code point U+231B -->
+ <string name="spoken_emoji_231B">Hourglass</string>
+ <!-- Spoken description for Unicode code point U+23E9 -->
+ <string name="spoken_emoji_23E9">Black right-pointing double triangle</string>
+ <!-- Spoken description for Unicode code point U+23EA -->
+ <string name="spoken_emoji_23EA">Black left-pointing double triangle</string>
+ <!-- Spoken description for Unicode code point U+23EB -->
+ <string name="spoken_emoji_23EB">Black up-pointing double triangle</string>
+ <!-- Spoken description for Unicode code point U+23EC -->
+ <string name="spoken_emoji_23EC">Black down-pointing double triangle</string>
+ <!-- Spoken description for Unicode code point U+23F0 -->
+ <string name="spoken_emoji_23F0">Alarm clock</string>
+ <!-- Spoken description for Unicode code point U+23F3 -->
+ <string name="spoken_emoji_23F3">Hourglass with flowing sand</string>
+ <!-- Spoken description for Unicode code point U+24C2 -->
+ <string name="spoken_emoji_24C2">Circled latin capital letter m</string>
+ <!-- Spoken description for Unicode code point U+25AA -->
+ <string name="spoken_emoji_25AA">Black small square</string>
+ <!-- Spoken description for Unicode code point U+25AB -->
+ <string name="spoken_emoji_25AB">White small square</string>
+ <!-- Spoken description for Unicode code point U+25B6 -->
+ <string name="spoken_emoji_25B6">Black right-pointing triangle</string>
+ <!-- Spoken description for Unicode code point U+25C0 -->
+ <string name="spoken_emoji_25C0">Black left-pointing triangle</string>
+ <!-- Spoken description for Unicode code point U+25FB -->
+ <string name="spoken_emoji_25FB">White medium square</string>
+ <!-- Spoken description for Unicode code point U+25FC -->
+ <string name="spoken_emoji_25FC">Black medium square</string>
+ <!-- Spoken description for Unicode code point U+25FD -->
+ <string name="spoken_emoji_25FD">White medium small square</string>
+ <!-- Spoken description for Unicode code point U+25FE -->
+ <string name="spoken_emoji_25FE">Black medium small square</string>
+ <!-- Spoken description for Unicode code point U+2600 -->
+ <string name="spoken_emoji_2600">Black sun with rays</string>
+ <!-- Spoken description for Unicode code point U+2601 -->
+ <string name="spoken_emoji_2601">Cloud</string>
+ <!-- Spoken description for Unicode code point U+260E -->
+ <string name="spoken_emoji_260E">Black telephone</string>
+ <!-- Spoken description for Unicode code point U+2611 -->
+ <string name="spoken_emoji_2611">Ballot box with check</string>
+ <!-- Spoken description for Unicode code point U+2614 -->
+ <string name="spoken_emoji_2614">Umbrella with rain drops</string>
+ <!-- Spoken description for Unicode code point U+2615 -->
+ <string name="spoken_emoji_2615">Hot beverage</string>
+ <!-- Spoken description for Unicode code point U+261D -->
+ <string name="spoken_emoji_261D">White up pointing index</string>
+ <!-- Spoken description for Unicode code point U+263A -->
+ <string name="spoken_emoji_263A">White smiling face</string>
+ <!-- Spoken description for Unicode code point U+2648 -->
+ <string name="spoken_emoji_2648">Aries</string>
+ <!-- Spoken description for Unicode code point U+2649 -->
+ <string name="spoken_emoji_2649">Taurus</string>
+ <!-- Spoken description for Unicode code point U+264A -->
+ <string name="spoken_emoji_264A">Gemini</string>
+ <!-- Spoken description for Unicode code point U+264B -->
+ <string name="spoken_emoji_264B">Cancer</string>
+ <!-- Spoken description for Unicode code point U+264C -->
+ <string name="spoken_emoji_264C">Leo</string>
+ <!-- Spoken description for Unicode code point U+264D -->
+ <string name="spoken_emoji_264D">Virgo</string>
+ <!-- Spoken description for Unicode code point U+264E -->
+ <string name="spoken_emoji_264E">Libra</string>
+ <!-- Spoken description for Unicode code point U+264F -->
+ <string name="spoken_emoji_264F">Scorpius</string>
+ <!-- Spoken description for Unicode code point U+2650 -->
+ <string name="spoken_emoji_2650">Sagittarius</string>
+ <!-- Spoken description for Unicode code point U+2651 -->
+ <string name="spoken_emoji_2651">Capricorn</string>
+ <!-- Spoken description for Unicode code point U+2652 -->
+ <string name="spoken_emoji_2652">Aquarius</string>
+ <!-- Spoken description for Unicode code point U+2653 -->
+ <string name="spoken_emoji_2653">Pisces</string>
+ <!-- Spoken description for Unicode code point U+2660 -->
+ <string name="spoken_emoji_2660">Black spade suit</string>
+ <!-- Spoken description for Unicode code point U+2663 -->
+ <string name="spoken_emoji_2663">Black club suit</string>
+ <!-- Spoken description for Unicode code point U+2665 -->
+ <string name="spoken_emoji_2665">Black heart suit</string>
+ <!-- Spoken description for Unicode code point U+2666 -->
+ <string name="spoken_emoji_2666">Black diamond suit</string>
+ <!-- Spoken description for Unicode code point U+2668 -->
+ <string name="spoken_emoji_2668">Hot springs</string>
+ <!-- Spoken description for Unicode code point U+267B -->
+ <string name="spoken_emoji_267B">Black universal recycling symbol</string>
+ <!-- Spoken description for Unicode code point U+267F -->
+ <string name="spoken_emoji_267F">Wheelchair symbol</string>
+ <!-- Spoken description for Unicode code point U+2693 -->
+ <string name="spoken_emoji_2693">Anchor</string>
+ <!-- Spoken description for Unicode code point U+26A0 -->
+ <string name="spoken_emoji_26A0">Warning sign</string>
+ <!-- Spoken description for Unicode code point U+26A1 -->
+ <string name="spoken_emoji_26A1">High voltage sign</string>
+ <!-- Spoken description for Unicode code point U+26AA -->
+ <string name="spoken_emoji_26AA">Medium white circle</string>
+ <!-- Spoken description for Unicode code point U+26AB -->
+ <string name="spoken_emoji_26AB">Medium black circle</string>
+ <!-- Spoken description for Unicode code point U+26BD -->
+ <string name="spoken_emoji_26BD">Soccer ball</string>
+ <!-- Spoken description for Unicode code point U+26BE -->
+ <string name="spoken_emoji_26BE">Baseball</string>
+ <!-- Spoken description for Unicode code point U+26C4 -->
+ <string name="spoken_emoji_26C4">Snowman without snow</string>
+ <!-- Spoken description for Unicode code point U+26C5 -->
+ <string name="spoken_emoji_26C5">Sun behind cloud</string>
+ <!-- Spoken description for Unicode code point U+26CE -->
+ <string name="spoken_emoji_26CE">Ophiuchus</string>
+ <!-- Spoken description for Unicode code point U+26D4 -->
+ <string name="spoken_emoji_26D4">No entry</string>
+ <!-- Spoken description for Unicode code point U+26EA -->
+ <string name="spoken_emoji_26EA">Church</string>
+ <!-- Spoken description for Unicode code point U+26F2 -->
+ <string name="spoken_emoji_26F2">Fountain</string>
+ <!-- Spoken description for Unicode code point U+26F3 -->
+ <string name="spoken_emoji_26F3">Flag in hole</string>
+ <!-- Spoken description for Unicode code point U+26F5 -->
+ <string name="spoken_emoji_26F5">Sailboat</string>
+ <!-- Spoken description for Unicode code point U+26FA -->
+ <string name="spoken_emoji_26FA">Tent</string>
+ <!-- Spoken description for Unicode code point U+26FD -->
+ <string name="spoken_emoji_26FD">Fuel pump</string>
+ <!-- Spoken description for Unicode code point U+2702 -->
+ <string name="spoken_emoji_2702">Black scissors</string>
+ <!-- Spoken description for Unicode code point U+2705 -->
+ <string name="spoken_emoji_2705">White heavy check mark</string>
+ <!-- Spoken description for Unicode code point U+2708 -->
+ <string name="spoken_emoji_2708">Airplane</string>
+ <!-- Spoken description for Unicode code point U+2709 -->
+ <string name="spoken_emoji_2709">Envelope</string>
+ <!-- Spoken description for Unicode code point U+270A -->
+ <string name="spoken_emoji_270A">Raised fist</string>
+ <!-- Spoken description for Unicode code point U+270B -->
+ <string name="spoken_emoji_270B">Raised hand</string>
+ <!-- Spoken description for Unicode code point U+270C -->
+ <string name="spoken_emoji_270C">Victory hand</string>
+ <!-- Spoken description for Unicode code point U+270F -->
+ <string name="spoken_emoji_270F">Pencil</string>
+ <!-- Spoken description for Unicode code point U+2712 -->
+ <string name="spoken_emoji_2712">Black nib</string>
+ <!-- Spoken description for Unicode code point U+2714 -->
+ <string name="spoken_emoji_2714">Heavy check mark</string>
+ <!-- Spoken description for Unicode code point U+2716 -->
+ <string name="spoken_emoji_2716">Heavy multiplication x</string>
+ <!-- Spoken description for Unicode code point U+2728 -->
+ <string name="spoken_emoji_2728">Sparkles</string>
+ <!-- Spoken description for Unicode code point U+2733 -->
+ <string name="spoken_emoji_2733">Eight spoked asterisk</string>
+ <!-- Spoken description for Unicode code point U+2734 -->
+ <string name="spoken_emoji_2734">Eight pointed black star</string>
+ <!-- Spoken description for Unicode code point U+2744 -->
+ <string name="spoken_emoji_2744">Snowflake</string>
+ <!-- Spoken description for Unicode code point U+2747 -->
+ <string name="spoken_emoji_2747">Sparkle</string>
+ <!-- Spoken description for Unicode code point U+274C -->
+ <string name="spoken_emoji_274C">Cross mark</string>
+ <!-- Spoken description for Unicode code point U+274E -->
+ <string name="spoken_emoji_274E">Negative squared cross mark</string>
+ <!-- Spoken description for Unicode code point U+2753 -->
+ <string name="spoken_emoji_2753">Black question mark ornament</string>
+ <!-- Spoken description for Unicode code point U+2754 -->
+ <string name="spoken_emoji_2754">White question mark ornament</string>
+ <!-- Spoken description for Unicode code point U+2755 -->
+ <string name="spoken_emoji_2755">White exclamation mark ornament</string>
+ <!-- Spoken description for Unicode code point U+2757 -->
+ <string name="spoken_emoji_2757">Heavy exclamation mark symbol</string>
+ <!-- Spoken description for Unicode code point U+2764 -->
+ <string name="spoken_emoji_2764">Heavy black heart</string>
+ <!-- Spoken description for Unicode code point U+2795 -->
+ <string name="spoken_emoji_2795">Heavy plus sign</string>
+ <!-- Spoken description for Unicode code point U+2796 -->
+ <string name="spoken_emoji_2796">Heavy minus sign</string>
+ <!-- Spoken description for Unicode code point U+2797 -->
+ <string name="spoken_emoji_2797">Heavy division sign</string>
+ <!-- Spoken description for Unicode code point U+27A1 -->
+ <string name="spoken_emoji_27A1">Black rightwards arrow</string>
+ <!-- Spoken description for Unicode code point U+27B0 -->
+ <string name="spoken_emoji_27B0">Curly loop</string>
+ <!-- Spoken description for Unicode code point U+27BF -->
+ <string name="spoken_emoji_27BF">Double curly loop</string>
+ <!-- Spoken description for Unicode code point U+2934 -->
+ <string name="spoken_emoji_2934">Arrow pointing rightwards then curving upwards</string>
+ <!-- Spoken description for Unicode code point U+2935 -->
+ <string name="spoken_emoji_2935">Arrow pointing rightwards then curving downwards</string>
+ <!-- Spoken description for Unicode code point U+2B05 -->
+ <string name="spoken_emoji_2B05">Leftwards black arrow</string>
+ <!-- Spoken description for Unicode code point U+2B06 -->
+ <string name="spoken_emoji_2B06">Upwards black arrow</string>
+ <!-- Spoken description for Unicode code point U+2B07 -->
+ <string name="spoken_emoji_2B07">Downwards black arrow</string>
+ <!-- Spoken description for Unicode code point U+2B1B -->
+ <string name="spoken_emoji_2B1B">Black large square</string>
+ <!-- Spoken description for Unicode code point U+2B1C -->
+ <string name="spoken_emoji_2B1C">White large square</string>
+ <!-- Spoken description for Unicode code point U+2B50 -->
+ <string name="spoken_emoji_2B50">White medium star</string>
+ <!-- Spoken description for Unicode code point U+2B55 -->
+ <string name="spoken_emoji_2B55">Heavy large circle</string>
+ <!-- Spoken description for Unicode code point U+3030 -->
+ <string name="spoken_emoji_3030">Wavy dash</string>
+ <!-- Spoken description for Unicode code point U+303D -->
+ <string name="spoken_emoji_303D">Part alternation mark</string>
+ <!-- Spoken description for Unicode code point U+3297 -->
+ <string name="spoken_emoji_3297">Circled ideograph congratulation</string>
+ <!-- Spoken description for Unicode code point U+3299 -->
+ <string name="spoken_emoji_3299">Circled ideograph secret</string>
+ <!-- Spoken description for Unicode code point U+1F004 -->
+ <string name="spoken_emoji_1F004">Mahjong tile red dragon</string>
+ <!-- Spoken description for Unicode code point U+1F0CF -->
+ <string name="spoken_emoji_1F0CF">Playing card black joker</string>
+ <!-- Spoken description for Unicode code point U+1F170 -->
+ <string name="spoken_emoji_1F170">Negative squared latin capital letter a</string>
+ <!-- Spoken description for Unicode code point U+1F171 -->
+ <string name="spoken_emoji_1F171">Negative squared latin capital letter b</string>
+ <!-- Spoken description for Unicode code point U+1F17E -->
+ <string name="spoken_emoji_1F17E">Negative squared latin capital letter o</string>
+ <!-- Spoken description for Unicode code point U+1F17F -->
+ <string name="spoken_emoji_1F17F">Negative squared latin capital letter p</string>
+ <!-- Spoken description for Unicode code point U+1F18E -->
+ <string name="spoken_emoji_1F18E">Negative squared ab</string>
+ <!-- Spoken description for Unicode code point U+1F191 -->
+ <string name="spoken_emoji_1F191">Squared cl</string>
+ <!-- Spoken description for Unicode code point U+1F192 -->
+ <string name="spoken_emoji_1F192">Squared cool</string>
+ <!-- Spoken description for Unicode code point U+1F193 -->
+ <string name="spoken_emoji_1F193">Squared free</string>
+ <!-- Spoken description for Unicode code point U+1F194 -->
+ <string name="spoken_emoji_1F194">Squared id</string>
+ <!-- Spoken description for Unicode code point U+1F195 -->
+ <string name="spoken_emoji_1F195">Squared new</string>
+ <!-- Spoken description for Unicode code point U+1F196 -->
+ <string name="spoken_emoji_1F196">Squared ng</string>
+ <!-- Spoken description for Unicode code point U+1F197 -->
+ <string name="spoken_emoji_1F197">Squared ok</string>
+ <!-- Spoken description for Unicode code point U+1F198 -->
+ <string name="spoken_emoji_1F198">Squared sos</string>
+ <!-- Spoken description for Unicode code point U+1F199 -->
+ <string name="spoken_emoji_1F199">Squared up with exclamation mark</string>
+ <!-- Spoken description for Unicode code point U+1F19A -->
+ <string name="spoken_emoji_1F19A">Squared vs</string>
+ <!-- Spoken description for Unicode code point U+1F201 -->
+ <string name="spoken_emoji_1F201">Squared katakana koko</string>
+ <!-- Spoken description for Unicode code point U+1F202 -->
+ <string name="spoken_emoji_1F202">Squared katakana sa</string>
+ <!-- Spoken description for Unicode code point U+1F21A -->
+ <string name="spoken_emoji_1F21A">Squared cjk unified ideograph-7121</string>
+ <!-- Spoken description for Unicode code point U+1F22F -->
+ <string name="spoken_emoji_1F22F">Squared cjk unified ideograph-6307</string>
+ <!-- Spoken description for Unicode code point U+1F232 -->
+ <string name="spoken_emoji_1F232">Squared cjk unified ideograph-7981</string>
+ <!-- Spoken description for Unicode code point U+1F233 -->
+ <string name="spoken_emoji_1F233">Squared cjk unified ideograph-7a7a</string>
+ <!-- Spoken description for Unicode code point U+1F234 -->
+ <string name="spoken_emoji_1F234">Squared cjk unified ideograph-5408</string>
+ <!-- Spoken description for Unicode code point U+1F235 -->
+ <string name="spoken_emoji_1F235">Squared cjk unified ideograph-6e80</string>
+ <!-- Spoken description for Unicode code point U+1F236 -->
+ <string name="spoken_emoji_1F236">Squared cjk unified ideograph-6709</string>
+ <!-- Spoken description for Unicode code point U+1F237 -->
+ <string name="spoken_emoji_1F237">Squared cjk unified ideograph-6708</string>
+ <!-- Spoken description for Unicode code point U+1F238 -->
+ <string name="spoken_emoji_1F238">Squared cjk unified ideograph-7533</string>
+ <!-- Spoken description for Unicode code point U+1F239 -->
+ <string name="spoken_emoji_1F239">Squared cjk unified ideograph-5272</string>
+ <!-- Spoken description for Unicode code point U+1F23A -->
+ <string name="spoken_emoji_1F23A">Squared cjk unified ideograph-55b6</string>
+ <!-- Spoken description for Unicode code point U+1F250 -->
+ <string name="spoken_emoji_1F250">Circled ideograph advantage</string>
+ <!-- Spoken description for Unicode code point U+1F251 -->
+ <string name="spoken_emoji_1F251">Circled ideograph accept</string>
+ <!-- Spoken description for Unicode code point U+1F300 -->
+ <string name="spoken_emoji_1F300">Cyclone</string>
+ <!-- Spoken description for Unicode code point U+1F301 -->
+ <string name="spoken_emoji_1F301">Foggy</string>
+ <!-- Spoken description for Unicode code point U+1F302 -->
+ <string name="spoken_emoji_1F302">Closed umbrella</string>
+ <!-- Spoken description for Unicode code point U+1F303 -->
+ <string name="spoken_emoji_1F303">Night with stars</string>
+ <!-- Spoken description for Unicode code point U+1F304 -->
+ <string name="spoken_emoji_1F304">Sunrise over mountains</string>
+ <!-- Spoken description for Unicode code point U+1F305 -->
+ <string name="spoken_emoji_1F305">Sunrise</string>
+ <!-- Spoken description for Unicode code point U+1F306 -->
+ <string name="spoken_emoji_1F306">Cityscape at dusk</string>
+ <!-- Spoken description for Unicode code point U+1F307 -->
+ <string name="spoken_emoji_1F307">Sunset over buildings</string>
+ <!-- Spoken description for Unicode code point U+1F308 -->
+ <string name="spoken_emoji_1F308">Rainbow</string>
+ <!-- Spoken description for Unicode code point U+1F309 -->
+ <string name="spoken_emoji_1F309">Bridge at night</string>
+ <!-- Spoken description for Unicode code point U+1F30A -->
+ <string name="spoken_emoji_1F30A">Water wave</string>
+ <!-- Spoken description for Unicode code point U+1F30B -->
+ <string name="spoken_emoji_1F30B">Volcano</string>
+ <!-- Spoken description for Unicode code point U+1F30C -->
+ <string name="spoken_emoji_1F30C">Milky way</string>
+ <!-- Spoken description for Unicode code point U+1F30D -->
+ <string name="spoken_emoji_1F30D">Earth globe europe-africa</string>
+ <!-- Spoken description for Unicode code point U+1F30E -->
+ <string name="spoken_emoji_1F30E">Earth globe americas</string>
+ <!-- Spoken description for Unicode code point U+1F30F -->
+ <string name="spoken_emoji_1F30F">Earth globe asia-australia</string>
+ <!-- Spoken description for Unicode code point U+1F310 -->
+ <string name="spoken_emoji_1F310">Globe with meridians</string>
+ <!-- Spoken description for Unicode code point U+1F311 -->
+ <string name="spoken_emoji_1F311">New moon symbol</string>
+ <!-- Spoken description for Unicode code point U+1F312 -->
+ <string name="spoken_emoji_1F312">Waxing crescent moon symbol</string>
+ <!-- Spoken description for Unicode code point U+1F313 -->
+ <string name="spoken_emoji_1F313">First quarter moon symbol</string>
+ <!-- Spoken description for Unicode code point U+1F314 -->
+ <string name="spoken_emoji_1F314">Waxing gibbous moon symbol</string>
+ <!-- Spoken description for Unicode code point U+1F315 -->
+ <string name="spoken_emoji_1F315">Full moon symbol</string>
+ <!-- Spoken description for Unicode code point U+1F316 -->
+ <string name="spoken_emoji_1F316">Waning gibbous moon symbol</string>
+ <!-- Spoken description for Unicode code point U+1F317 -->
+ <string name="spoken_emoji_1F317">Last quarter moon symbol</string>
+ <!-- Spoken description for Unicode code point U+1F318 -->
+ <string name="spoken_emoji_1F318">Waning crescent moon symbol</string>
+ <!-- Spoken description for Unicode code point U+1F319 -->
+ <string name="spoken_emoji_1F319">Crescent moon</string>
+ <!-- Spoken description for Unicode code point U+1F31A -->
+ <string name="spoken_emoji_1F31A">New moon with face</string>
+ <!-- Spoken description for Unicode code point U+1F31B -->
+ <string name="spoken_emoji_1F31B">First quarter moon with face</string>
+ <!-- Spoken description for Unicode code point U+1F31C -->
+ <string name="spoken_emoji_1F31C">Last quarter moon with face</string>
+ <!-- Spoken description for Unicode code point U+1F31D -->
+ <string name="spoken_emoji_1F31D">Full moon with face</string>
+ <!-- Spoken description for Unicode code point U+1F31E -->
+ <string name="spoken_emoji_1F31E">Sun with face</string>
+ <!-- Spoken description for Unicode code point U+1F31F -->
+ <string name="spoken_emoji_1F31F">Glowing star</string>
+ <!-- Spoken description for Unicode code point U+1F320 -->
+ <string name="spoken_emoji_1F320">Shooting star</string>
+ <!-- Spoken description for Unicode code point U+1F330 -->
+ <string name="spoken_emoji_1F330">Chestnut</string>
+ <!-- Spoken description for Unicode code point U+1F331 -->
+ <string name="spoken_emoji_1F331">Seedling</string>
+ <!-- Spoken description for Unicode code point U+1F332 -->
+ <string name="spoken_emoji_1F332">Evergreen tree</string>
+ <!-- Spoken description for Unicode code point U+1F333 -->
+ <string name="spoken_emoji_1F333">Deciduous tree</string>
+ <!-- Spoken description for Unicode code point U+1F334 -->
+ <string name="spoken_emoji_1F334">Palm tree</string>
+ <!-- Spoken description for Unicode code point U+1F335 -->
+ <string name="spoken_emoji_1F335">Cactus</string>
+ <!-- Spoken description for Unicode code point U+1F337 -->
+ <string name="spoken_emoji_1F337">Tulip</string>
+ <!-- Spoken description for Unicode code point U+1F338 -->
+ <string name="spoken_emoji_1F338">Cherry blossom</string>
+ <!-- Spoken description for Unicode code point U+1F339 -->
+ <string name="spoken_emoji_1F339">Rose</string>
+ <!-- Spoken description for Unicode code point U+1F33A -->
+ <string name="spoken_emoji_1F33A">Hibiscus</string>
+ <!-- Spoken description for Unicode code point U+1F33B -->
+ <string name="spoken_emoji_1F33B">Sunflower</string>
+ <!-- Spoken description for Unicode code point U+1F33C -->
+ <string name="spoken_emoji_1F33C">Blossom</string>
+ <!-- Spoken description for Unicode code point U+1F33D -->
+ <string name="spoken_emoji_1F33D">Ear of maize</string>
+ <!-- Spoken description for Unicode code point U+1F33E -->
+ <string name="spoken_emoji_1F33E">Ear of rice</string>
+ <!-- Spoken description for Unicode code point U+1F33F -->
+ <string name="spoken_emoji_1F33F">Herb</string>
+ <!-- Spoken description for Unicode code point U+1F340 -->
+ <string name="spoken_emoji_1F340">Four leaf clover</string>
+ <!-- Spoken description for Unicode code point U+1F341 -->
+ <string name="spoken_emoji_1F341">Maple leaf</string>
+ <!-- Spoken description for Unicode code point U+1F342 -->
+ <string name="spoken_emoji_1F342">Fallen leaf</string>
+ <!-- Spoken description for Unicode code point U+1F343 -->
+ <string name="spoken_emoji_1F343">Leaf fluttering in wind</string>
+ <!-- Spoken description for Unicode code point U+1F344 -->
+ <string name="spoken_emoji_1F344">Mushroom</string>
+ <!-- Spoken description for Unicode code point U+1F345 -->
+ <string name="spoken_emoji_1F345">Tomato</string>
+ <!-- Spoken description for Unicode code point U+1F346 -->
+ <string name="spoken_emoji_1F346">Aubergine</string>
+ <!-- Spoken description for Unicode code point U+1F347 -->
+ <string name="spoken_emoji_1F347">Grapes</string>
+ <!-- Spoken description for Unicode code point U+1F348 -->
+ <string name="spoken_emoji_1F348">Melon</string>
+ <!-- Spoken description for Unicode code point U+1F349 -->
+ <string name="spoken_emoji_1F349">Watermelon</string>
+ <!-- Spoken description for Unicode code point U+1F34A -->
+ <string name="spoken_emoji_1F34A">Tangerine</string>
+ <!-- Spoken description for Unicode code point U+1F34B -->
+ <string name="spoken_emoji_1F34B">Lemon</string>
+ <!-- Spoken description for Unicode code point U+1F34C -->
+ <string name="spoken_emoji_1F34C">Banana</string>
+ <!-- Spoken description for Unicode code point U+1F34D -->
+ <string name="spoken_emoji_1F34D">Pineapple</string>
+ <!-- Spoken description for Unicode code point U+1F34E -->
+ <string name="spoken_emoji_1F34E">Red apple</string>
+ <!-- Spoken description for Unicode code point U+1F34F -->
+ <string name="spoken_emoji_1F34F">Green apple</string>
+ <!-- Spoken description for Unicode code point U+1F350 -->
+ <string name="spoken_emoji_1F350">Pear</string>
+ <!-- Spoken description for Unicode code point U+1F351 -->
+ <string name="spoken_emoji_1F351">Peach</string>
+ <!-- Spoken description for Unicode code point U+1F352 -->
+ <string name="spoken_emoji_1F352">Cherries</string>
+ <!-- Spoken description for Unicode code point U+1F353 -->
+ <string name="spoken_emoji_1F353">Strawberry</string>
+ <!-- Spoken description for Unicode code point U+1F354 -->
+ <string name="spoken_emoji_1F354">Hamburger</string>
+ <!-- Spoken description for Unicode code point U+1F355 -->
+ <string name="spoken_emoji_1F355">Slice of pizza</string>
+ <!-- Spoken description for Unicode code point U+1F356 -->
+ <string name="spoken_emoji_1F356">Meat on bone</string>
+ <!-- Spoken description for Unicode code point U+1F357 -->
+ <string name="spoken_emoji_1F357">Poultry leg</string>
+ <!-- Spoken description for Unicode code point U+1F358 -->
+ <string name="spoken_emoji_1F358">Rice cracker</string>
+ <!-- Spoken description for Unicode code point U+1F359 -->
+ <string name="spoken_emoji_1F359">Rice ball</string>
+ <!-- Spoken description for Unicode code point U+1F35A -->
+ <string name="spoken_emoji_1F35A">Cooked rice</string>
+ <!-- Spoken description for Unicode code point U+1F35B -->
+ <string name="spoken_emoji_1F35B">Curry and rice</string>
+ <!-- Spoken description for Unicode code point U+1F35C -->
+ <string name="spoken_emoji_1F35C">Steaming bowl</string>
+ <!-- Spoken description for Unicode code point U+1F35D -->
+ <string name="spoken_emoji_1F35D">Spaghetti</string>
+ <!-- Spoken description for Unicode code point U+1F35E -->
+ <string name="spoken_emoji_1F35E">Bread</string>
+ <!-- Spoken description for Unicode code point U+1F35F -->
+ <string name="spoken_emoji_1F35F">French fries</string>
+ <!-- Spoken description for Unicode code point U+1F360 -->
+ <string name="spoken_emoji_1F360">Roasted sweet potato</string>
+ <!-- Spoken description for Unicode code point U+1F361 -->
+ <string name="spoken_emoji_1F361">Dango</string>
+ <!-- Spoken description for Unicode code point U+1F362 -->
+ <string name="spoken_emoji_1F362">Oden</string>
+ <!-- Spoken description for Unicode code point U+1F363 -->
+ <string name="spoken_emoji_1F363">Sushi</string>
+ <!-- Spoken description for Unicode code point U+1F364 -->
+ <string name="spoken_emoji_1F364">Fried shrimp</string>
+ <!-- Spoken description for Unicode code point U+1F365 -->
+ <string name="spoken_emoji_1F365">Fish cake with swirl design</string>
+ <!-- Spoken description for Unicode code point U+1F366 -->
+ <string name="spoken_emoji_1F366">Soft ice cream</string>
+ <!-- Spoken description for Unicode code point U+1F367 -->
+ <string name="spoken_emoji_1F367">Shaved ice</string>
+ <!-- Spoken description for Unicode code point U+1F368 -->
+ <string name="spoken_emoji_1F368">Ice cream</string>
+ <!-- Spoken description for Unicode code point U+1F369 -->
+ <string name="spoken_emoji_1F369">Doughnut</string>
+ <!-- Spoken description for Unicode code point U+1F36A -->
+ <string name="spoken_emoji_1F36A">Cookie</string>
+ <!-- Spoken description for Unicode code point U+1F36B -->
+ <string name="spoken_emoji_1F36B">Chocolate bar</string>
+ <!-- Spoken description for Unicode code point U+1F36C -->
+ <string name="spoken_emoji_1F36C">Candy</string>
+ <!-- Spoken description for Unicode code point U+1F36D -->
+ <string name="spoken_emoji_1F36D">Lollipop</string>
+ <!-- Spoken description for Unicode code point U+1F36E -->
+ <string name="spoken_emoji_1F36E">Custard</string>
+ <!-- Spoken description for Unicode code point U+1F36F -->
+ <string name="spoken_emoji_1F36F">Honey pot</string>
+ <!-- Spoken description for Unicode code point U+1F370 -->
+ <string name="spoken_emoji_1F370">Shortcake</string>
+ <!-- Spoken description for Unicode code point U+1F371 -->
+ <string name="spoken_emoji_1F371">Bento box</string>
+ <!-- Spoken description for Unicode code point U+1F372 -->
+ <string name="spoken_emoji_1F372">Pot of food</string>
+ <!-- Spoken description for Unicode code point U+1F373 -->
+ <string name="spoken_emoji_1F373">Cooking</string>
+ <!-- Spoken description for Unicode code point U+1F374 -->
+ <string name="spoken_emoji_1F374">Fork and knife</string>
+ <!-- Spoken description for Unicode code point U+1F375 -->
+ <string name="spoken_emoji_1F375">Teacup without handle</string>
+ <!-- Spoken description for Unicode code point U+1F376 -->
+ <string name="spoken_emoji_1F376">Sake bottle and cup</string>
+ <!-- Spoken description for Unicode code point U+1F377 -->
+ <string name="spoken_emoji_1F377">Wine glass</string>
+ <!-- Spoken description for Unicode code point U+1F378 -->
+ <string name="spoken_emoji_1F378">Cocktail glass</string>
+ <!-- Spoken description for Unicode code point U+1F379 -->
+ <string name="spoken_emoji_1F379">Tropical drink</string>
+ <!-- Spoken description for Unicode code point U+1F37A -->
+ <string name="spoken_emoji_1F37A">Beer mug</string>
+ <!-- Spoken description for Unicode code point U+1F37B -->
+ <string name="spoken_emoji_1F37B">Clinking beer mugs</string>
+ <!-- Spoken description for Unicode code point U+1F37C -->
+ <string name="spoken_emoji_1F37C">Baby bottle</string>
+ <!-- Spoken description for Unicode code point U+1F380 -->
+ <string name="spoken_emoji_1F380">Ribbon</string>
+ <!-- Spoken description for Unicode code point U+1F381 -->
+ <string name="spoken_emoji_1F381">Wrapped present</string>
+ <!-- Spoken description for Unicode code point U+1F382 -->
+ <string name="spoken_emoji_1F382">Birthday cake</string>
+ <!-- Spoken description for Unicode code point U+1F383 -->
+ <string name="spoken_emoji_1F383">Jack-o-lantern</string>
+ <!-- Spoken description for Unicode code point U+1F384 -->
+ <string name="spoken_emoji_1F384">Christmas tree</string>
+ <!-- Spoken description for Unicode code point U+1F385 -->
+ <string name="spoken_emoji_1F385">Father christmas</string>
+ <!-- Spoken description for Unicode code point U+1F386 -->
+ <string name="spoken_emoji_1F386">Fireworks</string>
+ <!-- Spoken description for Unicode code point U+1F387 -->
+ <string name="spoken_emoji_1F387">Firework sparkler</string>
+ <!-- Spoken description for Unicode code point U+1F388 -->
+ <string name="spoken_emoji_1F388">Balloon</string>
+ <!-- Spoken description for Unicode code point U+1F389 -->
+ <string name="spoken_emoji_1F389">Party popper</string>
+ <!-- Spoken description for Unicode code point U+1F38A -->
+ <string name="spoken_emoji_1F38A">Confetti ball</string>
+ <!-- Spoken description for Unicode code point U+1F38B -->
+ <string name="spoken_emoji_1F38B">Tanabata tree</string>
+ <!-- Spoken description for Unicode code point U+1F38C -->
+ <string name="spoken_emoji_1F38C">Crossed flags</string>
+ <!-- Spoken description for Unicode code point U+1F38D -->
+ <string name="spoken_emoji_1F38D">Pine decoration</string>
+ <!-- Spoken description for Unicode code point U+1F38E -->
+ <string name="spoken_emoji_1F38E">Japanese dolls</string>
+ <!-- Spoken description for Unicode code point U+1F38F -->
+ <string name="spoken_emoji_1F38F">Carp streamer</string>
+ <!-- Spoken description for Unicode code point U+1F390 -->
+ <string name="spoken_emoji_1F390">Wind chime</string>
+ <!-- Spoken description for Unicode code point U+1F391 -->
+ <string name="spoken_emoji_1F391">Moon viewing ceremony</string>
+ <!-- Spoken description for Unicode code point U+1F392 -->
+ <string name="spoken_emoji_1F392">School satchel</string>
+ <!-- Spoken description for Unicode code point U+1F393 -->
+ <string name="spoken_emoji_1F393">Graduation cap</string>
+ <!-- Spoken description for Unicode code point U+1F3A0 -->
+ <string name="spoken_emoji_1F3A0">Carousel horse</string>
+ <!-- Spoken description for Unicode code point U+1F3A1 -->
+ <string name="spoken_emoji_1F3A1">Ferris wheel</string>
+ <!-- Spoken description for Unicode code point U+1F3A2 -->
+ <string name="spoken_emoji_1F3A2">Roller coaster</string>
+ <!-- Spoken description for Unicode code point U+1F3A3 -->
+ <string name="spoken_emoji_1F3A3">Fishing pole and fish</string>
+ <!-- Spoken description for Unicode code point U+1F3A4 -->
+ <string name="spoken_emoji_1F3A4">Microphone</string>
+ <!-- Spoken description for Unicode code point U+1F3A5 -->
+ <string name="spoken_emoji_1F3A5">Movie camera</string>
+ <!-- Spoken description for Unicode code point U+1F3A6 -->
+ <string name="spoken_emoji_1F3A6">Cinema</string>
+ <!-- Spoken description for Unicode code point U+1F3A7 -->
+ <string name="spoken_emoji_1F3A7">Headphone</string>
+ <!-- Spoken description for Unicode code point U+1F3A8 -->
+ <string name="spoken_emoji_1F3A8">Artist palette</string>
+ <!-- Spoken description for Unicode code point U+1F3A9 -->
+ <string name="spoken_emoji_1F3A9">Top hat</string>
+ <!-- Spoken description for Unicode code point U+1F3AA -->
+ <string name="spoken_emoji_1F3AA">Circus tent</string>
+ <!-- Spoken description for Unicode code point U+1F3AB -->
+ <string name="spoken_emoji_1F3AB">Ticket</string>
+ <!-- Spoken description for Unicode code point U+1F3AC -->
+ <string name="spoken_emoji_1F3AC">Clapper board</string>
+ <!-- Spoken description for Unicode code point U+1F3AD -->
+ <string name="spoken_emoji_1F3AD">Performing arts</string>
+ <!-- Spoken description for Unicode code point U+1F3AE -->
+ <string name="spoken_emoji_1F3AE">Video game</string>
+ <!-- Spoken description for Unicode code point U+1F3AF -->
+ <string name="spoken_emoji_1F3AF">Direct hit</string>
+ <!-- Spoken description for Unicode code point U+1F3B0 -->
+ <string name="spoken_emoji_1F3B0">Slot machine</string>
+ <!-- Spoken description for Unicode code point U+1F3B1 -->
+ <string name="spoken_emoji_1F3B1">Billiards</string>
+ <!-- Spoken description for Unicode code point U+1F3B2 -->
+ <string name="spoken_emoji_1F3B2">Game die</string>
+ <!-- Spoken description for Unicode code point U+1F3B3 -->
+ <string name="spoken_emoji_1F3B3">Bowling</string>
+ <!-- Spoken description for Unicode code point U+1F3B4 -->
+ <string name="spoken_emoji_1F3B4">Flower playing cards</string>
+ <!-- Spoken description for Unicode code point U+1F3B5 -->
+ <string name="spoken_emoji_1F3B5">Musical note</string>
+ <!-- Spoken description for Unicode code point U+1F3B6 -->
+ <string name="spoken_emoji_1F3B6">Multiple musical notes</string>
+ <!-- Spoken description for Unicode code point U+1F3B7 -->
+ <string name="spoken_emoji_1F3B7">Saxophone</string>
+ <!-- Spoken description for Unicode code point U+1F3B8 -->
+ <string name="spoken_emoji_1F3B8">Guitar</string>
+ <!-- Spoken description for Unicode code point U+1F3B9 -->
+ <string name="spoken_emoji_1F3B9">Musical keyboard</string>
+ <!-- Spoken description for Unicode code point U+1F3BA -->
+ <string name="spoken_emoji_1F3BA">Trumpet</string>
+ <!-- Spoken description for Unicode code point U+1F3BB -->
+ <string name="spoken_emoji_1F3BB">Violin</string>
+ <!-- Spoken description for Unicode code point U+1F3BC -->
+ <string name="spoken_emoji_1F3BC">Musical score</string>
+ <!-- Spoken description for Unicode code point U+1F3BD -->
+ <string name="spoken_emoji_1F3BD">Running shirt with sash</string>
+ <!-- Spoken description for Unicode code point U+1F3BE -->
+ <string name="spoken_emoji_1F3BE">Tennis racquet and ball</string>
+ <!-- Spoken description for Unicode code point U+1F3BF -->
+ <string name="spoken_emoji_1F3BF">Ski and ski boot</string>
+ <!-- Spoken description for Unicode code point U+1F3C0 -->
+ <string name="spoken_emoji_1F3C0">Basketball and hoop</string>
+ <!-- Spoken description for Unicode code point U+1F3C1 -->
+ <string name="spoken_emoji_1F3C1">Chequered flag</string>
+ <!-- Spoken description for Unicode code point U+1F3C2 -->
+ <string name="spoken_emoji_1F3C2">Snowboarder</string>
+ <!-- Spoken description for Unicode code point U+1F3C3 -->
+ <string name="spoken_emoji_1F3C3">Runner</string>
+ <!-- Spoken description for Unicode code point U+1F3C4 -->
+ <string name="spoken_emoji_1F3C4">Surfer</string>
+ <!-- Spoken description for Unicode code point U+1F3C6 -->
+ <string name="spoken_emoji_1F3C6">Trophy</string>
+ <!-- Spoken description for Unicode code point U+1F3C7 -->
+ <string name="spoken_emoji_1F3C7">Horse racing</string>
+ <!-- Spoken description for Unicode code point U+1F3C8 -->
+ <string name="spoken_emoji_1F3C8">American football</string>
+ <!-- Spoken description for Unicode code point U+1F3C9 -->
+ <string name="spoken_emoji_1F3C9">Rugby football</string>
+ <!-- Spoken description for Unicode code point U+1F3CA -->
+ <string name="spoken_emoji_1F3CA">Swimmer</string>
+ <!-- Spoken description for Unicode code point U+1F3E0 -->
+ <string name="spoken_emoji_1F3E0">House building</string>
+ <!-- Spoken description for Unicode code point U+1F3E1 -->
+ <string name="spoken_emoji_1F3E1">House with garden</string>
+ <!-- Spoken description for Unicode code point U+1F3E2 -->
+ <string name="spoken_emoji_1F3E2">Office building</string>
+ <!-- Spoken description for Unicode code point U+1F3E3 -->
+ <string name="spoken_emoji_1F3E3">Japanese post office</string>
+ <!-- Spoken description for Unicode code point U+1F3E4 -->
+ <string name="spoken_emoji_1F3E4">European post office</string>
+ <!-- Spoken description for Unicode code point U+1F3E5 -->
+ <string name="spoken_emoji_1F3E5">Hospital</string>
+ <!-- Spoken description for Unicode code point U+1F3E6 -->
+ <string name="spoken_emoji_1F3E6">Bank</string>
+ <!-- Spoken description for Unicode code point U+1F3E7 -->
+ <string name="spoken_emoji_1F3E7">Automated teller machine</string>
+ <!-- Spoken description for Unicode code point U+1F3E8 -->
+ <string name="spoken_emoji_1F3E8">Hotel</string>
+ <!-- Spoken description for Unicode code point U+1F3E9 -->
+ <string name="spoken_emoji_1F3E9">Love hotel</string>
+ <!-- Spoken description for Unicode code point U+1F3EA -->
+ <string name="spoken_emoji_1F3EA">Convenience store</string>
+ <!-- Spoken description for Unicode code point U+1F3EB -->
+ <string name="spoken_emoji_1F3EB">School</string>
+ <!-- Spoken description for Unicode code point U+1F3EC -->
+ <string name="spoken_emoji_1F3EC">Department store</string>
+ <!-- Spoken description for Unicode code point U+1F3ED -->
+ <string name="spoken_emoji_1F3ED">Factory</string>
+ <!-- Spoken description for Unicode code point U+1F3EE -->
+ <string name="spoken_emoji_1F3EE">Izakaya lantern</string>
+ <!-- Spoken description for Unicode code point U+1F3EF -->
+ <string name="spoken_emoji_1F3EF">Japanese castle</string>
+ <!-- Spoken description for Unicode code point U+1F3F0 -->
+ <string name="spoken_emoji_1F3F0">European castle</string>
+ <!-- Spoken description for Unicode code point U+1F400 -->
+ <string name="spoken_emoji_1F400">Rat</string>
+ <!-- Spoken description for Unicode code point U+1F401 -->
+ <string name="spoken_emoji_1F401">Mouse</string>
+ <!-- Spoken description for Unicode code point U+1F402 -->
+ <string name="spoken_emoji_1F402">Ox</string>
+ <!-- Spoken description for Unicode code point U+1F403 -->
+ <string name="spoken_emoji_1F403">Water buffalo</string>
+ <!-- Spoken description for Unicode code point U+1F404 -->
+ <string name="spoken_emoji_1F404">Cow</string>
+ <!-- Spoken description for Unicode code point U+1F406 -->
+ <string name="spoken_emoji_1F406">Leopard</string>
+ <!-- Spoken description for Unicode code point U+1F407 -->
+ <string name="spoken_emoji_1F407">Rabbit</string>
+ <!-- Spoken description for Unicode code point U+1F408 -->
+ <string name="spoken_emoji_1F408">Cat</string>
+ <!-- Spoken description for Unicode code point U+1F409 -->
+ <string name="spoken_emoji_1F409">Dragon</string>
+ <!-- Spoken description for Unicode code point U+1F40A -->
+ <string name="spoken_emoji_1F40A">Crocodile</string>
+ <!-- Spoken description for Unicode code point U+1F40B -->
+ <string name="spoken_emoji_1F40B">Whale</string>
+ <!-- Spoken description for Unicode code point U+1F40C -->
+ <string name="spoken_emoji_1F40C">Snail</string>
+ <!-- Spoken description for Unicode code point U+1F40D -->
+ <string name="spoken_emoji_1F40D">Snake</string>
+ <!-- Spoken description for Unicode code point U+1F40E -->
+ <string name="spoken_emoji_1F40E">Horse</string>
+ <!-- Spoken description for Unicode code point U+1F40F -->
+ <string name="spoken_emoji_1F40F">Ram</string>
+ <!-- Spoken description for Unicode code point U+1F410 -->
+ <string name="spoken_emoji_1F410">Goat</string>
+ <!-- Spoken description for Unicode code point U+1F411 -->
+ <string name="spoken_emoji_1F411">Sheep</string>
+ <!-- Spoken description for Unicode code point U+1F412 -->
+ <string name="spoken_emoji_1F412">Monkey</string>
+ <!-- Spoken description for Unicode code point U+1F413 -->
+ <string name="spoken_emoji_1F413">Rooster</string>
+ <!-- Spoken description for Unicode code point U+1F414 -->
+ <string name="spoken_emoji_1F414">Chicken</string>
+ <!-- Spoken description for Unicode code point U+1F415 -->
+ <string name="spoken_emoji_1F415">Dog</string>
+ <!-- Spoken description for Unicode code point U+1F416 -->
+ <string name="spoken_emoji_1F416">Pig</string>
+ <!-- Spoken description for Unicode code point U+1F417 -->
+ <string name="spoken_emoji_1F417">Boar</string>
+ <!-- Spoken description for Unicode code point U+1F418 -->
+ <string name="spoken_emoji_1F418">Elephant</string>
+ <!-- Spoken description for Unicode code point U+1F419 -->
+ <string name="spoken_emoji_1F419">Octopus</string>
+ <!-- Spoken description for Unicode code point U+1F41A -->
+ <string name="spoken_emoji_1F41A">Spiral shell</string>
+ <!-- Spoken description for Unicode code point U+1F41B -->
+ <string name="spoken_emoji_1F41B">Bug</string>
+ <!-- Spoken description for Unicode code point U+1F41C -->
+ <string name="spoken_emoji_1F41C">Ant</string>
+ <!-- Spoken description for Unicode code point U+1F41D -->
+ <string name="spoken_emoji_1F41D">Honeybee</string>
+ <!-- Spoken description for Unicode code point U+1F41E -->
+ <string name="spoken_emoji_1F41E">Lady beetle</string>
+ <!-- Spoken description for Unicode code point U+1F41F -->
+ <string name="spoken_emoji_1F41F">Fish</string>
+ <!-- Spoken description for Unicode code point U+1F420 -->
+ <string name="spoken_emoji_1F420">Tropical fish</string>
+ <!-- Spoken description for Unicode code point U+1F421 -->
+ <string name="spoken_emoji_1F421">Blowfish</string>
+ <!-- Spoken description for Unicode code point U+1F422 -->
+ <string name="spoken_emoji_1F422">Turtle</string>
+ <!-- Spoken description for Unicode code point U+1F423 -->
+ <string name="spoken_emoji_1F423">Hatching chick</string>
+ <!-- Spoken description for Unicode code point U+1F424 -->
+ <string name="spoken_emoji_1F424">Baby chick</string>
+ <!-- Spoken description for Unicode code point U+1F425 -->
+ <string name="spoken_emoji_1F425">Front-facing baby chick</string>
+ <!-- Spoken description for Unicode code point U+1F426 -->
+ <string name="spoken_emoji_1F426">Bird</string>
+ <!-- Spoken description for Unicode code point U+1F427 -->
+ <string name="spoken_emoji_1F427">Penguin</string>
+ <!-- Spoken description for Unicode code point U+1F428 -->
+ <string name="spoken_emoji_1F428">Koala</string>
+ <!-- Spoken description for Unicode code point U+1F429 -->
+ <string name="spoken_emoji_1F429">Poodle</string>
+ <!-- Spoken description for Unicode code point U+1F42A -->
+ <string name="spoken_emoji_1F42A">Dromedary camel</string>
+ <!-- Spoken description for Unicode code point U+1F42B -->
+ <string name="spoken_emoji_1F42B">Bactrian camel</string>
+ <!-- Spoken description for Unicode code point U+1F42C -->
+ <string name="spoken_emoji_1F42C">Dolphin</string>
+ <!-- Spoken description for Unicode code point U+1F42D -->
+ <string name="spoken_emoji_1F42D">Mouse face</string>
+ <!-- Spoken description for Unicode code point U+1F42E -->
+ <string name="spoken_emoji_1F42E">Cow face</string>
+ <!-- Spoken description for Unicode code point U+1F42F -->
+ <string name="spoken_emoji_1F42F">Tiger face</string>
+ <!-- Spoken description for Unicode code point U+1F430 -->
+ <string name="spoken_emoji_1F430">Rabbit face</string>
+ <!-- Spoken description for Unicode code point U+1F431 -->
+ <string name="spoken_emoji_1F431">Cat face</string>
+ <!-- Spoken description for Unicode code point U+1F432 -->
+ <string name="spoken_emoji_1F432">Dragon face</string>
+ <!-- Spoken description for Unicode code point U+1F433 -->
+ <string name="spoken_emoji_1F433">Spouting whale</string>
+ <!-- Spoken description for Unicode code point U+1F434 -->
+ <string name="spoken_emoji_1F434">Horse face</string>
+ <!-- Spoken description for Unicode code point U+1F435 -->
+ <string name="spoken_emoji_1F435">Monkey face</string>
+ <!-- Spoken description for Unicode code point U+1F436 -->
+ <string name="spoken_emoji_1F436">Dog face</string>
+ <!-- Spoken description for Unicode code point U+1F437 -->
+ <string name="spoken_emoji_1F437">Pig face</string>
+ <!-- Spoken description for Unicode code point U+1F438 -->
+ <string name="spoken_emoji_1F438">Frog face</string>
+ <!-- Spoken description for Unicode code point U+1F439 -->
+ <string name="spoken_emoji_1F439">Hamster face</string>
+ <!-- Spoken description for Unicode code point U+1F43A -->
+ <string name="spoken_emoji_1F43A">Wolf face</string>
+ <!-- Spoken description for Unicode code point U+1F43B -->
+ <string name="spoken_emoji_1F43B">Bear face</string>
+ <!-- Spoken description for Unicode code point U+1F43C -->
+ <string name="spoken_emoji_1F43C">Panda face</string>
+ <!-- Spoken description for Unicode code point U+1F43D -->
+ <string name="spoken_emoji_1F43D">Pig nose</string>
+ <!-- Spoken description for Unicode code point U+1F43E -->
+ <string name="spoken_emoji_1F43E">Paw prints</string>
+ <!-- Spoken description for Unicode code point U+1F440 -->
+ <string name="spoken_emoji_1F440">Eyes</string>
+ <!-- Spoken description for Unicode code point U+1F442 -->
+ <string name="spoken_emoji_1F442">Ear</string>
+ <!-- Spoken description for Unicode code point U+1F443 -->
+ <string name="spoken_emoji_1F443">Nose</string>
+ <!-- Spoken description for Unicode code point U+1F444 -->
+ <string name="spoken_emoji_1F444">Mouth</string>
+ <!-- Spoken description for Unicode code point U+1F445 -->
+ <string name="spoken_emoji_1F445">Tongue</string>
+ <!-- Spoken description for Unicode code point U+1F446 -->
+ <string name="spoken_emoji_1F446">White up pointing backhand index</string>
+ <!-- Spoken description for Unicode code point U+1F447 -->
+ <string name="spoken_emoji_1F447">White down pointing backhand index</string>
+ <!-- Spoken description for Unicode code point U+1F448 -->
+ <string name="spoken_emoji_1F448">White left pointing backhand index</string>
+ <!-- Spoken description for Unicode code point U+1F449 -->
+ <string name="spoken_emoji_1F449">White right pointing backhand index</string>
+ <!-- Spoken description for Unicode code point U+1F44A -->
+ <string name="spoken_emoji_1F44A">Fisted hand sign</string>
+ <!-- Spoken description for Unicode code point U+1F44B -->
+ <string name="spoken_emoji_1F44B">Waving hand sign</string>
+ <!-- Spoken description for Unicode code point U+1F44C -->
+ <string name="spoken_emoji_1F44C">Ok hand sign</string>
+ <!-- Spoken description for Unicode code point U+1F44D -->
+ <string name="spoken_emoji_1F44D">Thumbs up sign</string>
+ <!-- Spoken description for Unicode code point U+1F44E -->
+ <string name="spoken_emoji_1F44E">Thumbs down sign</string>
+ <!-- Spoken description for Unicode code point U+1F44F -->
+ <string name="spoken_emoji_1F44F">Clapping hands sign</string>
+ <!-- Spoken description for Unicode code point U+1F450 -->
+ <string name="spoken_emoji_1F450">Open hands sign</string>
+ <!-- Spoken description for Unicode code point U+1F451 -->
+ <string name="spoken_emoji_1F451">Crown</string>
+ <!-- Spoken description for Unicode code point U+1F452 -->
+ <string name="spoken_emoji_1F452">Womans hat</string>
+ <!-- Spoken description for Unicode code point U+1F453 -->
+ <string name="spoken_emoji_1F453">Eyeglasses</string>
+ <!-- Spoken description for Unicode code point U+1F454 -->
+ <string name="spoken_emoji_1F454">Necktie</string>
+ <!-- Spoken description for Unicode code point U+1F455 -->
+ <string name="spoken_emoji_1F455">T-shirt</string>
+ <!-- Spoken description for Unicode code point U+1F456 -->
+ <string name="spoken_emoji_1F456">Jeans</string>
+ <!-- Spoken description for Unicode code point U+1F457 -->
+ <string name="spoken_emoji_1F457">Dress</string>
+ <!-- Spoken description for Unicode code point U+1F458 -->
+ <string name="spoken_emoji_1F458">Kimono</string>
+ <!-- Spoken description for Unicode code point U+1F459 -->
+ <string name="spoken_emoji_1F459">Bikini</string>
+ <!-- Spoken description for Unicode code point U+1F45A -->
+ <string name="spoken_emoji_1F45A">Womans clothes</string>
+ <!-- Spoken description for Unicode code point U+1F45B -->
+ <string name="spoken_emoji_1F45B">Purse</string>
+ <!-- Spoken description for Unicode code point U+1F45C -->
+ <string name="spoken_emoji_1F45C">Handbag</string>
+ <!-- Spoken description for Unicode code point U+1F45D -->
+ <string name="spoken_emoji_1F45D">Pouch</string>
+ <!-- Spoken description for Unicode code point U+1F45E -->
+ <string name="spoken_emoji_1F45E">Mans shoe</string>
+ <!-- Spoken description for Unicode code point U+1F45F -->
+ <string name="spoken_emoji_1F45F">Athletic shoe</string>
+ <!-- Spoken description for Unicode code point U+1F460 -->
+ <string name="spoken_emoji_1F460">High-heeled shoe</string>
+ <!-- Spoken description for Unicode code point U+1F461 -->
+ <string name="spoken_emoji_1F461">Womans sandal</string>
+ <!-- Spoken description for Unicode code point U+1F462 -->
+ <string name="spoken_emoji_1F462">Womans boots</string>
+ <!-- Spoken description for Unicode code point U+1F463 -->
+ <string name="spoken_emoji_1F463">Footprints</string>
+ <!-- Spoken description for Unicode code point U+1F464 -->
+ <string name="spoken_emoji_1F464">Bust in silhouette</string>
+ <!-- Spoken description for Unicode code point U+1F465 -->
+ <string name="spoken_emoji_1F465">Busts in silhouette</string>
+ <!-- Spoken description for Unicode code point U+1F466 -->
+ <string name="spoken_emoji_1F466">Boy</string>
+ <!-- Spoken description for Unicode code point U+1F467 -->
+ <string name="spoken_emoji_1F467">Girl</string>
+ <!-- Spoken description for Unicode code point U+1F468 -->
+ <string name="spoken_emoji_1F468">Man</string>
+ <!-- Spoken description for Unicode code point U+1F469 -->
+ <string name="spoken_emoji_1F469">Woman</string>
+ <!-- Spoken description for Unicode code point U+1F46A -->
+ <string name="spoken_emoji_1F46A">Family</string>
+ <!-- Spoken description for Unicode code point U+1F46B -->
+ <string name="spoken_emoji_1F46B">Man and woman holding hands</string>
+ <!-- Spoken description for Unicode code point U+1F46C -->
+ <string name="spoken_emoji_1F46C">Two men holding hands</string>
+ <!-- Spoken description for Unicode code point U+1F46D -->
+ <string name="spoken_emoji_1F46D">Two women holding hands</string>
+ <!-- Spoken description for Unicode code point U+1F46E -->
+ <string name="spoken_emoji_1F46E">Police officer</string>
+ <!-- Spoken description for Unicode code point U+1F46F -->
+ <string name="spoken_emoji_1F46F">Woman with bunny ears</string>
+ <!-- Spoken description for Unicode code point U+1F470 -->
+ <string name="spoken_emoji_1F470">Bride with veil</string>
+ <!-- Spoken description for Unicode code point U+1F471 -->
+ <string name="spoken_emoji_1F471">Person with blond hair</string>
+ <!-- Spoken description for Unicode code point U+1F472 -->
+ <string name="spoken_emoji_1F472">Man with gua pi mao</string>
+ <!-- Spoken description for Unicode code point U+1F473 -->
+ <string name="spoken_emoji_1F473">Man with turban</string>
+ <!-- Spoken description for Unicode code point U+1F474 -->
+ <string name="spoken_emoji_1F474">Older man</string>
+ <!-- Spoken description for Unicode code point U+1F475 -->
+ <string name="spoken_emoji_1F475">Older woman</string>
+ <!-- Spoken description for Unicode code point U+1F476 -->
+ <string name="spoken_emoji_1F476">Baby</string>
+ <!-- Spoken description for Unicode code point U+1F477 -->
+ <string name="spoken_emoji_1F477">Construction worker</string>
+ <!-- Spoken description for Unicode code point U+1F478 -->
+ <string name="spoken_emoji_1F478">Princess</string>
+ <!-- Spoken description for Unicode code point U+1F479 -->
+ <string name="spoken_emoji_1F479">Japanese ogre</string>
+ <!-- Spoken description for Unicode code point U+1F47A -->
+ <string name="spoken_emoji_1F47A">Japanese goblin</string>
+ <!-- Spoken description for Unicode code point U+1F47B -->
+ <string name="spoken_emoji_1F47B">Ghost</string>
+ <!-- Spoken description for Unicode code point U+1F47C -->
+ <string name="spoken_emoji_1F47C">Baby angel</string>
+ <!-- Spoken description for Unicode code point U+1F47D -->
+ <string name="spoken_emoji_1F47D">Extraterrestrial alien</string>
+ <!-- Spoken description for Unicode code point U+1F47E -->
+ <string name="spoken_emoji_1F47E">Alien monster</string>
+ <!-- Spoken description for Unicode code point U+1F47F -->
+ <string name="spoken_emoji_1F47F">Imp</string>
+ <!-- Spoken description for Unicode code point U+1F480 -->
+ <string name="spoken_emoji_1F480">Skull</string>
+ <!-- Spoken description for Unicode code point U+1F481 -->
+ <string name="spoken_emoji_1F481">Information desk person</string>
+ <!-- Spoken description for Unicode code point U+1F482 -->
+ <string name="spoken_emoji_1F482">Guardsman</string>
+ <!-- Spoken description for Unicode code point U+1F483 -->
+ <string name="spoken_emoji_1F483">Dancer</string>
+ <!-- Spoken description for Unicode code point U+1F484 -->
+ <string name="spoken_emoji_1F484">Lipstick</string>
+ <!-- Spoken description for Unicode code point U+1F485 -->
+ <string name="spoken_emoji_1F485">Nail polish</string>
+ <!-- Spoken description for Unicode code point U+1F486 -->
+ <string name="spoken_emoji_1F486">Face massage</string>
+ <!-- Spoken description for Unicode code point U+1F487 -->
+ <string name="spoken_emoji_1F487">Haircut</string>
+ <!-- Spoken description for Unicode code point U+1F488 -->
+ <string name="spoken_emoji_1F488">Barber pole</string>
+ <!-- Spoken description for Unicode code point U+1F489 -->
+ <string name="spoken_emoji_1F489">Syringe</string>
+ <!-- Spoken description for Unicode code point U+1F48A -->
+ <string name="spoken_emoji_1F48A">Pill</string>
+ <!-- Spoken description for Unicode code point U+1F48B -->
+ <string name="spoken_emoji_1F48B">Kiss mark</string>
+ <!-- Spoken description for Unicode code point U+1F48C -->
+ <string name="spoken_emoji_1F48C">Love letter</string>
+ <!-- Spoken description for Unicode code point U+1F48D -->
+ <string name="spoken_emoji_1F48D">Ring</string>
+ <!-- Spoken description for Unicode code point U+1F48E -->
+ <string name="spoken_emoji_1F48E">Gem stone</string>
+ <!-- Spoken description for Unicode code point U+1F48F -->
+ <string name="spoken_emoji_1F48F">Kiss</string>
+ <!-- Spoken description for Unicode code point U+1F490 -->
+ <string name="spoken_emoji_1F490">Bouquet</string>
+ <!-- Spoken description for Unicode code point U+1F491 -->
+ <string name="spoken_emoji_1F491">Couple with heart</string>
+ <!-- Spoken description for Unicode code point U+1F492 -->
+ <string name="spoken_emoji_1F492">Wedding</string>
+ <!-- Spoken description for Unicode code point U+1F493 -->
+ <string name="spoken_emoji_1F493">Beating heart</string>
+ <!-- Spoken description for Unicode code point U+1F494 -->
+ <string name="spoken_emoji_1F494">Broken heart</string>
+ <!-- Spoken description for Unicode code point U+1F495 -->
+ <string name="spoken_emoji_1F495">Two hearts</string>
+ <!-- Spoken description for Unicode code point U+1F496 -->
+ <string name="spoken_emoji_1F496">Sparkling heart</string>
+ <!-- Spoken description for Unicode code point U+1F497 -->
+ <string name="spoken_emoji_1F497">Growing heart</string>
+ <!-- Spoken description for Unicode code point U+1F498 -->
+ <string name="spoken_emoji_1F498">Heart with arrow</string>
+ <!-- Spoken description for Unicode code point U+1F499 -->
+ <string name="spoken_emoji_1F499">Blue heart</string>
+ <!-- Spoken description for Unicode code point U+1F49A -->
+ <string name="spoken_emoji_1F49A">Green heart</string>
+ <!-- Spoken description for Unicode code point U+1F49B -->
+ <string name="spoken_emoji_1F49B">Yellow heart</string>
+ <!-- Spoken description for Unicode code point U+1F49C -->
+ <string name="spoken_emoji_1F49C">Purple heart</string>
+ <!-- Spoken description for Unicode code point U+1F49D -->
+ <string name="spoken_emoji_1F49D">Heart with ribbon</string>
+ <!-- Spoken description for Unicode code point U+1F49E -->
+ <string name="spoken_emoji_1F49E">Revolving hearts</string>
+ <!-- Spoken description for Unicode code point U+1F49F -->
+ <string name="spoken_emoji_1F49F">Heart decoration</string>
+ <!-- Spoken description for Unicode code point U+1F4A0 -->
+ <string name="spoken_emoji_1F4A0">Diamond shape with a dot inside</string>
+ <!-- Spoken description for Unicode code point U+1F4A1 -->
+ <string name="spoken_emoji_1F4A1">Electric light bulb</string>
+ <!-- Spoken description for Unicode code point U+1F4A2 -->
+ <string name="spoken_emoji_1F4A2">Anger symbol</string>
+ <!-- Spoken description for Unicode code point U+1F4A3 -->
+ <string name="spoken_emoji_1F4A3">Bomb</string>
+ <!-- Spoken description for Unicode code point U+1F4A4 -->
+ <string name="spoken_emoji_1F4A4">Sleeping symbol</string>
+ <!-- Spoken description for Unicode code point U+1F4A5 -->
+ <string name="spoken_emoji_1F4A5">Collision symbol</string>
+ <!-- Spoken description for Unicode code point U+1F4A6 -->
+ <string name="spoken_emoji_1F4A6">Splashing sweat symbol</string>
+ <!-- Spoken description for Unicode code point U+1F4A7 -->
+ <string name="spoken_emoji_1F4A7">Droplet</string>
+ <!-- Spoken description for Unicode code point U+1F4A8 -->
+ <string name="spoken_emoji_1F4A8">Dash symbol</string>
+ <!-- Spoken description for Unicode code point U+1F4A9 -->
+ <string name="spoken_emoji_1F4A9">Pile of poo</string>
+ <!-- Spoken description for Unicode code point U+1F4AA -->
+ <string name="spoken_emoji_1F4AA">Flexed biceps</string>
+ <!-- Spoken description for Unicode code point U+1F4AB -->
+ <string name="spoken_emoji_1F4AB">Dizzy symbol</string>
+ <!-- Spoken description for Unicode code point U+1F4AC -->
+ <string name="spoken_emoji_1F4AC">Speech balloon</string>
+ <!-- Spoken description for Unicode code point U+1F4AD -->
+ <string name="spoken_emoji_1F4AD">Thought balloon</string>
+ <!-- Spoken description for Unicode code point U+1F4AE -->
+ <string name="spoken_emoji_1F4AE">White flower</string>
+ <!-- Spoken description for Unicode code point U+1F4AF -->
+ <string name="spoken_emoji_1F4AF">Hundred points symbol</string>
+ <!-- Spoken description for Unicode code point U+1F4B0 -->
+ <string name="spoken_emoji_1F4B0">Money bag</string>
+ <!-- Spoken description for Unicode code point U+1F4B1 -->
+ <string name="spoken_emoji_1F4B1">Currency exchange</string>
+ <!-- Spoken description for Unicode code point U+1F4B2 -->
+ <string name="spoken_emoji_1F4B2">Heavy dollar sign</string>
+ <!-- Spoken description for Unicode code point U+1F4B3 -->
+ <string name="spoken_emoji_1F4B3">Credit card</string>
+ <!-- Spoken description for Unicode code point U+1F4B4 -->
+ <string name="spoken_emoji_1F4B4">Banknote with yen sign</string>
+ <!-- Spoken description for Unicode code point U+1F4B5 -->
+ <string name="spoken_emoji_1F4B5">Banknote with dollar sign</string>
+ <!-- Spoken description for Unicode code point U+1F4B6 -->
+ <string name="spoken_emoji_1F4B6">Banknote with euro sign</string>
+ <!-- Spoken description for Unicode code point U+1F4B7 -->
+ <string name="spoken_emoji_1F4B7">Banknote with pound sign</string>
+ <!-- Spoken description for Unicode code point U+1F4B8 -->
+ <string name="spoken_emoji_1F4B8">Money with wings</string>
+ <!-- Spoken description for Unicode code point U+1F4B9 -->
+ <string name="spoken_emoji_1F4B9">Chart with upwards trend and yen sign</string>
+ <!-- Spoken description for Unicode code point U+1F4BA -->
+ <string name="spoken_emoji_1F4BA">Seat</string>
+ <!-- Spoken description for Unicode code point U+1F4BB -->
+ <string name="spoken_emoji_1F4BB">Personal computer</string>
+ <!-- Spoken description for Unicode code point U+1F4BC -->
+ <string name="spoken_emoji_1F4BC">Briefcase</string>
+ <!-- Spoken description for Unicode code point U+1F4BD -->
+ <string name="spoken_emoji_1F4BD">Minidisc</string>
+ <!-- Spoken description for Unicode code point U+1F4BE -->
+ <string name="spoken_emoji_1F4BE">Floppy disk</string>
+ <!-- Spoken description for Unicode code point U+1F4BF -->
+ <string name="spoken_emoji_1F4BF">Optical disc</string>
+ <!-- Spoken description for Unicode code point U+1F4C0 -->
+ <string name="spoken_emoji_1F4C0">Dvd</string>
+ <!-- Spoken description for Unicode code point U+1F4C1 -->
+ <string name="spoken_emoji_1F4C1">File folder</string>
+ <!-- Spoken description for Unicode code point U+1F4C2 -->
+ <string name="spoken_emoji_1F4C2">Open file folder</string>
+ <!-- Spoken description for Unicode code point U+1F4C3 -->
+ <string name="spoken_emoji_1F4C3">Page with curl</string>
+ <!-- Spoken description for Unicode code point U+1F4C4 -->
+ <string name="spoken_emoji_1F4C4">Page facing up</string>
+ <!-- Spoken description for Unicode code point U+1F4C5 -->
+ <string name="spoken_emoji_1F4C5">Calendar</string>
+ <!-- Spoken description for Unicode code point U+1F4C6 -->
+ <string name="spoken_emoji_1F4C6">Tear-off calendar</string>
+ <!-- Spoken description for Unicode code point U+1F4C7 -->
+ <string name="spoken_emoji_1F4C7">Card index</string>
+ <!-- Spoken description for Unicode code point U+1F4C8 -->
+ <string name="spoken_emoji_1F4C8">Chart with upwards trend</string>
+ <!-- Spoken description for Unicode code point U+1F4C9 -->
+ <string name="spoken_emoji_1F4C9">Chart with downwards trend</string>
+ <!-- Spoken description for Unicode code point U+1F4CA -->
+ <string name="spoken_emoji_1F4CA">Bar chart</string>
+ <!-- Spoken description for Unicode code point U+1F4CB -->
+ <string name="spoken_emoji_1F4CB">Clipboard</string>
+ <!-- Spoken description for Unicode code point U+1F4CC -->
+ <string name="spoken_emoji_1F4CC">Pushpin</string>
+ <!-- Spoken description for Unicode code point U+1F4CD -->
+ <string name="spoken_emoji_1F4CD">Round pushpin</string>
+ <!-- Spoken description for Unicode code point U+1F4CE -->
+ <string name="spoken_emoji_1F4CE">Paperclip</string>
+ <!-- Spoken description for Unicode code point U+1F4CF -->
+ <string name="spoken_emoji_1F4CF">Straight ruler</string>
+ <!-- Spoken description for Unicode code point U+1F4D0 -->
+ <string name="spoken_emoji_1F4D0">Triangular ruler</string>
+ <!-- Spoken description for Unicode code point U+1F4D1 -->
+ <string name="spoken_emoji_1F4D1">Bookmark tabs</string>
+ <!-- Spoken description for Unicode code point U+1F4D2 -->
+ <string name="spoken_emoji_1F4D2">Ledger</string>
+ <!-- Spoken description for Unicode code point U+1F4D3 -->
+ <string name="spoken_emoji_1F4D3">Notebook</string>
+ <!-- Spoken description for Unicode code point U+1F4D4 -->
+ <string name="spoken_emoji_1F4D4">Notebook with decorative cover</string>
+ <!-- Spoken description for Unicode code point U+1F4D5 -->
+ <string name="spoken_emoji_1F4D5">Closed book</string>
+ <!-- Spoken description for Unicode code point U+1F4D6 -->
+ <string name="spoken_emoji_1F4D6">Open book</string>
+ <!-- Spoken description for Unicode code point U+1F4D7 -->
+ <string name="spoken_emoji_1F4D7">Green book</string>
+ <!-- Spoken description for Unicode code point U+1F4D8 -->
+ <string name="spoken_emoji_1F4D8">Blue book</string>
+ <!-- Spoken description for Unicode code point U+1F4D9 -->
+ <string name="spoken_emoji_1F4D9">Orange book</string>
+ <!-- Spoken description for Unicode code point U+1F4DA -->
+ <string name="spoken_emoji_1F4DA">Books</string>
+ <!-- Spoken description for Unicode code point U+1F4DB -->
+ <string name="spoken_emoji_1F4DB">Name badge</string>
+ <!-- Spoken description for Unicode code point U+1F4DC -->
+ <string name="spoken_emoji_1F4DC">Scroll</string>
+ <!-- Spoken description for Unicode code point U+1F4DD -->
+ <string name="spoken_emoji_1F4DD">Memo</string>
+ <!-- Spoken description for Unicode code point U+1F4DE -->
+ <string name="spoken_emoji_1F4DE">Telephone receiver</string>
+ <!-- Spoken description for Unicode code point U+1F4DF -->
+ <string name="spoken_emoji_1F4DF">Pager</string>
+ <!-- Spoken description for Unicode code point U+1F4E0 -->
+ <string name="spoken_emoji_1F4E0">Fax machine</string>
+ <!-- Spoken description for Unicode code point U+1F4E1 -->
+ <string name="spoken_emoji_1F4E1">Satellite antenna</string>
+ <!-- Spoken description for Unicode code point U+1F4E2 -->
+ <string name="spoken_emoji_1F4E2">Public address loudspeaker</string>
+ <!-- Spoken description for Unicode code point U+1F4E3 -->
+ <string name="spoken_emoji_1F4E3">Cheering megaphone</string>
+ <!-- Spoken description for Unicode code point U+1F4E4 -->
+ <string name="spoken_emoji_1F4E4">Outbox tray</string>
+ <!-- Spoken description for Unicode code point U+1F4E5 -->
+ <string name="spoken_emoji_1F4E5">Inbox tray</string>
+ <!-- Spoken description for Unicode code point U+1F4E6 -->
+ <string name="spoken_emoji_1F4E6">Package</string>
+ <!-- Spoken description for Unicode code point U+1F4E7 -->
+ <string name="spoken_emoji_1F4E7">E-mail symbol</string>
+ <!-- Spoken description for Unicode code point U+1F4E8 -->
+ <string name="spoken_emoji_1F4E8">Incoming envelope</string>
+ <!-- Spoken description for Unicode code point U+1F4E9 -->
+ <string name="spoken_emoji_1F4E9">Envelope with downwards arrow above</string>
+ <!-- Spoken description for Unicode code point U+1F4EA -->
+ <string name="spoken_emoji_1F4EA">Closed mailbox with lowered flag</string>
+ <!-- Spoken description for Unicode code point U+1F4EB -->
+ <string name="spoken_emoji_1F4EB">Closed mailbox with raised flag</string>
+ <!-- Spoken description for Unicode code point U+1F4EC -->
+ <string name="spoken_emoji_1F4EC">Open mailbox with raised flag</string>
+ <!-- Spoken description for Unicode code point U+1F4ED -->
+ <string name="spoken_emoji_1F4ED">Open mailbox with lowered flag</string>
+ <!-- Spoken description for Unicode code point U+1F4EE -->
+ <string name="spoken_emoji_1F4EE">Postbox</string>
+ <!-- Spoken description for Unicode code point U+1F4EF -->
+ <string name="spoken_emoji_1F4EF">Postal horn</string>
+ <!-- Spoken description for Unicode code point U+1F4F0 -->
+ <string name="spoken_emoji_1F4F0">Newspaper</string>
+ <!-- Spoken description for Unicode code point U+1F4F1 -->
+ <string name="spoken_emoji_1F4F1">Mobile phone</string>
+ <!-- Spoken description for Unicode code point U+1F4F2 -->
+ <string name="spoken_emoji_1F4F2">Mobile phone with rightwards arrow at left</string>
+ <!-- Spoken description for Unicode code point U+1F4F3 -->
+ <string name="spoken_emoji_1F4F3">Vibration mode</string>
+ <!-- Spoken description for Unicode code point U+1F4F4 -->
+ <string name="spoken_emoji_1F4F4">Mobile phone off</string>
+ <!-- Spoken description for Unicode code point U+1F4F5 -->
+ <string name="spoken_emoji_1F4F5">No mobile phones</string>
+ <!-- Spoken description for Unicode code point U+1F4F6 -->
+ <string name="spoken_emoji_1F4F6">Antenna with bars</string>
+ <!-- Spoken description for Unicode code point U+1F4F7 -->
+ <string name="spoken_emoji_1F4F7">Camera</string>
+ <!-- Spoken description for Unicode code point U+1F4F9 -->
+ <string name="spoken_emoji_1F4F9">Video camera</string>
+ <!-- Spoken description for Unicode code point U+1F4FA -->
+ <string name="spoken_emoji_1F4FA">Television</string>
+ <!-- Spoken description for Unicode code point U+1F4FB -->
+ <string name="spoken_emoji_1F4FB">Radio</string>
+ <!-- Spoken description for Unicode code point U+1F4FC -->
+ <string name="spoken_emoji_1F4FC">Videocassette</string>
+ <!-- Spoken description for Unicode code point U+1F500 -->
+ <string name="spoken_emoji_1F500">Twisted rightwards arrows</string>
+ <!-- Spoken description for Unicode code point U+1F501 -->
+ <string name="spoken_emoji_1F501">Clockwise rightwards and leftwards open circle arrows</string>
+ <!-- Spoken description for Unicode code point U+1F502 -->
+ <string name="spoken_emoji_1F502">Clockwise rightwards and leftwards open circle arrows with circled one overlay</string>
+ <!-- Spoken description for Unicode code point U+1F503 -->
+ <string name="spoken_emoji_1F503">Clockwise downwards and upwards open circle arrows</string>
+ <!-- Spoken description for Unicode code point U+1F504 -->
+ <string name="spoken_emoji_1F504">Anticlockwise downwards and upwards open circle arrows</string>
+ <!-- Spoken description for Unicode code point U+1F505 -->
+ <string name="spoken_emoji_1F505">Low brightness symbol</string>
+ <!-- Spoken description for Unicode code point U+1F506 -->
+ <string name="spoken_emoji_1F506">High brightness symbol</string>
+ <!-- Spoken description for Unicode code point U+1F507 -->
+ <string name="spoken_emoji_1F507">Speaker with cancellation stroke</string>
+ <!-- Spoken description for Unicode code point U+1F508 -->
+ <string name="spoken_emoji_1F508">Speaker</string>
+ <!-- Spoken description for Unicode code point U+1F509 -->
+ <string name="spoken_emoji_1F509">Speaker with one sound wave</string>
+ <!-- Spoken description for Unicode code point U+1F50A -->
+ <string name="spoken_emoji_1F50A">Speaker with three sound waves</string>
+ <!-- Spoken description for Unicode code point U+1F50B -->
+ <string name="spoken_emoji_1F50B">Battery</string>
+ <!-- Spoken description for Unicode code point U+1F50C -->
+ <string name="spoken_emoji_1F50C">Electric plug</string>
+ <!-- Spoken description for Unicode code point U+1F50D -->
+ <string name="spoken_emoji_1F50D">Left-pointing magnifying glass</string>
+ <!-- Spoken description for Unicode code point U+1F50E -->
+ <string name="spoken_emoji_1F50E">Right-pointing magnifying glass</string>
+ <!-- Spoken description for Unicode code point U+1F50F -->
+ <string name="spoken_emoji_1F50F">Lock with ink pen</string>
+ <!-- Spoken description for Unicode code point U+1F510 -->
+ <string name="spoken_emoji_1F510">Closed lock with key</string>
+ <!-- Spoken description for Unicode code point U+1F511 -->
+ <string name="spoken_emoji_1F511">Key</string>
+ <!-- Spoken description for Unicode code point U+1F512 -->
+ <string name="spoken_emoji_1F512">Lock</string>
+ <!-- Spoken description for Unicode code point U+1F513 -->
+ <string name="spoken_emoji_1F513">Open lock</string>
+ <!-- Spoken description for Unicode code point U+1F514 -->
+ <string name="spoken_emoji_1F514">Bell</string>
+ <!-- Spoken description for Unicode code point U+1F515 -->
+ <string name="spoken_emoji_1F515">Bell with cancellation stroke</string>
+ <!-- Spoken description for Unicode code point U+1F516 -->
+ <string name="spoken_emoji_1F516">Bookmark</string>
+ <!-- Spoken description for Unicode code point U+1F517 -->
+ <string name="spoken_emoji_1F517">Link symbol</string>
+ <!-- Spoken description for Unicode code point U+1F518 -->
+ <string name="spoken_emoji_1F518">Radio button</string>
+ <!-- Spoken description for Unicode code point U+1F519 -->
+ <string name="spoken_emoji_1F519">Back with leftwards arrow above</string>
+ <!-- Spoken description for Unicode code point U+1F51A -->
+ <string name="spoken_emoji_1F51A">End with leftwards arrow above</string>
+ <!-- Spoken description for Unicode code point U+1F51B -->
+ <string name="spoken_emoji_1F51B">On with exclamation mark with left right arrow above</string>
+ <!-- Spoken description for Unicode code point U+1F51C -->
+ <string name="spoken_emoji_1F51C">Soon with rightwards arrow above</string>
+ <!-- Spoken description for Unicode code point U+1F51D -->
+ <string name="spoken_emoji_1F51D">Top with upwards arrow above</string>
+ <!-- Spoken description for Unicode code point U+1F51E -->
+ <string name="spoken_emoji_1F51E">No one under eighteen symbol</string>
+ <!-- Spoken description for Unicode code point U+1F51F -->
+ <string name="spoken_emoji_1F51F">Keycap ten</string>
+ <!-- Spoken description for Unicode code point U+1F520 -->
+ <string name="spoken_emoji_1F520">Input symbol for latin capital letters</string>
+ <!-- Spoken description for Unicode code point U+1F521 -->
+ <string name="spoken_emoji_1F521">Input symbol for latin small letters</string>
+ <!-- Spoken description for Unicode code point U+1F522 -->
+ <string name="spoken_emoji_1F522">Input symbol for numbers</string>
+ <!-- Spoken description for Unicode code point U+1F523 -->
+ <string name="spoken_emoji_1F523">Input symbol for symbols</string>
+ <!-- Spoken description for Unicode code point U+1F524 -->
+ <string name="spoken_emoji_1F524">Input symbol for latin letters</string>
+ <!-- Spoken description for Unicode code point U+1F525 -->
+ <string name="spoken_emoji_1F525">Fire</string>
+ <!-- Spoken description for Unicode code point U+1F526 -->
+ <string name="spoken_emoji_1F526">Electric torch</string>
+ <!-- Spoken description for Unicode code point U+1F527 -->
+ <string name="spoken_emoji_1F527">Wrench</string>
+ <!-- Spoken description for Unicode code point U+1F528 -->
+ <string name="spoken_emoji_1F528">Hammer</string>
+ <!-- Spoken description for Unicode code point U+1F529 -->
+ <string name="spoken_emoji_1F529">Nut and bolt</string>
+ <!-- Spoken description for Unicode code point U+1F52A -->
+ <string name="spoken_emoji_1F52A">Hocho</string>
+ <!-- Spoken description for Unicode code point U+1F52B -->
+ <string name="spoken_emoji_1F52B">Pistol</string>
+ <!-- Spoken description for Unicode code point U+1F52C -->
+ <string name="spoken_emoji_1F52C">Microscope</string>
+ <!-- Spoken description for Unicode code point U+1F52D -->
+ <string name="spoken_emoji_1F52D">Telescope</string>
+ <!-- Spoken description for Unicode code point U+1F52E -->
+ <string name="spoken_emoji_1F52E">Crystal ball</string>
+ <!-- Spoken description for Unicode code point U+1F52F -->
+ <string name="spoken_emoji_1F52F">Six pointed star with middle dot</string>
+ <!-- Spoken description for Unicode code point U+1F530 -->
+ <string name="spoken_emoji_1F530">Japanese symbol for beginner</string>
+ <!-- Spoken description for Unicode code point U+1F531 -->
+ <string name="spoken_emoji_1F531">Trident emblem</string>
+ <!-- Spoken description for Unicode code point U+1F532 -->
+ <string name="spoken_emoji_1F532">Black square button</string>
+ <!-- Spoken description for Unicode code point U+1F533 -->
+ <string name="spoken_emoji_1F533">White square button</string>
+ <!-- Spoken description for Unicode code point U+1F534 -->
+ <string name="spoken_emoji_1F534">Large red circle</string>
+ <!-- Spoken description for Unicode code point U+1F535 -->
+ <string name="spoken_emoji_1F535">Large blue circle</string>
+ <!-- Spoken description for Unicode code point U+1F536 -->
+ <string name="spoken_emoji_1F536">Large orange diamond</string>
+ <!-- Spoken description for Unicode code point U+1F537 -->
+ <string name="spoken_emoji_1F537">Large blue diamond</string>
+ <!-- Spoken description for Unicode code point U+1F538 -->
+ <string name="spoken_emoji_1F538">Small orange diamond</string>
+ <!-- Spoken description for Unicode code point U+1F539 -->
+ <string name="spoken_emoji_1F539">Small blue diamond</string>
+ <!-- Spoken description for Unicode code point U+1F53A -->
+ <string name="spoken_emoji_1F53A">Up-pointing red triangle</string>
+ <!-- Spoken description for Unicode code point U+1F53B -->
+ <string name="spoken_emoji_1F53B">Down-pointing red triangle</string>
+ <!-- Spoken description for Unicode code point U+1F53C -->
+ <string name="spoken_emoji_1F53C">Up-pointing small red triangle</string>
+ <!-- Spoken description for Unicode code point U+1F53D -->
+ <string name="spoken_emoji_1F53D">Down-pointing small red triangle</string>
+ <!-- Spoken description for Unicode code point U+1F550 -->
+ <string name="spoken_emoji_1F550">Clock face one oclock</string>
+ <!-- Spoken description for Unicode code point U+1F551 -->
+ <string name="spoken_emoji_1F551">Clock face two oclock</string>
+ <!-- Spoken description for Unicode code point U+1F552 -->
+ <string name="spoken_emoji_1F552">Clock face three oclock</string>
+ <!-- Spoken description for Unicode code point U+1F553 -->
+ <string name="spoken_emoji_1F553">Clock face four oclock</string>
+ <!-- Spoken description for Unicode code point U+1F554 -->
+ <string name="spoken_emoji_1F554">Clock face five oclock</string>
+ <!-- Spoken description for Unicode code point U+1F555 -->
+ <string name="spoken_emoji_1F555">Clock face six oclock</string>
+ <!-- Spoken description for Unicode code point U+1F556 -->
+ <string name="spoken_emoji_1F556">Clock face seven oclock</string>
+ <!-- Spoken description for Unicode code point U+1F557 -->
+ <string name="spoken_emoji_1F557">Clock face eight oclock</string>
+ <!-- Spoken description for Unicode code point U+1F558 -->
+ <string name="spoken_emoji_1F558">Clock face nine oclock</string>
+ <!-- Spoken description for Unicode code point U+1F559 -->
+ <string name="spoken_emoji_1F559">Clock face ten oclock</string>
+ <!-- Spoken description for Unicode code point U+1F55A -->
+ <string name="spoken_emoji_1F55A">Clock face eleven oclock</string>
+ <!-- Spoken description for Unicode code point U+1F55B -->
+ <string name="spoken_emoji_1F55B">Clock face twelve oclock</string>
+ <!-- Spoken description for Unicode code point U+1F55C -->
+ <string name="spoken_emoji_1F55C">Clock face one-thirty</string>
+ <!-- Spoken description for Unicode code point U+1F55D -->
+ <string name="spoken_emoji_1F55D">Clock face two-thirty</string>
+ <!-- Spoken description for Unicode code point U+1F55E -->
+ <string name="spoken_emoji_1F55E">Clock face three-thirty</string>
+ <!-- Spoken description for Unicode code point U+1F55F -->
+ <string name="spoken_emoji_1F55F">Clock face four-thirty</string>
+ <!-- Spoken description for Unicode code point U+1F560 -->
+ <string name="spoken_emoji_1F560">Clock face five-thirty</string>
+ <!-- Spoken description for Unicode code point U+1F561 -->
+ <string name="spoken_emoji_1F561">Clock face six-thirty</string>
+ <!-- Spoken description for Unicode code point U+1F562 -->
+ <string name="spoken_emoji_1F562">Clock face seven-thirty</string>
+ <!-- Spoken description for Unicode code point U+1F563 -->
+ <string name="spoken_emoji_1F563">Clock face eight-thirty</string>
+ <!-- Spoken description for Unicode code point U+1F564 -->
+ <string name="spoken_emoji_1F564">Clock face nine-thirty</string>
+ <!-- Spoken description for Unicode code point U+1F565 -->
+ <string name="spoken_emoji_1F565">Clock face ten-thirty</string>
+ <!-- Spoken description for Unicode code point U+1F566 -->
+ <string name="spoken_emoji_1F566">Clock face eleven-thirty</string>
+ <!-- Spoken description for Unicode code point U+1F567 -->
+ <string name="spoken_emoji_1F567">Clock face twelve-thirty</string>
+ <!-- Spoken description for Unicode code point U+1F5FB -->
+ <string name="spoken_emoji_1F5FB">Mount fuji</string>
+ <!-- Spoken description for Unicode code point U+1F5FC -->
+ <string name="spoken_emoji_1F5FC">Tokyo tower</string>
+ <!-- Spoken description for Unicode code point U+1F5FD -->
+ <string name="spoken_emoji_1F5FD">Statue of liberty</string>
+ <!-- Spoken description for Unicode code point U+1F5FE -->
+ <string name="spoken_emoji_1F5FE">Silhouette of japan</string>
+ <!-- Spoken description for Unicode code point U+1F5FF -->
+ <string name="spoken_emoji_1F5FF">Moyai</string>
+ <!-- Spoken description for Unicode code point U+1F600 -->
+ <string name="spoken_emoji_1F600">Grinning face</string>
+ <!-- Spoken description for Unicode code point U+1F601 -->
+ <string name="spoken_emoji_1F601">Grinning face with smiling eyes</string>
+ <!-- Spoken description for Unicode code point U+1F602 -->
+ <string name="spoken_emoji_1F602">Face with tears of joy</string>
+ <!-- Spoken description for Unicode code point U+1F603 -->
+ <string name="spoken_emoji_1F603">Smiling face with open mouth</string>
+ <!-- Spoken description for Unicode code point U+1F604 -->
+ <string name="spoken_emoji_1F604">Smiling face with open mouth and smiling eyes</string>
+ <!-- Spoken description for Unicode code point U+1F605 -->
+ <string name="spoken_emoji_1F605">Smiling face with open mouth and cold sweat</string>
+ <!-- Spoken description for Unicode code point U+1F606 -->
+ <string name="spoken_emoji_1F606">Smiling face with open mouth and tightly-closed eyes</string>
+ <!-- Spoken description for Unicode code point U+1F607 -->
+ <string name="spoken_emoji_1F607">Smiling face with halo</string>
+ <!-- Spoken description for Unicode code point U+1F608 -->
+ <string name="spoken_emoji_1F608">Smiling face with horns</string>
+ <!-- Spoken description for Unicode code point U+1F609 -->
+ <string name="spoken_emoji_1F609">Winking face</string>
+ <!-- Spoken description for Unicode code point U+1F60A -->
+ <string name="spoken_emoji_1F60A">Smiling face with smiling eyes</string>
+ <!-- Spoken description for Unicode code point U+1F60B -->
+ <string name="spoken_emoji_1F60B">Face savouring delicious food</string>
+ <!-- Spoken description for Unicode code point U+1F60C -->
+ <string name="spoken_emoji_1F60C">Relieved face</string>
+ <!-- Spoken description for Unicode code point U+1F60D -->
+ <string name="spoken_emoji_1F60D">Smiling face with heart-shaped eyes</string>
+ <!-- Spoken description for Unicode code point U+1F60E -->
+ <string name="spoken_emoji_1F60E">Smiling face with sunglasses</string>
+ <!-- Spoken description for Unicode code point U+1F60F -->
+ <string name="spoken_emoji_1F60F">Smirking face</string>
+ <!-- Spoken description for Unicode code point U+1F610 -->
+ <string name="spoken_emoji_1F610">Neutral face</string>
+ <!-- Spoken description for Unicode code point U+1F611 -->
+ <string name="spoken_emoji_1F611">Expressionless face</string>
+ <!-- Spoken description for Unicode code point U+1F612 -->
+ <string name="spoken_emoji_1F612">Unamused face</string>
+ <!-- Spoken description for Unicode code point U+1F613 -->
+ <string name="spoken_emoji_1F613">Face with cold sweat</string>
+ <!-- Spoken description for Unicode code point U+1F614 -->
+ <string name="spoken_emoji_1F614">Pensive face</string>
+ <!-- Spoken description for Unicode code point U+1F615 -->
+ <string name="spoken_emoji_1F615">Confused face</string>
+ <!-- Spoken description for Unicode code point U+1F616 -->
+ <string name="spoken_emoji_1F616">Confounded face</string>
+ <!-- Spoken description for Unicode code point U+1F617 -->
+ <string name="spoken_emoji_1F617">Kissing face</string>
+ <!-- Spoken description for Unicode code point U+1F618 -->
+ <string name="spoken_emoji_1F618">Face throwing a kiss</string>
+ <!-- Spoken description for Unicode code point U+1F619 -->
+ <string name="spoken_emoji_1F619">Kissing face with smiling eyes</string>
+ <!-- Spoken description for Unicode code point U+1F61A -->
+ <string name="spoken_emoji_1F61A">Kissing face with closed eyes</string>
+ <!-- Spoken description for Unicode code point U+1F61B -->
+ <string name="spoken_emoji_1F61B">Face with stuck-out tongue</string>
+ <!-- Spoken description for Unicode code point U+1F61C -->
+ <string name="spoken_emoji_1F61C">Face with stuck-out tongue and winking eye</string>
+ <!-- Spoken description for Unicode code point U+1F61D -->
+ <string name="spoken_emoji_1F61D">Face with stuck-out tongue and tightly-closed eyes</string>
+ <!-- Spoken description for Unicode code point U+1F61E -->
+ <string name="spoken_emoji_1F61E">Disappointed face</string>
+ <!-- Spoken description for Unicode code point U+1F61F -->
+ <string name="spoken_emoji_1F61F">Worried face</string>
+ <!-- Spoken description for Unicode code point U+1F620 -->
+ <string name="spoken_emoji_1F620">Angry face</string>
+ <!-- Spoken description for Unicode code point U+1F621 -->
+ <string name="spoken_emoji_1F621">Pouting face</string>
+ <!-- Spoken description for Unicode code point U+1F622 -->
+ <string name="spoken_emoji_1F622">Crying face</string>
+ <!-- Spoken description for Unicode code point U+1F623 -->
+ <string name="spoken_emoji_1F623">Persevering face</string>
+ <!-- Spoken description for Unicode code point U+1F624 -->
+ <string name="spoken_emoji_1F624">Face with look of triumph</string>
+ <!-- Spoken description for Unicode code point U+1F625 -->
+ <string name="spoken_emoji_1F625">Disappointed but relieved face</string>
+ <!-- Spoken description for Unicode code point U+1F626 -->
+ <string name="spoken_emoji_1F626">Frowning face with open mouth</string>
+ <!-- Spoken description for Unicode code point U+1F627 -->
+ <string name="spoken_emoji_1F627">Anguished face</string>
+ <!-- Spoken description for Unicode code point U+1F628 -->
+ <string name="spoken_emoji_1F628">Fearful face</string>
+ <!-- Spoken description for Unicode code point U+1F629 -->
+ <string name="spoken_emoji_1F629">Weary face</string>
+ <!-- Spoken description for Unicode code point U+1F62A -->
+ <string name="spoken_emoji_1F62A">Sleepy face</string>
+ <!-- Spoken description for Unicode code point U+1F62B -->
+ <string name="spoken_emoji_1F62B">Tired face</string>
+ <!-- Spoken description for Unicode code point U+1F62C -->
+ <string name="spoken_emoji_1F62C">Grimacing face</string>
+ <!-- Spoken description for Unicode code point U+1F62D -->
+ <string name="spoken_emoji_1F62D">Loudly crying face</string>
+ <!-- Spoken description for Unicode code point U+1F62E -->
+ <string name="spoken_emoji_1F62E">Face with open mouth</string>
+ <!-- Spoken description for Unicode code point U+1F62F -->
+ <string name="spoken_emoji_1F62F">Hushed face</string>
+ <!-- Spoken description for Unicode code point U+1F630 -->
+ <string name="spoken_emoji_1F630">Face with open mouth and cold sweat</string>
+ <!-- Spoken description for Unicode code point U+1F631 -->
+ <string name="spoken_emoji_1F631">Face screaming in fear</string>
+ <!-- Spoken description for Unicode code point U+1F632 -->
+ <string name="spoken_emoji_1F632">Astonished face</string>
+ <!-- Spoken description for Unicode code point U+1F633 -->
+ <string name="spoken_emoji_1F633">Flushed face</string>
+ <!-- Spoken description for Unicode code point U+1F634 -->
+ <string name="spoken_emoji_1F634">Sleeping face</string>
+ <!-- Spoken description for Unicode code point U+1F635 -->
+ <string name="spoken_emoji_1F635">Dizzy face</string>
+ <!-- Spoken description for Unicode code point U+1F636 -->
+ <string name="spoken_emoji_1F636">Face without mouth</string>
+ <!-- Spoken description for Unicode code point U+1F637 -->
+ <string name="spoken_emoji_1F637">Face with medical mask</string>
+ <!-- Spoken description for Unicode code point U+1F638 -->
+ <string name="spoken_emoji_1F638">Grinning cat face with smiling eyes</string>
+ <!-- Spoken description for Unicode code point U+1F639 -->
+ <string name="spoken_emoji_1F639">Cat face with tears of joy</string>
+ <!-- Spoken description for Unicode code point U+1F63A -->
+ <string name="spoken_emoji_1F63A">Smiling cat face with open mouth</string>
+ <!-- Spoken description for Unicode code point U+1F63B -->
+ <string name="spoken_emoji_1F63B">Smiling cat face with heart-shaped eyes</string>
+ <!-- Spoken description for Unicode code point U+1F63C -->
+ <string name="spoken_emoji_1F63C">Cat face with wry smile</string>
+ <!-- Spoken description for Unicode code point U+1F63D -->
+ <string name="spoken_emoji_1F63D">Kissing cat face with closed eyes</string>
+ <!-- Spoken description for Unicode code point U+1F63E -->
+ <string name="spoken_emoji_1F63E">Pouting cat face</string>
+ <!-- Spoken description for Unicode code point U+1F63F -->
+ <string name="spoken_emoji_1F63F">Crying cat face</string>
+ <!-- Spoken description for Unicode code point U+1F640 -->
+ <string name="spoken_emoji_1F640">Weary cat face</string>
+ <!-- Spoken description for Unicode code point U+1F645 -->
+ <string name="spoken_emoji_1F645">Face with no good gesture</string>
+ <!-- Spoken description for Unicode code point U+1F646 -->
+ <string name="spoken_emoji_1F646">Face with ok gesture</string>
+ <!-- Spoken description for Unicode code point U+1F647 -->
+ <string name="spoken_emoji_1F647">Person bowing deeply</string>
+ <!-- Spoken description for Unicode code point U+1F648 -->
+ <string name="spoken_emoji_1F648">See-no-evil monkey</string>
+ <!-- Spoken description for Unicode code point U+1F649 -->
+ <string name="spoken_emoji_1F649">Hear-no-evil monkey</string>
+ <!-- Spoken description for Unicode code point U+1F64A -->
+ <string name="spoken_emoji_1F64A">Speak-no-evil monkey</string>
+ <!-- Spoken description for Unicode code point U+1F64B -->
+ <string name="spoken_emoji_1F64B">Happy person raising one hand</string>
+ <!-- Spoken description for Unicode code point U+1F64C -->
+ <string name="spoken_emoji_1F64C">Person raising both hands in celebration</string>
+ <!-- Spoken description for Unicode code point U+1F64D -->
+ <string name="spoken_emoji_1F64D">Person frowning</string>
+ <!-- Spoken description for Unicode code point U+1F64E -->
+ <string name="spoken_emoji_1F64E">Person with pouting face</string>
+ <!-- Spoken description for Unicode code point U+1F64F -->
+ <string name="spoken_emoji_1F64F">Person with folded hands</string>
+ <!-- Spoken description for Unicode code point U+1F680 -->
+ <string name="spoken_emoji_1F680">Rocket</string>
+ <!-- Spoken description for Unicode code point U+1F681 -->
+ <string name="spoken_emoji_1F681">Helicopter</string>
+ <!-- Spoken description for Unicode code point U+1F682 -->
+ <string name="spoken_emoji_1F682">Steam locomotive</string>
+ <!-- Spoken description for Unicode code point U+1F683 -->
+ <string name="spoken_emoji_1F683">Railway car</string>
+ <!-- Spoken description for Unicode code point U+1F684 -->
+ <string name="spoken_emoji_1F684">High-speed train</string>
+ <!-- Spoken description for Unicode code point U+1F685 -->
+ <string name="spoken_emoji_1F685">High-speed train with bullet nose</string>
+ <!-- Spoken description for Unicode code point U+1F686 -->
+ <string name="spoken_emoji_1F686">Train</string>
+ <!-- Spoken description for Unicode code point U+1F687 -->
+ <string name="spoken_emoji_1F687">Metro</string>
+ <!-- Spoken description for Unicode code point U+1F688 -->
+ <string name="spoken_emoji_1F688">Light rail</string>
+ <!-- Spoken description for Unicode code point U+1F689 -->
+ <string name="spoken_emoji_1F689">Station</string>
+ <!-- Spoken description for Unicode code point U+1F68A -->
+ <string name="spoken_emoji_1F68A">Tram</string>
+ <!-- Spoken description for Unicode code point U+1F68B -->
+ <string name="spoken_emoji_1F68B">Tram car</string>
+ <!-- Spoken description for Unicode code point U+1F68C -->
+ <string name="spoken_emoji_1F68C">Bus</string>
+ <!-- Spoken description for Unicode code point U+1F68D -->
+ <string name="spoken_emoji_1F68D">Oncoming bus</string>
+ <!-- Spoken description for Unicode code point U+1F68E -->
+ <string name="spoken_emoji_1F68E">Trolleybus</string>
+ <!-- Spoken description for Unicode code point U+1F68F -->
+ <string name="spoken_emoji_1F68F">Bus stop</string>
+ <!-- Spoken description for Unicode code point U+1F690 -->
+ <string name="spoken_emoji_1F690">Minibus</string>
+ <!-- Spoken description for Unicode code point U+1F691 -->
+ <string name="spoken_emoji_1F691">Ambulance</string>
+ <!-- Spoken description for Unicode code point U+1F692 -->
+ <string name="spoken_emoji_1F692">Fire engine</string>
+ <!-- Spoken description for Unicode code point U+1F693 -->
+ <string name="spoken_emoji_1F693">Police car</string>
+ <!-- Spoken description for Unicode code point U+1F694 -->
+ <string name="spoken_emoji_1F694">Oncoming police car</string>
+ <!-- Spoken description for Unicode code point U+1F695 -->
+ <string name="spoken_emoji_1F695">Taxi</string>
+ <!-- Spoken description for Unicode code point U+1F696 -->
+ <string name="spoken_emoji_1F696">Oncoming taxi</string>
+ <!-- Spoken description for Unicode code point U+1F697 -->
+ <string name="spoken_emoji_1F697">Automobile</string>
+ <!-- Spoken description for Unicode code point U+1F698 -->
+ <string name="spoken_emoji_1F698">Oncoming automobile</string>
+ <!-- Spoken description for Unicode code point U+1F699 -->
+ <string name="spoken_emoji_1F699">Recreational vehicle</string>
+ <!-- Spoken description for Unicode code point U+1F69A -->
+ <string name="spoken_emoji_1F69A">Delivery truck</string>
+ <!-- Spoken description for Unicode code point U+1F69B -->
+ <string name="spoken_emoji_1F69B">Articulated lorry</string>
+ <!-- Spoken description for Unicode code point U+1F69C -->
+ <string name="spoken_emoji_1F69C">Tractor</string>
+ <!-- Spoken description for Unicode code point U+1F69D -->
+ <string name="spoken_emoji_1F69D">Monorail</string>
+ <!-- Spoken description for Unicode code point U+1F69E -->
+ <string name="spoken_emoji_1F69E">Mountain railway</string>
+ <!-- Spoken description for Unicode code point U+1F69F -->
+ <string name="spoken_emoji_1F69F">Suspension railway</string>
+ <!-- Spoken description for Unicode code point U+1F6A0 -->
+ <string name="spoken_emoji_1F6A0">Mountain cableway</string>
+ <!-- Spoken description for Unicode code point U+1F6A1 -->
+ <string name="spoken_emoji_1F6A1">Aerial tramway</string>
+ <!-- Spoken description for Unicode code point U+1F6A2 -->
+ <string name="spoken_emoji_1F6A2">Ship</string>
+ <!-- Spoken description for Unicode code point U+1F6A3 -->
+ <string name="spoken_emoji_1F6A3">Rowboat</string>
+ <!-- Spoken description for Unicode code point U+1F6A4 -->
+ <string name="spoken_emoji_1F6A4">Speedboat</string>
+ <!-- Spoken description for Unicode code point U+1F6A5 -->
+ <string name="spoken_emoji_1F6A5">Horizontal traffic light</string>
+ <!-- Spoken description for Unicode code point U+1F6A6 -->
+ <string name="spoken_emoji_1F6A6">Vertical traffic light</string>
+ <!-- Spoken description for Unicode code point U+1F6A7 -->
+ <string name="spoken_emoji_1F6A7">Construction sign</string>
+ <!-- Spoken description for Unicode code point U+1F6A8 -->
+ <string name="spoken_emoji_1F6A8">Police cars revolving light</string>
+ <!-- Spoken description for Unicode code point U+1F6A9 -->
+ <string name="spoken_emoji_1F6A9">Triangular flag on post</string>
+ <!-- Spoken description for Unicode code point U+1F6AA -->
+ <string name="spoken_emoji_1F6AA">Door</string>
+ <!-- Spoken description for Unicode code point U+1F6AB -->
+ <string name="spoken_emoji_1F6AB">No entry sign</string>
+ <!-- Spoken description for Unicode code point U+1F6AC -->
+ <string name="spoken_emoji_1F6AC">Smoking symbol</string>
+ <!-- Spoken description for Unicode code point U+1F6AD -->
+ <string name="spoken_emoji_1F6AD">No smoking symbol</string>
+ <!-- Spoken description for Unicode code point U+1F6AE -->
+ <string name="spoken_emoji_1F6AE">Put litter in its place symbol</string>
+ <!-- Spoken description for Unicode code point U+1F6AF -->
+ <string name="spoken_emoji_1F6AF">Do not litter symbol</string>
+ <!-- Spoken description for Unicode code point U+1F6B0 -->
+ <string name="spoken_emoji_1F6B0">Potable water symbol</string>
+ <!-- Spoken description for Unicode code point U+1F6B1 -->
+ <string name="spoken_emoji_1F6B1">Non-potable water symbol</string>
+ <!-- Spoken description for Unicode code point U+1F6B2 -->
+ <string name="spoken_emoji_1F6B2">Bicycle</string>
+ <!-- Spoken description for Unicode code point U+1F6B3 -->
+ <string name="spoken_emoji_1F6B3">No bicycles</string>
+ <!-- Spoken description for Unicode code point U+1F6B4 -->
+ <string name="spoken_emoji_1F6B4">Bicyclist</string>
+ <!-- Spoken description for Unicode code point U+1F6B5 -->
+ <string name="spoken_emoji_1F6B5">Mountain bicyclist</string>
+ <!-- Spoken description for Unicode code point U+1F6B6 -->
+ <string name="spoken_emoji_1F6B6">Pedestrian</string>
+ <!-- Spoken description for Unicode code point U+1F6B7 -->
+ <string name="spoken_emoji_1F6B7">No pedestrians</string>
+ <!-- Spoken description for Unicode code point U+1F6B8 -->
+ <string name="spoken_emoji_1F6B8">Children crossing</string>
+ <!-- Spoken description for Unicode code point U+1F6B9 -->
+ <string name="spoken_emoji_1F6B9">Mens symbol</string>
+ <!-- Spoken description for Unicode code point U+1F6BA -->
+ <string name="spoken_emoji_1F6BA">Womens symbol</string>
+ <!-- Spoken description for Unicode code point U+1F6BB -->
+ <string name="spoken_emoji_1F6BB">Restroom</string>
+ <!-- Spoken description for Unicode code point U+1F6BC -->
+ <string name="spoken_emoji_1F6BC">Baby symbol</string>
+ <!-- Spoken description for Unicode code point U+1F6BD -->
+ <string name="spoken_emoji_1F6BD">Toilet</string>
+ <!-- Spoken description for Unicode code point U+1F6BE -->
+ <string name="spoken_emoji_1F6BE">Water closet</string>
+ <!-- Spoken description for Unicode code point U+1F6BF -->
+ <string name="spoken_emoji_1F6BF">Shower</string>
+ <!-- Spoken description for Unicode code point U+1F6C0 -->
+ <string name="spoken_emoji_1F6C0">Bath</string>
+ <!-- Spoken description for Unicode code point U+1F6C1 -->
+ <string name="spoken_emoji_1F6C1">Bathtub</string>
+ <!-- Spoken description for Unicode code point U+1F6C2 -->
+ <string name="spoken_emoji_1F6C2">Passport control</string>
+ <!-- Spoken description for Unicode code point U+1F6C3 -->
+ <string name="spoken_emoji_1F6C3">Customs</string>
+ <!-- Spoken description for Unicode code point U+1F6C4 -->
+ <string name="spoken_emoji_1F6C4">Baggage claim</string>
+ <!-- Spoken description for Unicode code point U+1F6C5 -->
+ <string name="spoken_emoji_1F6C5">Left luggage</string>
+</resources>
diff --git a/java/src/com/android/inputmethod/accessibility/AccessibilityUtils.java b/java/src/com/android/inputmethod/accessibility/AccessibilityUtils.java
index bc094b117..d50dd3ee6 100644
--- a/java/src/com/android/inputmethod/accessibility/AccessibilityUtils.java
+++ b/java/src/com/android/inputmethod/accessibility/AccessibilityUtils.java
@@ -68,7 +68,6 @@ public final class AccessibilityUtils {
// These only need to be initialized if the kill switch is off.
sInstance.initInternal(context);
KeyCodeDescriptionMapper.init();
- AccessibleKeyboardViewProxy.init(context);
}
public static AccessibilityUtils getInstance() {
diff --git a/java/src/com/android/inputmethod/accessibility/AccessibleKeyboardViewProxy.java b/java/src/com/android/inputmethod/accessibility/MainKeyboardAccessibilityDelegate.java
index 15f79f3de..10929424b 100644
--- a/java/src/com/android/inputmethod/accessibility/AccessibleKeyboardViewProxy.java
+++ b/java/src/com/android/inputmethod/accessibility/MainKeyboardAccessibilityDelegate.java
@@ -36,9 +36,7 @@ import com.android.inputmethod.keyboard.MainKeyboardView;
import com.android.inputmethod.latin.R;
import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
-public final class AccessibleKeyboardViewProxy extends AccessibilityDelegateCompat {
- private static final AccessibleKeyboardViewProxy sInstance = new AccessibleKeyboardViewProxy();
-
+public final class MainKeyboardAccessibilityDelegate extends AccessibilityDelegateCompat {
/** Map of keyboard modes to resource IDs. */
private static final SparseIntArray KEYBOARD_MODE_RES_IDS = new SparseIntArray();
@@ -54,9 +52,9 @@ public final class AccessibleKeyboardViewProxy extends AccessibilityDelegateComp
KEYBOARD_MODE_RES_IDS.put(KeyboardId.MODE_URL, R.string.keyboard_mode_url);
}
- private MainKeyboardView mView;
+ private final MainKeyboardView mView;
private Keyboard mKeyboard;
- private AccessibilityEntityProvider mAccessibilityNodeProvider;
+ private MainKeyboardAccessibilityNodeProvider mAccessibilityNodeProvider;
private Key mLastHoverKey = null;
@@ -69,46 +67,14 @@ public final class AccessibleKeyboardViewProxy extends AccessibilityDelegateComp
private int mLastKeyboardMode = KEYBOARD_IS_HIDDEN;
private static final int KEYBOARD_IS_HIDDEN = -1;
- public static void init(final Context context) {
- sInstance.initInternal(context);
- }
-
- public static AccessibleKeyboardViewProxy getInstance() {
- return sInstance;
- }
-
- private AccessibleKeyboardViewProxy() {
- // Not publicly instantiable.
- }
-
- private void initInternal(final Context context) {
+ public MainKeyboardAccessibilityDelegate(final MainKeyboardView view) {
+ final Context context = view.getContext();
mEdgeSlop = context.getResources().getDimensionPixelSize(
R.dimen.config_accessibility_edge_slop);
- }
-
- /**
- * Sets the view wrapped by this proxy.
- *
- * @param view The view to wrap.
- */
- public void setView(final MainKeyboardView view) {
- if (view == null) {
- // Ignore null views.
- return;
- }
mView = view;
// Ensure that the view has an accessibility delegate.
ViewCompat.setAccessibilityDelegate(view, this);
-
- if (mAccessibilityNodeProvider == null) {
- return;
- }
- mAccessibilityNodeProvider.setView(view);
-
- // Since this class is constructed lazily, we might not get a subsequent
- // call to setKeyboard() and therefore need to call it now.
- setKeyboard(view.getKeyboard());
}
/**
@@ -156,9 +122,6 @@ public final class AccessibleKeyboardViewProxy extends AccessibilityDelegateComp
* Called when the keyboard is hidden and accessibility is enabled.
*/
public void onHideWindow() {
- if (mView == null) {
- return;
- }
announceKeyboardHidden();
mLastKeyboardMode = KEYBOARD_IS_HIDDEN;
}
@@ -264,7 +227,7 @@ public final class AccessibleKeyboardViewProxy extends AccessibilityDelegateComp
}
/**
- * Proxy method for View.getAccessibilityNodeProvider(). This method is called in SDK
+ * Delegate method for View.getAccessibilityNodeProvider(). This method is called in SDK
* version 15 (Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) and higher to obtain the virtual
* node hierarchy provider.
*
@@ -272,10 +235,7 @@ public final class AccessibleKeyboardViewProxy extends AccessibilityDelegateComp
* @return The accessibility node provider for the current keyboard.
*/
@Override
- public AccessibilityEntityProvider getAccessibilityNodeProvider(final View host) {
- if (mView == null) {
- return null;
- }
+ public MainKeyboardAccessibilityNodeProvider getAccessibilityNodeProvider(final View host) {
return getAccessibilityNodeProvider();
}
@@ -288,10 +248,6 @@ public final class AccessibleKeyboardViewProxy extends AccessibilityDelegateComp
* @return {@code true} if the event is handled
*/
public boolean dispatchHoverEvent(final MotionEvent event, final KeyDetector keyDetector) {
- if (mView == null) {
- return false;
- }
-
final int x = (int) event.getX();
final int y = (int) event.getY();
final Key previousKey = mLastHoverKey;
@@ -325,14 +281,14 @@ public final class AccessibleKeyboardViewProxy extends AccessibilityDelegateComp
}
/**
- * @return A lazily-instantiated node provider for this view proxy.
+ * @return A lazily-instantiated node provider for this view delegate.
*/
- private AccessibilityEntityProvider getAccessibilityNodeProvider() {
+ private MainKeyboardAccessibilityNodeProvider getAccessibilityNodeProvider() {
// Instantiate the provide only when requested. Since the system
// will call this method multiple times it is a good practice to
// cache the provider instance.
if (mAccessibilityNodeProvider == null) {
- mAccessibilityNodeProvider = new AccessibilityEntityProvider(mView);
+ mAccessibilityNodeProvider = new MainKeyboardAccessibilityNodeProvider(mView);
}
return mAccessibilityNodeProvider;
}
@@ -417,7 +373,7 @@ public final class AccessibleKeyboardViewProxy extends AccessibilityDelegateComp
if (key == null) {
return false;
}
- final AccessibilityEntityProvider provider = getAccessibilityNodeProvider();
+ final MainKeyboardAccessibilityNodeProvider provider = getAccessibilityNodeProvider();
switch (event.getAction()) {
case MotionEvent.ACTION_HOVER_ENTER:
diff --git a/java/src/com/android/inputmethod/accessibility/AccessibilityEntityProvider.java b/java/src/com/android/inputmethod/accessibility/MainKeyboardAccessibilityNodeProvider.java
index ec1ab3565..f69d316c9 100644
--- a/java/src/com/android/inputmethod/accessibility/AccessibilityEntityProvider.java
+++ b/java/src/com/android/inputmethod/accessibility/MainKeyboardAccessibilityNodeProvider.java
@@ -47,8 +47,8 @@ import java.util.List;
* virtual views, thus conveying their logical structure.
* </p>
*/
-public final class AccessibilityEntityProvider extends AccessibilityNodeProviderCompat {
- private static final String TAG = AccessibilityEntityProvider.class.getSimpleName();
+public final class MainKeyboardAccessibilityNodeProvider extends AccessibilityNodeProviderCompat {
+ private static final String TAG = MainKeyboardAccessibilityNodeProvider.class.getSimpleName();
private static final int UNDEFINED = Integer.MIN_VALUE;
private final KeyCodeDescriptionMapper mKeyCodeDescriptionMapper;
@@ -64,23 +64,14 @@ public final class AccessibilityEntityProvider extends AccessibilityNodeProvider
private int mAccessibilityFocusedView = UNDEFINED;
/** The current keyboard view. */
- private KeyboardView mKeyboardView;
+ private final KeyboardView mKeyboardView;
/** The current keyboard. */
private Keyboard mKeyboard;
- public AccessibilityEntityProvider(final KeyboardView keyboardView) {
+ public MainKeyboardAccessibilityNodeProvider(final KeyboardView keyboardView) {
mKeyCodeDescriptionMapper = KeyCodeDescriptionMapper.getInstance();
mAccessibilityUtils = AccessibilityUtils.getInstance();
- setView(keyboardView);
- }
-
- /**
- * Sets the keyboard view represented by this node provider.
- *
- * @param keyboardView The keyboard view to represent.
- */
- public void setView(final KeyboardView keyboardView) {
mKeyboardView = keyboardView;
updateParentLocation();
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
index 0e667bc1c..589e99ea6 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
@@ -26,7 +26,6 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.inputmethod.EditorInfo;
-import com.android.inputmethod.accessibility.AccessibleKeyboardViewProxy;
import com.android.inputmethod.compat.InputMethodServiceCompatUtils;
import com.android.inputmethod.keyboard.KeyboardLayoutSet.KeyboardLayoutSetException;
import com.android.inputmethod.keyboard.internal.KeyboardState;
@@ -148,6 +147,7 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
public void onHideWindow() {
mIsAutoCorrectionActive = false;
+ mKeyboardView.onHideWindow();
}
private void setKeyboard(final Keyboard keyboard) {
@@ -353,11 +353,6 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
mEmojiPalettesView.setHardwareAcceleratedDrawingEnabled(
isHardwareAcceleratedDrawingEnabled);
mEmojiPalettesView.setKeyboardActionListener(mLatinIME);
-
- // This always needs to be set since the accessibility state can
- // potentially change without the input view being re-created.
- AccessibleKeyboardViewProxy.getInstance().setView(mKeyboardView);
-
return mCurrentInputView;
}
diff --git a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
index ecef8cc6c..8f79a9128 100644
--- a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
@@ -39,7 +39,7 @@ import android.view.inputmethod.InputMethodSubtype;
import android.widget.TextView;
import com.android.inputmethod.accessibility.AccessibilityUtils;
-import com.android.inputmethod.accessibility.AccessibleKeyboardViewProxy;
+import com.android.inputmethod.accessibility.MainKeyboardAccessibilityDelegate;
import com.android.inputmethod.annotations.ExternallyReferenced;
import com.android.inputmethod.keyboard.internal.DrawingHandler;
import com.android.inputmethod.keyboard.internal.DrawingPreviewPlacerView;
@@ -179,6 +179,8 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
private final DrawingHandler mDrawingHandler =
new DrawingHandler(this);
+ private final MainKeyboardAccessibilityDelegate mAccessibilityDelegate;
+
public MainKeyboardView(final Context context, final AttributeSet attrs) {
this(context, attrs, R.attr.mainKeyboardViewStyle);
}
@@ -278,6 +280,8 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
mLanguageOnSpacebarHorizontalMargin = (int)getResources().getDimension(
R.dimen.config_language_on_spacebar_horizontal_margin);
+
+ mAccessibilityDelegate = new MainKeyboardAccessibilityDelegate(this);
}
@Override
@@ -404,9 +408,7 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
ResearchLogger.mainKeyboardView_setKeyboard(keyboard, orientation);
}
- // This always needs to be set since the accessibility state can
- // potentially change without the keyboard being set again.
- AccessibleKeyboardViewProxy.getInstance().setKeyboard(keyboard);
+ mAccessibilityDelegate.setKeyboard(keyboard);
}
/**
@@ -769,6 +771,12 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
mMoreKeysKeyboardCache.clear();
}
+ public void onHideWindow() {
+ if (AccessibilityUtils.getInstance().isAccessibilityEnabled()) {
+ mAccessibilityDelegate.onHideWindow();
+ }
+ }
+
/**
* Receives hover events from the input framework.
*
@@ -779,8 +787,7 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
@Override
public boolean dispatchHoverEvent(final MotionEvent event) {
if (AccessibilityUtils.getInstance().isTouchExplorationEnabled()) {
- return AccessibleKeyboardViewProxy.getInstance().dispatchHoverEvent(
- event, mKeyDetector);
+ return mAccessibilityDelegate.dispatchHoverEvent(event, mKeyDetector);
}
// Reflection doesn't support calling superclass methods.
diff --git a/java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java b/java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java
index 09d0ea210..9bc01a2b1 100644
--- a/java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java
@@ -29,6 +29,7 @@ import android.provider.ContactsContract.Contacts;
import android.text.TextUtils;
import android.util.Log;
+import com.android.inputmethod.annotations.UsedForTesting;
import com.android.inputmethod.latin.personalization.AccountUtils;
import com.android.inputmethod.latin.utils.StringUtils;
@@ -61,9 +62,6 @@ public class ContactsBinaryDictionary extends ExpandableBinaryDictionary {
/** The number of contacts in the most recent dictionary rebuild. */
static private int sContactCountAtLastRebuild = 0;
- /** The locale for this contacts dictionary. Controls name bigram predictions. */
- public final Locale mLocale;
-
private ContentObserver mObserver;
/**
@@ -71,11 +69,7 @@ public class ContactsBinaryDictionary extends ExpandableBinaryDictionary {
*/
private final boolean mUseFirstLastBigrams;
- public ContactsBinaryDictionary(final Context context, final Locale locale) {
- this(context, locale, null /* dictFile */);
- }
-
- public ContactsBinaryDictionary(final Context context, final Locale locale,
+ private ContactsBinaryDictionary(final Context context, final Locale locale,
final File dictFile) {
this(context, locale, dictFile, NAME);
}
@@ -84,12 +78,17 @@ public class ContactsBinaryDictionary extends ExpandableBinaryDictionary {
final File dictFile, final String name) {
super(context, getDictName(name, locale, dictFile), locale, Dictionary.TYPE_CONTACTS,
dictFile);
- mLocale = locale;
mUseFirstLastBigrams = useFirstLastBigramsForLocale(locale);
registerObserver(context);
reloadDictionaryIfRequired();
}
+ @UsedForTesting
+ public static ContactsBinaryDictionary getDictionary(final Context context, final Locale locale,
+ final File dictFile) {
+ return new ContactsBinaryDictionary(context, locale, dictFile);
+ }
+
private synchronized void registerObserver(final Context context) {
if (mObserver != null) return;
ContentResolver cres = context.getContentResolver();
diff --git a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java b/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java
index b6fcbd1d6..627793f18 100644
--- a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java
+++ b/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java
@@ -24,7 +24,6 @@ import com.android.inputmethod.annotations.UsedForTesting;
import com.android.inputmethod.keyboard.ProximityInfo;
import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
import com.android.inputmethod.latin.personalization.PersonalizationDictionary;
-import com.android.inputmethod.latin.personalization.PersonalizationHelper;
import com.android.inputmethod.latin.personalization.UserHistoryDictionary;
import com.android.inputmethod.latin.utils.CollectionUtils;
import com.android.inputmethod.latin.utils.ExecutorUtils;
@@ -32,10 +31,14 @@ import com.android.inputmethod.latin.utils.LanguageModelParam;
import com.android.inputmethod.latin.utils.SuggestionResults;
import java.io.File;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
+import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -54,7 +57,7 @@ public class DictionaryFacilitatorForSuggest {
// To synchronize assigning mDictionaries to ensure closing dictionaries.
private Object mLock = new Object();
- private static final String[] dictTypesOrderedToGetSuggestion =
+ private static final String[] DICT_TYPES_ORDERED_TO_GET_SUGGESTION =
new String[] {
Dictionary.TYPE_MAIN,
Dictionary.TYPE_USER_HISTORY,
@@ -63,13 +66,30 @@ public class DictionaryFacilitatorForSuggest {
Dictionary.TYPE_CONTACTS
};
+ private static final Map<String, Class<? extends ExpandableBinaryDictionary>>
+ DICT_TYPE_TO_CLASS = CollectionUtils.newHashMap();
+
+ static {
+ DICT_TYPE_TO_CLASS.put(Dictionary.TYPE_USER_HISTORY, UserHistoryDictionary.class);
+ DICT_TYPE_TO_CLASS.put(Dictionary.TYPE_PERSONALIZATION, PersonalizationDictionary.class);
+ DICT_TYPE_TO_CLASS.put(Dictionary.TYPE_USER, UserBinaryDictionary.class);
+ DICT_TYPE_TO_CLASS.put(Dictionary.TYPE_CONTACTS, ContactsBinaryDictionary.class);
+ }
+
+ private static final String DICT_FACTORY_METHOD_NAME = "getDictionary";
+ private static final Class<?>[] DICT_FACTORY_METHOD_ARG_TYPES =
+ new Class[] { Context.class, Locale.class, File.class };
+
+ private static final String[] SUB_DICT_TYPES =
+ Arrays.copyOfRange(DICT_TYPES_ORDERED_TO_GET_SUGGESTION, 1 /* start */,
+ DICT_TYPES_ORDERED_TO_GET_SUGGESTION.length);
+
/**
* Class contains dictionaries for a locale.
*/
private static class Dictionaries {
public final Locale mLocale;
- public final ConcurrentHashMap<String, Dictionary> mDictMap =
- CollectionUtils.newConcurrentHashMap();
+ private Dictionary mMainDict;
public final ConcurrentHashMap<String, ExpandableBinaryDictionary> mSubDictMap =
CollectionUtils.newConcurrentHashMap();
@@ -78,41 +98,36 @@ public class DictionaryFacilitatorForSuggest {
}
public Dictionaries(final Locale locale, final Dictionary mainDict,
- final ExpandableBinaryDictionary contactsDict,
- final ExpandableBinaryDictionary userDict,
- final ExpandableBinaryDictionary userHistoryDict,
- final ExpandableBinaryDictionary personalizationDict) {
+ final Map<String, ExpandableBinaryDictionary> subDicts) {
mLocale = locale;
// Main dictionary can be asynchronously loaded.
setMainDict(mainDict);
- setSubDict(Dictionary.TYPE_CONTACTS, contactsDict);
- setSubDict(Dictionary.TYPE_USER, userDict);
- setSubDict(Dictionary.TYPE_USER_HISTORY, userHistoryDict);
- setSubDict(Dictionary.TYPE_PERSONALIZATION, personalizationDict);
+ for (final Map.Entry<String, ExpandableBinaryDictionary> entry : subDicts.entrySet()) {
+ setSubDict(entry.getKey(), entry.getValue());
+ }
}
private void setSubDict(final String dictType, final ExpandableBinaryDictionary dict) {
if (dict != null) {
- mDictMap.put(dictType, dict);
mSubDictMap.put(dictType, dict);
}
}
public void setMainDict(final Dictionary mainDict) {
// Close old dictionary if exists. Main dictionary can be assigned multiple times.
- final Dictionary oldDict;
- if (mainDict != null) {
- oldDict = mDictMap.put(Dictionary.TYPE_MAIN, mainDict);
- } else {
- oldDict = mDictMap.remove(Dictionary.TYPE_MAIN);
- }
+ final Dictionary oldDict = mMainDict;
+ mMainDict = mainDict;
if (oldDict != null && mainDict != oldDict) {
oldDict.close();
}
}
- public Dictionary getMainDict() {
- return mDictMap.get(Dictionary.TYPE_MAIN);
+ public Dictionary getDict(final String dictType) {
+ if (Dictionary.TYPE_MAIN.equals(dictType)) {
+ return mMainDict;
+ } else {
+ return getSubDict(dictType);
+ }
}
public ExpandableBinaryDictionary getSubDict(final String dictType) {
@@ -120,12 +135,20 @@ public class DictionaryFacilitatorForSuggest {
}
public boolean hasDict(final String dictType) {
- return mDictMap.containsKey(dictType);
+ if (Dictionary.TYPE_MAIN.equals(dictType)) {
+ return mMainDict != null;
+ } else {
+ return mSubDictMap.containsKey(dictType);
+ }
}
public void closeDict(final String dictType) {
- final Dictionary dict = mDictMap.remove(dictType);
- mSubDictMap.remove(dictType);
+ final Dictionary dict;
+ if (Dictionary.TYPE_MAIN.equals(dictType)) {
+ dict = mMainDict;
+ } else {
+ dict = mSubDictMap.remove(dictType);
+ }
if (dict != null) {
dict.close();
}
@@ -142,6 +165,26 @@ public class DictionaryFacilitatorForSuggest {
return mDictionaries.mLocale;
}
+ private static ExpandableBinaryDictionary getSubDict(final String dictType,
+ final Context context, final Locale locale, final File dictFile) {
+ final Class<? extends ExpandableBinaryDictionary> dictClass =
+ DICT_TYPE_TO_CLASS.get(dictType);
+ if (dictClass == null) {
+ return null;
+ }
+ try {
+ final Method factoryMethod = dictClass.getMethod(DICT_FACTORY_METHOD_NAME,
+ DICT_FACTORY_METHOD_ARG_TYPES);
+ final Object dict = factoryMethod.invoke(null /* obj */,
+ new Object[] { context, locale, dictFile });
+ return (ExpandableBinaryDictionary) dict;
+ } catch (final NoSuchMethodException | SecurityException | IllegalAccessException
+ | IllegalArgumentException | InvocationTargetException e) {
+ Log.e(TAG, "Cannot create dictionary: " + dictType, e);
+ return null;
+ }
+ }
+
public void resetDictionaries(final Context context, final Locale newLocale,
final boolean useContactsDict, final boolean usePersonalizedDicts,
final boolean forceReloadMainDictionary,
@@ -149,64 +192,44 @@ public class DictionaryFacilitatorForSuggest {
final boolean localeHasBeenChanged = !newLocale.equals(mDictionaries.mLocale);
// We always try to have the main dictionary. Other dictionaries can be unused.
final boolean reloadMainDictionary = localeHasBeenChanged || forceReloadMainDictionary;
- final boolean closeContactsDictionary = localeHasBeenChanged || !useContactsDict;
- final boolean closeUserDictionary = localeHasBeenChanged;
- final boolean closeUserHistoryDictionary = localeHasBeenChanged || !usePersonalizedDicts;
- final boolean closePersonalizationDictionary =
- localeHasBeenChanged || !usePersonalizedDicts;
+ // TODO: Make subDictTypesToUse configurable by resource or a static final list.
+ final Set<String> subDictTypesToUse = CollectionUtils.newHashSet();
+ if (useContactsDict) {
+ subDictTypesToUse.add(Dictionary.TYPE_CONTACTS);
+ }
+ subDictTypesToUse.add(Dictionary.TYPE_USER);
+ if (usePersonalizedDicts) {
+ subDictTypesToUse.add(Dictionary.TYPE_USER_HISTORY);
+ subDictTypesToUse.add(Dictionary.TYPE_PERSONALIZATION);
+ }
final Dictionary newMainDict;
if (reloadMainDictionary) {
// The main dictionary will be asynchronously loaded.
newMainDict = null;
} else {
- newMainDict = mDictionaries.getMainDict();
- }
-
- // Open or move contacts dictionary.
- final ExpandableBinaryDictionary newContactsDict;
- if (!closeContactsDictionary && mDictionaries.hasDict(Dictionary.TYPE_CONTACTS)) {
- newContactsDict = mDictionaries.getSubDict(Dictionary.TYPE_CONTACTS);
- } else if (useContactsDict) {
- newContactsDict = new ContactsBinaryDictionary(context, newLocale);
- } else {
- newContactsDict = null;
- }
-
- // Open or move user dictionary.
- final ExpandableBinaryDictionary newUserDictionary;
- if (!closeUserDictionary && mDictionaries.hasDict(Dictionary.TYPE_USER)) {
- newUserDictionary = mDictionaries.getSubDict(Dictionary.TYPE_USER);
- } else {
- newUserDictionary = new UserBinaryDictionary(context, newLocale);
- mIsUserDictEnabled = UserBinaryDictionary.isEnabled(context);
+ newMainDict = mDictionaries.getDict(Dictionary.TYPE_MAIN);
}
- // Open or move user history dictionary.
- final ExpandableBinaryDictionary newUserHistoryDict;
- if (!closeUserHistoryDictionary && mDictionaries.hasDict(Dictionary.TYPE_USER_HISTORY)) {
- newUserHistoryDict = mDictionaries.getSubDict(Dictionary.TYPE_USER_HISTORY);
- } else if (usePersonalizedDicts) {
- newUserHistoryDict = PersonalizationHelper.getUserHistoryDictionary(context, newLocale);
- } else {
- newUserHistoryDict = null;
- }
-
- // Open or move personalization dictionary.
- final ExpandableBinaryDictionary newPersonalizationDict;
- if (!closePersonalizationDictionary
- && mDictionaries.hasDict(Dictionary.TYPE_PERSONALIZATION)) {
- newPersonalizationDict = mDictionaries.getSubDict(Dictionary.TYPE_PERSONALIZATION);
- } else if (usePersonalizedDicts) {
- newPersonalizationDict =
- PersonalizationHelper.getPersonalizationDictionary(context, newLocale);
- } else {
- newPersonalizationDict = null;
+ final Map<String, ExpandableBinaryDictionary> subDicts = CollectionUtils.newHashMap();
+ for (final String dictType : SUB_DICT_TYPES) {
+ if (!subDictTypesToUse.contains(dictType)) {
+ // This dictionary will not be used.
+ continue;
+ }
+ final ExpandableBinaryDictionary dict;
+ if (!localeHasBeenChanged && mDictionaries.hasDict(dictType)) {
+ // Continue to use current dictionary.
+ dict = mDictionaries.getSubDict(dictType);
+ } else {
+ // Start to use new dictionary.
+ dict = getSubDict(dictType, context, newLocale, null /* dictFile */);
+ }
+ subDicts.put(dictType, dict);
}
// Replace Dictionaries.
- final Dictionaries newDictionaries = new Dictionaries(newLocale, newMainDict,
- newContactsDict, newUserDictionary, newUserHistoryDict, newPersonalizationDict);
+ final Dictionaries newDictionaries = new Dictionaries(newLocale, newMainDict, subDicts);
final Dictionaries oldDictionaries;
synchronized (mLock) {
oldDictionaries = mDictionaries;
@@ -218,24 +241,15 @@ public class DictionaryFacilitatorForSuggest {
if (listener != null) {
listener.onUpdateMainDictionaryAvailability(hasInitializedMainDictionary());
}
-
// Clean up old dictionaries.
if (reloadMainDictionary) {
oldDictionaries.closeDict(Dictionary.TYPE_MAIN);
}
- if (closeContactsDictionary) {
- oldDictionaries.closeDict(Dictionary.TYPE_CONTACTS);
- }
- if (closeUserDictionary) {
- oldDictionaries.closeDict(Dictionary.TYPE_USER);
- }
- if (closeUserHistoryDictionary) {
- oldDictionaries.closeDict(Dictionary.TYPE_USER_HISTORY);
- }
- if (closePersonalizationDictionary) {
- oldDictionaries.closeDict(Dictionary.TYPE_PERSONALIZATION);
+ for (final String dictType : SUB_DICT_TYPES) {
+ if (localeHasBeenChanged || !subDictTypesToUse.contains(dictType)) {
+ oldDictionaries.closeDict(dictType);
+ }
}
- oldDictionaries.mDictMap.clear();
oldDictionaries.mSubDictMap.clear();
}
@@ -269,52 +283,28 @@ public class DictionaryFacilitatorForSuggest {
final ArrayList<String> dictionaryTypes, final HashMap<String, File> dictionaryFiles,
final Map<String, Map<String, String>> additionalDictAttributes) {
Dictionary mainDictionary = null;
- ContactsBinaryDictionary contactsDictionary = null;
- UserBinaryDictionary userDictionary = null;
- UserHistoryDictionary userHistoryDictionary = null;
- PersonalizationDictionary personalizationDictionary = null;
+ final Map<String, ExpandableBinaryDictionary> subDicts = CollectionUtils.newHashMap();
for (final String dictType : dictionaryTypes) {
if (dictType.equals(Dictionary.TYPE_MAIN)) {
mainDictionary = DictionaryFactory.createMainDictionaryFromManager(context, locale);
- } else if (dictType.equals(Dictionary.TYPE_USER_HISTORY)) {
- userHistoryDictionary =
- PersonalizationHelper.getUserHistoryDictionary(context, locale);
- // Staring with an empty user history dictionary for testing.
- // Testing program may populate this dictionary before actual testing.
- userHistoryDictionary.reloadDictionaryIfRequired();
- userHistoryDictionary.waitAllTasksForTests();
+ } else {
+ final File dictFile = dictionaryFiles.get(dictType);
+ final ExpandableBinaryDictionary dict = getSubDict(
+ dictType, context, locale, dictFile);
if (additionalDictAttributes.containsKey(dictType)) {
- userHistoryDictionary.clearAndFlushDictionaryWithAdditionalAttributes(
+ dict.clearAndFlushDictionaryWithAdditionalAttributes(
additionalDictAttributes.get(dictType));
}
- } else if (dictType.equals(Dictionary.TYPE_PERSONALIZATION)) {
- personalizationDictionary =
- PersonalizationHelper.getPersonalizationDictionary(context, locale);
- // Staring with an empty personalization dictionary for testing.
- // Testing program may populate this dictionary before actual testing.
- personalizationDictionary.reloadDictionaryIfRequired();
- personalizationDictionary.waitAllTasksForTests();
- if (additionalDictAttributes.containsKey(dictType)) {
- personalizationDictionary.clearAndFlushDictionaryWithAdditionalAttributes(
- additionalDictAttributes.get(dictType));
+ if (dict == null) {
+ throw new RuntimeException("Unknown dictionary type: " + dictType);
}
- } else if (dictType.equals(Dictionary.TYPE_USER)) {
- final File file = dictionaryFiles.get(dictType);
- userDictionary = new UserBinaryDictionary(context, locale, file);
- userDictionary.reloadDictionaryIfRequired();
- userDictionary.waitAllTasksForTests();
- } else if (dictType.equals(Dictionary.TYPE_CONTACTS)) {
- final File file = dictionaryFiles.get(dictType);
- contactsDictionary = new ContactsBinaryDictionary(context, locale, file);
- contactsDictionary.reloadDictionaryIfRequired();
- contactsDictionary.waitAllTasksForTests();
- } else {
- throw new RuntimeException("Unknown dictionary type: " + dictType);
+ dict.reloadDictionaryIfRequired();
+ dict.waitAllTasksForTests();
+ subDicts.put(dictType, dict);
}
}
- mDictionaries = new Dictionaries(locale, mainDictionary, contactsDictionary,
- userDictionary, userHistoryDictionary, personalizationDictionary);
+ mDictionaries = new Dictionaries(locale, mainDictionary, subDicts);
}
public void closeDictionaries() {
@@ -323,15 +313,15 @@ public class DictionaryFacilitatorForSuggest {
dictionaries = mDictionaries;
mDictionaries = new Dictionaries();
}
- for (final Dictionary dict : dictionaries.mDictMap.values()) {
- dict.close();
+ for (final String dictType : DICT_TYPES_ORDERED_TO_GET_SUGGESTION) {
+ dictionaries.closeDict(dictType);
}
}
// The main dictionary could have been loaded asynchronously. Don't cache the return value
// of this method.
public boolean hasInitializedMainDictionary() {
- final Dictionary mainDict = mDictionaries.getMainDict();
+ final Dictionary mainDict = mDictionaries.getDict(Dictionary.TYPE_MAIN);
return mainDict != null && mainDict.isInitialized();
}
@@ -408,7 +398,7 @@ public class DictionaryFacilitatorForSuggest {
// consolidation is done.
// TODO: Remove this hack when ready.
final int lowerCaseFreqInMainDict = dictionaries.hasDict(Dictionary.TYPE_MAIN) ?
- dictionaries.getMainDict().getFrequency(suggestionLowerCase) :
+ dictionaries.getDict(Dictionary.TYPE_MAIN).getFrequency(suggestionLowerCase) :
Dictionary.NOT_A_PROBABILITY;
if (maxFreq < lowerCaseFreqInMainDict
&& lowerCaseFreqInMainDict >= CAPITALIZED_FORM_MAX_PROBABILITY_FOR_INSERT) {
@@ -439,12 +429,11 @@ public class DictionaryFacilitatorForSuggest {
final boolean blockOffensiveWords, final int[] additionalFeaturesOptions,
final int sessionId, final ArrayList<SuggestedWordInfo> rawSuggestions) {
final Dictionaries dictionaries = mDictionaries;
- final Map<String, Dictionary> dictMap = dictionaries.mDictMap;
final SuggestionResults suggestionResults =
new SuggestionResults(dictionaries.mLocale, SuggestedWords.MAX_SUGGESTIONS);
final float[] languageWeight = new float[] { Dictionary.NOT_A_LANGUAGE_WEIGHT };
- for (final String dictType : dictTypesOrderedToGetSuggestion) {
- final Dictionary dictionary = dictMap.get(dictType);
+ for (final String dictType : DICT_TYPES_ORDERED_TO_GET_SUGGESTION) {
+ final Dictionary dictionary = dictionaries.getDict(dictType);
if (null == dictionary) continue;
final ArrayList<SuggestedWordInfo> dictionarySuggestions =
dictionary.getSuggestionsWithSessionId(composer, prevWord, proximityInfo,
@@ -460,11 +449,11 @@ public class DictionaryFacilitatorForSuggest {
}
public boolean isValidMainDictWord(final String word) {
- final Dictionaries dictionaries = mDictionaries;
- if (TextUtils.isEmpty(word) || !dictionaries.hasDict(Dictionary.TYPE_MAIN)) {
+ final Dictionary mainDict = mDictionaries.getDict(Dictionary.TYPE_MAIN);
+ if (TextUtils.isEmpty(word) || mainDict == null) {
return false;
}
- return dictionaries.getMainDict().isValidWord(word);
+ return mainDict.isValidWord(word);
}
public boolean isValidWord(final String word, final boolean ignoreCase) {
@@ -476,8 +465,8 @@ public class DictionaryFacilitatorForSuggest {
return false;
}
final String lowerCasedWord = word.toLowerCase(dictionaries.mLocale);
- final Map<String, Dictionary> dictMap = dictionaries.mDictMap;
- for (final Dictionary dictionary : dictMap.values()) {
+ for (final String dictType : DICT_TYPES_ORDERED_TO_GET_SUGGESTION) {
+ final Dictionary dictionary = dictionaries.getDict(dictType);
// Ideally the passed map would come out of a {@link java.util.concurrent.Future} and
// would be immutable once it's finished initializing, but concretely a null test is
// probably good enough for the time being.
@@ -495,8 +484,10 @@ public class DictionaryFacilitatorForSuggest {
return Dictionary.NOT_A_PROBABILITY;
}
int maxFreq = -1;
- final Map<String, Dictionary> dictMap = mDictionaries.mDictMap;
- for (final Dictionary dictionary : dictMap.values()) {
+ final Dictionaries dictionaries = mDictionaries;
+ for (final String dictType : DICT_TYPES_ORDERED_TO_GET_SUGGESTION) {
+ final Dictionary dictionary = dictionaries.getDict(dictType);
+ if (dictionary == null) continue;
final int tempFreq = dictionary.getFrequency(word);
if (tempFreq >= maxFreq) {
maxFreq = tempFreq;
diff --git a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
index 550db4a6c..c825ca462 100644
--- a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
@@ -97,6 +97,8 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
private final ReentrantReadWriteLock mLock;
+ private Map<String, String> mAdditionalAttributeMap = null;
+
/* A extension for a binary dictionary file. */
protected static final String DICT_FILE_EXTENSION = ".dict";
@@ -196,6 +198,9 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
protected Map<String, String> getHeaderAttributeMap() {
HashMap<String, String> attributeMap = new HashMap<String, String>();
+ if (mAdditionalAttributeMap != null) {
+ attributeMap.putAll(mAdditionalAttributeMap);
+ }
attributeMap.put(DictionaryHeader.DICTIONARY_ID_KEY, mDictName);
attributeMap.put(DictionaryHeader.DICTIONARY_LOCALE_KEY, mLocale.toString());
attributeMap.put(DictionaryHeader.DICTIONARY_VERSION_KEY,
@@ -523,17 +528,17 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
} else if (mBinaryDictionary == null) {
// Otherwise, load the existing dictionary.
loadBinaryDictionaryLocked();
+ if (mBinaryDictionary != null && !(isValidDictionaryLocked()
+ // TODO: remove the check below
+ && matchesExpectedBinaryDictFormatVersionForThisType(
+ mBinaryDictionary.getFormatVersion()))) {
+ // Binary dictionary or its format version is not valid. Regenerate
+ // the dictionary file. writeBinaryDictionary will remove the
+ // existing files if appropriate.
+ createNewDictionaryLocked();
+ }
}
mNeedsToReload = false;
- if (mBinaryDictionary != null && !(isValidDictionaryLocked()
- // TODO: remove the check below
- && matchesExpectedBinaryDictFormatVersionForThisType(
- mBinaryDictionary.getFormatVersion()))) {
- // Binary dictionary or its format version is not valid. Regenerate
- // the dictionary file. writeBinaryDictionary will remove the
- // existing files if appropriate.
- createNewDictionaryLocked();
- }
} finally {
mIsReloading.set(false);
}
@@ -592,6 +597,12 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
}
@UsedForTesting
+ public void clearAndFlushDictionaryWithAdditionalAttributes(
+ final Map<String, String> attributeMap) {
+ mAdditionalAttributeMap = attributeMap;
+ clear();
+ }
+
public void dumpAllWordsForDebug() {
reloadDictionaryIfRequired();
asyncExecuteTaskWithLock(mLock.readLock(), new Runnable() {
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index e5dcb12ae..d64a1a6f7 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -55,7 +55,6 @@ import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputMethodSubtype;
import com.android.inputmethod.accessibility.AccessibilityUtils;
-import com.android.inputmethod.accessibility.AccessibleKeyboardViewProxy;
import com.android.inputmethod.annotations.UsedForTesting;
import com.android.inputmethod.compat.InputMethodServiceCompatUtils;
import com.android.inputmethod.dictionarypack.DictionaryPackConstants;
@@ -1002,10 +1001,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
LatinImeLogger.commit();
mKeyboardSwitcher.onHideWindow();
- if (AccessibilityUtils.getInstance().isAccessibilityEnabled()) {
- AccessibleKeyboardViewProxy.getInstance().onHideWindow();
- }
-
if (TRACE) Debug.stopMethodTracing();
if (isShowingOptionDialog()) {
mOptionsDialog.dismiss();
diff --git a/java/src/com/android/inputmethod/latin/UserBinaryDictionary.java b/java/src/com/android/inputmethod/latin/UserBinaryDictionary.java
index b21f30087..e1cda696c 100644
--- a/java/src/com/android/inputmethod/latin/UserBinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/UserBinaryDictionary.java
@@ -28,6 +28,7 @@ import android.provider.UserDictionary.Words;
import android.text.TextUtils;
import android.util.Log;
+import com.android.inputmethod.annotations.UsedForTesting;
import com.android.inputmethod.compat.UserDictionaryCompatUtils;
import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
@@ -50,23 +51,15 @@ public class UserBinaryDictionary extends ExpandableBinaryDictionary {
// to auto-correct, so we set this to the highest frequency that won't, i.e. 14.
private static final int USER_DICT_SHORTCUT_FREQUENCY = 14;
- // TODO: use Words.SHORTCUT when we target JellyBean or above
- final static String SHORTCUT = "shortcut";
- private static final String[] PROJECTION_QUERY;
- static {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
- PROJECTION_QUERY = new String[] {
- Words.WORD,
- SHORTCUT,
- Words.FREQUENCY,
- };
- } else {
- PROJECTION_QUERY = new String[] {
- Words.WORD,
- Words.FREQUENCY,
- };
- }
- }
+ private static final String[] PROJECTION_QUERY_WITH_SHORTCUT = new String[] {
+ Words.WORD,
+ Words.SHORTCUT,
+ Words.FREQUENCY,
+ };
+ private static final String[] PROJECTION_QUERY_WITHOUT_SHORTCUT = new String[] {
+ Words.WORD,
+ Words.FREQUENCY,
+ };
private static final String NAME = "userunigram";
@@ -74,17 +67,8 @@ public class UserBinaryDictionary extends ExpandableBinaryDictionary {
final private String mLocale;
final private boolean mAlsoUseMoreRestrictiveLocales;
- public UserBinaryDictionary(final Context context, final Locale locale) {
- this(context, locale, false /* alsoUseMoreRestrictiveLocales */, null /* dictFile */);
- }
-
- public UserBinaryDictionary(final Context context, final Locale locale, final File dictFile) {
- this(context, locale, false /* alsoUseMoreRestrictiveLocales */, dictFile);
- }
-
- public UserBinaryDictionary(final Context context, final Locale locale,
- final boolean alsoUseMoreRestrictiveLocales, final File dictFile) {
- this(context, locale, alsoUseMoreRestrictiveLocales, dictFile, NAME);
+ private UserBinaryDictionary(final Context context, final Locale locale, final File dictFile) {
+ this(context, locale, false /* alsoUseMoreRestrictiveLocales */, dictFile, NAME);
}
protected UserBinaryDictionary(final Context context, final Locale locale,
@@ -121,6 +105,12 @@ public class UserBinaryDictionary extends ExpandableBinaryDictionary {
reloadDictionaryIfRequired();
}
+ @UsedForTesting
+ public static UserBinaryDictionary getDictionary(final Context context, final Locale locale,
+ final File dictFile) {
+ return new UserBinaryDictionary(context, locale, dictFile);
+ }
+
@Override
public synchronized void close() {
if (mObserver != null) {
@@ -179,10 +169,29 @@ public class UserBinaryDictionary extends ExpandableBinaryDictionary {
} else {
requestArguments = localeElements;
}
+ final String requestString = request.toString();
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+ try {
+ addWordsFromProjectionLocked(PROJECTION_QUERY_WITH_SHORTCUT, requestString,
+ requestArguments);
+ } catch (IllegalArgumentException e) {
+ // This may happen on some non-compliant devices where the declared API is JB+ but
+ // the SHORTCUT column is not present for some reason.
+ addWordsFromProjectionLocked(PROJECTION_QUERY_WITHOUT_SHORTCUT, requestString,
+ requestArguments);
+ }
+ } else {
+ addWordsFromProjectionLocked(PROJECTION_QUERY_WITHOUT_SHORTCUT, requestString,
+ requestArguments);
+ }
+ }
+
+ private void addWordsFromProjectionLocked(final String[] query, String request,
+ final String[] requestArguments) throws IllegalArgumentException {
Cursor cursor = null;
try {
cursor = mContext.getContentResolver().query(
- Words.CONTENT_URI, PROJECTION_QUERY, request.toString(), requestArguments, null);
+ Words.CONTENT_URI, query, request, requestArguments, null);
addWordsLocked(cursor);
} catch (final SQLiteException e) {
Log.e(TAG, "SQLiteException in the remote User dictionary process.", e);
@@ -239,7 +248,7 @@ public class UserBinaryDictionary extends ExpandableBinaryDictionary {
if (cursor == null) return;
if (cursor.moveToFirst()) {
final int indexWord = cursor.getColumnIndex(Words.WORD);
- final int indexShortcut = hasShortcutColumn ? cursor.getColumnIndex(SHORTCUT) : 0;
+ final int indexShortcut = hasShortcutColumn ? cursor.getColumnIndex(Words.SHORTCUT) : 0;
final int indexFrequency = cursor.getColumnIndex(Words.FREQUENCY);
while (!cursor.isAfterLast()) {
final String word = cursor.getString(indexWord);
diff --git a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
index d2100d415..75432fbac 100644
--- a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
+++ b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
@@ -784,11 +784,11 @@ public final class InputLogic {
// TODO: remove this argument
final LatinIME.UIHandler handler) {
final int codePoint = inputTransaction.mEvent.mCodePoint;
+ final SettingsValues settingsValues = inputTransaction.mSettingsValues;
boolean didAutoCorrect = false;
// We avoid sending spaces in languages without spaces if we were composing.
final boolean shouldAvoidSendingCode = Constants.CODE_SPACE == codePoint
- && !inputTransaction.mSettingsValues.mSpacingAndPunctuations
- .mCurrentLanguageHasSpaces
+ && !settingsValues.mSpacingAndPunctuations.mCurrentLanguageHasSpaces
&& mWordComposer.isComposingWord();
if (mWordComposer.isCursorFrontOrMiddleOfComposingWord()) {
// If we are in the middle of a recorrection, we need to commit the recorrection
@@ -798,13 +798,13 @@ public final class InputLogic {
}
// isComposingWord() may have changed since we stored wasComposing
if (mWordComposer.isComposingWord()) {
- if (inputTransaction.mSettingsValues.mCorrectionEnabled) {
+ if (settingsValues.mCorrectionEnabled) {
final String separator = shouldAvoidSendingCode ? LastComposedWord.NOT_A_SEPARATOR
: StringUtils.newSingleCodePointString(codePoint);
- commitCurrentAutoCorrection(inputTransaction.mSettingsValues, separator, handler);
+ commitCurrentAutoCorrection(settingsValues, separator, handler);
didAutoCorrect = true;
} else {
- commitTyped(inputTransaction.mSettingsValues,
+ commitTyped(settingsValues,
StringUtils.newSingleCodePointString(codePoint));
}
}
@@ -821,20 +821,23 @@ public final class InputLogic {
// Double quotes behave like they are usually preceded by space iff we are
// not inside a double quote or after a digit.
needsPrecedingSpace = !isInsideDoubleQuoteOrAfterDigit;
+ } else if (settingsValues.mSpacingAndPunctuations.isClusteringSymbol(codePoint)
+ && settingsValues.mSpacingAndPunctuations.isClusteringSymbol(
+ mConnection.getCodePointBeforeCursor())) {
+ needsPrecedingSpace = false;
} else {
- needsPrecedingSpace = inputTransaction.mSettingsValues.isUsuallyPrecededBySpace(
- codePoint);
+ needsPrecedingSpace = settingsValues.isUsuallyPrecededBySpace(codePoint);
}
if (needsPrecedingSpace) {
- promotePhantomSpace(inputTransaction.mSettingsValues);
+ promotePhantomSpace(settingsValues);
}
if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
ResearchLogger.latinIME_handleSeparator(codePoint, mWordComposer.isComposingWord());
}
if (!shouldAvoidSendingCode) {
- sendKeyCodePoint(inputTransaction.mSettingsValues, codePoint);
+ sendKeyCodePoint(settingsValues, codePoint);
}
if (Constants.CODE_SPACE == codePoint) {
@@ -852,7 +855,7 @@ public final class InputLogic {
swapSwapperAndSpace(inputTransaction);
mSpaceState = SpaceState.SWAP_PUNCTUATION;
} else if ((SpaceState.PHANTOM == inputTransaction.mSpaceState
- && inputTransaction.mSettingsValues.isUsuallyFollowedBySpace(codePoint))
+ && settingsValues.isUsuallyFollowedBySpace(codePoint))
|| (Constants.CODE_DOUBLE_QUOTE == codePoint
&& isInsideDoubleQuoteOrAfterDigit)) {
// If we are in phantom space state, and the user presses a separator, we want to
diff --git a/java/src/com/android/inputmethod/latin/personalization/DecayingExpandableBinaryDictionaryBase.java b/java/src/com/android/inputmethod/latin/personalization/DecayingExpandableBinaryDictionaryBase.java
index 352288f8b..38c28a734 100644
--- a/java/src/com/android/inputmethod/latin/personalization/DecayingExpandableBinaryDictionaryBase.java
+++ b/java/src/com/android/inputmethod/latin/personalization/DecayingExpandableBinaryDictionaryBase.java
@@ -18,15 +18,11 @@ package com.android.inputmethod.latin.personalization;
import android.content.Context;
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.Constants;
import com.android.inputmethod.latin.Dictionary;
import com.android.inputmethod.latin.ExpandableBinaryDictionary;
import com.android.inputmethod.latin.makedict.DictionaryHeader;
-import com.android.inputmethod.latin.utils.LanguageModelParam;
import java.io.File;
-import java.util.ArrayList;
import java.util.Locale;
import java.util.Map;
@@ -47,8 +43,6 @@ public abstract class DecayingExpandableBinaryDictionaryBase extends ExpandableB
/** The locale for this dictionary. */
public final Locale mLocale;
- private Map<String, String> mAdditionalAttributeMap = null;
-
protected DecayingExpandableBinaryDictionaryBase(final Context context,
final String dictName, final Locale locale, final String dictionaryType,
final File dictFile) {
@@ -72,9 +66,6 @@ public abstract class DecayingExpandableBinaryDictionaryBase extends ExpandableB
@Override
protected Map<String, String> getHeaderAttributeMap() {
final Map<String, String> attributeMap = super.getHeaderAttributeMap();
- if (mAdditionalAttributeMap != null) {
- attributeMap.putAll(mAdditionalAttributeMap);
- }
attributeMap.put(DictionaryHeader.USES_FORGETTING_CURVE_KEY,
DictionaryHeader.ATTRIBUTE_VALUE_TRUE);
attributeMap.put(DictionaryHeader.HAS_HISTORICAL_INFO_KEY,
@@ -92,13 +83,6 @@ public abstract class DecayingExpandableBinaryDictionaryBase extends ExpandableB
// No initial contents.
}
- @UsedForTesting
- public void clearAndFlushDictionaryWithAdditionalAttributes(
- final Map<String, String> attributeMap) {
- mAdditionalAttributeMap = attributeMap;
- clear();
- }
-
/* package */ void runGCIfRequired() {
runGCIfRequired(false /* mindsBlockByGC */);
}
diff --git a/java/src/com/android/inputmethod/latin/personalization/PersonalizationDictionary.java b/java/src/com/android/inputmethod/latin/personalization/PersonalizationDictionary.java
index 4afd5b4c9..1423fceff 100644
--- a/java/src/com/android/inputmethod/latin/personalization/PersonalizationDictionary.java
+++ b/java/src/com/android/inputmethod/latin/personalization/PersonalizationDictionary.java
@@ -18,6 +18,7 @@ package com.android.inputmethod.latin.personalization;
import android.content.Context;
+import com.android.inputmethod.annotations.UsedForTesting;
import com.android.inputmethod.latin.Dictionary;
import java.io.File;
@@ -26,14 +27,16 @@ import java.util.Locale;
public class PersonalizationDictionary extends DecayingExpandableBinaryDictionaryBase {
/* package */ static final String NAME = PersonalizationDictionary.class.getSimpleName();
+ // TODO: Make this constructor private
/* package */ PersonalizationDictionary(final Context context, final Locale locale) {
- this(context, locale, null /* dictFile */);
+ super(context, getDictName(NAME, locale, null /* dictFile */), locale,
+ Dictionary.TYPE_PERSONALIZATION, null /* dictFile */);
}
- public PersonalizationDictionary(final Context context, final Locale locale,
- final File dictFile) {
- super(context, getDictName(NAME, locale, dictFile), locale, Dictionary.TYPE_PERSONALIZATION,
- dictFile);
+ @UsedForTesting
+ public static PersonalizationDictionary getDictionary(final Context context,
+ final Locale locale, final File dictFile) {
+ return PersonalizationHelper.getPersonalizationDictionary(context, locale);
}
@Override
diff --git a/java/src/com/android/inputmethod/latin/personalization/UserHistoryDictionary.java b/java/src/com/android/inputmethod/latin/personalization/UserHistoryDictionary.java
index 8a29c354d..818cd9a5f 100644
--- a/java/src/com/android/inputmethod/latin/personalization/UserHistoryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/personalization/UserHistoryDictionary.java
@@ -18,6 +18,7 @@ package com.android.inputmethod.latin.personalization;
import android.content.Context;
+import com.android.inputmethod.annotations.UsedForTesting;
import com.android.inputmethod.latin.Constants;
import com.android.inputmethod.latin.Dictionary;
import com.android.inputmethod.latin.ExpandableBinaryDictionary;
@@ -32,14 +33,16 @@ import java.util.Locale;
public class UserHistoryDictionary extends DecayingExpandableBinaryDictionaryBase {
/* package */ static final String NAME = UserHistoryDictionary.class.getSimpleName();
+ // TODO: Make this constructor private
/* package */ UserHistoryDictionary(final Context context, final Locale locale) {
- this(context, locale, null /* dictFile */);
+ super(context, getDictName(NAME, locale, null /* dictFile */), locale,
+ Dictionary.TYPE_USER_HISTORY, null /* dictFile */);
}
- public UserHistoryDictionary(final Context context, final Locale locale,
+ @UsedForTesting
+ public static UserHistoryDictionary getDictionary(final Context context, final Locale locale,
final File dictFile) {
- super(context, getDictName(NAME, locale, dictFile), locale, Dictionary.TYPE_USER_HISTORY,
- dictFile);
+ return PersonalizationHelper.getUserHistoryDictionary(context, locale);
}
@Override
diff --git a/java/src/com/android/inputmethod/latin/settings/SpacingAndPunctuations.java b/java/src/com/android/inputmethod/latin/settings/SpacingAndPunctuations.java
index 796921f71..b8d2a2248 100644
--- a/java/src/com/android/inputmethod/latin/settings/SpacingAndPunctuations.java
+++ b/java/src/com/android/inputmethod/latin/settings/SpacingAndPunctuations.java
@@ -30,6 +30,7 @@ import java.util.Locale;
public final class SpacingAndPunctuations {
private final int[] mSortedSymbolsPrecededBySpace;
private final int[] mSortedSymbolsFollowedBySpace;
+ private final int[] mSortedSymbolsClusteringTogether;
private final int[] mSortedWordConnectors;
public final int[] mSortedWordSeparators;
public final PunctuationSuggestions mSuggestPuncList;
@@ -46,6 +47,8 @@ public final class SpacingAndPunctuations {
// To be able to binary search the code point. See {@link #isUsuallyFollowedBySpace(int)}.
mSortedSymbolsFollowedBySpace = StringUtils.toSortedCodePointArray(
res.getString(R.string.symbols_followed_by_space));
+ mSortedSymbolsClusteringTogether = StringUtils.toSortedCodePointArray(
+ res.getString(R.string.symbols_clustering_together));
// To be able to binary search the code point. See {@link #isWordConnector(int)}.
mSortedWordConnectors = StringUtils.toSortedCodePointArray(
res.getString(R.string.symbols_word_connectors));
@@ -85,6 +88,10 @@ public final class SpacingAndPunctuations {
return Arrays.binarySearch(mSortedSymbolsFollowedBySpace, code) >= 0;
}
+ public boolean isClusteringSymbol(final int code) {
+ return Arrays.binarySearch(mSortedSymbolsClusteringTogether, code) >= 0;
+ }
+
public boolean isSentenceSeparator(final int code) {
return code == mSentenceSeparator;
}