Commit graph

193 commits

Author SHA1 Message Date
Tadashi G. Takaoka
5f282ea9e4 Add CollectionUtils class to create generic collection easily
Change-Id: I6b4de9187e122298e5e9cd8ddc9070d062df6a89
2012-08-22 10:21:38 +09:00
Ken Wakasa
4af100759b (DO NOT MERGE) Remove useless module tags from makefiles
Change-Id: If77482da66e80b762cf205369f7d53d069cd8072
2012-08-17 20:12:49 +09:00
Joe Onorato
8685030562 am 33afbf9a: am 38be4ee0: Merge "Unnessary LOCAL_MODULE_TAGS"
* commit '33afbf9a3438df786782283b57a399599809dba6':
  Unnessary LOCAL_MODULE_TAGS
2012-08-17 00:16:42 -07:00
Jean Chalard
565fdeee7d Reinstate putting shortcut-only entries in the dictionary
Not sure at which point this functionality got lost, but
anyway, it's back

Bug: 6906525
Change-Id: Ie87baa0dacdcee90e029917ca866099593d5d048
2012-08-10 15:51:53 +09:00
Jean Chalard
31b90a368f Support a syntax to add whitelist entries in shortcuts
Bug: 6906525
Change-Id: Ie33586c07973bf76e38390766175ba424d72d655
2012-08-10 11:26:40 +09:00
Jean Chalard
ccd8ed53b3 Support stdin and stdout for compress/uncompress
This will improve flexibility in dictionary generation by
allowing pipelined commands.

Change-Id: Ia07bdc82c8bd740b5dfee6b5fd1a067f4b8b7ba5
2012-08-09 14:25:13 +09:00
Jean Chalard
4c573f3c64 Rename dicttool to dicttool_aosp and split commands
Change-Id: I83d948be2db5cd0203e876f019697e1d5e038818
2012-08-08 17:15:58 +09:00
Jean Chalard
04cccea295 Move makedict to live under dicttool (A5)
This removes the makedict directory and makes a new target
to replace it. The old command is still working the same
way it used to.

Change-Id: Ie73b12a7ef101dd2b282e0cb4206ac263af1093e
2012-08-04 02:14:13 +09:00
Jean Chalard
3598053d41 Move dicttool tests and make a script to run them (A4)
Change-Id: If582e81741c5edaf345dcb55517dcad0baa64c9e
2012-08-04 01:55:33 +09:00
Jean Chalard
5284a1e3d3 Fix the build
Change-Id: I0d6570332bcf569d8c43b3edd8b3ab52263ef179
2012-08-04 01:48:17 +09:00
Jean Chalard
54e84a00fc Make a makedict command for dicttool (A3)
This behaves exactly as the old makedict command. Further
changes will redirect the calls to makedict to this, so as
to consolidate similar code.

Groundwork for
Bug: 6429606

Change-Id: Ibeadbf48bec70f988a15ca36ebf5d1ce3b5b54ea
2012-08-04 01:11:46 +09:00
Jean Chalard
82cd20ee98 Simplification (A2)
A single command at a time and no arity gives opportunity to simplify
the argument parsing code.

Change-Id: Iff7bab78ede7448a662092f221c590a9eedae2a5
2012-08-03 23:02:39 +09:00
Jean Chalard
77c8c73837 Remove arity from dicttool commands (A1)
This unnecessarily complicates and limits commands.
It's simpler to just have one command by invocation.

Groundwork for
Bug: 6429606

Change-Id: I24cf267a9cbc937a5ba53942b29e28e7095d2fd2
2012-08-03 23:02:06 +09:00
Tadashi G. Takaoka
b98b957424 Fix east slavic keyboard layouts
This change affects Ukrainian, Belarusian, Kyrgyz, and Russian
keyboard. The followings are the layout changes for each language
respectively.

[Ukrainian]
 * Replace useless CYRILLIC LETTER E with CYRILLIC LETTER UKRAINIAN IE.
 * Replace useless CYRILLIC LETTER HARD SIGN with CYRILLIC LETTER YI
   on 10-inch tablet.
 * Add CYRILLIC LETTER GHE WITH UPTURN as more keys of CYRILLIC LETTER
   GHE.

