Commit graph

9614 commits

Author SHA1 Message Date
Tadashi G. Takaoka
20dd1bc090 Cosmetic source code formating change
Change-Id: I3a53b49afab70dfb13f12027070635da6001eb79
2012-11-01 13:10:44 +09:00
Ken Wakasa
01f6a61e51 Merge "Use 32-bit code points for suggestions output" 2012-10-31 09:36:01 -07:00
The Android Open Source Project
c2cf819fe9 am b2b10f9a: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit 'b2b10f9ad814574a3559ff2d32cbe2d173d14aab':
2012-10-31 09:23:32 -07:00
The Android Open Source Project
b2b10f9ad8 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I4a04730079d76f1d050c1bcdeb701bd8bbb79511
2012-10-31 09:18:41 -07:00
Ken Wakasa
1e61493c50 Use 32-bit code points for suggestions output
This is a multi-project commit with Ic43dd666

bug: 6526418
Change-Id: I39c1acb4e91d04cd8a4ec5a943c8cf575da75ebc
2012-11-01 00:09:51 +09:00
Tadashi G. Takaoka
0ea2c80d8d Merge "Consolidate two helper methods (refactor step 3)" 2012-10-31 03:58:47 -07:00
Tadashi G. Takaoka
661bc810e5 Merge "Flatten nested if-else blocks into plain if-else blocks (refactor step 2.5)" 2012-10-31 03:46:05 -07:00
Tadashi G. Takaoka
831198a4e4 Consolidate two helper methods (refactor step 3)
Change-Id: I8b8522d1e5342fc73346ba2748e75f0c1d5bf03c
2012-10-31 19:45:29 +09:00
Tadashi G. Takaoka
2a3b15b267 Flatten nested if-else blocks into plain if-else blocks (refactor step 2.5)
Change-Id: I42aad04658e14e8fd703e3828676719a333ec8f9
2012-10-31 19:44:45 +09:00
Tadashi G. Takaoka
8ae9fbef77 Merge "Separate nested if-blocks into helper methods (refactor step 2)" 2012-10-31 03:43:27 -07:00
Tadashi G. Takaoka
3c6d3a4df8 Separate nested if-blocks into helper methods (refactor step 2)
Change-Id: Ic0ed243f8c1fbf62793565ee37175270b47f0801
2012-10-31 19:34:43 +09:00
Jean Chalard
f5adbb1e1b Move the emoji dictionaries source under AOSP.
Change-Id: Ie870a90d483d9f27aed96fb4b44126315c43922f
2012-10-31 19:22:42 +09:00
Tadashi G. Takaoka
dd43dd61eb Merge "Separate nested if-blocks into helper methods (refactor step 1)" 2012-10-31 03:18:08 -07:00
Jean Chalard
63b66b6f39 Merge "Switch the AOSP word lists to the combined format." 2012-10-31 02:57:26 -07:00
Jean Chalard
a424ff06ec Switch the AOSP word lists to the combined format.
This will help with managing the word lists.

Bug: 7388859
Change-Id: I89f049569b177d3027fe56d6c67eaca27d44dc7d
2012-10-31 18:52:00 +09:00
Tadashi G. Takaoka
8b449c6dda Separate nested if-blocks into helper methods (refactor step 1)
Change-Id: I87ef8b174295fb12a91fec35acd3b0cc152ad8f0
2012-10-31 18:40:28 +09:00
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