Commit graph

359 commits

Author SHA1 Message Date
Tadashi G. Takaoka
ac5e6ddd97 Add Italian (Switzerland) it_CH layout
Bug: 13920900
Change-Id: I57df8ca12b0d8cc4bbca2372c0470dcae5b5cbfb
2014-04-10 11:56:44 +09:00
Tadashi G. Takaoka
d317796207 Use Locale to process text resources
Change-Id: Ic1c4e1776071332e02c368055157124bb539d14e
2014-04-09 18:28:17 +09:00
Tadashi G. Takaoka
6bb3556ff7 Use locale to look up KeyboardTextsTable
Change-Id: I1e05c7fdbb757efef0e9407dc25482ef1115e49a
2014-04-08 19:12:31 +09:00
Tadashi G. Takaoka
465a2ac534 Refactor make-keyboard-text
Change-Id: Ifaf955ae896a18e5cbc9c1af5a1b7e15942eb886
2014-04-08 17:11:06 +09:00
Ken Wakasa
694114feca Remove redundant LOCAL_IS_HOST_MODULE assignments
Also, remove irrelevant LOCAL_NDK_STL_VARIANT for host modules.

Change-Id: I45e916c11f7c1f9b13956f01274a82ee7de1f558
2014-04-04 22:32:45 +09:00
Ken Wakasa
3ccbf7ef08 32-bit dicttool
As we can't easily turn on -m64 for only one module, the JNI library for
a host tool should be 32-bit, at least for now.

Change-Id: I1f001ccca1ad968a2241c0494bb70391fb11a59f
2014-04-04 20:10:04 +09:00
Yohei Yukawa
c73b46f40a Do not call exit 1 when loaded with source command
BUG: 13754552
Change-Id: I3d5e4c0786547521325405100c175dd1b21754df
2014-04-02 19:47:08 +09:00
Ken Wakasa
96092ebd78 Use Clang for dicttool
Fix the wrong shared lib name too.

Change-Id: Ib98c55dfd1aee4a762dc96b12df3a463bef2ac80
2014-03-27 19:14:37 +09:00
Keisuke Kuroyanagi
6008898b99 Merge "Move code only used for dicttool and tests under tests." 2014-03-27 06:37:10 +00:00
Keisuke Kuroyanagi
93cda5bb39 Move code only used for dicttool and tests under tests.
Bug: 13035567
Change-Id: I13c6df013ef2b67c9bf67455d9c32d283bf9ea2e
2014-03-27 15:30:32 +09:00
Tadashi G. Takaoka
393efd94e5 Rename text resources consistently
- keylabel_<key>, the key label text of the <key>
- keyspec_<key>, the key specification of the <key>
- keyhintlabel_<key>, the hint label text of the <key>
- morekeys_<key>, the more keys specifications of the <key>
- additional_morekeys_<key>, the additional more keys specification of
  the <key>

