diff options
44 files changed, 2028 insertions, 321 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">([{&;:!?</string> <!-- Symbols that are normally followed by a space (used to add an auto-space after these) --> <string name="symbols_followed_by_space">.,;:!?)]}&</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">"	 
 "()[]{}*&<>+=|.,;:!?/_\"</string> diff --git a/java/res/values-hi/strings-talkback-descriptions.xml b/java/res/values-hi/strings-talkback-descriptions.xml index a1468da51..df9511905 100644 --- a/java/res/values-hi/strings-talkback-descriptions.xml +++ b/java/res/values-hi/strings-talkback-descriptions.xml @@ -20,25 +20,25 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="spoken_use_headphones" msgid="4313642710742229868">"ज़ोर से बोली जाने वाली पासवर्ड कुंजियां सुनने के लिए हैडसेट प्लग करें."</string> + <string name="spoken_use_headphones" msgid="4313642710742229868">"जोर से बोली जाने वाली पासवर्ड कुंजियां सुनने के लिए हैडसेट प्लग करें."</string> <string name="spoken_current_text_is" msgid="4240549866156675799">"वर्तमान पाठ %s है"</string> <string name="spoken_no_text_entered" msgid="1711276837961785646">"कोई पाठ नहीं डाला गया"</string> <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> को सुधार कर <xliff:g id="CORRECTED_WORD">%3$s</xliff:g> करता है"</string> <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> स्वत: सुधार करता है"</string> <string name="spoken_description_unknown" msgid="2382510329910793539">"कुंजी कोड %d"</string> - <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string> + <string name="spoken_description_shift" msgid="7209798151676638728">"शिफ़्ट"</string> <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"शिफ़्ट चालू (अक्षम करने के लिए टैप करें)"</string> <string name="spoken_description_caps_lock" msgid="5020582161133170892">"कैप्स लॉक चालू (अक्षम करने के लिए टैप करें)"</string> - <string name="spoken_description_delete" msgid="3878902286264983302">"Delete"</string> + <string name="spoken_description_delete" msgid="3878902286264983302">"डिलीट"</string> <string name="spoken_description_to_symbol" msgid="8244903740201126590">"प्रतीक"</string> <string name="spoken_description_to_alpha" msgid="4081215210530031950">"अक्षर"</string> <string name="spoken_description_to_numeric" msgid="4560261331530795682">"संख्याएं"</string> <string name="spoken_description_settings" msgid="7281251004003143204">"सेटिंग"</string> - <string name="spoken_description_tab" msgid="8210782459446866716">"Tab"</string> + <string name="spoken_description_tab" msgid="8210782459446866716">"टैब"</string> <string name="spoken_description_space" msgid="5908716896642059145">"स्पेस"</string> <string name="spoken_description_mic" msgid="6153138783813452464">"ध्वनि इनपुट"</string> <string name="spoken_description_emoji" msgid="7990051553008088470">"ईमोजी"</string> - <string name="spoken_description_return" msgid="3183692287397645708">"Return"</string> + <string name="spoken_description_return" msgid="3183692287397645708">"रिटर्न"</string> <string name="spoken_description_search" msgid="5099937658231911288">"खोजें"</string> <string name="spoken_description_dot" msgid="5644176501632325560">"डॉट"</string> <string name="spoken_description_language_switch" msgid="6818666779313544553">"भाषा स्विच करें"</string> diff --git a/java/res/values-hy-rAM/strings-talkback-descriptions.xml b/java/res/values-hy-rAM/strings-talkback-descriptions.xml index d8f7d272d..e5b1ce6d9 100644 --- a/java/res/values-hy-rAM/strings-talkback-descriptions.xml +++ b/java/res/values-hy-rAM/strings-talkback-descriptions.xml @@ -23,7 +23,7 @@ <string name="spoken_use_headphones" msgid="4313642710742229868">"Միացրեք ականջակալը՝ բարձրաձայն արտասանվող գաղտնաբառը լսելու համար:"</string> <string name="spoken_current_text_is" msgid="4240549866156675799">"Տվյալ տեքստը %s է"</string> <string name="spoken_no_text_entered" msgid="1711276837961785646">"Տեքստ չի մուտքագրվել"</string> - <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g>-ը շտկում է <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g>-ը և դարձնում <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string> + <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g>-ը շտկում է <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g>-ը՝ դարձնելով <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string> <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> ստեղնը ինքնաշտկում է կատարում"</string> <string name="spoken_description_unknown" msgid="2382510329910793539">"Բանալու կոդը՝ %d"</string> <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string> @@ -34,8 +34,8 @@ <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Տառեր"</string> <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Թվեր"</string> <string name="spoken_description_settings" msgid="7281251004003143204">"Կարգավորումներ"</string> - <string name="spoken_description_tab" msgid="8210782459446866716">"Թաբ"</string> - <string name="spoken_description_space" msgid="5908716896642059145">"Բացակ"</string> + <string name="spoken_description_tab" msgid="8210782459446866716">"Tab"</string> + <string name="spoken_description_space" msgid="5908716896642059145">"Բացատ"</string> <string name="spoken_description_mic" msgid="6153138783813452464">"Ձայնային մուտքագրում"</string> <string name="spoken_description_emoji" msgid="7990051553008088470">"Զմայլիկներ"</string> <string name="spoken_description_return" msgid="3183692287397645708">"Վերադառնալ"</string> @@ -59,7 +59,7 @@ <string name="keyboard_mode_im" msgid="3812086215529493501">"նամակագրություն"</string> <string name="keyboard_mode_number" msgid="5395042245837996809">"թվեր"</string> <string name="keyboard_mode_phone" msgid="2486230278064523665">"հեռախոսահամար"</string> - <string name="keyboard_mode_text" msgid="9138789594969187494">"տեքստային հաղորդագրություն"</string> + <string name="keyboard_mode_text" msgid="9138789594969187494">"տեքստ"</string> <string name="keyboard_mode_time" msgid="8558297845514402675">"ժամանակ"</string> <string name="keyboard_mode_url" msgid="8072011652949962550">"URL"</string> <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Վերջինները"</string> diff --git a/java/res/values-zu/strings-talkback-descriptions.xml b/java/res/values-zu/strings-talkback-descriptions.xml index d30ec8b71..e01f7347d 100644 --- a/java/res/values-zu/strings-talkback-descriptions.xml +++ b/java/res/values-zu/strings-talkback-descriptions.xml @@ -26,12 +26,12 @@ <string name="spoken_auto_correct" msgid="8989324692167993804">"I-<xliff:g id="KEY_NAME">%1$s</xliff:g> ilungisa i-<xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> kube yi-<xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string> <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"I-<xliff:g id="KEY_NAME">%1$s</xliff:g> yenza ukulungisa okuzenzakalelayo"</string> <string name="spoken_description_unknown" msgid="2382510329910793539">"Ikhodi yokhiye %d"</string> - <string name="spoken_description_shift" msgid="7209798151676638728">"I-Shift"</string> + <string name="spoken_description_shift" msgid="7209798151676638728">"U-Shift"</string> <string name="spoken_description_shift_shifted" msgid="1609924271343916689">"U-Shift uvuliwe (thepha ukuwuvimbela)"</string> <string name="spoken_description_caps_lock" msgid="5020582161133170892">"Ofeleba bavuliwe (thepha ukubavimbela)"</string> <string name="spoken_description_delete" msgid="3878902286264983302">"Susa"</string> <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Amasimbuli"</string> - <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Imbhalo"</string> + <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Izinhlamvu"</string> <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Izinombolo"</string> <string name="spoken_description_settings" msgid="7281251004003143204">"Izilungiselelo"</string> <string name="spoken_description_tab" msgid="8210782459446866716">"Ithebhu"</string> @@ -65,7 +65,7 @@ <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Okwakamuva"</string> <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"Abantu"</string> <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"Izinto"</string> - <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Awendalo"</string> + <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Indalo"</string> <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Izindawo"</string> <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Amasimbuli"</string> <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Izithombe-mzwelo"</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">([{&</string> <!-- Symbols that are normally followed by a space (used to add an auto-space after these) --> <string name="symbols_followed_by_space">.,;:!?)]}&</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">"	 
 "()[]{}*&<>+=|.,;:!?/_\"</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/res/values/strings-talkback-descriptions.xml b/java/res/values/strings-talkback-descriptions.xml index 9c1e652b0..4ffca10c8 100644 --- a/java/res/values/strings-talkback-descriptions.xml +++ b/java/res/values/strings-talkback-descriptions.xml @@ -74,11 +74,10 @@ <string name="spoken_description_shiftmode_on">Shift enabled</string> <!-- Spoken feedback after turning "Caps lock" mode on. --> <string name="spoken_description_shiftmode_locked">Caps lock enabled</string> - <!-- Spoken feedback after turning "Shift" mode off. --> - <string name="spoken_description_shiftmode_off">Shift disabled</string> - <!-- Spoken feedback after changing to the symbols keyboard. --> <string name="spoken_description_mode_symbol">Symbols mode</string> + <!-- Spoken feedback after changing to the symbols shift keyboard. --> + <string name="spoken_description_mode_symbol_shift">Symbols shift mode</string> <!-- Spoken feedback after changing to the alphanumeric keyboard. --> <string name="spoken_description_mode_alpha">Letters mode</string> <!-- Spoken feedback after changing to the phone dialer keyboard. --> diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml index 3e3bedf15..7d86dbd5d 100644 --- a/java/res/xml/prefs.xml +++ b/java/res/xml/prefs.xml @@ -157,13 +157,6 @@ android:summary="@string/include_other_imes_in_language_switch_list_summary" android:persistent="true" android:defaultValue="false" /> - <!-- Values for popup dismiss delay are added programmatically --> - <CheckBoxPreference - android:key="pref_sliding_key_input_preview" - android:title="@string/sliding_key_input_preview" - android:summary="@string/sliding_key_input_preview_summary" - android:persistent="true" - android:defaultValue="true" /> <ListPreference android:key="pref_keyboard_layout_20110916" android:title="@string/keyboard_color_scheme" @@ -180,12 +173,6 @@ android:key="pref_key_preview_popup_dismiss_delay" android:title="@string/key_preview_popup_dismiss_delay" /> <com.android.inputmethod.latin.settings.SeekBarDialogPreference - android:key="pref_key_longpress_timeout" - android:title="@string/prefs_key_longpress_timeout_settings" - latin:minValue="@integer/config_min_longpress_timeout" - latin:maxValue="@integer/config_max_longpress_timeout" - latin:stepValue="@integer/config_longpress_timeout_step" /> - <com.android.inputmethod.latin.settings.SeekBarDialogPreference android:key="pref_vibration_duration_settings" android:title="@string/prefs_keypress_vibration_duration_settings" latin:maxValue="@integer/config_max_vibration_duration" /> diff --git a/java/res/xml/prefs_for_debug.xml b/java/res/xml/prefs_for_debug.xml index bb6a64118..c333b0751 100644 --- a/java/res/xml/prefs_for_debug.xml +++ b/java/res/xml/prefs_for_debug.xml @@ -41,6 +41,18 @@ android:title="@string/prefs_usability_study_mode" android:persistent="true" android:defaultValue="false" /> + <CheckBoxPreference + android:key="pref_sliding_key_input_preview" + android:title="@string/sliding_key_input_preview" + android:summary="@string/sliding_key_input_preview_summary" + android:persistent="true" + android:defaultValue="true" /> + <com.android.inputmethod.latin.settings.SeekBarDialogPreference + android:key="pref_key_longpress_timeout" + android:title="@string/prefs_key_longpress_timeout_settings" + latin:minValue="@integer/config_min_longpress_timeout" + latin:maxValue="@integer/config_max_longpress_timeout" + latin:stepValue="@integer/config_longpress_timeout_step" /> <com.android.inputmethod.latin.settings.SeekBarDialogPreference android:key="pref_key_preview_show_up_start_scale" android:title="@string/prefs_key_popup_show_up_start_scale_settings" 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 322127a12..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()); } /** @@ -136,12 +102,19 @@ public final class AccessibleKeyboardViewProxy extends AccessibilityDelegateComp return; } // Announce the language name only when the language is changed. - if (lastKeyboard == null || !lastKeyboard.mId.mSubtype.equals(keyboard.mId.mSubtype)) { + if (lastKeyboard == null || !keyboard.mId.mSubtype.equals(lastKeyboard.mId.mSubtype)) { announceKeyboardLanguage(keyboard); + return; } // Announce the mode only when the mode is changed. - if (lastKeyboardMode != keyboard.mId.mMode) { + if (keyboard.mId.mMode != lastKeyboardMode) { announceKeyboardMode(keyboard); + return; + } + // Announce the keyboard type only when the type is changed. + if (keyboard.mId.mElementId != lastKeyboard.mId.mElementId) { + announceKeyboardType(keyboard, lastKeyboard); + return; } } @@ -149,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; } @@ -174,9 +144,8 @@ public final class AccessibleKeyboardViewProxy extends AccessibilityDelegateComp * @param keyboard The new keyboard. */ private void announceKeyboardMode(final Keyboard keyboard) { - final int mode = keyboard.mId.mMode; final Context context = mView.getContext(); - final int modeTextResId = KEYBOARD_MODE_RES_IDS.get(mode); + final int modeTextResId = KEYBOARD_MODE_RES_IDS.get(keyboard.mId.mMode); if (modeTextResId == 0) { return; } @@ -186,6 +155,50 @@ public final class AccessibleKeyboardViewProxy extends AccessibilityDelegateComp } /** + * Announces which type of keyboard is being displayed. + * + * @param keyboard The new keyboard. + * @param lastKeyboard The last keyboard. + */ + private void announceKeyboardType(final Keyboard keyboard, final Keyboard lastKeyboard) { + final int lastElementId = lastKeyboard.mId.mElementId; + final int resId; + switch (keyboard.mId.mElementId) { + case KeyboardId.ELEMENT_ALPHABET_AUTOMATIC_SHIFTED: + case KeyboardId.ELEMENT_ALPHABET: + if (lastElementId == KeyboardId.ELEMENT_ALPHABET + || lastElementId == KeyboardId.ELEMENT_ALPHABET_AUTOMATIC_SHIFTED) { + return; + } + resId = R.string.spoken_description_mode_alpha; + break; + case KeyboardId.ELEMENT_ALPHABET_MANUAL_SHIFTED: + resId = R.string.spoken_description_shiftmode_on; + break; + case KeyboardId.ELEMENT_ALPHABET_SHIFT_LOCK_SHIFTED: + case KeyboardId.ELEMENT_ALPHABET_SHIFT_LOCKED: + resId = R.string.spoken_description_shiftmode_locked; + break; + case KeyboardId.ELEMENT_SYMBOLS: + resId = R.string.spoken_description_mode_symbol; + break; + case KeyboardId.ELEMENT_SYMBOLS_SHIFTED: + resId = R.string.spoken_description_mode_symbol_shift; + break; + case KeyboardId.ELEMENT_PHONE: + resId = R.string.spoken_description_mode_phone; + break; + case KeyboardId.ELEMENT_PHONE_SYMBOLS: + resId = R.string.spoken_description_mode_phone_shift; + break; + default: + return; + } + final String text = mView.getContext().getString(resId); + sendWindowStateChanged(text); + } + + /** * Announces that the keyboard has been hidden. */ private void announceKeyboardHidden() { @@ -214,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. * @@ -222,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(); } @@ -238,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; @@ -275,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; } @@ -301,7 +307,7 @@ public final class AccessibleKeyboardViewProxy extends AccessibilityDelegateComp } /** - * Simulates a key press by injecting touch event into the keyboard view. + * Simulates a key press by injecting touch an event into the keyboard view. * This avoids the complexity of trackers and listeners within the keyboard. * * @param key The key to press. @@ -318,7 +324,7 @@ public final class AccessibleKeyboardViewProxy extends AccessibilityDelegateComp } /** - * Simulates a key release by injecting touch event into the keyboard view. + * Simulates a key release by injecting touch an event into the keyboard view. * This avoids the complexity of trackers and listeners within the keyboard. * * @param key The key to release. @@ -367,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: @@ -383,72 +389,4 @@ public final class AccessibleKeyboardViewProxy extends AccessibilityDelegateComp } return true; } - - /** - * Notifies the user of changes in the keyboard shift state. - */ - public void notifyShiftState() { - if (mView == null || mKeyboard == null) { - return; - } - - final KeyboardId keyboardId = mKeyboard.mId; - final int elementId = keyboardId.mElementId; - final Context context = mView.getContext(); - final CharSequence text; - - switch (elementId) { - case KeyboardId.ELEMENT_ALPHABET_SHIFT_LOCK_SHIFTED: - case KeyboardId.ELEMENT_ALPHABET_SHIFT_LOCKED: - text = context.getText(R.string.spoken_description_shiftmode_locked); - break; - case KeyboardId.ELEMENT_ALPHABET_AUTOMATIC_SHIFTED: - case KeyboardId.ELEMENT_ALPHABET_MANUAL_SHIFTED: - case KeyboardId.ELEMENT_SYMBOLS_SHIFTED: - text = context.getText(R.string.spoken_description_shiftmode_on); - break; - default: - text = context.getText(R.string.spoken_description_shiftmode_off); - } - AccessibilityUtils.getInstance().announceForAccessibility(mView, text); - } - - /** - * Notifies the user of changes in the keyboard symbols state. - */ - public void notifySymbolsState() { - if (mView == null || mKeyboard == null) { - return; - } - - final KeyboardId keyboardId = mKeyboard.mId; - final int elementId = keyboardId.mElementId; - final Context context = mView.getContext(); - final int resId; - - switch (elementId) { - case KeyboardId.ELEMENT_ALPHABET: - case KeyboardId.ELEMENT_ALPHABET_AUTOMATIC_SHIFTED: - case KeyboardId.ELEMENT_ALPHABET_MANUAL_SHIFTED: - case KeyboardId.ELEMENT_ALPHABET_SHIFT_LOCK_SHIFTED: - case KeyboardId.ELEMENT_ALPHABET_SHIFT_LOCKED: - resId = R.string.spoken_description_mode_alpha; - break; - case KeyboardId.ELEMENT_SYMBOLS: - case KeyboardId.ELEMENT_SYMBOLS_SHIFTED: - resId = R.string.spoken_description_mode_symbol; - break; - case KeyboardId.ELEMENT_PHONE: - resId = R.string.spoken_description_mode_phone; - break; - case KeyboardId.ELEMENT_PHONE_SYMBOLS: - resId = R.string.spoken_description_mode_phone_shift; - break; - default: - return; - } - - final String text = context.getString(resId); - AccessibilityUtils.getInstance().announceForAccessibility(mView, text); - } } 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/compat/InputMethodManagerCompatWrapper.java b/java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java index a80c3fefe..18b3a6060 100644 --- a/java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java +++ b/java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java @@ -28,6 +28,12 @@ public final class InputMethodManagerCompatWrapper { private static final Method METHOD_switchToNextInputMethod = CompatUtils.getMethod( InputMethodManager.class, "switchToNextInputMethod", IBinder.class, Boolean.TYPE); + // Note that InputMethodManager.shouldOfferSwitchingToNextInputMethod() has been introduced + // in API level 19 (Build.VERSION_CODES.KITKAT). + private static final Method METHOD_shouldOfferSwitchingToNextInputMethod = + CompatUtils.getMethod(InputMethodManager.class, + "shouldOfferSwitchingToNextInputMethod", IBinder.class); + public final InputMethodManager mImm; public InputMethodManagerCompatWrapper(final Context context) { @@ -38,4 +44,9 @@ public final class InputMethodManagerCompatWrapper { return (Boolean)CompatUtils.invoke(mImm, false /* defaultValue */, METHOD_switchToNextInputMethod, token, onlyCurrentIme); } + + public boolean shouldOfferSwitchingToNextInputMethod(final IBinder token) { + return (Boolean)CompatUtils.invoke(mImm, false /* defaultValue */, + METHOD_shouldOfferSwitchingToNextInputMethod, token); + } } diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java index dcf7f7472..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; @@ -123,7 +122,7 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions { builder.setOptions( mSubtypeSwitcher.isShortcutImeEnabled(), settingsValues.mShowsVoiceInputKey, - settingsValues.isLanguageSwitchKeyEnabled()); + mLatinIME.shouldShowLanguageSwitchKey()); mKeyboardLayoutSet = builder.build(); mCurrentSettingsValues = settingsValues; try { @@ -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/ExpandableBinaryDictionary.java b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java index b79b99edc..c825ca462 100644 --- a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java +++ b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java @@ -516,28 +516,29 @@ abstract public class ExpandableBinaryDictionary extends Dictionary { */ private final void asyncReloadDictionary() { if (mIsReloading.compareAndSet(false, true)) { - mNeedsToReload = false; asyncExecuteTaskWithWriteLock(new Runnable() { @Override public void run() { try { - if (!mDictFile.exists() || haveContentsChanged()) { + // TODO: Quit checking contents in ExpandableBinaryDictionary. + if (!mDictFile.exists() || (mNeedsToReload && haveContentsChanged())) { // If the dictionary file does not exist or contents have been updated, // generate a new one. createNewDictionaryLocked(); } 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(); + } } - 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; } finally { mIsReloading.set(false); } diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 27790d6c6..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(); @@ -1230,7 +1225,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen // TODO: Revise the language switch key behavior to make it much smarter and more reasonable. public void switchToNextSubtype() { final IBinder token = getWindow().getWindow().getAttributes().token; - if (mSettings.getCurrent().mIncludesOtherImesInLanguageSwitchList) { + if (shouldSwitchToOtherInputMethods()) { mRichImm.switchToNextInputMethod(token, false /* onlyCurrentIme */); return; } @@ -1597,18 +1592,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen public void onReleaseKey(final int primaryCode, final boolean withSliding) { mKeyboardSwitcher.onReleaseKey(primaryCode, withSliding, getCurrentAutoCapsState(), getCurrentRecapitalizeState()); - - // If accessibility is on, ensure the user receives keyboard state updates. - if (AccessibilityUtils.getInstance().isTouchExplorationEnabled()) { - switch (primaryCode) { - case Constants.CODE_SHIFT: - AccessibleKeyboardViewProxy.getInstance().notifyShiftState(); - break; - case Constants.CODE_SWITCH_ALPHA_SYMBOL: - AccessibleKeyboardViewProxy.getInstance().notifySymbolsState(); - break; - } - } } private HardwareEventDecoder getHardwareKeyEventDecoder(final int deviceId) { @@ -1800,4 +1783,28 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen p.println(settingsValues.dump()); // TODO: Dump all settings values } + + public boolean shouldSwitchToOtherInputMethods() { + // TODO: Revisit here to reorganize the settings. Probably we can/should use different + // strategy once the implementation of + // {@link InputMethodManager#shouldOfferSwitchingToNextInputMethod} is defined well. + final boolean fallbackValue = mSettings.getCurrent().mIncludesOtherImesInLanguageSwitchList; + final IBinder token = getWindow().getWindow().getAttributes().token; + if (token == null) { + return fallbackValue; + } + return mRichImm.shouldOfferSwitchingToNextInputMethod(token, fallbackValue); + } + + public boolean shouldShowLanguageSwitchKey() { + // TODO: Revisit here to reorganize the settings. Probably we can/should use different + // strategy once the implementation of + // {@link InputMethodManager#shouldOfferSwitchingToNextInputMethod} is defined well. + final boolean fallbackValue = mSettings.getCurrent().isLanguageSwitchKeyEnabled(); + final IBinder token = getWindow().getWindow().getAttributes().token; + if (token == null) { + return fallbackValue; + } + return mRichImm.shouldOfferSwitchingToNextInputMethod(token, fallbackValue); + } } diff --git a/java/src/com/android/inputmethod/latin/RichInputMethodManager.java b/java/src/com/android/inputmethod/latin/RichInputMethodManager.java index 630a03670..64cc562c8 100644 --- a/java/src/com/android/inputmethod/latin/RichInputMethodManager.java +++ b/java/src/com/android/inputmethod/latin/RichInputMethodManager.java @@ -20,6 +20,7 @@ import static com.android.inputmethod.latin.Constants.Subtype.KEYBOARD_MODE; import android.content.Context; import android.content.SharedPreferences; +import android.os.Build; import android.os.IBinder; import android.preference.PreferenceManager; import android.util.Log; @@ -406,4 +407,24 @@ public final class RichInputMethodManager { mSubtypeListCacheWithoutImplicitlySelectedSubtypes.clear(); mInputMethodInfoCache.clear(); } + + public boolean shouldOfferSwitchingToNextInputMethod(final IBinder binder, + boolean defaultValue) { + // Use the default value instead on Jelly Bean MR2 and previous, where + // {@link InputMethodManager#shouldOfferSwitchingToNextInputMethod} isn't yet available. + if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN_MR2) { + return defaultValue; + } + // Use the default value instead on KitKat as well, where + // {@link InputMethodManager#shouldOfferSwitchingToNextInputMethod} is still just a stub to + // return true always. + if (Build.VERSION.SDK_INT == Build.VERSION_CODES.KITKAT) { + // Make sure this is actually KitKat. + // TODO: Consider to remove this check once the *next* version becomes available. + if (Build.VERSION.CODENAME.equals("REL")) { + return defaultValue; + } + } + return mImmWrapper.shouldOfferSwitchingToNextInputMethod(binder); + } } diff --git a/java/src/com/android/inputmethod/latin/UserBinaryDictionary.java b/java/src/com/android/inputmethod/latin/UserBinaryDictionary.java index 0a9dae4e7..e1cda696c 100644 --- a/java/src/com/android/inputmethod/latin/UserBinaryDictionary.java +++ b/java/src/com/android/inputmethod/latin/UserBinaryDictionary.java @@ -51,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"; @@ -177,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); @@ -237,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/settings/DebugSettings.java b/java/src/com/android/inputmethod/latin/settings/DebugSettings.java index 11d369282..c4c1234fc 100644 --- a/java/src/com/android/inputmethod/latin/settings/DebugSettings.java +++ b/java/src/com/android/inputmethod/latin/settings/DebugSettings.java @@ -55,6 +55,8 @@ public final class DebugSettings extends PreferenceFragment private static final String PREF_DUMP_USER_DICT = "dump_user_dict"; private static final String PREF_DUMP_USER_HISTORY_DICT = "dump_user_history_dict"; private static final String PREF_DUMP_PERSONALIZATION_DICT = "dump_personalization_dict"; + public static final String PREF_SLIDING_KEY_INPUT_PREVIEW = "pref_sliding_key_input_preview"; + public static final String PREF_KEY_LONGPRESS_TIMEOUT = "pref_key_longpress_timeout"; private static final boolean SHOW_STATISTICS_LOGGING = false; @@ -110,6 +112,7 @@ public final class DebugSettings extends PreferenceFragment findPreference(PREF_DUMP_PERSONALIZATION_DICT).setOnPreferenceClickListener( dictDumpPrefClickListener); final Resources res = getResources(); + setupKeyLongpressTimeoutSettings(prefs, res); setupKeyPreviewAnimationDuration(prefs, res, PREF_KEY_PREVIEW_SHOW_UP_DURATION, res.getInteger(R.integer.config_key_preview_show_up_duration)); setupKeyPreviewAnimationDuration(prefs, res, PREF_KEY_PREVIEW_DISMISS_DURATION, @@ -200,6 +203,44 @@ public final class DebugSettings extends PreferenceFragment } } + private void setupKeyLongpressTimeoutSettings(final SharedPreferences sp, + final Resources res) { + final SeekBarDialogPreference pref = (SeekBarDialogPreference)findPreference( + PREF_KEY_LONGPRESS_TIMEOUT); + if (pref == null) { + return; + } + pref.setInterface(new SeekBarDialogPreference.ValueProxy() { + @Override + public void writeValue(final int value, final String key) { + sp.edit().putInt(key, value).apply(); + } + + @Override + public void writeDefaultValue(final String key) { + sp.edit().remove(key).apply(); + } + + @Override + public int readValue(final String key) { + return Settings.readKeyLongpressTimeout(sp, res); + } + + @Override + public int readDefaultValue(final String key) { + return Settings.readDefaultKeyLongpressTimeout(res); + } + + @Override + public String getValueText(final int value) { + return res.getString(R.string.abbreviation_unit_milliseconds, value); + } + + @Override + public void feedbackValue(final int value) {} + }); + } + private void setupKeyPreviewAnimationScale(final SharedPreferences sp, final Resources res, final String prefKey, final float defaultValue) { final SeekBarDialogPreference pref = (SeekBarDialogPreference)findPreference(prefKey); diff --git a/java/src/com/android/inputmethod/latin/settings/Settings.java b/java/src/com/android/inputmethod/latin/settings/Settings.java index 353b7463d..a3aae8cb3 100644 --- a/java/src/com/android/inputmethod/latin/settings/Settings.java +++ b/java/src/com/android/inputmethod/latin/settings/Settings.java @@ -72,8 +72,6 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang public static final String PREF_BIGRAM_PREDICTIONS = "next_word_prediction"; public static final String PREF_GESTURE_SETTINGS = "gesture_typing_settings"; public static final String PREF_GESTURE_INPUT = "gesture_input"; - public static final String PREF_SLIDING_KEY_INPUT_PREVIEW = "pref_sliding_key_input_preview"; - public static final String PREF_KEY_LONGPRESS_TIMEOUT = "pref_key_longpress_timeout"; public static final String PREF_VIBRATION_DURATION_SETTINGS = "pref_vibration_duration_settings"; public static final String PREF_KEYPRESS_SOUND_VOLUME = @@ -196,7 +194,7 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang // Accessed from the settings interface, hence public public static boolean readKeypressSoundEnabled(final SharedPreferences prefs, final Resources res) { - return prefs.getBoolean(Settings.PREF_SOUND_ON, + return prefs.getBoolean(PREF_SOUND_ON, res.getBoolean(R.bool.config_default_sound_enabled)); } @@ -216,7 +214,7 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang public static boolean readBlockPotentiallyOffensive(final SharedPreferences prefs, final Resources res) { - return prefs.getBoolean(Settings.PREF_BLOCK_POTENTIALLY_OFFENSIVE, + return prefs.getBoolean(PREF_BLOCK_POTENTIALLY_OFFENSIVE, res.getBoolean(R.bool.config_block_potentially_offensive)); } @@ -227,12 +225,12 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang public static boolean readGestureInputEnabled(final SharedPreferences prefs, final Resources res) { return readFromBuildConfigIfGestureInputEnabled(res) - && prefs.getBoolean(Settings.PREF_GESTURE_INPUT, true); + && prefs.getBoolean(PREF_GESTURE_INPUT, true); } public static boolean readPhraseGestureEnabled(final SharedPreferences prefs, final Resources res) { - return prefs.getBoolean(Settings.PREF_PHRASE_GESTURE_ENABLED, + return prefs.getBoolean(PREF_PHRASE_GESTURE_ENABLED, res.getBoolean(R.bool.config_default_phrase_gesture_enabled)); } @@ -278,7 +276,7 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang public static void writePrefAdditionalSubtypes(final SharedPreferences prefs, final String prefSubtypes) { - prefs.edit().putString(Settings.PREF_CUSTOM_INPUT_STYLES, prefSubtypes).apply(); + prefs.edit().putString(PREF_CUSTOM_INPUT_STYLES, prefSubtypes).apply(); } public static float readKeypressSoundVolume(final SharedPreferences prefs, @@ -301,7 +299,7 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang public static int readKeyLongpressTimeout(final SharedPreferences prefs, final Resources res) { final int milliseconds = prefs.getInt( - PREF_KEY_LONGPRESS_TIMEOUT, UNDEFINED_PREFERENCE_VALUE_INT); + DebugSettings.PREF_KEY_LONGPRESS_TIMEOUT, UNDEFINED_PREFERENCE_VALUE_INT); return (milliseconds != UNDEFINED_PREFERENCE_VALUE_INT) ? milliseconds : readDefaultKeyLongpressTimeout(res); } @@ -354,18 +352,18 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang if (!enableSetupWizardByConfig) { return false; } - if (!prefs.contains(Settings.PREF_SHOW_SETUP_WIZARD_ICON)) { + if (!prefs.contains(PREF_SHOW_SETUP_WIZARD_ICON)) { final ApplicationInfo appInfo = context.getApplicationInfo(); final boolean isApplicationInSystemImage = (appInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0; // Default value return !isApplicationInSystemImage; } - return prefs.getBoolean(Settings.PREF_SHOW_SETUP_WIZARD_ICON, false); + return prefs.getBoolean(PREF_SHOW_SETUP_WIZARD_ICON, false); } public static boolean isInternal(final SharedPreferences prefs) { - return prefs.getBoolean(Settings.PREF_KEY_IS_INTERNAL, false); + return prefs.getBoolean(PREF_KEY_IS_INTERNAL, false); } public void writeLastUsedPersonalizationToken(byte[] token) { diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java b/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java index bb5547fc9..22cbd204c 100644 --- a/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java +++ b/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java @@ -228,7 +228,6 @@ public final class SettingsFragment extends InputMethodSettingsFragment AdditionalFeaturesSettingUtils.addAdditionalFeaturesPreferences(context, this); - setupKeyLongpressTimeoutSettings(prefs, res); setupKeypressVibrationDurationSettings(prefs, res); setupKeypressSoundVolumeSettings(prefs, res); refreshEnablingsOfKeypressSoundAndVibrationSettings(prefs, res); @@ -368,44 +367,6 @@ public final class SettingsFragment extends InputMethodSettingsFragment }); } - private void setupKeyLongpressTimeoutSettings(final SharedPreferences sp, - final Resources res) { - final SeekBarDialogPreference pref = (SeekBarDialogPreference)findPreference( - Settings.PREF_KEY_LONGPRESS_TIMEOUT); - if (pref == null) { - return; - } - pref.setInterface(new SeekBarDialogPreference.ValueProxy() { - @Override - public void writeValue(final int value, final String key) { - sp.edit().putInt(key, value).apply(); - } - - @Override - public void writeDefaultValue(final String key) { - sp.edit().remove(key).apply(); - } - - @Override - public int readValue(final String key) { - return Settings.readKeyLongpressTimeout(sp, res); - } - - @Override - public int readDefaultValue(final String key) { - return Settings.readDefaultKeyLongpressTimeout(res); - } - - @Override - public String getValueText(final int value) { - return res.getString(R.string.abbreviation_unit_milliseconds, value); - } - - @Override - public void feedbackValue(final int value) {} - }); - } - private void setupKeypressSoundVolumeSettings(final SharedPreferences sp, final Resources res) { final SeekBarDialogPreference pref = (SeekBarDialogPreference)findPreference( Settings.PREF_KEYPRESS_SOUND_VOLUME); diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java index d47a61ed1..dde50ccaf 100644 --- a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java +++ b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java @@ -119,7 +119,7 @@ public final class SettingsValues { mSoundOn = Settings.readKeypressSoundEnabled(prefs, res); mKeyPreviewPopupOn = Settings.readKeyPreviewPopupEnabled(prefs, res); mSlidingKeyInputPreviewEnabled = prefs.getBoolean( - Settings.PREF_SLIDING_KEY_INPUT_PREVIEW, true); + DebugSettings.PREF_SLIDING_KEY_INPUT_PREVIEW, true); mShowsVoiceInputKey = needsToShowVoiceInputKey(prefs, res); final String autoCorrectionThresholdRawValue = prefs.getString( Settings.PREF_AUTO_CORRECTION_THRESHOLD, 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; } diff --git a/java/src/com/android/inputmethod/latin/suggestions/MoreSuggestions.java b/java/src/com/android/inputmethod/latin/suggestions/MoreSuggestions.java index a104baa08..5a325ea82 100644 --- a/java/src/com/android/inputmethod/latin/suggestions/MoreSuggestions.java +++ b/java/src/com/android/inputmethod/latin/suggestions/MoreSuggestions.java @@ -74,7 +74,13 @@ public final class MoreSuggestions extends Keyboard { int rowStartIndex = fromIndex; final int size = Math.min(suggestedWords.size(), SuggestedWords.MAX_SUGGESTIONS); while (index < size) { - final String word = suggestedWords.getLabel(index); + final String word; + if (isIndexSubjectToAutoCorrection(suggestedWords, index)) { + // INDEX_OF_AUTO_CORRECTION and INDEX_OF_TYPED_WORD got swapped. + word = suggestedWords.getLabel(SuggestedWords.INDEX_OF_TYPED_WORD); + } else { + word = suggestedWords.getLabel(index); + } // TODO: Should take care of text x-scaling. mWidths[index] = (int)(TypefaceUtils.getStringWidth(word, paint) + padding); final int numColumn = index - rowStartIndex + 1; @@ -172,6 +178,11 @@ public final class MoreSuggestions extends Keyboard { } } + private static boolean isIndexSubjectToAutoCorrection(final SuggestedWords suggestedWords, + final int index) { + return suggestedWords.mWillAutoCorrect && index == SuggestedWords.INDEX_OF_AUTO_CORRECTION; + } + public static final class Builder extends KeyboardBuilder<MoreSuggestionsParam> { private final MoreSuggestionsView mPaneView; private SuggestedWords mSuggestedWords; @@ -189,7 +200,6 @@ public final class MoreSuggestions extends Keyboard { final int xmlId = R.xml.kbd_suggestions_pane_template; load(xmlId, parentKeyboard.mId); mParams.mVerticalGap = mParams.mTopPadding = parentKeyboard.mVerticalGap / 2; - mPaneView.updateKeyboardGeometry(mParams.mDefaultRowHeight); final int count = mParams.layout(suggestedWords, fromIndex, maxWidth, minWidth, maxRow, mPaneView.newLabelPaint(null /* key */), mResources); @@ -206,8 +216,16 @@ public final class MoreSuggestions extends Keyboard { final int x = params.getX(index); final int y = params.getY(index); final int width = params.getWidth(index); - final String word = mSuggestedWords.getLabel(index); - final String info = mSuggestedWords.getDebugString(index); + final String word; + final String info; + if (isIndexSubjectToAutoCorrection(mSuggestedWords, index)) { + // INDEX_OF_AUTO_CORRECTION and INDEX_OF_TYPED_WORD got swapped. + word = mSuggestedWords.getLabel(SuggestedWords.INDEX_OF_TYPED_WORD); + info = mSuggestedWords.getDebugString(SuggestedWords.INDEX_OF_TYPED_WORD); + } else { + word = mSuggestedWords.getLabel(index); + info = mSuggestedWords.getDebugString(index); + } final int indexInMoreSuggestions = index + SUGGESTION_CODE_BASE; final Key key = new Key(word, KeyboardIconsSet.ICON_UNDEFINED, indexInMoreSuggestions, null /* outputText */, info, 0 /* labelFlags */, diff --git a/java/src/com/android/inputmethod/latin/utils/PrioritizedSerialExecutor.java b/java/src/com/android/inputmethod/latin/utils/PrioritizedSerialExecutor.java index a23b3ac79..bf38abc95 100644 --- a/java/src/com/android/inputmethod/latin/utils/PrioritizedSerialExecutor.java +++ b/java/src/com/android/inputmethod/latin/utils/PrioritizedSerialExecutor.java @@ -16,6 +16,8 @@ package com.android.inputmethod.latin.utils; +import com.android.inputmethod.annotations.UsedForTesting; + import java.util.Queue; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.ConcurrentLinkedQueue; @@ -74,6 +76,7 @@ public class PrioritizedSerialExecutor { * Enqueues the given task into the prioritized task queue. * @param r the enqueued task */ + @UsedForTesting public void executePrioritized(final Runnable r) { synchronized(mLock) { if (!mIsShutdown) { diff --git a/native/jni/NativeFileList.mk b/native/jni/NativeFileList.mk index 70a6638fb..34c190718 100644 --- a/native/jni/NativeFileList.mk +++ b/native/jni/NativeFileList.mk @@ -56,10 +56,10 @@ LATIN_IME_CORE_SRC_FILES := \ dynamic_pt_reading_helper.cpp \ dynamic_pt_reading_utils.cpp \ dynamic_pt_updating_helper.cpp \ - dynamic_pt_writing_utils.cpp) \ + dynamic_pt_writing_utils.cpp \ + patricia_trie_reading_utils.cpp) \ $(addprefix suggest/policyimpl/dictionary/structure/v2/, \ patricia_trie_policy.cpp \ - patricia_trie_reading_utils.cpp \ ver2_patricia_trie_node_reader.cpp \ ver2_pt_node_array_reader.cpp) \ $(addprefix suggest/policyimpl/dictionary/structure/v4/, \ diff --git a/native/jni/src/defines.h b/native/jni/src/defines.h index 3becc79e8..a80c97530 100644 --- a/native/jni/src/defines.h +++ b/native/jni/src/defines.h @@ -293,13 +293,6 @@ static inline void prof_out(void) { #define M_PI_F 3.14159265f #define MAX_PERCENTILE 100 -// Number of base-10 digits in the largest integer + 1 to leave room for a zero terminator. -// As such, this is the maximum number of characters will be needed to represent an int as a -// string, including the terminator; this is used as the size of a string buffer large enough to -// hold any value that is intended to fit in an integer, e.g. in the code that reads the header -// of the binary dictionary where a {key,value} string pair scheme is used. -#define LARGEST_INT_DIGIT_COUNT 11 - #define NOT_A_CODE_POINT (-1) #define NOT_A_DISTANCE (-1) #define NOT_A_COORDINATE (-1) @@ -325,14 +318,13 @@ static inline void prof_out(void) { #define KEYCODE_SPACE ' ' #define KEYCODE_SINGLE_QUOTE '\'' #define KEYCODE_HYPHEN_MINUS '-' +// Code point to indicate beginning-of-sentence. This is not in the code point space of unicode. +#define CODE_POINT_BEGINNING_OF_SENTENCE 0x110000 #define SUGGEST_INTERFACE_OUTPUT_SCALE 1000000.0f #define MAX_PROBABILITY 255 #define MAX_BIGRAM_ENCODED_PROBABILITY 15 -// Assuming locale strings such as en_US, sr-Latn etc. -#define MAX_LOCALE_STRING_LENGTH 10 - // Max value for length, distance and probability which are used in weighting // TODO: Remove #define MAX_VALUE_FOR_WEIGHTING 10000000 diff --git a/native/jni/src/suggest/core/layout/proximity_info.h b/native/jni/src/suggest/core/layout/proximity_info.h index 56711d1ff..d4e453736 100644 --- a/native/jni/src/suggest/core/layout/proximity_info.h +++ b/native/jni/src/suggest/core/layout/proximity_info.h @@ -103,6 +103,8 @@ class ProximityInfo { const int KEYBOARD_HEIGHT; const float KEYBOARD_HYPOTENUSE; const bool HAS_TOUCH_POSITION_CORRECTION_DATA; + // Assuming locale strings such as en_US, sr-Latn etc. + static const int MAX_LOCALE_STRING_LENGTH = 10; char mLocaleStr[MAX_LOCALE_STRING_LENGTH]; int *mProximityCharsArray; int mKeyXCoordinates[MAX_KEY_COUNT_IN_A_KEYBOARD]; diff --git a/native/jni/src/suggest/policyimpl/dictionary/header/header_read_write_utils.cpp b/native/jni/src/suggest/policyimpl/dictionary/header/header_read_write_utils.cpp index d20accfbc..5608e27d4 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/header/header_read_write_utils.cpp +++ b/native/jni/src/suggest/policyimpl/dictionary/header/header_read_write_utils.cpp @@ -26,6 +26,13 @@ namespace latinime { +// Number of base-10 digits in the largest integer + 1 to leave room for a zero terminator. +// As such, this is the maximum number of characters will be needed to represent an int as a +// string, including the terminator; this is used as the size of a string buffer large enough to +// hold any value that is intended to fit in an integer, e.g. in the code that reads the header +// of the binary dictionary where a {key,value} string pair scheme is used. +const int HeaderReadWriteUtils::LARGEST_INT_DIGIT_COUNT = 11; + const int HeaderReadWriteUtils::MAX_ATTRIBUTE_KEY_LENGTH = 256; const int HeaderReadWriteUtils::MAX_ATTRIBUTE_VALUE_LENGTH = 256; @@ -154,8 +161,8 @@ typedef DictionaryHeaderStructurePolicy::AttributeMap AttributeMap; /* static */ void HeaderReadWriteUtils::setIntAttributeInner(AttributeMap *const headerAttributes, const AttributeMap::key_type *const key, const int value) { AttributeMap::mapped_type valueVector; - char charBuf[LARGEST_INT_DIGIT_COUNT + 1]; - snprintf(charBuf, LARGEST_INT_DIGIT_COUNT + 1, "%d", value); + char charBuf[LARGEST_INT_DIGIT_COUNT]; + snprintf(charBuf, sizeof(charBuf), "%d", value); insertCharactersIntoVector(charBuf, &valueVector); (*headerAttributes)[*key] = valueVector; } diff --git a/native/jni/src/suggest/policyimpl/dictionary/header/header_read_write_utils.h b/native/jni/src/suggest/policyimpl/dictionary/header/header_read_write_utils.h index a6b4c4e14..9b90488fc 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/header/header_read_write_utils.h +++ b/native/jni/src/suggest/policyimpl/dictionary/header/header_read_write_utils.h @@ -92,6 +92,7 @@ class HeaderReadWriteUtils { private: DISALLOW_IMPLICIT_CONSTRUCTORS(HeaderReadWriteUtils); + static const int LARGEST_INT_DIGIT_COUNT; static const int MAX_ATTRIBUTE_KEY_LENGTH; static const int MAX_ATTRIBUTE_VALUE_LENGTH; diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_updating_helper.cpp b/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_updating_helper.cpp index 2457b49c8..e02dd5550 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_updating_helper.cpp +++ b/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_updating_helper.cpp @@ -18,9 +18,9 @@ #include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_helper.h" #include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_writing_utils.h" +#include "suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h" #include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_reader.h" #include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_writer.h" -#include "suggest/policyimpl/dictionary/structure/v2/patricia_trie_reading_utils.h" #include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/patricia_trie_reading_utils.cpp b/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.cpp index b4eee5572..e64a13cc4 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/patricia_trie_reading_utils.cpp +++ b/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/structure/v2/patricia_trie_reading_utils.h" +#include "suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h" #include "defines.h" #include "suggest/core/policy/dictionary_bigrams_structure_policy.h" diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/patricia_trie_reading_utils.h b/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h index a6090a513..c3f09c3b1 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/patricia_trie_reading_utils.h +++ b/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h @@ -26,7 +26,6 @@ namespace latinime { class DictionaryShortcutsStructurePolicy; class DictionaryBigramsStructurePolicy; -// TODO: Move to pt_common class PatriciaTrieReadingUtils { public: typedef uint8_t NodeFlags; diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h b/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h index e4847fcf9..91192fc57 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h +++ b/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h @@ -21,7 +21,7 @@ #include "defines.h" #include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_utils.h" -#include "suggest/policyimpl/dictionary/structure/v2/patricia_trie_reading_utils.h" +#include "suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h" #include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/patricia_trie_policy.cpp b/native/jni/src/suggest/policyimpl/dictionary/structure/v2/patricia_trie_policy.cpp index b426dbf28..b3af1f47a 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/patricia_trie_policy.cpp +++ b/native/jni/src/suggest/policyimpl/dictionary/structure/v2/patricia_trie_policy.cpp @@ -22,7 +22,7 @@ #include "suggest/core/dicnode/dic_node_vector.h" #include "suggest/core/dictionary/binary_dictionary_bigrams_iterator.h" #include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_helper.h" -#include "suggest/policyimpl/dictionary/structure/v2/patricia_trie_reading_utils.h" +#include "suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h" #include "suggest/policyimpl/dictionary/utils/probability_utils.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_patricia_trie_node_reader.cpp b/native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_patricia_trie_node_reader.cpp index 778d7a408..0c8de0df2 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_patricia_trie_node_reader.cpp +++ b/native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_patricia_trie_node_reader.cpp @@ -16,7 +16,7 @@ #include "suggest/policyimpl/dictionary/structure/v2/ver2_patricia_trie_node_reader.h" -#include "suggest/policyimpl/dictionary/structure/v2/patricia_trie_reading_utils.h" +#include "suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_pt_node_array_reader.cpp b/native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_pt_node_array_reader.cpp index 125ea31dc..b46617d96 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_pt_node_array_reader.cpp +++ b/native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_pt_node_array_reader.cpp @@ -16,7 +16,7 @@ #include "suggest/policyimpl/dictionary/structure/v2/ver2_pt_node_array_reader.h" -#include "suggest/policyimpl/dictionary/structure/v2/patricia_trie_reading_utils.h" +#include "suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_reader.cpp b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_reader.cpp index f149781f4..67420a252 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_reader.cpp +++ b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_reader.cpp @@ -17,7 +17,7 @@ #include "suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_reader.h" #include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_utils.h" -#include "suggest/policyimpl/dictionary/structure/v2/patricia_trie_reading_utils.h" +#include "suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h" #include "suggest/policyimpl/dictionary/structure/v4/content/probability_dict_content.h" #include "suggest/policyimpl/dictionary/structure/v4/content/probability_entry.h" #include "suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_reading_utils.h" diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_writer.cpp b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_writer.cpp index f24c2e1af..38ff42fee 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_writer.cpp +++ b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_writer.cpp @@ -21,7 +21,7 @@ #include "suggest/policyimpl/dictionary/shortcut/ver4_shortcut_list_policy.h" #include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_utils.h" #include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_writing_utils.h" -#include "suggest/policyimpl/dictionary/structure/v2/patricia_trie_reading_utils.h" +#include "suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h" #include "suggest/policyimpl/dictionary/structure/v4/content/probability_entry.h" #include "suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_reader.h" #include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.h" diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_pt_node_array_reader.cpp b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_pt_node_array_reader.cpp index bbdf40cdd..b014c523d 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_pt_node_array_reader.cpp +++ b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_pt_node_array_reader.cpp @@ -17,7 +17,7 @@ #include "suggest/policyimpl/dictionary/structure/v4/ver4_pt_node_array_reader.h" #include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_utils.h" -#include "suggest/policyimpl/dictionary/structure/v2/patricia_trie_reading_utils.h" +#include "suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h" #include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" namespace latinime { diff --git a/tests/src/com/android/inputmethod/latin/InputLogicTests.java b/tests/src/com/android/inputmethod/latin/InputLogicTests.java index d2dd29262..29423e8e3 100644 --- a/tests/src/com/android/inputmethod/latin/InputLogicTests.java +++ b/tests/src/com/android/inputmethod/latin/InputLogicTests.java @@ -334,6 +334,18 @@ public class InputLogicTests extends InputTestsBase { assertEquals("manual pick then separator", EXPECTED_RESULT, mEditText.getText().toString()); } + // This test matches the one in InputLogicTestsNonEnglish. In some non-English languages, + // ! and ? are clustering punctuation signs. + public void testClusteringPunctuation() { + final String WORD1_TO_TYPE = "test"; + final String WORD2_TO_TYPE = "!!?!:!"; + final String EXPECTED_RESULT = "test!!?!:!"; + type(WORD1_TO_TYPE); + pickSuggestionManually(0, WORD1_TO_TYPE); + type(WORD2_TO_TYPE); + assertEquals("clustering punctuation", EXPECTED_RESULT, mEditText.getText().toString()); + } + public void testManualPickThenStripperThenPick() { final String WORD_TO_TYPE = "this"; final String STRIPPER = "\n"; diff --git a/tests/src/com/android/inputmethod/latin/InputLogicTestsNonEnglish.java b/tests/src/com/android/inputmethod/latin/InputLogicTestsNonEnglish.java index 1257ae297..68b6ee674 100644 --- a/tests/src/com/android/inputmethod/latin/InputLogicTestsNonEnglish.java +++ b/tests/src/com/android/inputmethod/latin/InputLogicTestsNonEnglish.java @@ -45,6 +45,19 @@ public class InputLogicTestsNonEnglish extends InputTestsBase { mEditText.getText().toString()); } + public void testClusteringPunctuationForFrench() { + final String WORD1_TO_TYPE = "test"; + final String WORD2_TO_TYPE = "!!?!:!"; + // In English, the expected result would be "test!!?!:!" + final String EXPECTED_RESULT = "test !!?! : !"; + changeLanguage("fr"); + type(WORD1_TO_TYPE); + pickSuggestionManually(0, WORD1_TO_TYPE); + type(WORD2_TO_TYPE); + assertEquals("clustering punctuation for French", EXPECTED_RESULT, + mEditText.getText().toString()); + } + public void testWordThenSpaceThenPunctuationFromStripTwiceForFrench() { final String WORD_TO_TYPE = "test "; final String PUNCTUATION_FROM_STRIP = "!"; |