Commit Graph

9998 Commits (f90fc105ab1159f43f536bcacdd1224c2c05bacb)

Author SHA1 Message Date
Jean Chalard 1b67a2bd8b Merge "Use spaces instead of tabs in the combined format." 2012-10-31 02:33:55 -07:00
Jean Chalard 8f18c261cd Use spaces instead of tabs in the combined format.
Change-Id: Ie8a4cdc44f87839e29bfbffc03d4853b7b5cc5f6
2012-10-31 18:32:09 +09:00
Jean Chalard 0b900f5e64 Merge "Add a plumbing option to dicttool info." 2012-10-31 00:54:17 -07:00
Jean Chalard 51a0ef8c59 Add a plumbing option to dicttool info.
Also align the `porcelain' option to the diff command
that was used mistakenly.

Bug: 7388665
Change-Id: Ic0e1b98c62ce37b2e909384a0370af4458563703
2012-10-31 16:35:22 +09:00
Tadashi G. Takaoka 33aa6e3cf0 Escape "#" sign in XML file
Change-Id: Icd38abc4a0454ca949613d8c4bb528758cd990d8
2012-10-31 14:26:03 +09:00
Jean Chalard a8058d169d Cleanup after dicttool
Arrange for temporary files to be deleted.
Also, add a security on stack overflows.

Change-Id: I9da2ebefb06409a71b235243ea835ce10d6a9b81
2012-10-30 19:57:02 +09:00
Jean Chalard ee0b5488b5 Implement the package command
Bug: 7388852
Change-Id: Ib6a50e02894961b4c7d3f57bc0fc70c3b3bfe4e9
2012-10-30 18:42:58 +09:00
Jean Chalard ba98b63983 Add the unpackage command
Bug: 7388852
Change-Id: I7e5376f5d646e669884ef78e4e0dee62c99d4d6b
2012-10-30 18:20:26 +09:00
Jean Chalard e44358d2eb Add an empty crypt command to aosp dicttool
This also makes the AdditionalCommandList useless,
so let's remove it

Bug: 7388852
Change-Id: I308f54ca6f778afe01c1233801a9cc22ebb3d1e9
2012-10-30 17:44:39 +09:00
Tadashi G. Takaoka c7318bbc0b Fix possible NPE
Bug: 7398904
Change-Id: I6b7aba7a9bf52ca494cb4390b19525c98790bd49
2012-10-29 18:40:37 +09:00
Ken Wakasa fd08cd498e Adjust C++ compiler warning flags with the off-device TRT
Change-Id: I031d191f8de99789fa0c000c01d61baffa2d3627
2012-10-29 18:22:53 +09:00
Jean Chalard e5b68fb51d Accept comments in the combined file format
Change-Id: I17b745281b8b7b1922e1c2d3717986e9bb11aa0b
2012-10-29 18:08:50 +09:00
Tadashi G. Takaoka cfbfb1c50a Remove reference of android.util.Log in Constants class
This is a follow up of Iee01d4d2.

Change-Id: I0bcd349d317d9f7d40ef0574e72c640f9f990c5d
2012-10-29 17:25:13 +09:00
Tadashi G. Takaoka 7947eaf475 Merge "Move code point constants from Keyboard to Constants class" 2012-10-29 00:10:52 -07:00
Tadashi G. Takaoka 240871ecaf Move code point constants from Keyboard to Constants class
Change-Id: Iee01d4d2b916d0b584531104ac865ae6e6370a3d
2012-10-29 16:04:20 +09:00
Jean Chalard f41389a74b Remove warnings
Thanks Eclipse

Change-Id: I88e3979ed22be5d8be5a5accdde417c6b1a8bf2d
2012-10-29 14:24:16 +09:00
Jean Chalard 74d66a5513 Add word arguments to the info command (A10)
With this, it's now possible to get all the information about a word from
any dictionary.

Bug: 7388857
Change-Id: Ifc9d539f52f87044a1974d95bf35d87465e84c47
2012-10-29 12:41:57 +09:00
Jean Chalard a23e333079 Implement the word-level diff (A9)
Bug: 7388857
Change-Id: I4c4560d4f4b579936a44cdf409a4c27300b65610
2012-10-29 12:31:22 +09:00
Jean Chalard 0c5b93800e Add the dicttool diff command. (A8)
This is an initial implementation, it does not
do everything just yet.

Bug: 7388857
Change-Id: I11543973a4657e122ca3475225059b06b9a3f2b9
2012-10-29 11:15:15 +09:00
Jean Chalard 6ecc50a867 Add a reporting option to the getDictionary method (A7)
This is refactoring to help future changes

Change-Id: I8c4372383a2fff5805b96cc47df5012e4b231004
2012-10-29 10:39:40 +09:00
The Android Automerger cbbfb472ab merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-26 16:23:17 -07:00
Tadashi G. Takaoka da8f4e2616 Fix maketext template to use @UsedForTesting
This is a follow up of I0b7e0c19.

Change-Id: I8530453bfba9d4de2b134f52acc931cc9659a9d6
2012-10-26 15:29:52 +09:00
Ken Wakasa d505319a25 am 5199b8bf: am f6df37ce: Merge "LatinIME: Add accents to german keyboard"
* commit '5199b8bf1a212b93c9f37d4bb18121ba7f174bd0':
  LatinIME: Add accents to german keyboard
2012-10-25 23:13:48 -07:00
Ken Wakasa 5199b8bf1a am f6df37ce: Merge "LatinIME: Add accents to german keyboard"
* commit 'f6df37ce2dce9ada1af097e0c2fbdd84c0334c61':
  LatinIME: Add accents to german keyboard
2012-10-25 23:11:21 -07:00
Ken Wakasa f6df37ce2d Merge "LatinIME: Add accents to german keyboard" 2012-10-25 22:47:24 -07:00
Satoshi Kataoka 6067b9e1bd am ef5f88f3: am 5e118c4c: am 60dea36d: Assuming that NO_EXTRACT_UI mode is NO_FULSCREEN
* commit 'ef5f88f33e432284c958fafe18f891a10f77e1f9':
  Assuming that NO_EXTRACT_UI mode is NO_FULSCREEN
2012-10-25 19:31:27 -07:00
Satoshi Kataoka ef5f88f33e am 5e118c4c: am 60dea36d: Assuming that NO_EXTRACT_UI mode is NO_FULSCREEN
* commit '5e118c4c048254d40405dbb454bbea9ab9e9d174':
  Assuming that NO_EXTRACT_UI mode is NO_FULSCREEN
2012-10-25 19:29:16 -07:00
Satoshi Kataoka 5e118c4c04 am 60dea36d: Assuming that NO_EXTRACT_UI mode is NO_FULSCREEN
* commit '60dea36dafc4a567b948b5175bcca776b08fdfad':
  Assuming that NO_EXTRACT_UI mode is NO_FULSCREEN
2012-10-25 19:26:35 -07:00
Satoshi Kataoka 60dea36daf Assuming that NO_EXTRACT_UI mode is NO_FULSCREEN
Bug: 7393485
Bug: 7272829
Change-Id: I873e8d99486c734e76484526631a90fc55e91c86
2012-10-25 20:00:46 +09:00
Jean Chalard 47cac57e45 Finish up the "info" command in dicttool. (A6)
Bug: 7388857
Change-Id: I704f12a6be76ce1644ec5e8dd3b667f112e9c04a
2012-10-25 19:15:24 +09:00
Jean Chalard f1d35ac5dc Implement a part of the "info" command (A5)
Bug: 7388857
Change-Id: Id1bba7a33ab6195d5711bebb1df5c18c9c08925c
2012-10-25 18:19:10 +09:00
Jean Chalard 3862b9e819 Add symmetry and pre-emptively improve performance (A4)
The test for binary dictionary will soon entail decrypting and
uncompressing files if necessary to test for their headers, and will
become much slower than it is. It's better to be able to detect the
XML format too, and leave the slower test for last.

Bug: 7388852
Change-Id: I6b9a7944de80217e1571cab65dcd1cff347b3046
2012-10-25 17:20:24 +09:00
Jean Chalard 0044df6cf2 Add automatic decryption capabilities. (A3)
Bug: 7388852
Change-Id: Ie952b1ad6cfad2f83793bd968e159d3cfbf20a47
2012-10-25 16:47:32 +09:00
Jean Chalard b3c98901c5 Add auto detection and decoding of dictionary files. (A2)
Bug: 7388852
Change-Id: I25e755fc15f5b383acc046f668e9681efa4f0c2f
2012-10-25 16:40:15 +09:00
Jean Chalard 77fe603a3d Some initial refactoring in dicttool. (A1)
Bug: 7388852
Change-Id: I5ff70d12f3a8096ae6fb8cd4883a32ffe1683c9b
2012-10-25 16:40:11 +09:00
The Android Automerger 99a8169e18 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-24 06:59:24 -07:00
Jean Chalard b5a15bc076 am 7c22c62d: am 1f9eea44: am 306e0a80: Update AOSP dictionaries.
* commit '7c22c62d8f50aebe2f96bf5dcf99077d64db6f8f':
  Update AOSP dictionaries.
2012-10-24 02:17:37 -07:00
Jean Chalard 7c22c62d8f am 1f9eea44: am 306e0a80: Update AOSP dictionaries.
* commit '1f9eea44dc4e9b8365938647b2f257f229abfff4':
  Update AOSP dictionaries.
2012-10-24 00:29:04 -07:00
Jean Chalard 1f9eea44dc am 306e0a80: Update AOSP dictionaries.
* commit '306e0a800f2ac9fc6af24d41bfff2d8445e963c4':
  Update AOSP dictionaries.
2012-10-24 00:26:30 -07:00
Jean Chalard 306e0a800f Update AOSP dictionaries.
Changes :
- Add "emoji"
- Change the whitelist target of "foo" from "for" to "too"
- Fix non-word frequencies to 0
- Fix the freq of common en_US vs en_GB words
- Add "connection" to the en_GB dictionary

Bug: 7368441
Bug: 7370033
Bug: 7371955
Change-Id: Ib22a97e97b486b05012d5496619557f406c441b9
2012-10-24 16:12:28 +09:00
Jean Chalard ddb0bcc051 Fix a bug where a bigram would be ignored
Bug: 7403386
Change-Id: I89f495d07f7059a9f1ccd97d487c2f2657a8ebd2
2012-10-24 13:24:59 +09:00
The Android Automerger 9f97ced562 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-23 06:59:51 -07:00
Jean Chalard 1ec8299389 Fix the build (again)
Change-Id: Idb7addede891a5c672d7fc09ddfe4d2585f8d647
2012-10-23 19:34:37 +09:00
Jean Chalard 5e5be5a2d2 Merge "Return the correct bigram frequency" 2012-10-23 01:19:28 -07:00
Jean Chalard c59c741987 Return the correct bigram frequency
The "correct" bigram frequency is now returned by the reading
code. However, as the binary format represents the frequency
in a lossy manner, the frequency is not guaranteed to be the
exact same as the one in the source text format - only a close
enough value. It is however the exact same value seen by the
native code.

Bug: 7395653
Change-Id: I49199ef18901c671189912b3550623e9643baedd
2012-10-23 17:17:37 +09:00
Jean Chalard 1e0cc86b6f Fix the build.
It seems this change snuck out from a previous version.

Change-Id: I9c33d51273732b1d55bfd60f0957184c86fa88ab
2012-10-23 15:34:42 +09:00
Jean Chalard c7020f54f9 Merge "Add reader and writer for the combined dict format." 2012-10-22 23:11:20 -07:00
Jean Chalard 9bb4eebf48 Add reader and writer for the combined dict format.
This introduces a new textual format for the dictionary that combines
words, bigrams and shortcuts to avoid complexity. It is also extensible
to n-grams to fool-prof for the future, and easier to read than XML.

Bug: 7388540
Change-Id: I942bbad51bd0c905a5a54c278667563fd6dd66ec
2012-10-23 15:06:25 +09:00
Jean Chalard 751f3dc0e1 am 6fe6f38d: am d39e6435: am f960eb18: Don\'t put spaces after characters that don\'t take one
* commit '6fe6f38d8af09b24e40a6e01eae919820cd04c16':
  Don't put spaces after characters that don't take one
2012-10-22 21:46:43 -07:00
Jean Chalard 6fe6f38d8a am d39e6435: am f960eb18: Don\'t put spaces after characters that don\'t take one
* commit 'd39e64350c99b0dd3076214ebb1ec9ed1eb6e386':
  Don't put spaces after characters that don't take one
2012-10-22 21:44:20 -07:00