Jean Chalard
f2af726f79
Merge "Add a more synthetic variable (A33)"
2012-06-29 02:22:05 -07:00
Jean Chalard
aa246f23ce
Merge "Remove cruft (A32)"
2012-06-29 02:12:47 -07:00
Jean Chalard
defc2e2efa
Merge "Simplification (A31)"
2012-06-29 02:09:16 -07:00
Jean Chalard
7a6ac44f5f
Merge "Small refactoring (A30)"
2012-06-29 02:09:06 -07:00
Tadashi G. Takaoka
e0b7359126
Merge "Use SparseArray<E> instead of HashMap<Integer,E>"
2012-06-29 02:05:39 -07:00
Tadashi G. Takaoka
56853c1e48
Use SparseArray<E> instead of HashMap<Integer,E>
...
Change-Id: Id962e670ee1a5164e6c69deb84625139bf5e7974
2012-06-29 17:56:31 +09:00
Jean Chalard
1b2e2d893d
Add a more synthetic variable (A33)
...
The goal here is to disambiguate TypedWordValid and
HasAutoCorrectionCandidate. Ultimately, HasAutoCorrectionCandidate
will disappear.
Bug: 6705473
Change-Id: I1acbd0a5efc7f4bf7b0bdb12839fe3d84e9d1dda
2012-06-29 17:00:57 +09:00
Jean Chalard
9011b89f4e
Remove cruft (A32)
...
Change-Id: I35c2ba4caf6be4ba0449e11c0597ae8e468c0e6e
2012-06-29 17:00:57 +09:00
Jean Chalard
2cda148fd5
Simplification (A31)
...
Change-Id: I9e4d030974ccec1a6256de6ca87610870e404149
2012-06-29 17:00:57 +09:00
Jean Chalard
deb2d88245
Small refactoring (A30)
...
Change-Id: I41b413986a3c5bb6697bb7bbced17ed1e361913c
2012-06-29 17:00:57 +09:00
Jean Chalard
0a63111821
Remove a useless parameter (A29)
...
Change-Id: I52625e707abf61da9b95e542f0814c66b532f483
2012-06-29 17:00:56 +09:00
Jean Chalard
4f444410f2
Remove a useless variable (A28)
...
Change-Id: I1058123d233540fb72a94028987a43740224f635
2012-06-29 17:00:56 +09:00
Jean Chalard
f4267c0521
Fix a small bug (A27)
...
TypedWordValid and AllowsToBeAutoCorrected are almost the
same thing; the difference is whether the word is also a
whitelist entry or not. In this case, TypedWordValid was
the right one to test.
Change-Id: I695fe5b9f6bbe9d3ba314c646da3a25742c9f4ed
2012-06-29 17:00:56 +09:00
Jean Chalard
9e0af57736
Optimization (A26)
...
Change-Id: I1d7790289635729645995fb8c38868259ab1b3be
2012-06-29 17:00:56 +09:00
Jean Chalard
7a94cbd2a4
Remove useless code (A25)
...
isWhitelistedOrNotAWord takes an 'ignoreCase' argument. By looking
at the contents of the wordcomposer here, there is only one case
where its output will be different : when the word is typed with a
capital, but the lower case version exists in the dictionary.
E.g. the user typed "This".
In this case, isWhitelistedOrNotAWord in line 235 will return false
instead of true, so the test will score a true instead of a false,
so hasAutoCorrection may be true instead of false in this specific
case and that's the only case where it's different.
But in this case, allowsToBeAutoCorrected is certain to be false,
which means the result will not have changed if hasAutoCorrection
was true in the first place. So in the end this change is sure not
to change the behavior.
Change-Id: Ic41cf959c20c19165f84d9b8ff006731fa595d84
2012-06-29 16:57:56 +09:00
Jean Chalard
b3cfde2cbb
Add a few comments for future reference (A24)
...
Change-Id: Ia356130b8a95ec9cf676bc6be05d801c13f14b64
2012-06-29 15:45:27 +09:00
Jean Chalard
e398c6c024
Rename a method for readability (A23)
...
Change-Id: I6f569322e645d36bc82fddf4ec2fd621972e3b47
2012-06-29 15:45:24 +09:00
Jean Chalard
ea578f6b1d
Revert a test for readability (A22)
...
Change-Id: I1df4cef5ae2736a22273843dce67f0012181bfd3
2012-06-29 15:44:55 +09:00
Jean Chalard
19d02c19d0
Remove a useless variable (A21)
...
Change-Id: I901e6b0e2b994128da19d68233b9f68bb308cb95
2012-06-29 15:44:17 +09:00
Jean Chalard
1333579b4b
Don't special-case 1-letter words (A13)
...
There is no reason to prevent 1-letter words to auto-correct
to themselves, or to dictionary words. Don't do it.
Change-Id: Iceada847ae632336026ada29afed0353cd9c51b5
2012-06-29 15:12:51 +09:00
Jean Chalard
4d5e7235c5
Remove a useless variable (A20)
...
Change-Id: Ifc37462f5243563693c8cd7cbeb401ff054daa52
2012-06-29 15:12:51 +09:00
Jean Chalard
d426941ee8
Fix a theoretical bug (A12)
...
If a word is a dictionary word but still has no suggestion,
this method should return true. In the practice, it makes
no difference since a word without suggestion won't be changed
anyway.
Change-Id: Ib1f5ef254b7da7e5cedb2f973529ad431beb93f9
2012-06-29 15:12:51 +09:00
Jean Chalard
739683dcfb
Rename a method for readability (A19)
...
Change-Id: I0b8c06d1fd0bfb3caf363c048acc7048abed1752
2012-06-29 15:12:51 +09:00
Jean Chalard
31b346aac6
Remove a useless test (A18)
...
allowsToBeAutoCorrected always returns false if the word is empty.
This is because the whitelist never contains an empty string,
and isValidWord returns false if the word is empty.
Change-Id: I34ecc2a1563aea6db5b2f12796f251f6598576a2
2012-06-29 15:12:51 +09:00
Jean Chalard
b01cdb975a
Inline a method (A17)
...
This will allow us to remove unnecessary processing
Change-Id: I251dfdaffb077906186686ebe65fd82e1e360bd2
2012-06-29 15:12:51 +09:00
Jean Chalard
42dde06782
Make a function a one-liner (A16)
...
...to better inline it
Change-Id: I88496b8f18b81f0c05e4bbf2d1039de1f93e0c25
2012-06-29 15:12:51 +09:00
Jean Chalard
a96a11949f
Inline a simple method (A15)
...
Change-Id: Ib74fcbf33c680bf02c39a9896e30e3afbcfd149a
2012-06-29 15:12:51 +09:00
Jean Chalard
074c90af98
Inline a method (A14)
...
The new code is worse than the old one, but this is a necessary
step to make things prettier.
Change-Id: If6e8a139bb85e6920c749743c78792a22a8acb45
2012-06-29 15:12:51 +09:00
Jean Chalard
9701b360d9
Rename a terribly-named method for clarity (A11)
...
Change-Id: Id180000404dc6929d80f98c0e9cd2026230ad2d1
2012-06-29 15:12:50 +09:00
Jean Chalard
6b911c27a3
Merge "Small readability improvement (A10)"
2012-06-28 23:11:23 -07:00
Jean Chalard
f89a75134b
Small readability improvement (A10)
...
Change-Id: Iba326921711e1c4eab38264e66b6b44a64fec398
2012-06-29 15:05:08 +09:00
Jean Chalard
305326e789
Refactoring and add debug prints (A9)
...
Change-Id: I46497bff107f0def0dfa2b043b20d9a0b0cde040
2012-06-29 14:24:54 +09:00
Jean Chalard
5110e2cb51
Optimization (A8)
...
Change-Id: I2b9e8cc6a13fd9af84a5189e4d3fbb2b05c68d46
2012-06-29 12:54:11 +09: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
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
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
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
b5afd3de0c
Remove unused stuff.
...
Change-Id: Ifd0d5b6978f76b841574a6e10157c32d0cd656b6
2012-06-27 17:44:16 +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
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
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
Jean Chalard
ec8b27fe49
Cut out a method for clarity
...
Change-Id: I1dc668698a5cd840297e713a26a525f5e32d35d6
2012-06-26 19:49:01 +09:00
Jean Chalard
0131170da9
Merge "Avoid string conversions when possible."
2012-06-26 03:48:01 -07:00
Jean Chalard
5953dc93cf
Avoid string conversions when possible.
...
Change-Id: Ibf5f3e40da55998364d0d835ecf283f32c80fcf5
2012-06-26 19:45:52 +09:00
Jean Chalard
5d218bc029
Merge "Simplify a method call."
2012-06-26 03:45:02 -07:00
Jean Chalard
bed514bd90
Simplify a method call.
...
Change-Id: Ieede787a13cef79353f13af52488ef3732ac9850
2012-06-26 19:33:16 +09:00
Jean Chalard
61c1002b6b
Merge "Refactor and squash long-standing bugs (A2)"
2012-06-26 03:19:20 -07:00
Tadashi G. Takaoka
abf81192ff
Merge "Remove unnecessary variables"
2012-06-26 03:16:17 -07:00
Tadashi G. Takaoka
342ea3d324
Merge "Pass MotionEvent to PointerTracker"
2012-06-26 03:16:12 -07:00
Jean Chalard
9433ce86b7
Refactor and squash long-standing bugs (A2)
...
This is awesome.
- Improve performance by stopping useless string/array conversions.
- Simplify method interface.
- Fix localization bugs - we now know our locale
- Fix bugs with surrogate code points
Bug: 4769095
Change-Id: I8a8ee224b713429ee0a4ce5bd52f1b63378cf56f
2012-06-26 19:12:07 +09:00
Tadashi G. Takaoka
3314d38daf
Pass MotionEvent to PointerTracker
...
This is a one of groundwork to integrate gesture input.
Change-Id: I5b75c6978b51df91fdc384a9f6d1d5a5ddc563e2
2012-06-26 19:05:47 +09:00
Jean Chalard
a8c9946b44
Merge "Remember the locale in the Suggest object (A1)"
2012-06-26 03:05:05 -07:00
Tadashi G. Takaoka
7bb8e95b52
Merge "Cleanup PointerTracker debug method"
2012-06-26 03:03:49 -07:00
Tadashi G. Takaoka
0d9d37cec2
Remove unnecessary variables
...
Bug: 6722052
Change-Id: I92e85b3e49b8f4b228f0cf0994216c5050e0865c
2012-06-26 19:01:59 +09:00
Jean Chalard
8e17f6d93a
Remember the locale in the Suggest object (A1)
...
This will be necessary for uppercasing and titlecasing words
correctly.
Change-Id: I0f446a4c82bc482240ff730a2ad6586a61571d6b
2012-06-26 18:55:18 +09:00
Jean Chalard
6cad198d9c
Remove a useless member (A2)
...
Change-Id: Ia727ffc2946352bbf79e0c97684f8fa98f428cef
2012-06-26 18:42:06 +09:00
Jean Chalard
0da9a7c094
Convert a member to a local variable (A1)
...
Change-Id: I9eab910989443704f83711cf4fb0070c5987a13a
2012-06-26 18:41:49 +09:00
Tadashi G. Takaoka
d7edd1cbb5
Cleanup PointerTracker debug method
...
Change-Id: Ib3bfa0a46f5814a6df838005d7243e2f536a98a0
2012-06-26 18:36:30 +09:00
Jean Chalard
f05392f213
Remove an unused method (A22)
...
Change-Id: I2195f365df1799c8b3b2a53670d1df535ab1a742
2012-06-26 17:59:04 +09:00
Jean Chalard
6234be1fe7
Simplification and optimization (A20)
...
Change-Id: Ia837e553ccfe67cd4303096290194a5186df059b
2012-06-26 17:59:04 +09:00
Jean Chalard
77e95e60bb
Preparation for a simplification (A19)
...
Change-Id: I4605a571faf5fbc68b18ce525d6019600bfa8cf7
2012-06-26 17:59:04 +09:00
Jean Chalard
0a79446531
Remove a meaningless separation (A18)
...
Change-Id: I267177044c7d7b0d9119839a11057b2bbf41f75f
2012-06-26 17:59:04 +09:00
Jean Chalard
61e7ec6587
Remove the Callback interface for simpler code. (A17)
...
Bug: 6252660
Bug: 6166228
Bug: 2704000
Bug: 6225530
Change-Id: I009b54fc2e73cadca6734bdca074d033e81f6a2b
2012-06-26 17:58:52 +09:00
Jean Chalard
2f1b6c9ea4
Remove the callback argument to getBigrams() (A16)
...
Bug: 6252660
Bug: 6166228
Bug: 2704000
Bug: 6225530
Change-Id: I7457ac04f8cd4019fb86c986725aae3de1b1a65e
2012-06-26 17:54:49 +09:00
Jean Chalard
60eed92dc3
Remove the callback argument to getWords() (A15)
...
Bug: 6252660
Bug: 6166228
Bug: 2704000
Bug: 6225530
Change-Id: I919bf70a1213ab5d7c7a9e5715bd72a6e257148b
2012-06-26 17:36:47 +09:00
Jean Chalard
2225b3bace
Do away with Utils#addAllSuggestions (A14)
...
It's not used any more.
Change-Id: Id9da40fdbf7078f3ac647d1368237d6601f5a2ba
2012-06-26 17:36:47 +09:00
Jean Chalard
d9df8094e6
Neutralize AndroidSpellChecker.SuggestionsGatherer#addWords (A13)
...
Bug: 6252660
Bug: 6166228
Bug: 2704000
Bug: 6225530
Change-Id: Ia54e1e44e1fd4e8ba2c9316928c0595cbe3f933c
2012-06-26 17:36:47 +09:00
Jean Chalard
7830476022
Neutralize Suggest#addWords (A12)
...
Bug: 6252660
Bug: 6166228
Bug: 2704000
Bug: 6225530
Change-Id: Id923367342a62a650a5f1d38e2fa0e913030dca8
2012-06-26 17:36:47 +09:00
Jean Chalard
fd998bd37a
Refactoring (A11)
...
Change-Id: I86bd7587dd80773a51ba6db312ba55dc41e7c8c7
2012-06-26 17:36:47 +09:00
Jean Chalard
64dad2d5a9
Remove an unused method and inline another (A10)
...
Change-Id: Ifd71ce79711b0c15c7764e97351dbb1b8e4c0c2d
2012-06-26 17:36:47 +09:00
Jean Chalard
d522ddefc2
Merge "Merge the interface of two methods that do the same thing (A9)"
2012-06-26 01:35:15 -07:00
Jean Chalard
90981e423a
Merge "Change the return type of getWords and getBigrams (A8)"
2012-06-26 01:33:04 -07:00
Jean Chalard
9053862470
Merge "Remove dependency on WordCallback from BinaryDictionary (A7)"
2012-06-26 01:16:43 -07:00
Jean Chalard
b9f99c8679
Merge "Remove useless code and storage (A6)"
2012-06-26 01:16:32 -07:00
Jean Chalard
8fb0ff00b1
Merge "Remove a duplicate processing (A5)"
2012-06-26 01:16:19 -07:00
Tadashi G. Takaoka
1c6a9cc44d
Merge "Update current key reference in PointerTracker when keyboard is changed"
2012-06-26 00:58:16 -07:00
Jean Chalard
28eeb35d14
Merge the interface of two methods that do the same thing (A9)
...
Change-Id: Ia5701d713d0fd5bb646b54a03a1a5602dad0a9e6
2012-06-26 16:55:09 +09:00