[Belarusian]
 * Add CYRILLIC LETTER IO as more keys of CYRILLIC LETTER IE.
 * Replace useless CYRILLIC LETTER HARD SIGN with CYRILLIC LETTER IE
   on 10-inch tablet.

[Kyrgyz]
 * Add CYRILLIC LETTER IO as more keys of CYRILLIC LETTER IE.
 * Remove CYRILLIC LETTER HARD SIGN from more keys of CYRILLIC LETTER
   HA because CYRILLIC LETTER SOFT SIGN has it.

[Russian]
 * Remove CYRILLIC LETTER HARD SIGN from more keys of CYRILLIC LETTER
   HA because CYRILLIC LETTER SOFT SIGN has it.

This change also replace misspelled "more_keys_for_cyrillic_ye" text
name with "more_keys_for_cyrillic_ie".

Bug: 6881007
Change-Id: I9e88c4e27f66225e1676f2b286a7e55b9f2cbf5b
2012-07-31 13:19:11 +09:00
Tadashi G. Takaoka
97c8d288a8 Add Zulu keyboard
Bug: 6867914
Change-Id: I13316ac2a554a8601f920e875d540e5375e12860
2012-07-26 19:03:35 +09:00
Tadashi G. Takaoka
b90363e40c Fix Afrikaans more keys layout
Bug: 6867914
Change-Id: I43178a729f4770743f9fea87bad539c54da045c5
2012-07-26 16:31:06 +09:00
Tadashi G. Takaoka
55c01170c4 Add Afrikaans keyboard layout
Bug: 6867914
Change-Id: Ice35b20a0a51dda21c8271256064523bb5844952
2012-07-26 15:57:35 +09:00
Tadashi G. Takaoka
a28f6c9a18 Add Swahili keyboard layout
Bug: 6867914
Change-Id: I2b9b0a06ff49a2afe16ec7a0ace0503d1658d413
2012-07-25 17:48:37 +09:00
Tadashi G. Takaoka
9ecf634686 Add Seriban Latin keyboard layout as comments
Bug: 6867914
Bug: 6867842
Change-Id: I3434434628e72fdb127d158de6c17fdfa77ee9c8
2012-07-24 20:07:59 +09:00
Tadashi G. Takaoka
a01d9aea64 Add Tagalog keyboard layout
Bug: 6867914
Change-Id: I78ca6216cc74f8d34291950c05c810c800a3ddba
2012-07-24 18:54:43 +09:00
Joe Onorato
00da3084bf Unnessary LOCAL_MODULE_TAGS
Change-Id: Idaf766c4b5b45da782e15750cbefa9d9ec1f0487
2012-07-21 17:34:38 -07:00
Tadashi G. Takaoka
af2c115253 Opening punctuations have a priority in Spanish keyboard
Bug: 6737535
Change-Id: I87442eb978ac68be3d3df99eed8a92877a6f4ab0
2012-07-17 16:14:36 +09:00
Tadashi G. Takaoka
a5bbb8df75 am e4bbff78: am 38dc9ca3: Fix duplicate period on Persian tablet keyboard
* commit 'e4bbff783bddb70f52402454987ede281fb86039':
  Fix duplicate period on Persian tablet keyboard
2012-06-18 10:52:54 -07:00
Tadashi G. Takaoka
794a9c913a am 58f9b35e: am 6de1b7a7: Fix Persian keyboard having correct code points
* commit '58f9b35e1cf5a975ec1312858aad9b5cc307fda8':
  Fix Persian keyboard having correct code points
2012-06-18 10:52:46 -07:00
Tadashi G. Takaoka
38dc9ca314 Fix duplicate period on Persian tablet keyboard
Bug: 6679579
Change-Id: I8bccbfbdf7ea1fa1b78a5af05eb1df100f22ab0c
2012-06-18 10:33:03 -07:00
Tadashi G. Takaoka
6de1b7a709 Fix Persian keyboard having correct code points
Bug: 6679850
Change-Id: Iaa33f48ffb5634de31e039574fb58185c6c078e8
2012-06-16 20:30:45 -07:00
Tadashi G. Takaoka
9328e0f2d9 am aee2ed1f: am 14bc2e89: Fix Arabic diacritics order
* commit 'aee2ed1f4b0be7a538cc5722fed274632f2a40ba':
  Fix Arabic diacritics order