Change-Id: Ib2127f21fa33a2568e8a6eba65cfdb2cf78b480e
2014-03-25 13:02:09 +09:00
Jean Chalard
cbed462d19 [CB12] Reset the combining state when resetting the composer
Bug: 13406701
Change-Id: I490574b7ca4b953f67dd2c0ef97401297fade0a4
2014-03-24 17:44:31 +09:00
Jean Chalard
835965a75e [CB11] Get the result of the combination
Change-Id: I165ec4a24f5b1334d55c14948e4d942ec40eb33b
2014-03-20 23:33:12 +09:00
Jean Chalard
83372e75e4 Merge "[CB09] Pass events through the combiner chain" 2014-03-20 08:32:36 +00:00
Tadashi G. Takaoka
e7420f6bd1 Merge "Utilize autoColumnOrder for punctuation more keys" 2014-03-20 08:01:18 +00:00
Jean Chalard
f2bb15b0ab [CB09] Pass events through the combiner chain
Bug: 13406701
Change-Id: I4696f145478afdd132314b7d3c148c3a9ca11c9c
2014-03-20 16:59:29 +09:00
Tadashi G. Takaoka
844205ca2e Utilize autoColumnOrder for punctuation more keys
Change-Id: I1f8f5013f0bdf93cf590b8bd00d680b31e03d8b0
2014-03-20 16:38:38 +09:00
Jean Chalard
c083733972 Merge "[CB08] Create a combiner chain in the word composer." 2014-03-20 07:02:48 +00:00
Tadashi G. Takaoka
e884fde8d2 Merge "Fix Armenian punctuation order" 2014-03-20 06:43:50 +00:00
Jean Chalard
7ede642df4 [CB08] Create a combiner chain in the word composer.
Bug: 13406701
Change-Id: I3b9f75de9283f76366d1bef7e14a8f22f2186669
2014-03-20 14:27:55 +09:00
Tadashi G. Takaoka
d51aebd328 Fix Armenian punctuation order
Bug: 12623502
Change-Id: I6cc026132922e103d212b663664e7e0aa2404b35
2014-03-20 13:17:38 +09:00
Tadashi G. Takaoka
270bd39af4 Remove Latin comma from Arabic/Persian keyboard
Bug: 12807701
Change-Id: Icca63586d561a57b2c15cbfbae0de98dfcc137a3
2014-03-20 11:45:53 +09:00
Tadashi G. Takaoka
110e9f9e88 Add Galician keyboard
Bug: 13169021
Bug: 13017434
Change-Id: I5d44dc4c2387644028a5cf594954795e014f357a
2014-03-19 19:41:18 +09:00
Tadashi G. Takaoka
0c797e8867 Add Basque keyboard
Bug: 13169021
Bug: 13017434
Change-Id: I46c738e833a9f287586a03bda9ab0230f8b9eac1
2014-03-19 19:40:34 +09:00
Tadashi G. Takaoka
4640e7c989 Fix French accented letters order
Bug: 13497958
Change-Id: I062a0e2e75b2f6c2606b1309808cbaa83cc91018
2014-03-19 17:43:53 +09:00
Tadashi G. Takaoka
fc3263a75c Add preliminary Myanmar keyboard
This CL adds preliminary Myanmar keyboard as a groundwork. The
keyboard layout comes mainly from virtual keyboard of
<http://www.google.com.mm/>

Bug: 7963632
Change-Id: I36504ceb6c2079a6e133edaeb458da1c5cf3ded2
2014-03-18 10:28:57 +09:00
Tadashi G. Takaoka
d22bd20b36 Fix comments in XML files
Change-Id: Id0a69f98297d6a827006c6c4fe1304a197381f82
2014-03-17 12:45:39 +09:00
Tadashi G. Takaoka
ef27c83e74 Fix Persian symbols shifted output text
Bug: 13017434
Change-Id: I57af849ae4342bfee3fa08d7e90c6a6dbc229380
2014-03-17 12:31:09 +09:00
Tadashi G. Takaoka
538abc27dc Fix Arabic keyboard text and test comments
Bug: 13017434

Change-Id: Iec2ddab719e0c68a70bcf56a90eb4522c5fd7978
2014-03-17 11:56:13 +09:00
Jean Chalard
f8accd8839 [CB04] Add an event array to WordComposer.
Bug: 13406701
Change-Id: I9ecd2709c8f1c678a85b0cfaf7c5ed4f78459821
2014-03-14 12:44:49 +09:00
Tadashi G. Takaoka
567fbe90f7 Fix unused text resources of keyboard layouts
Icelandic keyboard has no nordic layout.
Latvian, Lithuanian, and Slovak keyboards have duplicated N WITH ACUTE.
No Language keyboard has duplicated letter a variants.

