Jean Chalard
4447a8ec6a
Merge "Refactoring and add debug prints (A9)"
2012-06-28 22:58:22 -07:00
Satoshi Kataoka
737c87a5f1
Merge "Accept external debug flag in native code"
2012-06-28 22:56:04 -07:00
Jean Chalard
305326e789
Refactoring and add debug prints (A9)
...
Change-Id: I46497bff107f0def0dfa2b043b20d9a0b0cde040
2012-06-29 14:24:54 +09:00
Jean Chalard
06bc7fedbd
Merge "Optimization (A8)"
2012-06-28 22:12:02 -07:00
Satoshi Kataoka
6b8e79bc25
Merge "Add a new define for gesture"
2012-06-28 21:03:18 -07:00
Satoshi Kataoka
3ffaf39281
Accept external debug flag in native code
...
Change-Id: I762fd9025ffd6518daf42903875d6ca0a5389ff4
2012-06-29 12:54:36 +09:00
Jean Chalard
5110e2cb51
Optimization (A8)
...
Change-Id: I2b9e8cc6a13fd9af84a5189e4d3fbb2b05c68d46
2012-06-29 12:54:11 +09:00
Ken Wakasa
8fcd7694ae
Update LatinIME native Makefile for gesture code
...
Also, a small clean up in the proguard.flags file
Change-Id: I860034c51a2abf448f7ecc250ed35687b1f1dd82
2012-06-29 00:06:14 +09:00
The Android Automerger
882c8aedd3
merge in jb-release history after reset to jb-dev
2012-06-28 07:04:50 -07:00
Jean Chalard
4847a27f74
Cleanup (A7)
...
Change-Id: Iba97e0062b702c005ab3ff9ce59f181d19ab7c98
2012-06-28 19:13:16 +09:00
Jean Chalard
ed83d4b143
Stop special-casing a single suggestion (A6)
...
Treat it like the others
Change-Id: Ic24e40ada0e75773c3ece9470ab61c350697be5d
2012-06-28 19:12:37 +09:00
Jean Chalard
251bb70f08
Cleanup (A5)
...
Change-Id: I06134145b47c46bbc6c340ca539f34a01e2ca163
2012-06-28 19:12:37 +09:00
Jean Chalard
4c4e3a0949
Transform the whitelist suggestion like the others (A4)
...
...instead of having a different code path
Change-Id: Icd177e2151e45d25300000d4b63d4fba1f52b6a8
2012-06-28 19:10:32 +09:00
Jean Chalard
33b3805e79
Small refactoring (A3)
...
This will help make upcoming changes clearer
Change-Id: Ida8d4935f7315e5da6007ad364124694da3112d0
2012-06-28 19:10:24 +09:00
Jean Chalard
b7cdafd78a
Don't pass everything to a function that needs only the head (A2)
...
Change-Id: Ic367836202ab8071c1a9a02eaf0651b0da947d51
2012-06-28 19:10:13 +09:00
Jean Chalard
09b30ac954
Merge "Use a TreeSet to sort suggestions instead of doing it by hand (A1)"
2012-06-28 03:08:26 -07:00
Jean Chalard
2d2e348033
Use a TreeSet to sort suggestions instead of doing it by hand (A1)
...
Change-Id: I16ba39321107e87ad48a99c2410a15995a66f23c
2012-06-28 18:54:14 +09:00
Satoshi Kataoka
712e02fba7
Add a new define for gesture
...
Change-Id: I6e0d8de75e129a6d1a33f7c7d5f5fa8c11dd2006
2012-06-28 15:13:57 +09:00
Tadashi G. Takaoka
69527d4d60
am 5e5cf045
: am 7f7947c9
: Keep subtypes in method.xml the same as pre-JellyBean
...
* commit '5e5cf045ca6debafcc29ae1c47afda4a3a152326':
Keep subtypes in method.xml the same as pre-JellyBean
2012-06-27 21:58:53 -07:00
Tadashi G. Takaoka
5e5cf045ca
am 7f7947c9
: Keep subtypes in method.xml the same as pre-JellyBean
...
* commit '7f7947c97b141cbb338c5164e9e19d1ac9ff3d1c':
Keep subtypes in method.xml the same as pre-JellyBean
2012-06-27 21:55:35 -07:00
Tadashi G. Takaoka
7f7947c97b
Keep subtypes in method.xml the same as pre-JellyBean
...
This change prevents Android Keyboard subtypes being mistakenly
disabled when upgrading from pre-JellyBean to JellyBean.
Bug: 6750906
Change-Id: I05de6c512e7aa17356e415476e5248986c7d4253
2012-06-28 13:44:09 +09:00
Ying Wang
ca5449bf4f
Import translations. DO NOT MERGE
...
Change-Id: I3d022f22729b758a73352f0e7361e3aead0ef062
2012-06-27 17:16:15 -07:00
Jean Chalard
10abf10c1f
Convert local members to local variables
...
Change-Id: I852787986c79502a4de7effe9c8281a4cf2d519d
2012-06-27 19:54:29 +09:00
Jean Chalard
3ecb2747b3
Optimization.
...
It's useless to do this for all suggestions including those
that will be ousted from the list.
Change-Id: I7bd63d783e21984a269e4b1ae17e9b9d8c0859e3
2012-06-27 18:55:43 +09:00
Jean Chalard
3705ef407b
Read the suggestion type from the suggestion
...
...instead of dirtily passing it from the dictionary loop
Change-Id: I92ddbd7451609b69f6d4dc31bf89d614423b2016
2012-06-27 18:18:35 +09:00
Jean Chalard
24eec0fa68
Remember the source dictionary for each suggestion.
...
Change-Id: I3c63372bd5572a479a67eaecfe8c8ea1cabc70d9
2012-06-27 18:17:28 +09:00
Jean Chalard
d8f0caa406
Move constants to a better place.
...
Change-Id: I5c27a3ed99b17f850e26a8503de16f001c7111c1
2012-06-27 18:08:08 +09:00
Jean Chalard
089c11a086
Cleanup
...
Change-Id: I575f22330bf6881af1d9a35f22b51b7bf2198113
2012-06-27 17:59:58 +09:00
Jean Chalard
d05d1d04d0
Merge "Remove unused stuff."
2012-06-27 01:56:16 -07:00
Jean Chalard
a238e393b9
Merge "Cleanup the dictionary type."
2012-06-27 01:55:45 -07:00
Jean Chalard
b5afd3de0c
Remove unused stuff.
...
Change-Id: Ifd0d5b6978f76b841574a6e10157c32d0cd656b6
2012-06-27 17:44:16 +09:00
Satoshi Kataoka
59c2cb704f
Merge "Add skeleton implementations for gesture"
2012-06-27 01:40:44 -07:00
Satoshi Kataoka
2f6817e567
Add skeleton implementations for gesture
...
Change-Id: I169034eba2001b98bad8f8a05372426c3ff8774e
2012-06-27 17:34:06 +09:00
Jean Chalard
05efe576f9
Cleanup the dictionary type.
...
Stop storing an int in each of the different class types, and
just store a string in the top class.
Change-Id: I2af1832743e6fe78e5c1364f6d9cc21252bf5831
2012-06-27 17:31:09 +09:00
Jean Chalard
c356df8e08
Merge "Update the prototype of onAddSuggestedWord - calling side."
2012-06-27 01:25:59 -07:00
Ken Wakasa
e55c23e4b0
Small cleanups
...
Change-Id: Ic1a198ab1b4f0323fde9e4245729fd0e6011b914
2012-06-27 16:54:37 +09:00
Satoshi Kataoka
1850551d6d
Merge "Change native functions' interface for gesture"
2012-06-27 00:30:29 -07:00
Satoshi Kataoka
efb63246c2
Change native functions' interface for gesture
...
Change-Id: I106a858f0be7452dd89f425805a6f72aa88c3f65
2012-06-27 16:22:39 +09:00
Jean Chalard
32ff2504a0
Update the prototype of onAddSuggestedWord - calling side.
...
We want to get rid of all those IDs in Latin IME.
Change-Id: Ibe08100a5e2976c80abb049889233b4047a686f3
2012-06-27 16:17:14 +09:00
Jean Chalard
2db27bcd06
Merge "Use binarySearch instead of a hand-written linear search"
2012-06-26 23:55:46 -07:00
Jean Chalard
78a8d5b6bc
Merge "Implement a comparator for SuggestedWordInfos."
2012-06-26 22:55:51 -07:00
Jean Chalard
56beb9e321
Use binarySearch instead of a hand-written linear search
...
Yay.
Change-Id: Icf686eb2d675da959f19edc856b521e6288dcea3
2012-06-27 14:17:29 +09:00
Jean Chalard
9da0027b38
Implement a comparator for SuggestedWordInfos.
...
Change-Id: Ic4b0ae05cd98a1aec5806c5e4b744158e73aea7a
2012-06-27 14:16:23 +09:00
Kurt Partridge
30447239e8
Merge "only output every kth word to log"
2012-06-26 20:49:03 -07:00
Jean Chalard
4ef01c51f8
Merge "Remove some special casing"
2012-06-26 20:33:43 -07:00
Kurt Partridge
e961188e9f
only output every kth word to log
...
multi-project CL with Ib5b544b9b2d8b0e4419238976b2e274e5ac564f8
Bug: 6188932
Change-Id: Iea68cf36924d6fda126130a98431a6ce02ba251e
2012-06-26 16:15:20 -07:00
The Android Automerger
e81880cc99
merge in jb-release history after reset to jb-dev
2012-06-26 11:12:07 -07:00
Jean Chalard
7e49a2b6b8
Remove some special casing
...
This special casing is useless. If the word is the same as what
user typed, the scoring algorithm already ensures that it comes
out at the top. Actually, as is written in a comment here, code
executed later is actively relying on this suggestion having
the top score ! There is no need to test it for equalness and
inserting it at the top then.
Change-Id: I263a6de59b77ec72a2dcbb933361b8e16fca0681
2012-06-26 20:40:42 +09:00
Jean Chalard
a3f5f51ec4
Fix a bug where a log would mysteriously not work
...
Change-Id: I5ca77ed65e95a6d357215c0e730238fb463986bb
2012-06-26 20:36:51 +09:00
Jean Chalard
22657dcba0
Optimization.
...
We already had that computed
Change-Id: I2a9742eaee2e9db1f73aeddda7bae7e237b4d15c
2012-06-26 20:02:07 +09:00