2012-06-14 21:08:18 -07:00
Tadashi G. Takaoka
14bc2e89ef Fix Arabic diacritics order
Bug: 6662536
Change-Id: I96e45ce0e8b9b5440a54f3b321a925bc87ec3ca9
2012-06-14 20:33:52 -07:00
Tadashi G. Takaoka
dfcf7cac5e am 1ab436c1: am 0e473e9c: Reorder Persian diacritics
* commit '1ab436c1e60c0e49333549fb93e135fa99458bda':
  Reorder Persian diacritics
2012-06-14 18:30:52 -07:00
Tadashi G. Takaoka
0e473e9c92 Reorder Persian diacritics
Bug: 6661783
Change-Id: I42bab7655121ec5671854d54c47bd0c7a29e7a98
2012-06-14 16:56:36 -07:00
Tadashi G. Takaoka
c380959f48 am bbf18807: am 1db4f951: Fix the order of Persian diacritics
* commit 'bbf188075d5e14626c0609f4c3ee6031f6c6d5a6':
  Fix the order of Persian diacritics
2012-06-14 10:33:46 -07:00
Tadashi G. Takaoka
1db4f95105 Fix the order of Persian diacritics
The java source file KeyboardTextsSet.java has rather big change, but
this file is auto generated by "maketext" tool. The crucial part of
this change is in 5 XML resource files.

Bug: 6661783
Change-Id: I1d827ab0ebe6caa5ab73531682d6c32540b0d7aa
2012-06-14 15:18:25 +09:00
Tadashi G. Takaoka
9c9802e647 Fix maketext tool to work correctly on darwin-x86
Bug: 6661783
Bug: 6662536
Change-Id: I5e657975098a0630ceb1821053cda68bf481d2e4
2012-06-13 22:32:28 -07:00
Tadashi G. Takaoka
59f5f250cf am e03f6b39: am e0952029: Merge "Make KeySpecParser case sensitive again" into jb-dev
* commit 'e03f6b3917f71a7c9f9459765264b547cc80b751':
  Make KeySpecParser case sensitive again
2012-05-28 03:33:28 -07:00
Tadashi G. Takaoka
0a3362d264 Make KeySpecParser case sensitive again
Partially revert I76c3e917.

Bug: 6561272
Change-Id: I5649a8ecb44bd11c67785ea97ddbb67b0a019ccc
2012-05-28 19:07:51 +09:00
Jean Chalard
ddcb4847df Add a tool to do intendance tasks on dictionaries.
Bug: 6429606
Change-Id: I0c7258d992a4bfa9707002f8fbc425ccde7c6172
2012-05-28 18:46:09 +09:00
Ken Wakasa
dd58065733 Cleanup Makefiles of LatinIME
Change-Id: Id4c6700bc045825eb64fb2b7ae57f23a6211441d
2012-05-24 12:08:59 +09:00
Jean Chalard
47db0be7cb Some obvious optimizations to makedict
Bug: 6394357
Change-Id: Ibfd98aac2304ef50cf90b1de984736ddcfe7a4bc
2012-05-14 12:34:05 +09:00
Jean Chalard
ad0233fa02 Merge "Refactor a method" into jb-dev 2012-05-11 04:09:17 -07:00
Jean Chalard
4455fe2c89 Refactor a method
Rename it, rename parameters, and add a parameter that will
be necessary soon.
Also, rescale the bigram frequency as necessary.

Bug: 6313806
Change-Id: I192543cfb6ab6bccda4a1a53c8e67fbf50a257b0
2012-05-11 19:34:35 +09:00
Tadashi G. Takaoka
a6204bbe2a Fix Spanish keyboard to have easy access to inverted ? and !
Bug: 6480385
Change-Id: Iae7879b5264711962a662f4b3d47a834bda715be
2012-05-11 19:17:53 +09:00
Tadashi G. Takaoka
ef6dadbe6c Reorganize punctuations and diacritics of Arabic and Persian
Bug: 6029665
Change-Id: Id72d5af2c9c8fff09a366819901c950b87756dea
2012-05-11 15:48:56 +09:00
Ken Wakasa
84478103ec Tidy up the MakedictLog class.
Follow up to I436b2b7b