Change-Id: Iaeacebc1f7efdb70294e6342e42232b73aed9398
2014-03-10 17:31:25 +09:00
Tadashi G. Takaoka
e07a777ed6 Fix unneeded u with diaeresis more key on Swedish keyboard
Change-Id: Ib4a17fa464899907616e76426e5df0d370a40f80
2014-03-10 11:15:18 +09:00
Tadashi G. Takaoka
315010636a Fix excessive more keys on Estonian keyboard
Change-Id: I6c2d5d123d519278a6ff0f12fece69ccbad1aad5
2014-03-10 10:56:26 +09:00
Keisuke Kuroyanagi
f14cf3e64c Fix: dicttool build.
Change-Id: I5c3bcbe9f3054bdd1a760398fe11344e0e05ac6a
2014-03-07 13:01:48 +00:00
Keisuke Kuroyanagi
32326a9d7a Merge "Move DictionaryOptions from FusionDictionary to FormatSpec." 2014-03-07 10:42:18 +00:00
Keisuke Kuroyanagi
a103e29d00 Merge "Separate WeightedString from FusionDictionary." 2014-03-07 09:07:26 +00:00
Ken Wakasa
344742b0d1 Recover the dicttool build except for Mac
With a hack: Temporarily disable host tool build on Mac until the
build system is ready for C++11.

Change-Id: Ib412ba0d7fecc968cc09b4d8fde4e838bdc0618a
2014-03-07 15:04:27 +09:00
Ken Wakasa
c290888461 Fix Mac SDK build
Temporary fix.

Change-Id: I79c8c31e7b07776a048a16918008a942261e1115
2014-03-06 23:41:23 +09:00
Ken Wakasa
ca0a0da864 Switch to C++11
Change-Id: Ib2970327c36422d7b11103d52ba7e9e52db5554f
2014-03-06 20:32:20 +09:00
Keisuke Kuroyanagi
3ad4af2354 Move DictionaryOptions from FusionDictionary to FormatSpec.
Bug: 8187060
Bug:13035567

Change-Id: Id4f45e589521ae98c926a4c0607be10ce1a983f2
2014-03-06 18:53:09 +09:00
Keisuke Kuroyanagi
516f86815d Separate WeightedString from FusionDictionary.
Bug: 8187060

Change-Id: I40c1dafca3eb52244c64fdb4c1db30a56385d678
2014-03-06 18:53:06 +09:00
Tadashi G. Takaoka
dbe531efa8 Merge "Remove unused text resource keylabel_for_east_slavic_row1_12" 2014-03-06 02:47:06 +00:00
Keisuke Kuroyanagi
e784148ae6 Separate utility methods from BinaryDictionary.
Bug: 8187060
Change-Id: Ice2984e332b7bd3bb17174aefc80b5635b72fc50
2014-03-05 18:19:34 +09:00
Tadashi G. Takaoka
4309b83ea9 Remove unused text resource keylabel_for_east_slavic_row1_12
The text resource used in 10 inch tablet layout.

This change also corrects {keylabel|more_keys}_for_east_slavic_row2_1
to _row2_2.

