diff options
Diffstat (limited to 'tools')
6 files changed, 82 insertions, 21 deletions
diff --git a/tools/dicttool/Android.mk b/tools/dicttool/Android.mk index 0f1f34418..3e3d419e6 100644 --- a/tools/dicttool/Android.mk +++ b/tools/dicttool/Android.mk @@ -32,10 +32,12 @@ LOCAL_PATH := $(LATINIME_DICTTOOL_AOSP_LOCAL_PATH) include $(CLEAR_VARS) LATINIME_LOCAL_DIR := ../.. -LATINIME_BASE_SOURCE_DIRECTORY := $(LATINIME_LOCAL_DIR)/java/src/com/android/inputmethod -LATINIME_ANNOTATIONS_SOURCE_DIRECTORY := $(LATINIME_BASE_SOURCE_DIRECTORY)/annotations -MAKEDICT_CORE_SOURCE_DIRECTORY := $(LATINIME_BASE_SOURCE_DIRECTORY)/latin/makedict -LATINIME_TESTS_SOURCE_DIRECTORY := $(LATINIME_LOCAL_DIR)/tests/src/com/android/inputmethod/latin +LATINIME_BASE_SRC_DIR := $(LATINIME_LOCAL_DIR)/java/src/com/android/inputmethod +LATINIME_BASE_OVERRIDABLE_SRC_DIR := \ + $(LATINIME_LOCAL_DIR)/java-overridable/src/com/android/inputmethod +LATINIME_ANNOTATIONS_SRC_DIR := $(LATINIME_BASE_SRC_DIR)/annotations +MAKEDICT_CORE_SRC_DIR := $(LATINIME_BASE_SRC_DIR)/latin/makedict +LATINIME_TESTS_SRC_DIR := $(LATINIME_LOCAL_DIR)/tests/src/com/android/inputmethod/latin # Dependencies for Dicttool. Most of these files are needed by BinaryDictionary.java. Note that # a significant part of the dependencies are mocked in the compat/ directory, with empty or @@ -51,7 +53,6 @@ LATINIME_SRC_FILES_FOR_DICTTOOL := \ latin/PrevWordsInfo.java \ latin/SuggestedWords.java \ latin/WordComposer.java \ - latin/define/DebugFlags.java \ latin/settings/NativeSuggestOptions.java \ latin/settings/SettingsValuesForSuggestion.java \ latin/utils/BinaryDictionaryUtils.java \ @@ -63,29 +64,33 @@ LATINIME_SRC_FILES_FOR_DICTTOOL := \ latin/utils/ResizableIntArray.java \ latin/utils/StringUtils.java +LATINIME_OVERRIDABLE_SRC_FILES_FOR_DICTTOOL := \ + latin/define/DebugFlags.java + LATINIME_TEST_SRC_FILES_FOR_DICTTOOL := \ utils/ByteArrayDictBuffer.java -USED_TARGETED_SRCS := \ - $(addprefix $(LATINIME_BASE_SOURCE_DIRECTORY)/, $(LATINIME_SRC_FILES_FOR_DICTTOOL)) \ - $(addprefix $(LATINIME_TESTS_SOURCE_DIRECTORY)/, $(LATINIME_TEST_SRC_FILES_FOR_DICTTOOL)) +USED_TARGETED_SRC_FILES := \ + $(addprefix $(LATINIME_BASE_SRC_DIR)/, $(LATINIME_SRC_FILES_FOR_DICTTOOL)) \ + $(addprefix $(LATINIME_BASE_OVERRIDABLE_SRC_DIR)/, \ + $(LATINIME_OVERRIDABLE_SRC_FILES_FOR_DICTTOOL)) \ + $(addprefix $(LATINIME_TESTS_SRC_DIR)/, $(LATINIME_TEST_SRC_FILES_FOR_DICTTOOL)) -DICTTOOL_ONDEVICE_TESTS_DIRECTORY := \ +DICTTOOL_ONDEVICE_TESTS_DIR := \ $(LATINIME_LOCAL_DIR)/tests/src/com/android/inputmethod/latin/makedict/ -DICTTOOL_COMPAT_TESTS_DIRECTORY := compat +DICTTOOL_COMPAT_TESTS_DIR := compat -LOCAL_MAIN_SRC_FILES := $(call all-java-files-under, $(MAKEDICT_CORE_SOURCE_DIRECTORY)) +LOCAL_MAIN_SRC_FILES := $(call all-java-files-under, $(MAKEDICT_CORE_SRC_DIR)) LOCAL_TOOL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_ANNOTATIONS_SRC_FILES := \ - $(call all-java-files-under, $(LATINIME_ANNOTATIONS_SOURCE_DIRECTORY)) +LOCAL_ANNOTATIONS_SRC_FILES := $(call all-java-files-under, $(LATINIME_ANNOTATIONS_SRC_DIR)) LOCAL_SRC_FILES := $(LOCAL_TOOL_SRC_FILES) \ $(filter-out $(addprefix %/, $(notdir $(LOCAL_TOOL_SRC_FILES))), $(LOCAL_MAIN_SRC_FILES)) \ - $(call all-java-files-under, $(DICTTOOL_COMPAT_TESTS_DIRECTORY)) \ - $(LOCAL_ANNOTATIONS_SRC_FILES) $(USED_TARGETED_SRCS) \ - $(LATINIME_BASE_SOURCE_DIRECTORY)/latin/Constants.java \ + $(call all-java-files-under, $(DICTTOOL_COMPAT_TESTS_DIR)) \ + $(LOCAL_ANNOTATIONS_SRC_FILES) $(USED_TARGETED_SRC_FILES) \ + $(LATINIME_BASE_SRC_DIR)/latin/Constants.java \ $(call all-java-files-under, tests) \ - $(call all-java-files-under, $(DICTTOOL_ONDEVICE_TESTS_DIRECTORY)) + $(call all-java-files-under, $(DICTTOOL_ONDEVICE_TESTS_DIR)) LOCAL_JAVA_LIBRARIES := junit LOCAL_STATIC_JAVA_LIBRARIES := jsr305lib diff --git a/tools/make-keyboard-text/res/values-bn-rIN/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-bn-rIN/donottranslate-more-keys.xml index 4955cd46a..1ec4249d0 100644 --- a/tools/make-keyboard-text/res/values-bn-rIN/donottranslate-more-keys.xml +++ b/tools/make-keyboard-text/res/values-bn-rIN/donottranslate-more-keys.xml @@ -23,6 +23,6 @@ U+0996: "ख" BENGALI LETTER KHA U+0997: "ग" BENGALI LETTER GA --> <string name="keylabel_to_alpha">কখগ</string> - <!-- U+09F3: "৳" BENGALI RUPEE SIGN --> - <string name="keyspec_currency">৳</string> + <!-- U+20B9: "₹" INDIAN RUPEE SIGN --> + <string name="keyspec_currency">₹</string> </resources> diff --git a/tools/make-keyboard-text/res/values-si-rLK/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-si-rLK/donottranslate-more-keys.xml index 89c9195e8..871d82ab0 100644 --- a/tools/make-keyboard-text/res/values-si-rLK/donottranslate-more-keys.xml +++ b/tools/make-keyboard-text/res/values-si-rLK/donottranslate-more-keys.xml @@ -22,4 +22,6 @@ U+0D85: "අ" SINHALA LETTER AYANNA U+0D86: "ආ" SINHALA LETTER AAYANNA --> <string name="keylabel_to_alpha">අ,ආ</string> + <!-- U+0DBB/U+0DD4: "රු" SINHALA LETTER RAYANNA/SINHALA VOWEL SIGN KETTI PAA-PILLA --> + <string name="keyspec_currency">රු</string> </resources> diff --git a/tools/make-keyboard-text/res/values-ta-rLK/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-ta-rLK/donottranslate-more-keys.xml new file mode 100644 index 000000000..9e900a6b1 --- /dev/null +++ b/tools/make-keyboard-text/res/values-ta-rLK/donottranslate-more-keys.xml @@ -0,0 +1,28 @@ +<?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"> + <!-- Label for "switch to alphabetic" key. + U+0BA4: "த" TAMIL LETTER TA + U+0BAE/U+0BBF: "மி" TAMIL LETTER MA/TAMIL VOWEL SIGN I + U+0BB4/U+0BCD: "ழ்" TAMIL LETTER LLLA/TAMIL SIGN VIRAMA --> + <string name="keylabel_to_alpha">தமிழ்</string> + <!-- U+0DBB/U+0DD4: "රු" SINHALA LETTER RAYANNA/SINHALA VOWEL SIGN KETTI PAA-PILLA --> + <string name="keyspec_currency">රු</string> +</resources> diff --git a/tools/make-keyboard-text/res/values-ta-rSG/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-ta-rSG/donottranslate-more-keys.xml new file mode 100644 index 000000000..07e4d8beb --- /dev/null +++ b/tools/make-keyboard-text/res/values-ta-rSG/donottranslate-more-keys.xml @@ -0,0 +1,26 @@ +<?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"> + <!-- Label for "switch to alphabetic" key. + U+0BA4: "த" TAMIL LETTER TA + U+0BAE/U+0BBF: "மி" TAMIL LETTER MA/TAMIL VOWEL SIGN I + U+0BB4/U+0BCD: "ழ்" TAMIL LETTER LLLA/TAMIL SIGN VIRAMA --> + <string name="keylabel_to_alpha">தமிழ்</string> +</resources> diff --git a/tools/make-keyboard-text/res/values/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values/donottranslate-more-keys.xml index 4b9ca162e..c4a1b889e 100644 --- a/tools/make-keyboard-text/res/values/donottranslate-more-keys.xml +++ b/tools/make-keyboard-text/res/values/donottranslate-more-keys.xml @@ -87,7 +87,7 @@ U+20B1: "₱" PESO SIGN --> <string name="morekeys_currency_dollar">¢,£,€,¥,₱</string> <string name="keyspec_currency">$</string> - <string name="morekeys_currency">$,¢,€,£,¥,₱</string> + <string name="morekeys_currency_generic">$,¢,€,£,¥,₱</string> <string name="morekeys_punctuation">"!autoColumnOrder!8,\\,,?,!,#,!text/keyspec_right_parenthesis,!text/keyspec_left_parenthesis,/,;,',@,:,-,\",+,\\%,&"</string> <string name="morekeys_tablet_punctuation">"!autoColumnOrder!7,\\,,',#,!text/keyspec_right_parenthesis,!text/keyspec_left_parenthesis,/,;,@,:,-,\",+,\\%,&"</string> <!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE --> @@ -258,5 +258,5 @@ <string name="morekeys_single_quote">!fixedColumnOrder!5,!text/single_quotes,!text/single_angle_quotes</string> <string name="morekeys_double_quote">!fixedColumnOrder!5,!text/double_quotes,!text/double_angle_quotes</string> <string name="morekeys_tablet_double_quote">!fixedColumnOrder!6,!text/double_quotes,!text/single_quotes,!text/double_angle_quotes,!text/single_angle_quotes</string> - <string name="keyspec_emoji_key">!icon/emoji_key|!code/key_emoji</string> + <string name="keyspec_emoji_action_key">!icon/emoji_action_key|!code/key_emoji</string> </resources> |