Change-Id: Id17b134dab2f876b874a505e92a379c8b5567fa4
2012-05-05 23:40:21 +09:00
Jean Chalard
44c64f46a1 Ignore bigrams that are not also listed as unigrams
This is a cherry pick of I14b67e51 on jb-dev

Bug: 6340915
Change-Id: Iaa512abe1b19ca640ea201f9761fd7f1416270ed
2012-04-26 15:20:30 +09:00
Tadashi G. Takaoka
49caddbdab Support PC QWERTY layout
Bug: 4460018
Change-Id: I9a29f6a322af66f6a152fa1883b3686c5f7a3328
2012-04-25 16:34:59 +09:00
Tadashi G. Takaoka
b7286439f6 Fix percent sign in more keys
Bug: 6029665
Change-Id: I4bf0f5703d0c11d76bab478da2729b0e20fc64ea
2012-04-25 11:51:19 +09:00
Tadashi G. Takaoka
aaac9a5217 Add header commnets of KeyboardTextsSet.tmpl
Bug: 6371604
Change-Id: I1054685b9985b6923e3176679b3d95424d8114e0
2012-04-24 16:19:17 +09:00
Tadashi G. Takaoka
6bfd5f6319 Fix confusable "label" usage, use "text" instead
* Rename makelabel tool to maketext
* Rename KeyboardLablesSet class to KeyboardTextsSet
* Rename "!label/name" to "!text/name"

Change-Id: Ia9494a89fe56f20ca8e8fedb253adbcf8b771bd3
2012-04-20 15:48:30 +09:00
Tadashi G. Takaoka
cf41aff251 Use string attribute for icon name
Change-Id: I336acf33c7e6bc993b9da9b17ec689975fa8127d
2012-04-20 15:31:42 +09:00
Tadashi G. Takaoka
2f16fd40fa Make KeySpecParser case insensitive
Change-Id: I76c3e9179dd8777d3cf3138ad76513d83672debf
2012-04-20 13:20:08 +09:00
Tadashi G. Takaoka
a2f458f569 Add shortcut_as_more_key label
This change also optimezes KeyboardLabelsSet.java by reordering
donottranslate-more-keys.xml in makelabel tool.

Change-Id: Ief46ee783454bedcdffb0f24d9d03df51b6edcd6
2012-04-20 00:54:03 +09:00
Tadashi G. Takaoka
5e90f2873c Fix comment handling of makelabel tool
Change-Id: Id40336b543987eee1d2777394d9ee5d0a6343a4c
2012-04-19 23:44:43 +09:00
Tadashi G. Takaoka
aae757b8a1 Fix English "e" more keys
Change-Id: I982690a0d5f524769caa9a06d5da1528899552ef
2012-04-19 21:10:44 +09:00
Tadashi G. Takaoka
d005476715 Fix English "o" more keys
Change-Id: If2457251a24686742f410e75938251deb91efdf8
2012-04-19 21:04:47 +09:00
Tadashi G. Takaoka
2be51f4fd0 Generate KeyboardLabelsSet from donottranslate-more-keys.xml
This change introduces makelabel tool that reads all languages'
donottranslate-more-keys and generate KeyboardLabelsSet.java source
file. The makelabel command must be invoked prior to compile LatinIME.

Change-Id: I7515c7919c535e30f9c80a37bdc831d0f682cd43
2012-04-11 11:23:47 +09:00
Jean Chalard
1ec1be46b8 Write options into the XML format.
Change-Id: I12357c29185111447c1ab9ee50d9d1c23d62cae7
2012-04-06 17:07:51 +09:00
Jean Chalard
f420df2823 Add support for German umlaut and French ligatures flags
Bug: 6202812
Change-Id: Ib4a7f96f6ef86c840069b15d04393f84d428c176
2012-04-06 17:07:29 +09:00
Jean Chalard
b8060399c7 Remove constructors
And small cleanup.

