d6c610400e
Inline a wrapper method (A101)
...
Change-Id: I6ce856ff49a8f8c696851b2487590704010fc758
2012-07-11 14:57:51 +09:00
eb1443883f
Support batch input
...
Change-Id: Ibe63212fe71cdebb5b897bc5018ae75b2a87555a
2012-07-11 14:53:20 +09:00
21e5759e8e
Merge "Small readability improvement (A100)"
2012-07-10 22:49:25 -07:00
27207eaa04
Merge "Pull up some common code again (A99)"
2012-07-10 22:49:06 -07:00
722b00275d
Merge "Pull up some identical code (A98)"
2012-07-10 22:48:58 -07:00
8b166465b0
Merge "Inline a method to avoid confusion (A97)"
2012-07-10 22:48:52 -07:00
fd9b485111
Merge "Remove parameters for easier inlining (A96)"
2012-07-10 22:48:44 -07:00
0b329fd0d1
Merge "Pull up some more common code (A95)"
2012-07-10 22:48:38 -07:00
a5acd68caa
Merge "Pull up common code in the caller (A94)"
2012-07-10 22:48:33 -07:00
0d54692ce4
Merge "intentional logging"
2012-07-10 21:20:47 -07:00
82d5ed6fcd
Small readability improvement (A100)
...
Change-Id: I6340748654a95d203ed43ceb9a7e6468b5b8ab1c
2012-07-11 11:19:50 +09:00
860a9f85ff
Pull up some common code again (A99)
...
Change-Id: I9e9f5664bb12bb25d74c8a076a6ee1024c708145
2012-07-11 11:19:50 +09:00
8eaeb60e7f
Pull up some identical code (A98)
...
Change-Id: I6c265956394cf49e74b0256dfa5af06fe6b30467
2012-07-11 11:19:33 +09:00
e77f2996ea
Inline a method to avoid confusion (A97)
...
Change-Id: I3c3ffcd3d40493f4bfa0f6596f923b3430e605aa
2012-07-11 11:19:18 +09:00
cfae32c610
Remove parameters for easier inlining (A96)
...
Change-Id: Ied2e291393609300173681e26e82b7dd36b41bd0
2012-07-11 11:16:22 +09:00
ea98e026f1
Pull up some more common code (A95)
...
Change-Id: I3ac7ee823471a6d1da8031e064bce38b0e5a8f5c
2012-07-11 11:15:18 +09:00
b4b93dbf3e
Pull up common code in the caller (A94)
...
Change-Id: I84b97886280eca75d5f2b7546f20f8b1bced55bc
2012-07-11 11:13:56 +09:00
223d671ffc
intentional logging
...
- separate ResearchLog from ResearchLogger
- fix abort menu to explicitly indicate re-enabling of logging
- auto flush entries every 5s
- conform to new suggestedWords class
multi-project change with I9fe1f8fe59d5891daa4ca84af157f36fb1bb17dc
Bug: 6188932
Change-Id: I7e99390f934481c6ed9cea2b259944583edda5bb
2012-07-10 18:44:18 -07:00
60baf00b3a
Import translations. DO NOT MERGE
...
Change-Id: I0376c38451de66ff8c40b488ed3a8599326755ad
Auto-generated-cl: translation import
2012-07-10 14:20:17 -07:00
ff730dbd14
Merge "Remove useless member variables (A93)"
2012-07-10 04:33:32 -07:00
20823b4623
Merge "Register the key when the finger slides off it in multitouch"
2012-07-10 04:19:40 -07:00
6f233f7ba1
Remove useless member variables (A93)
...
Change-Id: Iff0a0e8835f4d630b51a15c0d91881437094e785
2012-07-10 20:18:10 +09:00
5e06b8534f
Register the key when the finger slides off it in multitouch
...
Moved from jb-dev branch (I807fd6f4).
Bug: 6722867
Change-Id: I9764ac72f726396caaac819675d440372c882981
2012-07-10 20:14:29 +09:00
2ae75ed56b
Start converging two identical methods (A92)
...
Change-Id: I3c85a80610fde664a328f5606d0724f00d445ebe
2012-07-10 20:13:54 +09:00
d82dcdc924
Add batch input dictionary lookup
...
Change-Id: I4da3c976838e8eb56c9ec80aafaaf54d759b7981
2012-07-10 20:01:28 +09:00
5e573a1f0a
Remove a useless parameter (A91A)
...
Change-Id: I1d1758048649ef337875a5141d825569af7ad38c
2012-07-10 19:31:36 +09:00
f5943153ad
Cleanup old methods (A90)
...
Change-Id: I5435cef8ac6be523934ffa394952cb120c8e89d6
2012-07-10 19:30:46 +09:00
b30d2185f2
Implement the common Dictionary interface (A89)
...
This will de-duplicate a lot of existing code.
Change-Id: Idaffb2fde23b9741f057bcb2ecb3dde9d12ea5c5
2012-07-10 19:30:42 +09:00
a69f12a246
Reduce method visibility (A88)
...
Change-Id: I29d6afbcba0998558c9b19287a460d9f0e410994
2012-07-10 19:19:47 +09:00
0f57bdc0e5
Factorize code (A87)
...
Why was this copy-pasted :(
Change-Id: I6a537c56425ad039d7301a5fe1e0485784f07914
2012-07-10 19:19:43 +09:00
4e42e378fa
Move stuff around for readability (A86)
...
Change-Id: I5f4a18e43f3012acf96978d625325bf7c69c9c80
2012-07-10 18:57:57 +09:00
82009901ea
Add a consolidated method to the Dictionary interface (A85)
...
Change-Id: I5d79021e69cc738e3013e31764ab0a59e15decdf
2012-07-10 18:57:12 +09:00
2a37fb9d30
Refresh the cached single quotes count on commit
...
Change-Id: I9df5cf95c14da2e11ac709ca5e32dc7db3b02c37
2012-07-10 18:43:42 +09:00
a9632d8173
Merge "Enhance behavior consistency (A84)"
2012-07-10 02:31:40 -07:00
184c552917
Merge "Refactoring for whitelist (A83)"
2012-07-10 02:24:58 -07:00
b53e96813c
Merge "Refactoring (A82)"
2012-07-10 02:24:47 -07:00
50d1b7902f
Merge "Fix a bug with suggestion behavior (A81)"
2012-07-10 02:24:36 -07:00
a4d346c37a
Merge "Cleanup visibility in LatinIME (A80)"
2012-07-10 02:21:46 -07:00
c677b0071d
Enhance behavior consistency (A84)
...
Use the word the same way for suggestion and prediction. It makes
little logical sense that the trailing single quotes be removed
for suggestion lookup but not for prediction lookup.
Change-Id: I0de4b5f7c5b4c1b4ba1817ff9653d7c03967146d
2012-07-10 18:05:20 +09:00
1c6693a219
Refactoring for whitelist (A83)
...
Avoid special casing the whitelist dictionary by having it implement
the interface it pretends it implements
Change-Id: I8b873cb0f3fe13cefd32c8cb756a25c8ae16a2b4
2012-07-10 18:05:20 +09:00
fb6eeeb35a
Refactoring (A82)
...
The user history dictionary should be the one knowing it does not suggest words
beyond 2 characters, not Suggest.
Change-Id: Ie85ec6116eb495e0c7f51108e4620c5ae536f4bf
2012-07-10 18:05:20 +09:00
966efe4889
Fix a bug with suggestion behavior (A81)
...
Bug: 6788235
Change-Id: I5a4212872e0fd3f9e80168fd3abd5c2b3bc4110f
2012-07-10 18:05:19 +09:00
a5bb353de9
Cleanup visibility in LatinIME (A80)
...
Many methods were public but could have been private: change them
to private. Also, add a comment above public methods that don't
come from the IMF to make it clearer why they are necessary.
Change-Id: I574154b015d09c0f8542b81763f497691afdc3c1
2012-07-10 18:05:15 +09:00
7fcad7b9b6
Separate ICS-dependent code from the spell checker service
...
Bug: 6789576
Change-Id: Ia768258f6fa121c7a7757093eb8a20e665580865
2012-07-10 17:45:26 +09:00
b98414f8fd
Merge "Remove useless code (A79)"
2012-07-10 00:47:56 -07:00
29540b25f0
Merge "Simplification (A78)"
2012-07-10 00:47:10 -07:00
728c0cb251
Remove useless code (A79)
...
We postUpdateSuggestionStrip right away anyway - this only
makes the suggestion strip blink
Change-Id: I2ebd933e9a4c804ef1e8c62ccdaf4953a98a792e
2012-07-10 16:41:49 +09:00
09fdd30e52
Simplification (A78)
...
Change-Id: I622503af858ef419e94a17f182253cb03da00462
2012-07-10 16:41:47 +09:00
74620f449e
Merge "Create AndroidSpellCheckerSessionFactory"
2012-07-10 00:26:00 -07:00
37b19ffe6c
Create AndroidSpellCheckerSessionFactory
...
Bug: 6789576
Change-Id: I6de1e1aa64cf14f38ecb250579418bc518f0d838
2012-07-10 16:16:53 +09:00
759778a751
Merge "Separate SpellCheckerSession from SpellCheckerService"
2012-07-09 23:42:15 -07:00
84ed096641
Separate SpellCheckerSession from SpellCheckerService
...
Bug: 6789576
Change-Id: I7c55d36afad7ef6046353b3c9e849a54a6dc83ae
2012-07-10 15:34:40 +09:00
fed702a0ad
Merge "Move a test (A77)"
2012-07-09 23:01:33 -07:00
75e605f7ca
Merge "Pull up common code in the consolidated method (A76)"
2012-07-09 22:41:33 -07:00
c466cd3f99
Move a test (A77)
...
Change-Id: I417bd5f1318696aaa39fee18f3e750ea5c231f6b
2012-07-10 14:24:33 +09:00
32f5384fc9
Pull up common code in the consolidated method (A76)
...
Change-Id: I3ebecec37b49e139c243cf9da8bfe491e7ddada1
2012-07-10 14:22:12 +09:00
1e8fb312bf
Fix app name case
...
Change-Id: Id568adac98135cffceb111000e80f77928c045ea
2012-07-10 14:10:30 +09:00
80973dc76f
Merge "A little optimization of InputPointers.copy"
2012-07-09 21:09:13 -07:00
2ad6d12a30
A little optimization of InputPointers.copy
...
Change-Id: Id83b34e076ef91e06d7c1dd2b3ee7bb64d01b8cb
2012-07-10 13:05:43 +09:00
24e8a06f98
am 949d2ae5: am 4bcf70c9: Fix a bad interaction with mmap
...
* commit '949d2ae5788977c5e87e35e1bd1770f54ac88f5b':
Fix a bad interaction with mmap
2012-07-09 20:24:01 -07:00
59205dd270
Import translations. DO NOT MERGE
...
Change-Id: I48fd690e9368a6637c7fa93c15b6ecadcbe47ce8
Auto-generated-cl: translation import
2012-07-09 13:56:48 -07:00
14ec214132
Merge "Separate string resource of IME name"
2012-07-09 02:26:35 -07:00
69aef47e23
Separate string resource of IME name
...
Change-Id: Ib4afefac0e87c814c9e54cb65e78ee584c3f954c
2012-07-09 17:48:39 +09:00
7389c601e3
Merge "Add InputPointers.append() method"
2012-07-09 01:39:38 -07:00
1087c53f5a
Add InputPointers.append() method
...
Change-Id: Id2b0e242f7e9ce0ca888067857f8b64c02fde84e
2012-07-09 17:33:10 +09:00
e4498929b0
Simple refactoring (A75)
...
Change-Id: Id19efc5d279616da52667fa70326b86aba70d4a0
2012-07-09 15:06:16 +09:00
d579f1aefc
Consolidate methods that do the same thing (A74)
...
Change-Id: I6e7c3aba2b40ecefa483c9680978bc806368e96e
2012-07-09 15:06:16 +09:00
347a80f793
Tiny refactoring (A73)
...
If !mWordComposer.isComposingWord(), then mWordComposer.getTypedWord()
will always return an empty string.
Change-Id: Ife66d0abc44c743cbc30d31724e833cda168fd5c
2012-07-09 15:06:16 +09:00
7a422a0142
Cleanup again (A72)
...
Change-Id: Id3765bf9826cc2c7ca70158cda53c75dc58f51c6
2012-07-09 15:06:16 +09:00
37eaa24b5a
Simplification (A71)
...
Change-Id: I7a91d84291bea581ecc8ec5b29b9a87ccec76e7d
2012-07-09 15:06:16 +09:00
dc1b84d96c
Defer testing composition to a later time (A70)
...
This is not exactly the same logically speaking, because it's
theoretically possible that the composing state changed in between
the message enqueueing and it's retrieval. However in the practice,
if the composing state changed the message *must* have been
cancelled and resent, else the behavior breaks. So this actually
is more robust, and removes some obscure requirements on the
calling code.
In the practice, it should also make the cancelUpdateSuggestionStrip
message useless, although this change does not yet remove it.
Change-Id: I75141920ce64e38e2f92e9c02b6c979936eee9a9
2012-07-09 15:06:16 +09:00
a6757f400a
Code simplification (A69)
...
Change-Id: I2a77e437795fbbea47fd2e604ee6c26f8d0e458a
2012-07-09 15:06:16 +09:00
8f9c9377fc
Consolidate two methods (A68)
...
Change-Id: I4b91414190b3786065ebd962a76299b605e5797e
2012-07-09 15:06:15 +09:00
146bd2e456
Pass the value we really want to pass to update functions (A67)
...
Change-Id: Ica9b875d119dea2f8dc237fd63e5b4eaa5e1c400
2012-07-09 15:06:15 +09:00
60dbe0be43
Preparative change to pass a boolean with known value (A66)
...
Change-Id: Iff03fe7c4a8eec17c00a2fe99197e0cf21a0630a
2012-07-09 15:06:15 +09:00
853f4221ab
Merge "Remove useless processing (A65)"
2012-07-08 23:05:11 -07:00
9c0ddb5988
Merge "Remove unused WordComposer.init method"
2012-07-08 18:33:56 -07:00
1a9ef01187
Add a copyright header to AndroidManifest.xml
...
Change-Id: I588d7acc6f64360404440ad8dc2c00296046b09d
2012-07-06 20:29:08 +09:00
6b4ce58fc6
Remove unused WordComposer.init method
...
Change-Id: I46c6a6e1c1536599cb909bf81297001b238f2ec8
2012-07-06 20:12:14 +09:00
36311cacd6
Merge "Extend onTextInput to be able to inject suggestions"
2012-07-06 03:40:03 -07:00
4be03befe3
Extend onTextInput to be able to inject suggestions
...
Change-Id: I1061da0edfdb05c64c5711717d4ef9fa9681e568
2012-07-06 19:36:11 +09:00
a3dee0d062
Merge "Fix a bug where spaces would be forgotten"
2012-07-06 02:09:28 -07:00
4fde56b818
Fix a bug where spaces would be forgotten
...
Bug: 6785706
Change-Id: Ic7bf242ef058d116b986d47ad197b6d2802e2342
2012-07-06 17:51:10 +09:00
8e36e5102e
Remove useless processing (A65)
...
We just resetted the composing state - updating suggestions
is sure to yield no results. We may as well not call
updateSuggestions at all.
We should however still cancel any lingering timer from a
previous input field, to avoid this useless processing.
Change-Id: Ic1a19d577903d792bb797c837cc517ea8d430e75
2012-07-06 16:28:42 +09:00
449be371ae
Refinement (A64)
...
Change-Id: I7c16e28ffce4fe0965b756bf2b00ee63b77dd039
2012-07-06 16:28:42 +09:00
43193ad60f
Remove useless code (A63)
...
If the separator is not a space, then we will always call
setPunctuationSuggestions and reset the suggestion strip anyway.
If the separator is a space, then the cursor has a space on
the left, which means isCursorTouchingWord depends only on
whether it touches a word on the right. If we were displaying
the "add to dictionary hint", it means a suggestion was just
chosen, so it had to be displayed, and that requires a composing
word and no non-separator at the right of the cursor.
In the end, if we go through this postUpdateSuggestions call,
we are sure we will reset the suggestions later in this method,
either by calling postUpdateBigramPredictions, or
setPunctuationSuggestions.
Change-Id: I95d5f77a5d0ac6d1a6ced8d67d6ac8f650db4a32
2012-07-06 16:28:42 +09:00
8ba33c1a49
Simplification (A62)
...
Change-Id: I606270a0387787445b7cd6b94e4830bfc144b49e
2012-07-06 16:27:55 +09:00
66a2e96fb4
Remove useless code (A61)
...
Just after this, clear() will be called, removing the suggestion
strip from the screen. It will later be displayed again through
onStartInputView, which will update its content.
Change-Id: I15c23ad2adecab76b0791d7fc222d15b6533f3bd
2012-07-06 13:07:48 +09:00
b1dc8ad5f2
Simplification (A60)
...
Change-Id: I99e912d3edfc7dd3f17ee835331d5fcba976750c
2012-07-06 13:07:48 +09:00
663dbfd1cc
Simplification & UI improvement (A59)
...
The responsivity is better like this. This does not seem to
feel slow as the previous comment seemed to indicate.
Also remove a stale comment.
Change-Id: I4e7bf9fe28716e112db182e44b3fa88ee4526bb4
2012-07-06 13:07:48 +09:00
746e014eb5
Show predictions in the right cases (A58)
...
After reverting an auto-correct we always have a separator after
the previously inserted word, and the cursor is never touching
a word. Showing predictions is the right thing to do, while
calling postUpdateSuggestions will invariably yield an invariably
blank suggestion strip, which is not very helpful.
Likewise, after we pick a suggestion, we should be showing the
predictions unless showing the addToDictionary hint. There was
a bug here in the corner case that the word would be a candidate
for user dictionary, but the user dictionary provider is not
available: in this case we should be showing predictions, but
we were showing an unhelpful empty suggestion bar.
Change-Id: I287bb5eb4af762bd5a433e85e185fab6d203e91a
2012-07-06 13:07:48 +09:00
0e9e7e337d
Cleanup (A57)
...
We stopped cancelling manual picks a few weeks ago. This code
is dead.
Change-Id: I4032fcc3c95e9379f1839fe860a1b8a9bd7d0bc7
2012-07-06 13:07:30 +09:00
29eeef75ec
Merge "Fix a bug where the caps mode would not be changed"
2012-07-05 19:11:28 -07:00
f254e3fec7
Fix a bug where the caps mode would not be changed
...
Bug: 6766059
Change-Id: I378f9d35c4904c4f373260bda5863235d833eb31
2012-07-06 11:08:20 +09:00
d81e7d24d3
Simplification (A56)
...
If suggestion and prediction messages both happen to be in
the queue, the latest one will win (update the suggestion strip
later than the other, overwriting any previous suggestions).
So when we enqueue either one, it is always safe to cancel
all messages of both types.
Change-Id: Iad9dd06d08c49f60cac16b88edcc9531a18ec02e
2012-07-05 18:19:51 +09:00
414f14436e
Remove an unused method (A55)
...
Change-Id: I9974b88923b85cd6bec74f7607067c660f36f040
2012-07-05 18:10:37 +09:00
c84f178cd9
Merge "Remove a useless method, rename another. (A54)"
2012-07-05 02:05:50 -07:00
92d2f7e03b
Merge "Initialize SubtypeLocale from Settings"
2012-07-05 02:04:35 -07:00
792e7ddc24
Merge "Remove a redundant test (A53)"
2012-07-05 01:57:04 -07:00
9636735c0a
Merge "Small simplification (A52)"
2012-07-05 01:56:55 -07:00
21524c755c
Merge "Put some more code in common (A51)"
2012-07-05 01:50:44 -07:00
71d7fc91b7
Merge "Pull up a common variable into the wrapping method (A50)"
2012-07-05 01:47:59 -07:00
ac3ad6ef9f
Merge "Factorize some common code (A49)"
2012-07-05 01:45:08 -07:00
d6ac0443f0
Initialize SubtypeLocale from Settings
...
Bug: 6781106
Change-Id: I22f04af4fabf93346ab6f72c1841f096afaccb96
2012-07-05 17:39:30 +09:00
15d3532170
Merge "Fix tab key's navigation behavior"
2012-07-05 01:24:00 -07:00
3d8e7a62fc
Remove a useless method, rename another. (A54)
...
Change-Id: If36b5375b04f68deeb72bcece3cb8d37aed57f59
2012-07-05 17:22:15 +09:00
0783366036
Remove a redundant test (A53)
...
Change-Id: If711074fdcb586e35d02e421c845f2c9024ca718
2012-07-05 17:22:04 +09:00
4cba560dbb
Small simplification (A52)
...
Change-Id: I56bc5b9b584de5a14b41fc32c19f7fefb3b12e88
2012-07-05 17:22:00 +09:00
ea80794dd4
Put some more code in common (A51)
...
Change-Id: If1589e29728df20713c75e08df7f47f0de9202d4
2012-07-05 17:21:55 +09:00
cbfd2e1fdb
Pull up a common variable into the wrapping method (A50)
...
Change-Id: I0b62098308169b5c44ced25ffb902766e3732fbf
2012-07-05 17:21:51 +09:00
7ed22f1f72
Factorize some common code (A49)
...
Also add some comment to clarify what's happening inside those
methods
Change-Id: I5b9b1e105b3145f0b050f35d12c5b6ca6e4a4d8c
2012-07-05 17:21:44 +09:00
b28934adac
Fix tab key's navigation behavior
...
Bug: 6435484
Change-Id: Iffe459c117ad438e96ec6f5c7e64fb80b32d227e
2012-07-05 16:57:14 +09:00
133bb8544a
Merge "Fix upper case Eszett more key"
2012-07-05 00:52:08 -07:00
5946838b8e
Fix upper case Eszett more key
...
Bug: 6773873
Change-Id: I1a533c729c312a53663fb142cb6fcb4915b53206
2012-07-05 16:13:52 +09:00
0726f466f7
Merge "Add a wrapper to updateSuggestions / Predictions (A48)"
2012-07-04 21:08:21 -07:00
7aeb7ef1ab
Merge "Fix Keyboard.getKey as thread safe"
2012-07-04 19:58:17 -07:00
8f6c603b3b
Fix Keyboard.getKey as thread safe
...
This is a follow up of Id962e670.
Change-Id: I9e8542bff9e8faf57f934051fe612463c99ad61f
2012-07-05 11:43:43 +09:00
e47c728dd5
Add a wrapper to updateSuggestions / Predictions (A48)
...
The goal is to have those converge, as they contain almost 100%
duplicated code.
Change-Id: I6921791d47efce9fb396efd9626839d706664a91
2012-07-05 11:10:04 +09:00
7b40c68277
Refactoring which will help with future changes (A47)
...
Change-Id: Ibc2d28f9f95966f77d4d7bdf9ae4688baaed5989
2012-07-05 11:10:02 +09:00
e9a86e2cdb
Search bigrams for the lower case version of the word (A46)
...
...if there aren't any for the exact case version.
Bug: 6752830
Change-Id: I2737148b01ba04a64febe009ceb2ef53c265d224
2012-07-04 20:12:58 +09:00
4bcf70c931
Fix a bad interaction with mmap
...
Bug: 6761221
Change-Id: I7e6d98dc9d7cb34a6163c3957e401ff97abb975c
2012-07-04 17:57:06 +09:00
ac3bd96192
Merge "Remove WordComposer.add(int, int, int, KeyDetector) method"
2012-07-04 01:48:42 -07:00
5c641a9f59
Remove WordComposer.add(int, int, int, KeyDetector) method
...
Change-Id: Ie6af46acba18a2d1cf3ddd1578d60ded4c90f89a
2012-07-04 17:29:47 +09:00
5c98206dc5
Merge "Use Keyboard.getKey"
2012-07-04 01:12:02 -07:00
adc80eef15
Use Keyboard.getKey
...
Change-Id: I722b9e981389f660db928b7fd5ced1b82371fbf3
2012-07-04 16:31:57 +09:00
040aa28ed4
Merge "Get rid of redundant CharSequence member from SuggestedWordInfo"
2012-07-04 00:27:07 -07:00
f3897fb54e
Get rid of redundant CharSequence member from SuggestedWordInfo
...
Change-Id: Ie8792f4f5d3593c25c992fc72cf219daeaa70beb
2012-07-04 16:04:59 +09:00
c5e911c06b
Consolidate a method inside another (A45)
...
It's simpler to check the safety net directly inside the
function that checks for auto-correction threshold.
This introduces one very slight change in behavior. The value
checked by the safety net is not any more the "typed word" but the
"considered word", the difference being any possibly appended
single quotes.
E.g. the user types "this'''" : the typed word is "this'''" but
the considered word is "this".
This change in behavior can be considered a bugfix.
Change-Id: Ia7ab4bc933183dfbd41bb00328e4c0b5ab76bc63
2012-07-04 11:51:51 +09:00
f72b8f5662
Move the safety net function to AutoCorrection (A44)
...
Change-Id: Iec791d061f237f60992dd6048c4a37b46f4cb9aa
2012-07-04 11:51:46 +09:00
accd63f35f
Merge "Refactoring (A43)"
2012-07-03 19:40:19 -07:00
b0593636b1
Import translations. DO NOT MERGE
...
Change-Id: I9c9bbd6dda1e978e29e985296cb624035d45497d
Auto-generated-cl: translation import
2012-07-03 14:21:10 -07:00
b87b23eb75
Merge "Remove useless code (A42)"
2012-07-02 18:56:41 -07:00
6547f43666
Merge "Clarify some code and fix a bug (A41)"
2012-07-02 18:52:56 -07:00
d0ba95678e
Import translations. DO NOT MERGE
...
Change-Id: I13c7109bb886ef2860cbb4fc24650dd2b8badbcb
Auto-generated-cl: translation import
2012-07-02 14:37:28 -07:00
d6496c0913
Merge "Fix a bug with the user dictionary locale."
2012-07-02 02:57:50 -07:00
d113fd0be4
Fix a bug with the user dictionary locale.
...
We internally use the string "zz" to mean no locale, but
the user dictionary service does not understand that and
words added with this locale pitifully end being added to
a "zz" user dictionary, which makes no sense to the user.
This change fixes things so that words added when the
keyboard is in a "no locale" layout, the words are added
to the global, all-locales user dictionary.
Bug: 6645306
Change-Id: Iec3cdd1fe3d5bc43427a43ef9ae9bf89e12be1f2
2012-07-02 17:14:47 +09:00
4ca05e2474
Refactoring (A43)
...
Change-Id: Ib0b6f36999518096819ada2f19365767cb5f9931
2012-07-02 15:46:11 +09:00
7ad088a4cf
Remove useless code (A42)
...
If allowsAutoCorrected is false, there is no point in making
hasAutoCorrection true, since in the only place where we use
it again, it's &&'ed with allowsAutoCorrected !
Well that was extremely obscure, good thing refactoring allowed
to realize this was useless >.>
Change-Id: I34936d445f1ced17c7bd04a9524bf608f9e8b9c8
2012-07-02 15:46:08 +09:00
90d300c770
Clarify some code and fix a bug (A41)
...
The test against hasMainDictionary is a test to know if we should
auto-correct or not. Its result should be recorded in
hasAutoCorrection, not in allowsToBeAutoCorrected.
Actually, this value being inserted in allowsToBeAutoCorrected was
causing a bug that nobody noticed: when typing in a language with
no dictionary, the word in the middle of the suggestion strip would
always be bold, as if it was going to auto-correct to itself !
This change fixes this bug.
Change-Id: Ia1f08efd7089b9c5cbede910c5b0951d83e698d2
2012-07-02 15:46:03 +09:00
2631e3b195
Small refactoring (A39)
...
Change-Id: I3c45b5a6571f986acc7adb3a8fe17b210303f7ea
2012-07-02 15:45:58 +09:00
79f5317848
Match calls for future consolidation (A38)
...
Change-Id: I2b2ab99e801fa8b4b30eab16a8aefb8cfe104ba9
2012-07-02 15:45:54 +09:00
cd288620ea
Make the autocorrection scheme more straightforward (A37)
...
Change-Id: I4833ca7e057b8c1f1f22390673cbca0d2433b1bd
2012-07-02 15:45:34 +09:00
bd1d711488
Merge "Remove a duplicate method (A36)"
2012-07-01 22:36:38 -07:00
654d5ba165
Merge "Update log and make a variable private (A35)."
2012-07-01 22:30:36 -07:00
3ca3afe971
Merge "Update dictionaries."
2012-07-01 20:55:47 -07:00
aba432bf8d
Remove a duplicate method (A36)
...
Bug: 6705473
Change-Id: Ib6260034b09739b60071e90a018b2dc6be3815d7
2012-07-02 12:12:16 +09:00
84074cf503
Update log and make a variable private (A35).
...
Change-Id: Ib4a8f41dc5941bce46402e1a41a6c21dccb0601f
2012-07-02 12:11:27 +09:00
26c45718a5
Import translations. DO NOT MERGE
...
Change-Id: I1c7b1b7877fdbf6963b7a034a8ec197004f97b0e
Auto-generated-cl: translation import
2012-06-29 14:05:31 -07:00
1842fbba93
Remove old debug code that has been long broken (A34)
...
Change-Id: I9b5a0e34529724984aad1e2bf99b3e00f8ed0dd7
2012-06-29 19:47:00 +09:00
6f7b1ff468
Update dictionaries.
...
- English : some words caught through regression tests
- English : some words externally reported
- French : some words externally reported
- French : finished review of all accented words
Bug: 6726969
Bug: 6730031
Change-Id: I37d0dc310db2c79e03ac7ad452391e92d9b13357
2012-06-29 19:30:01 +09:00
105069a15f
Merge "Add input pointers"
2012-06-29 03:03:01 -07:00
71538b08e4
Add input pointers
...
Change-Id: I95300bf0a847fb86d026e846ff4ad723bb45284f
2012-06-29 18:58:51 +09:00
f2af726f79
Merge "Add a more synthetic variable (A33)"
2012-06-29 02:22:05 -07:00
aa246f23ce
Merge "Remove cruft (A32)"
2012-06-29 02:12:47 -07:00
defc2e2efa
Merge "Simplification (A31)"
2012-06-29 02:09:16 -07:00
7a6ac44f5f
Merge "Small refactoring (A30)"
2012-06-29 02:09:06 -07:00
e0b7359126
Merge "Use SparseArray<E> instead of HashMap<Integer,E>"
2012-06-29 02:05:39 -07:00
56853c1e48
Use SparseArray<E> instead of HashMap<Integer,E>
...
Change-Id: Id962e670ee1a5164e6c69deb84625139bf5e7974
2012-06-29 17:56:31 +09:00
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
9011b89f4e
Remove cruft (A32)
...
Change-Id: I35c2ba4caf6be4ba0449e11c0597ae8e468c0e6e
2012-06-29 17:00:57 +09:00
2cda148fd5
Simplification (A31)
...
Change-Id: I9e4d030974ccec1a6256de6ca87610870e404149
2012-06-29 17:00:57 +09:00
deb2d88245
Small refactoring (A30)
...
Change-Id: I41b413986a3c5bb6697bb7bbced17ed1e361913c
2012-06-29 17:00:57 +09:00
9e0af57736
Optimization (A26)
...
Change-Id: I1d7790289635729645995fb8c38868259ab1b3be
2012-06-29 17:00:56 +09:00
0a63111821
Remove a useless parameter (A29)
...
Change-Id: I52625e707abf61da9b95e542f0814c66b532f483
2012-06-29 17:00:56 +09:00
4f444410f2
Remove a useless variable (A28)
...
Change-Id: I1058123d233540fb72a94028987a43740224f635
2012-06-29 17:00:56 +09:00
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
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
b3cfde2cbb
Add a few comments for future reference (A24)
...
Change-Id: Ia356130b8a95ec9cf676bc6be05d801c13f14b64
2012-06-29 15:45:27 +09:00
e398c6c024
Rename a method for readability (A23)
...
Change-Id: I6f569322e645d36bc82fddf4ec2fd621972e3b47
2012-06-29 15:45:24 +09:00
ea578f6b1d
Revert a test for readability (A22)
...
Change-Id: I1df4cef5ae2736a22273843dce67f0012181bfd3
2012-06-29 15:44:55 +09:00
19d02c19d0
Remove a useless variable (A21)
...
Change-Id: I901e6b0e2b994128da19d68233b9f68bb308cb95
2012-06-29 15:44:17 +09:00
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
4d5e7235c5
Remove a useless variable (A20)
...
Change-Id: Ifc37462f5243563693c8cd7cbeb401ff054daa52
2012-06-29 15:12:51 +09:00
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
739683dcfb
Rename a method for readability (A19)
...
Change-Id: I0b8c06d1fd0bfb3caf363c048acc7048abed1752
2012-06-29 15:12:51 +09:00
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
b01cdb975a
Inline a method (A17)
...
This will allow us to remove unnecessary processing
Change-Id: I251dfdaffb077906186686ebe65fd82e1e360bd2
2012-06-29 15:12:51 +09:00
42dde06782
Make a function a one-liner (A16)
...
...to better inline it
Change-Id: I88496b8f18b81f0c05e4bbf2d1039de1f93e0c25
2012-06-29 15:12:51 +09:00
a96a11949f
Inline a simple method (A15)
...
Change-Id: Ib74fcbf33c680bf02c39a9896e30e3afbcfd149a
2012-06-29 15:12:51 +09:00
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
9701b360d9
Rename a terribly-named method for clarity (A11)
...
Change-Id: Id180000404dc6929d80f98c0e9cd2026230ad2d1
2012-06-29 15:12:50 +09:00
6b911c27a3
Merge "Small readability improvement (A10)"
2012-06-28 23:11:23 -07:00
f89a75134b
Small readability improvement (A10)
...
Change-Id: Iba326921711e1c4eab38264e66b6b44a64fec398
2012-06-29 15:05:08 +09:00
305326e789
Refactoring and add debug prints (A9)
...
Change-Id: I46497bff107f0def0dfa2b043b20d9a0b0cde040
2012-06-29 14:24:54 +09:00
5110e2cb51
Optimization (A8)
...
Change-Id: I2b9e8cc6a13fd9af84a5189e4d3fbb2b05c68d46
2012-06-29 12:54:11 +09:00
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
4847a27f74
Cleanup (A7)
...
Change-Id: Iba97e0062b702c005ab3ff9ce59f181d19ab7c98
2012-06-28 19:13:16 +09:00
ed83d4b143
Stop special-casing a single suggestion (A6)
...
Treat it like the others
Change-Id: Ic24e40ada0e75773c3ece9470ab61c350697be5d
2012-06-28 19:12:37 +09:00
251bb70f08
Cleanup (A5)
...
Change-Id: I06134145b47c46bbc6c340ca539f34a01e2ca163
2012-06-28 19:12:37 +09:00
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
33b3805e79
Small refactoring (A3)
...
This will help make upcoming changes clearer
Change-Id: Ida8d4935f7315e5da6007ad364124694da3112d0
2012-06-28 19:10:24 +09:00
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
09b30ac954
Merge "Use a TreeSet to sort suggestions instead of doing it by hand (A1)"
2012-06-28 03:08:26 -07:00
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
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
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
ca5449bf4f
Import translations. DO NOT MERGE
...
Change-Id: I3d022f22729b758a73352f0e7361e3aead0ef062
2012-06-27 17:16:15 -07:00
10abf10c1f
Convert local members to local variables
...
Change-Id: I852787986c79502a4de7effe9c8281a4cf2d519d
2012-06-27 19:54:29 +09:00
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
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
24eec0fa68
Remember the source dictionary for each suggestion.
...
Change-Id: I3c63372bd5572a479a67eaecfe8c8ea1cabc70d9
2012-06-27 18:17:28 +09:00
d8f0caa406
Move constants to a better place.
...
Change-Id: I5c27a3ed99b17f850e26a8503de16f001c7111c1
2012-06-27 18:08:08 +09:00
089c11a086
Cleanup
...
Change-Id: I575f22330bf6881af1d9a35f22b51b7bf2198113
2012-06-27 17:59:58 +09:00
b5afd3de0c
Remove unused stuff.
...
Change-Id: Ifd0d5b6978f76b841574a6e10157c32d0cd656b6
2012-06-27 17:44:16 +09:00
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
c356df8e08
Merge "Update the prototype of onAddSuggestedWord - calling side."
2012-06-27 01:25:59 -07:00
e55c23e4b0
Small cleanups
...
Change-Id: Ic1a198ab1b4f0323fde9e4245729fd0e6011b914
2012-06-27 16:54:37 +09:00
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
2db27bcd06
Merge "Use binarySearch instead of a hand-written linear search"
2012-06-26 23:55:46 -07:00
78a8d5b6bc
Merge "Implement a comparator for SuggestedWordInfos."
2012-06-26 22:55:51 -07:00
56beb9e321
Use binarySearch instead of a hand-written linear search
...
Yay.
Change-Id: Icf686eb2d675da959f19edc856b521e6288dcea3
2012-06-27 14:17:29 +09:00
9da0027b38
Implement a comparator for SuggestedWordInfos.
...
Change-Id: Ic4b0ae05cd98a1aec5806c5e4b744158e73aea7a
2012-06-27 14:16:23 +09:00
30447239e8
Merge "only output every kth word to log"
2012-06-26 20:49:03 -07:00
4ef01c51f8
Merge "Remove some special casing"
2012-06-26 20:33:43 -07:00
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
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
a3f5f51ec4
Fix a bug where a log would mysteriously not work
...
Change-Id: I5ca77ed65e95a6d357215c0e730238fb463986bb
2012-06-26 20:36:51 +09:00
22657dcba0
Optimization.
...
We already had that computed
Change-Id: I2a9742eaee2e9db1f73aeddda7bae7e237b4d15c
2012-06-26 20:02:07 +09:00
ec8b27fe49
Cut out a method for clarity
...
Change-Id: I1dc668698a5cd840297e713a26a525f5e32d35d6
2012-06-26 19:49:01 +09:00
0131170da9
Merge "Avoid string conversions when possible."
2012-06-26 03:48:01 -07:00
5953dc93cf
Avoid string conversions when possible.
...
Change-Id: Ibf5f3e40da55998364d0d835ecf283f32c80fcf5
2012-06-26 19:45:52 +09:00
5d218bc029
Merge "Simplify a method call."
2012-06-26 03:45:02 -07:00
bed514bd90
Simplify a method call.
...
Change-Id: Ieede787a13cef79353f13af52488ef3732ac9850
2012-06-26 19:33:16 +09:00
61c1002b6b
Merge "Refactor and squash long-standing bugs (A2)"
2012-06-26 03:19:20 -07:00
abf81192ff
Merge "Remove unnecessary variables"
2012-06-26 03:16:17 -07:00
342ea3d324
Merge "Pass MotionEvent to PointerTracker"
2012-06-26 03:16:12 -07:00
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
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
a8c9946b44
Merge "Remember the locale in the Suggest object (A1)"
2012-06-26 03:05:05 -07:00
7bb8e95b52
Merge "Cleanup PointerTracker debug method"
2012-06-26 03:03:49 -07:00
0d9d37cec2
Remove unnecessary variables
...
Bug: 6722052
Change-Id: I92e85b3e49b8f4b228f0cf0994216c5050e0865c
2012-06-26 19:01:59 +09:00
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
a5cfeeb6ef
Merge "Remove a useless member (A2)"
2012-06-26 02:46:48 -07:00
0f455ae2a6
Merge "Convert a member to a local variable (A1)"
2012-06-26 02:46:39 -07:00
bf0cae3695
Merge "Reword the 'word prediction' option"
2012-06-26 02:45:49 -07:00
6cad198d9c
Remove a useless member (A2)
...
Change-Id: Ia727ffc2946352bbf79e0c97684f8fa98f428cef
2012-06-26 18:42:06 +09:00
0da9a7c094
Convert a member to a local variable (A1)
...
Change-Id: I9eab910989443704f83711cf4fb0070c5987a13a
2012-06-26 18:41:49 +09:00
d7edd1cbb5
Cleanup PointerTracker debug method
...
Change-Id: Ib3bfa0a46f5814a6df838005d7243e2f536a98a0
2012-06-26 18:36:30 +09:00
8d076be2d1
Reword the 'word prediction' option
...
Bug: 6694141
Change-Id: Ic8fd902554cdf81998f3806a58484d9733848d99
2012-06-26 18:23:06 +09:00
f05392f213
Remove an unused method (A22)
...
Change-Id: I2195f365df1799c8b3b2a53670d1df535ab1a742
2012-06-26 17:59:04 +09:00
6234be1fe7
Simplification and optimization (A20)
...
Change-Id: Ia837e553ccfe67cd4303096290194a5186df059b
2012-06-26 17:59:04 +09:00
77e95e60bb
Preparation for a simplification (A19)
...
Change-Id: I4605a571faf5fbc68b18ce525d6019600bfa8cf7
2012-06-26 17:59:04 +09:00
0a79446531
Remove a meaningless separation (A18)
...
Change-Id: I267177044c7d7b0d9119839a11057b2bbf41f75f
2012-06-26 17:59:04 +09:00
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
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
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
2225b3bace
Do away with Utils#addAllSuggestions (A14)
...
It's not used any more.
Change-Id: Id9da40fdbf7078f3ac647d1368237d6601f5a2ba
2012-06-26 17:36:47 +09:00
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
7830476022
Neutralize Suggest#addWords (A12)
...
Bug: 6252660
Bug: 6166228
Bug: 2704000
Bug: 6225530
Change-Id: Id923367342a62a650a5f1d38e2fa0e913030dca8
2012-06-26 17:36:47 +09:00
fd998bd37a
Refactoring (A11)
...
Change-Id: I86bd7587dd80773a51ba6db312ba55dc41e7c8c7
2012-06-26 17:36:47 +09:00
Jean Chalard
Tadashi G. Takaoka
Kurt Partridge
Ying Wang
Satoshi Kataoka
Ken Wakasa
Eric Fischer