diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-02-21 03:57:00 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-02-21 03:57:00 -0800 |
| commit | 3792a64e48bb02f70ffe65dee35a5d8ac9c47837 (patch) | |
| tree | 578ad1761d51792b25cc38607719e7dc30c98cd4 | |
| parent | 3a7356c402e802dd41cdc702d904348dd47c13f2 (diff) | |
| parent | 1269ae31445ce46986638af8e5bb8ecab3db0915 (diff) | |
| download | latinime-3792a64e48bb02f70ffe65dee35a5d8ac9c47837.tar.gz latinime-3792a64e48bb02f70ffe65dee35a5d8ac9c47837.tar.xz latinime-3792a64e48bb02f70ffe65dee35a5d8ac9c47837.zip | |
am 1269ae31: Merge "Change make-keyboard-text -java option to point LatinIME/java directory"
* commit '1269ae31445ce46986638af8e5bb8ecab3db0915':
Change make-keyboard-text -java option to point LatinIME/java directory
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java | 5 | ||||
| -rw-r--r-- | tools/make-keyboard-text/res/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.tmpl (renamed from tools/make-keyboard-text/res/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.tmpl) | 5 | ||||
| -rw-r--r-- | tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/MoreKeysResources.java | 1 |
3 files changed, 6 insertions, 5 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java index 93d80c909..96acb1551 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java @@ -24,7 +24,8 @@ import java.util.HashMap; * !!!!! DO NOT EDIT THIS FILE !!!!! * * This file is generated by tools/make-keyboard-text. The base template file is - * tools/make-keyboard-text/res/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.tmpl + * tools/make-keyboard-text/res/src/com/android/inputmethod/keyboard/internal/ + * KeyboardTextsTable.tmpl * * This file must be updated when any text resources in keyboard layout files have been changed. * These text resources are referred as "!text/<resource_name>" in keyboard XML definitions, @@ -34,7 +35,7 @@ import java.util.HashMap; * To update this file, please run the following commands. * $ cd $ANDROID_BUILD_TOP * $ mmm packages/inputmethods/LatinIME/tools/make-keyboard-text - * $ make-keyboard-text -java packages/inputmethods/LatinIME/java/src + * $ make-keyboard-text -java packages/inputmethods/LatinIME/java * * The updated source file will be generated to the following path (this file). * packages/inputmethods/LatinIME/java/src/com/android/inputmethod/keyboard/internal/ diff --git a/tools/make-keyboard-text/res/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.tmpl b/tools/make-keyboard-text/res/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.tmpl index 7ec42ceea..b25bfb204 100644 --- a/tools/make-keyboard-text/res/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.tmpl +++ b/tools/make-keyboard-text/res/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.tmpl @@ -24,7 +24,8 @@ import java.util.HashMap; * !!!!! DO NOT EDIT THIS FILE !!!!! * * This file is generated by tools/make-keyboard-text. The base template file is - * tools/make-keyboard-text/res/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.tmpl + * tools/make-keyboard-text/res/src/com/android/inputmethod/keyboard/internal/ + * KeyboardTextsTable.tmpl * * This file must be updated when any text resources in keyboard layout files have been changed. * These text resources are referred as "!text/<resource_name>" in keyboard XML definitions, @@ -34,7 +35,7 @@ import java.util.HashMap; * To update this file, please run the following commands. * $ cd $ANDROID_BUILD_TOP * $ mmm packages/inputmethods/LatinIME/tools/make-keyboard-text - * $ make-keyboard-text -java packages/inputmethods/LatinIME/java/src + * $ make-keyboard-text -java packages/inputmethods/LatinIME/java * * The updated source file will be generated to the following path (this file). * packages/inputmethods/LatinIME/java/src/com/android/inputmethod/keyboard/internal/ diff --git a/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/MoreKeysResources.java b/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/MoreKeysResources.java index e9d6c864f..9bb2b38dd 100644 --- a/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/MoreKeysResources.java +++ b/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/MoreKeysResources.java @@ -29,7 +29,6 @@ import java.util.Comparator; import java.util.HashMap; import java.util.Locale; import java.util.jar.JarFile; -import java.util.regex.Pattern; public class MoreKeysResources { private static final String TEXT_RESOURCE_NAME = "donottranslate-more-keys.xml"; |