Change-Id: I60d69af22f97c008449b8dccc7c84ae6a05fe0d8
2014-03-04 17:12:31 +09:00
Keisuke Kuroyanagi
472e22a326 Merge "Fix: dicttool build." 2014-02-28 10:13:00 +00:00
Keisuke Kuroyanagi
36305d4207 Fix: dicttool build.
Change-Id: I592b14eba895786d0981586a01ef545e003396c8
2014-02-28 19:04:49 +09:00
Tadashi G. Takaoka
51cb8e6f4e Remove wrong duplicated resource from Afrikaans layout
Bug: 6867914
Change-Id: Ibc329c8ea03abaa91ba27e7e62fb6d02cc67debe
2014-02-27 19:01:49 +09:00
Jean Chalard
890b44e537 Correctly read the header of APK-embedded dicts
Bug: 13164518
Change-Id: I8768ad887af8b89ad9f29637f606c3c68629c7ca
2014-02-24 22:54:01 +09:00
Tadashi G. Takaoka
5eb6ea9f27 Change make-keyboard-text -java option to point LatinIME/java directory
Change-Id: I812713da5918049c0e504e48bd0693df2f7bf46d
2014-02-21 19:24:24 +09:00
Keisuke Kuroyanagi
0fc93fe445 Implement PatriciaTriePolicy::getNextWordAndNextToken().
Bug: 12810574
Change-Id: Id1d44f90de9455d9cbe7b6e0a161cae91d6d422c
2014-02-15 17:39:20 +09:00
Keisuke Kuroyanagi
85fe06e759 Merge "Remove unused argument from readDictionaryBinary." 2014-02-14 10:37:56 +00:00
Keisuke Kuroyanagi
8e3a1d0f89 Remove unused argument from readDictionaryBinary.
Bug: 12810574
Change-Id: Ice415ebd8d11162facca3fe8927ef8a616b11424
2014-02-14 19:02:15 +09:00
Tadashi G. Takaoka
53a237323a Add sanity check to KeybaordTextsTable for debugging
Bug: 13007104
Change-Id: Id12f75da7a1c6a2a078d41721ee4016794e9dd2a
2014-02-14 18:51:03 +09:00
Tadashi G. Takaoka
3c4f05dd66 Remove unused label_tab_key
Change-Id: Ic10b9678c9b0ebab977589aa0093740b9c9f2d90
2014-02-14 17:40:53 +09:00
Tadashi G. Takaoka
e422c94634 Fix test resource declarations and parsing a bit
Change-Id: I882a41b2934c48f4405f1ea5bf4d6ad41e87322c
2014-02-14 16:27:26 +09:00
Tadashi G. Takaoka
7ae6721ffa Remove RTL aware !code and add corresponding !text
Change-Id: I9021c8fa1cf2d4ac07579237a939c15551509a0b
2014-02-13 17:32:09 +09:00
Tadashi G. Takaoka
3cb77678f5 Fix Armenian switch to alphabet key text
Bug: 7963631
Change-Id: If5768c761ec96d3404900b0c017abc2317cce8d4
2014-02-13 17:26:16 +09:00
Tadashi G. Takaoka
0fe4d00068 Optimize KeyboardTextsTable
This change counts all occurrences of each string resource and sort
those in descending order of the occurrence.