Change-Id: I1de903f42c1b8d57a488be2162e0b94055a6d1f2
2012-04-06 16:53:15 +09:00
Jean Chalard
8cf1a8d04f Remove the shortcutOnly attribute which is now useless.
Change-Id: Ifccdfdaf7c0066bb7728981503baceff0fedb71f
2012-04-06 16:27:53 +09:00
Jean Chalard
c734c2aca1 Add a simple way to input dictionary header attributes
Just add them as an attribute to the root of the XML node.

Bug: 6202812
Change-Id: Idf040bfebf20a72f9e4370930a85d97df593f484
2012-04-03 15:18:51 +09:00
Ken Wakasa
2aa02b84a4 Revive the Makefile for makedict
Follow up to I4d2ef504.  Address a compiler warning and a small optimization as well.

bug: 6188977
bug: 6209651
Change-Id: Ibc9da51d48ebf0b8815ad0bb2f697242970ba8f7
2012-03-22 11:55:18 +09:00
Tom Ouyang
e276c2401e Move makedict to LatinIME android keyboard.
Bug: 6188977
Change-Id: I4d2ef504bb983abbda3cb52ee450cb46f58d95cf
2012-03-21 19:30:26 +09:00
Tom Ouyang
cdc51fc6af Change package name for makedict.
Bug: 6188977
Change-Id: I1d82479dc6b678c68835f0a291570f86fe879f5d
2012-03-19 17:43:45 +09:00
Ken Wakasa
951ab9d7eb Fix typo.
Change-Id: Ia18cd090fd81022041854ce190e36eca49c6b04a
2012-03-09 19:18:59 +09:00
Jean Chalard
a9a5dd07b5 Touch up the header format
Change-Id: Id2a65e8b74228eba18bbaaf3794cd0e9b7cd470d
2012-03-06 18:04:08 +09:00
Jean Chalard
89dfb2bae1 Update the magic number in makedict
Update makedict to write the magic number to the format
expected by LatinIME starting with I3aafdd7e

Bug: 5686638
Change-Id: I78c6befc3347f689a8520b450d589eabefc413d6
2012-03-06 16:46:11 +09:00
Jean Chalard
e0f6cc1814 Make makedict able to write binary format versions 1 and 2
Version 2 provides for a variable-length header region.
The first step is to allow the implementation to simply step
over the header, which will allow us to put any ignored metadata
we want. This change implements the makedict part of this.

Bug: 5686638
Change-Id: I97f1a8a4f84d15e1bedbad74e54303852aef6e0b
2012-03-01 11:05:17 +09:00
Jean Chalard
9242a2bcf8 Fix string iterations in a couple places.
Seems I didn't get how to iterate on a String correctly >.>
Talk about a big bug. Anyway, I think it's working now.

Bug: 5955228
Change-Id: I988c900cf2a16c44b9505cfd4f77c7cda7e592f0
2012-02-03 11:15:46 +09:00
Jean Chalard
c83999972d Merge "Actually add shortcut-only entries." 2012-01-16 02:23:53 -08:00
Jean Chalard
6145b73523 Add shortcut only to xml output.
Change-Id: I23b53826ce30b0ac81962d2f916514cb60bea6ff
2012-01-16 19:06:37 +09:00
Jean Chalard
c599f2e9d6 Actually add shortcut-only entries.
Change-Id: I84bec8fb560cec2ad9cc857397a3f77a96b1d12d
2012-01-16 19:04:37 +09:00
Jean Chalard
9b8b2c757d Read the group count correctly from the binary format
...in makedict, for reverse makedict.