Change-Id: I726402157feb0d436a54bd0a7252acd17fd711f9
2014-02-13 17:11:00 +09:00
Tadashi G. Takaoka
6e1710f0d4 Merge "Optimize text resources' ordering a bit" 2014-02-11 13:33:42 +00:00
Tadashi G. Takaoka
d495cc36b7 Merge "Get nicer output of make-keyboard-text" 2014-02-11 12:43:32 +00:00
Tadashi G. Takaoka
8bfd6100d9 Optimize text resources' ordering a bit
Change-Id: I19382f1d9a4b6be173d1e9f62edd727ea987fa20
2014-02-11 21:41:55 +09:00
Tadashi G. Takaoka
ed509695a4 Get nicer output of make-keyboard-text
Change-Id: I6d30127aac2198d55b1335002f7a66b4aaebf82d
2014-02-11 21:41:21 +09:00
Keisuke Kuroyanagi
ea24abf878 Merge "Remove unused code." 2014-02-10 07:19:53 +00:00
Keisuke Kuroyanagi
2ef87aee3e Merge "Make PtNode have ProbabilityInfo instead of raw value." 2014-02-10 06:10:51 +00:00
Keisuke Kuroyanagi
69ccac6e51 Remove unused code.
Bug: 12810574
Change-Id: If0ef02a984469a3b6e0c00b1c3c8d98d0d2b5466
2014-02-10 15:05:11 +09:00
Keisuke Kuroyanagi
8ffc631826 Make PtNode have ProbabilityInfo instead of raw value.
Bug: 11281877
Bug: 12810574
Change-Id: Id1cda0afc74c4e30633c735729143491b2274a7b
2014-02-10 15:05:08 +09:00
Tadashi G. Takaoka
e5320c1d1f Generate KeyboardTextsTable.java instead of KeyboardTextsSet.java
Change-Id: Ic48b093dc64b514822cc9daa1ac3d79deb7af089
2014-02-07 18:56:23 +09:00
Tadashi G. Takaoka
4e85476740 Merge "Consolidate keyIcon and code with keyLabel attribute" 2014-02-07 09:53:35 +00:00
Tadashi G. Takaoka
a83a1feb62 Consolidate keyIcon and code with keyLabel attribute
Change-Id: I75fbd348fab5022606ca14552eb03b15af6684c8
2014-02-07 18:47:22 +09:00
Tadashi G. Takaoka
3bbd50c36b Use SubtypeLocaleUtils.isRtlLanguage
Change-Id: Ic0208412cd9c02975641cb5c448d092f28786746
2014-02-06 18:15:32 +09:00
Tadashi G. Takaoka
0df462730b Remove unused smiley key definitions
Change-Id: Icbdfb360abab2964869898949774f47197f6d000
2014-02-06 16:56:42 +09:00
Keisuke Kuroyanagi
b24de426fc Use CombinedFormatUtils to convert dict elements to strings.
Bug: 11281877
Bug: 12810574
Change-Id: Ib631f75eab73abc9877a7698171c45e8f2fc7600
2014-02-06 16:09:25 +09:00
Keisuke Kuroyanagi
5f5feeba13 Consolidate WordProperty and Word.
Bug: 11281877
Bug: 12810574
Change-Id: I9dc99188f80f25a8780c1860dab46e4aa80a23e5
2014-02-06 15:13:33 +09:00
Keisuke Kuroyanagi
df1d3e733e Make WeightedString have ProbabilityInfo.
Bug: 11281877
Bug: 12810574
Change-Id: I265e3d8654c75766cd0e0d09d67ef62b4566298a
2014-02-05 21:44:55 +09:00
Keisuke Kuroyanagi
aaf864db7b Merge "Separate header class from FormatSpec." 2014-02-04 12:42:44 +00:00
Keisuke Kuroyanagi
b986f78ba8 Separate header class from FormatSpec.
Bug: 12810574
Change-Id: Iacf1cd05a268bf690ab864b5e32a18a4b0ccc693
2014-02-04 21:36:04 +09:00
Keisuke Kuroyanagi
33fd13bf3c Check timestamp for each pointer.
Bug: 11325631
Change-Id: I4e296cdeccf21323c5732754e86c3a4075ccf82a
2014-02-04 14:04:26 +09:00
Tadashi G. Takaoka
e855093f55 Move some methods to MoreKeySpec class
Change-Id: I025ed15e36ac3113db6a5fccefa0c87f016703fa
2014-01-31 20:19:48 +09:00
Jean Chalard
4e6f72cb80 Merge "[HD03] Straighten out attribute key names in Java." 2014-01-31 08:40:25 +00:00
Keisuke Kuroyanagi
e6ae5a8396 Merge "Fix dicttool_aosp build." 2014-01-31 08:26:00 +00:00
Keisuke Kuroyanagi
faa9cd1fbd Fix dicttool_aosp build.
Change-Id: I52918fea02425b628045443d63d178e289ac4fb7
2014-01-31 17:16:47 +09:00
Tadashi G. Takaoka
3b4eb03fa1 Move some prefix strings to relevant classes
Change-Id: I7321ac7820d4eded5f16f2440ffb4f525315b3f4
2014-01-31 17:09:14 +09:00
Tadashi G. Takaoka
0bae2ab460 Refactor KeyboardTextsSet class
Change-Id: I0b48c85aa2c291e1e7ee25d61c558700fc677e29
2014-01-31 16:31:07 +09:00
Jean Chalard
79b2e4d86c [HD03] Straighten out attribute key names in Java.
Bug: 11281748
Change-Id: I1d813bdacd45bcfd9c4cc73ac1d67c5c89854e86
2014-01-31 14:46:07 +09:00
Tadashi G. Takaoka
d432892f0c Fix Farsi keyboard comma and period
Bug: 12807701
Change-Id: I49503e9945d97e13d7cc98f54ca071cb935d1e52
2014-01-30 15:45:23 +09:00
Jean Chalard
d1f463eacf [IL69] Oust Keyboard from WordComposer#setComposingWord
Bug: 8636060
Change-Id: I624a45500603dfad355ee3b8b794b2d895219c0b
2014-01-23 15:32:59 +09:00
Tadashi G. Takaoka
47f04e2e35 Fix checkbuild breakage on dicttool
This CL fix the checkbuild build, though I'm not sure it can create
working dicttool or not.