Change-Id: I74774b50998eb605e8091d95cebdda6ad7f5fce3
2012-01-16 18:08:46 +09:00
Jean Chalard
2c0903b1d1 Write multi-byte chargroup count to the binary dict
Change-Id: I093739933652c1e8c70c06f92077d1e3dbd7d7da
2012-01-16 16:29:37 +09:00
Jean Chalard
eddfbb68dc Add a helper method
Change-Id: I7a898940d5f672bbee0da0c02af7a08297051ec3
2012-01-16 12:07:03 +09:00
Jean Chalard
903e58886e Add internal structure support for isShortcutOnly (B8)
Change-Id: Iaac80937540a45849c347f80400762032b27c82c
2012-01-11 18:18:51 +09:00
Jean Chalard
b751dbb6c8 Add shortcuts to XML output of makedict (B7)
Change-Id: I579e43cd147c4323c390cf1c9bf5e94ae79f9d86
2012-01-11 12:39:33 +09:00
Jean Chalard
342d5d5dd0 Wire the Xml-read shortcuts into the dict creation code (B6)
Change-Id: I352064835abb62c294b48e080d9709ff013c7bb0
2012-01-10 12:58:53 +09:00
Jean Chalard
8edd306718 Add methods to read and write shortcut to binary files (B5)
Change-Id: I8e6a4242a73b2ec95ce9e8b4739e16dfeb9f1204
2012-01-06 19:03:30 +09:00
Jean Chalard
aa91871030 Make the dictionary iterator shortcut-aware (B4)
Change-Id: I529dff4a50276d1a4f4896c66d1aa35296b21000
2012-01-05 19:11:02 +09:00
Jean Chalard
eec2e51e2c Add shortcut support to the in-memory format of makedict (B3)
Change-Id: Icb8427c82694e24c8d08a5376157c7d1444af979
2012-01-05 19:11:02 +09:00
Jean Chalard
3b161b2526 Parse the shortcuts list file. (B2)
This does not use the shortcuts yet, it only reads up the file
in memory.

Change-Id: Ib9b8594c2dd6a38b1209b01c80e8894696312998
2012-01-05 16:29:52 +09:00
Jean Chalard
3a4f6b53c4 Merge "Error out when given an unknown argument" 2011-12-27 23:48:19 -08:00
Jean Chalard
003b8cf9e6 Error out when given an unknown argument
Bug: 5802658
Change-Id: I3a3871f17a5001dc61e835111944d35540aa5bcd
2011-12-28 16:04:19 +09:00
Jean Chalard
4c34454a70 Make bigram handler a son of a more generic class (B1)
Change-Id: I71aa109d3e67ff139e4f385344882d906f687c77
2011-12-28 16:01:04 +09:00
Jean Chalard
d8120ff72e Fix a bug where attributes would have the wrong freq (B0)
The reading code is accepting 0..15 and this outputs
0..31.

Change-Id: Ia638950dc2ce0b8743cbb6a71fbad866e9208786
2011-12-27 12:28:13 +09:00
Ken Wakasa
d5e35acffb Reorganize LatinIME native build directory structure. Now it got NDK friendly.
Change-Id: I0f62ce8a6a4d2b6134db698f8b8d0576616e524d
2011-12-13 21:16:20 +09:00
Jean Chalard
e12e29ca7f Fix a bug where ampersands in XML would not work
Change-Id: Icc1bce28b78c4da2d529c308f251e298ea94539f
2011-09-28 20:58:59 +09:00
Jean Chalard
cad25fc8a7 Fix a bug ending in a NPE in some rare cases.
Change-Id: If8109c6aa29d100eb745f17f0af756bcb6e3cabb
2011-09-27 18:03:42 +09:00
Jean Chalard
88b22e2552 Remove the old dictionary maker
...and also rename the new one into "makedict".

Bug: 5151604
Change-Id: I44a8ab640d408f630f20f502787a967791796dc6
2011-08-15 14:24:37 +09:00
Jean Chalard
bfbbee8c57 Add the new dictionary maker to the build.
Bug: 4392433
Change-Id: Ic17806cb708b1181a52703537119f7f11fa5f1d6
2011-08-11 14:42:19 +09:00
Ken Wakasa
dccb31ddee Fix issues with single-char word. Some refactorings as well.
Change-Id: If20a15324d7704361dd61e0e431b665552567ea3
2011-04-18 11:45:49 +09:00
Ken Wakasa
a1e9e3922f Allow a single letter dic entry
Redo of Id46b4490 which has been abandoned

bug: 3193883
Change-Id: I95b16b1a4f190482098f40d8e29717ea28fdec1e
2010-12-14 13:05:08 +09:00
Ken Wakasa
bd6f4bfc59 Move tools/makedict from platform/development to platform/packages/inputmethods/LatinIME
The corresponding change is I559207ab

Change-Id: I01ef7084cffa72468e87147e0ec7a9b16dd19990
2010-12-11 10:46:54 +09:00