Change-Id: I5aec34a0f72441c75ac48184c0550b8e0fc40634
2014-01-17 00:25:11 +09:00
Jean Chalard
84a3047e80 Fix build.
Change-Id: I6d0b572190080e58e95f72856ad39e72a49537b7
2014-01-10 12:18:26 +09:00
Keisuke Kuroyanagi
c2fd53ee0e Remove ver4 dict updater.
Change-Id: I468994c98d091be621b9fb3fbe6405c67fc6a465
2013-12-17 18:17:51 +09:00
Tadashi G. Takaoka
fcacde3dad Revise Armenian punctuations more keys
Bug: 12096943
Change-Id: Ib8559f030fbc27ec7f7e9a9fb36aad72cca29e9f
2013-12-17 11:12:33 +09:00
Jean Chalard
5590e9d040 Merge "Make the bad header a checked exception and fix dicttool test" 2013-12-16 07:18:44 +00:00
Jean Chalard
3df617323e Make the bad header a checked exception and fix dicttool test
Change-Id: If780a2a1cb722aee83d910904c0a6315add9552d
2013-12-16 15:40:45 +09:00
Jean Chalard
b868375763 Fix failing tests
- Version 3 is not supported
- Now passing the right string to open v4 dicts. Fix the tests for this.

Change-Id: I7829330c3568a715b96396ba4e4e69c6e17775ab
2013-12-16 14:32:19 +09:00
Ken Wakasa
2c25c7c9e1 Fix locale names in the make-keyboard-text tool
Change-Id: I33c3fafcff124bb94e395cc604ce264daad55d2d
2013-12-14 18:50:57 +09:00
Jean Chalard
a245d15da5 Have dicttool use the native library to generate v4 dicts.
Yay !

Change-Id: Iea8ced9e81031b9ab7eff05ad9ef7215be248de9
2013-12-13 18:18:20 +09:00
Jean Chalard
7b55cd3e2b Remove flags from Java side.
This simplifies the code quite a bit.
- GERMAN_UMLAUTS are now handled through a key-value attribute.
  The dictionary generator does not need to know about it any more.
- FRENCH_LIGATURES are deprecated as we handle them with shortcuts now.
- CONTAINS_BIGRAMS is deprecated. Bigram processing is always applied
  regardless of this flag.

Bug: 11281748
Change-Id: If567e52e245a9342adc7f3104a0f7d8d782df8c1
2013-12-13 18:15:05 +09:00
Ken Wakasa
2fa3693c26 Reset to 9bd6dac470
The bulk merge from -bayo to klp-dev should not have been merged to master.

Change-Id: I527a03a76f5247e4939a672f27c314dc11cbb854
2013-12-13 17:13:32 +09:00
Tadashi G. Takaoka
d7d6088130 Revert back punctuations to the more keys keyboard of the period
Cherry-pick I157164910f from Master.

Bug: 11621857
Change-Id: I0fd0496e9091165280f34b4640ff0e524e3847b9
2013-11-12 17:51:54 +09:00
Ken Wakasa
56402cf10a Revert "Add Swiss French and German keyboard layouts."
This reverts commit 220ce8f269.

Sorry, but we are now in the week before the final cut for the next launch. We shouldn't be taking new features like this at this point. Let me revert this change for now. I'll re-revert this after the cut next week.

Change-Id: Ia8b00680c992ec526e6a858945f2380cbcdfdd55
2013-10-10 02:05:50 +00:00
Fredrik Roubert
220ce8f269 Add Swiss French and German keyboard layouts.
There used to be two "Swiss" keyboard layouts, labelled fr_CH and de_QY,
available in LatinIME. They were, however, not actually Swiss layouts
but instead work-arounds to be able to get French or German with qwertz
or qwerty (instead of azerty and qwertz) layouts, respectively. These
were thus removed by commit f6972561fc
replacing them with the generic fr-qwertz and de-qwerty layouts instead.

Here, now, is a proper Swiss keyboard layout, following Swiss standards
for people accustomed to typing on Swiss keyboards, with the expected
tailorings for French and German.

Change-Id: I9feed752053ecc694c84db713284f69bc1daf155
2013-10-09 17:42:17 +02:00