nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
6285 commits 1 branch 0 tags 363 MiB
Commit graph

2729 commits

Author SHA1 Message Date
Jean Chalard
0d0f182959 Cut out a private method to make things more readable 
Change-Id: I791700890338e023bd86b8794dbc90379b91dc7d
 2012-03-14 18:43:32 +09:00
Jean Chalard
ac5e463402 Minor optimization 
We know the size in advance, this may save a few allocations

Change-Id: I2fb9a725f34ba2da4f34ed335652f10447d5d166
 2012-03-14 18:35:07 +09:00
Jean Chalard
def4551c2a Some code simplification 
Just write the same thing in a more succint manner

Change-Id: I08a2c5edd52a3502914541061fd5b6ee7a92ebc4
 2012-03-14 18:33:57 +09:00
Jean Chalard
4a08b2f0e4 Cleanup & optimization 
Renaming some variables, and obvious optimizations.

Change-Id: Ib716748e9f3d602cf276dcd4e73f3bcfb819585e
 2012-03-14 18:29:06 +09:00
Jean Chalard
f985efe39c Remove a useless parameter 
Change-Id: I03005240238fb004c20b2df0d836796e2e8b307f
 2012-03-14 18:12:12 +09:00
Jean Chalard
bdf6d1b18b Remove a useless method 
Change-Id: I208dd2e725e37c2fb3cd51fe48194679e5912f6b
 2012-03-14 15:59:04 +09:00
Jean Chalard
eda7d8af60 Remove the Builder 
Change-Id: Idef22e6a82d59e3ec95b95ad237debcb07daf000
 2012-03-14 15:42:26 +09:00
Jean Chalard
33cc825374 Match the constructor of SuggestedWords to the Builder call. 
We have to match one way or another, and the argument order to the
Builder call is more logical.

Change-Id: Iac7c3a351c2687cb294d6a4924fd9cb20ca95177
 2012-03-14 15:42:22 +09:00
Jean Chalard
7d55c891af Make the Builder private 
Change-Id: I2184084f4b7729c4324f8291d548bd4c4c2872a1
 2012-03-14 15:42:14 +09:00
Jean Chalard
5b0643f50d Re-sequence the last calls to build() 
Change-Id: If77ee5aa9483d3ca03c52812f31665dee6468e99
 2012-03-14 14:19:24 +09:00
Jean Chalard
d42b0238f9 Merge "Move up the static methods of the Builder" 2012-03-13 21:22:22 -07:00
Jean Chalard
7d384c73da Merge "Kill the last place where the Builder was being used" 2012-03-13 21:22:03 -07:00
Jean Chalard
88bf1ba526 Move up the static methods of the Builder 
Change-Id: Ic3e07b745b7b24cae0f772ea49e0de615b44caf9
 2012-03-14 13:10:22 +09:00
Jean Chalard
8e19b1183e Kill the last place where the Builder was being used 
I had missed that one

Change-Id: I9a5040a7a61e294396aa424de96a69dbb15f037a
 2012-03-14 13:10:12 +09:00
Tadashi G. Takaoka
f147da0436 Merge "Use XML animator definition" 2012-03-13 21:10:08 -07:00
Tadashi G. Takaoka
d7c4ba1709 Use XML animator definition 
Change-Id: Ic2f6d3f8fdd2c0b0a00f004f49f95b00d474ee4b
 2012-03-14 13:08:27 +09:00
Jean Chalard
7b2d6a8f98 Merge "Make the Builder fully immutable at last" 2012-03-13 20:30:16 -07:00
Jean Chalard
76e3861981 Merge "Straighten out the last bastion of the Builder" 2012-03-13 20:23:16 -07:00
Jean Chalard
febf9929ca Merge "Add to SuggestedWords a missing parameter, and use it." 2012-03-13 20:15:34 -07:00
Tadashi G. Takaoka
82793f2f85 Merge "Avoid using interface member, use concrete collection class instead" 2012-03-13 06:25:39 -07:00
Tadashi G. Takaoka
ce96959518 Avoid using interface member, use concrete collection class instead 
Change-Id: I8b647e8c260aec58c557ce07f3a2d8987c24d7be
 2012-03-13 22:20:34 +09:00
Tadashi G. Takaoka
0bd4699f9c Merge "Update other alt keys' graphics" 2012-03-13 06:19:53 -07:00
Tadashi G. Takaoka
faad353fea Update other alt keys' graphics 
Change-Id: I12699907a514f5fc2e110a0a711fb91c14a8756f
 2012-03-13 22:12:40 +09:00
Tadashi G. Takaoka
e1a91d0b26 Merge "Avoid using collection interface, using array instead" 2012-03-13 05:19:47 -07:00
Tadashi G. Takaoka
b4fbbe57f5 Avoid using collection interface, using array instead 
Change-Id: Ie0554362b73967bfcbbab6ad19c24683066a608e
 2012-03-13 20:53:15 +09:00
Jean Chalard
e3afb7d192 Make the Builder fully immutable at last 
Change-Id: Ie399ca7a9e76ccab44a92bc378d11f92392fed2c
 2012-03-13 20:33:13 +09:00
Jean Chalard
6ffb5018c1 Straighten out the last bastion of the Builder 
...and go for the kill

Change-Id: I5ad57211b250d2578ca22a5dae93344d52f9da80
 2012-03-13 20:26:47 +09:00
Jean Chalard
ec471c72f8 Add to SuggestedWords a missing parameter, and use it. 
Also stop using Builder between its creation and the call to
the #build() method.

Change-Id: Ie1fc3ec7b6f4c7c3789f672f4e26b4bf58c3e062
 2012-03-13 20:19:21 +09:00
Jean Chalard
2e2519ee91 Make still more members of the Builder final. 
Change-Id: Ic455f97247da5e40d4939555ab639ecffef36e2d
 2012-03-13 20:05:00 +09:00
Tadashi G. Takaoka
edf5daa8ed Merge "Support invalidating multiple keys in KeyboardView" 2012-03-13 04:00:15 -07:00
Jean Chalard
bd4ba23d2b Some code reorganization. 
Use the same local variable inside both branches of an if.

Change-Id: I61f7d506d984f3723ec90604416d1875dd97cd8c
 2012-03-13 19:54:56 +09:00
Jean Chalard
b5eeb724fc Make some more Builder attributes final. 
Change-Id: I3132b7fe4ee97c566736bfc21c3783cfc79fc7ff
 2012-03-13 19:53:38 +09:00
Jean Chalard
c60fea852d Make the suggested word list final in Builder. 
Change-Id: I2ddfab00dc8c141fc989a051f16eb2b3571b7e86
 2012-03-13 19:37:17 +09:00
Jean Chalard
08adb09e14 Remove unused stuff. 
Remove 2 methods that were left only for tests to compile in
another project, but are not used any more now that the tests
have been updated.
Also remove an attribute that is never read.

Change-Id: Ic9ba1f52a465199c82c923d77ed7450460e8a4b9
 2012-03-13 19:37:16 +09:00
Jean Chalard
9ffaae71d9 Merge "Make an add into a set." 2012-03-13 03:35:17 -07:00
satok
728fd52b63 Merge "Pass the locale to the native code" 2012-03-13 03:27:11 -07:00
satok
7ef1dabd92 Pass the locale to the native code 
Change-Id: I8f73b9b33cca56b3fa44ec6259c0896be22f4a47
 2012-03-13 19:16:33 +09:00
Jean Chalard
674ffcdf93 Make an add into a set. 
This method now only sets words, so it should be named set.
The functionality is identical since there are no more places
where the list is reused.
This will also allow to make the list final in an upcoming change.

Change-Id: I25b0c7d7f13c3fa5d89806f01f48f1026769603f
 2012-03-13 19:07:42 +09:00
Tadashi G. Takaoka
299ac263b3 Support invalidating multiple keys in KeyboardView 
Change-Id: I347ccfc2cf60c17f5f0eddec6566662cb3a954ca
 2012-03-13 18:55:05 +09:00
Jean Chalard
d6662ecd30 Cleanup 
Remove an unused method, make others static, fix a formatting
issue

Change-Id: I40cb0b5e01a6f8e2f7b953bd9aad3168dfee71d1
 2012-03-13 18:34:19 +09:00
Jean Chalard
4ee186920e Remove a method that causes annoying side-effects. 
...and replace by a call to a central method.

Change-Id: I93d0a2c2e99963a5b69923d1062d0e01853216b6
 2012-03-13 18:22:49 +09:00
Jean Chalard
b8753eb31c Merge "Kill the StringBuilderPool." 2012-03-13 02:14:37 -07:00
Jean Chalard
adf218eed5 Kill the StringBuilderPool. 
The intention may have been nice originally but these end up
being copied anyway :/
Let's remove them now, and in a later change, just keep
references to the created objects.

Change-Id: Ifba8357c20384f9eb40cd916665ed1fc6dc8cab1
 2012-03-13 17:59:49 +09:00
satok
8e08bfb8de Merge "Implement additional proximity characters in the native code Bug: 4343280" 2012-03-13 01:41:46 -07:00
satok
552c3c27f0 Implement additional proximity characters in the native code 
Bug: 4343280

Change-Id: I9bbc5cab2fef1ee80c1fe32017df811ef8af10bc
 2012-03-13 17:38:50 +09:00
Tadashi G. Takaoka
aee5f03d6e Use integer alpha value instead of factor for animation 
Change-Id: I3099a7625e0176a1d2be42e58d6eb5fa95797bcb
 2012-03-13 16:47:45 +09:00
Jean Chalard
95fcb0cce9 Merge "Remove a useless parameter." 2012-03-13 00:26:06 -07:00
Tadashi G. Takaoka
dabf96896e Move language on spacebar parameters to LatinKeyboardView attributes 
Change-Id: I06e5d7d158a9b14b00df34e68b12cd012faf17d1
 2012-03-13 16:17:13 +09:00
Jean Chalard
d0d4074392 Remove a useless parameter. 
Change-Id: I7625bf17158c207ad7e8cd496bef825704173c4c
 2012-03-13 15:34:06 +09:00
Tadashi G. Takaoka
6fbcd0d219 Merge "Use Animator to draw language name on spacebar" 2012-03-12 22:57:57 -07:00
Tadashi G. Takaoka
4c0c638a18 Use Animator to draw language name on spacebar 
Note that Animator class exists in framework only on Honeycomb or
later.

Change-Id: Ie3392dbf8acc1547ebb2d16e04086c911d961aed
 2012-03-13 14:25:57 +09:00
Jean Chalard
7c9bff96f0 Kill methods with side-effects, take 2 
...working this time

Change-Id: I80e377e6250d3817f1e067a551bca2a557740764
 2012-03-13 14:18:30 +09:00
Jean Chalard
b26af7eae7 Revert "Kill methods with side-effects" 
This reverts commit ca0e048688
 2012-03-12 19:42:29 -07:00
Jean Chalard
ca0e048688 Kill methods with side-effects 
Change-Id: I42baeec68eb2540e7d8f8538ae2dceeef5594391
 2012-03-12 19:48:32 +09:00
Jean Chalard
f62d6f50f2 Merge "Consolidate words into SuggestedWordInfo" 2012-03-12 03:14:54 -07:00
Jean Chalard
c3c4ed91cf Consolidate words into SuggestedWordInfo 
We can't get rid of SuggestedWordInfo because it conveys
the information about whether a suggestion is outdated or
not. It is always created anyway. So it makes sense not
to have separate lists and to just keep everything in the
SuggestedWordInfo object.

Change-Id: Idd79dc267d97633901d3d2869da457736963e178
 2012-03-12 18:58:20 +09:00
Tadashi G. Takaoka
546692daac Merge "Support disableAdditionalMoreKeys and disableKeyLabelHint" 2012-03-12 01:48:05 -07:00
Tadashi G. Takaoka
b03529aa01 Support disableAdditionalMoreKeys and disableKeyLabelHint 
Change-Id: Idfa586417acd4a223380d52f044e3a86eb780b21
 2012-03-12 17:45:57 +09:00
Jean Chalard
a3f2ce1f31 Merge "Fix an OOB" 2012-03-12 01:12:40 -07:00
Jean Chalard
c0c20b386f Fix an OOB 
The combination of I6b0262fe which removes the internal
size() > 1 test in the safety net calculation and I642a5893
which assumed DBG means there is at least one suggestion.
This change writes the test correctly.

Change-Id: Ib63bce4e163a785f408dd145c23d64cd58fa8c90
 2012-03-12 16:50:58 +09:00
Tadashi G. Takaoka
b6895aec05 Merge "Rename keyboard XML files" 2012-03-12 00:42:03 -07:00
Tadashi G. Takaoka
47141f7011 Rename keyboard XML files 
* Slavic to East Slavic
* Serbian to South Slavic
* Scandinavian to Nordic

Bug: 6150183
Change-Id: I8f5641aa07b83cbb225f5fd73e351a6f8abe0784
 2012-03-12 16:39:29 +09:00
Jean Chalard
30936116d8 Merge "Make a method accessible for tests" 2012-03-12 00:23:29 -07:00
Jean Chalard
9dedec7c29 Make a method accessible for tests 
Tests are using a wrapper method that's going to disappear soon.
The method that becomes package-visible now is destined to be
removed too a little later.

Change-Id: If99b1c77ed52e050b47216cc7afab5f35c4bbb38
 2012-03-12 16:11:16 +09:00
Jean Chalard
1dfef0336d Make a method static 
Change-Id: Ie1d460562d38105abe91ae2da17cafd49e2cd394
 2012-03-12 15:00:36 +09:00
Ken Wakasa
c1ca8815f5 Fix an obvious bug in handleLanguageSwitchKey() 
bug: 5759092

Change-Id: I8c7b2ef024cbab399d96f6b3ec553da4e9d2fb18
 2012-03-11 00:44:47 +09:00
Jean Chalard
1a85b74adb Entirely remove safety net memory. 
mHasAutoCorrectionCandidate now includes the fact that this
did not get caught by the safety net. This is more intuitive.

Change-Id: I6502bbf1ca64a0a6d64f55d723305cf78352a656
 2012-03-09 22:10:25 +09:00
Jean Chalard
68823ae08e Make the safety net memory private 
Change-Id: I10959d47c980d2e8f2ea995955acf02193e3ff7b
 2012-03-09 22:01:15 +09:00
Jean Chalard
ebbb7e9665 Recompute safety net in debug cases instead of memorizing 
Change-Id: I67f3a31db081afa4871ec441dd461c56e098c668
 2012-03-09 22:00:23 +09:00
Jean Chalard
682c2d53cc Make access to the safety net calculation easier 
Change-Id: If33897b38af94ae81b05e5ef140a542724b9f34a
 2012-03-09 21:44:40 +09:00
Jean Chalard
151d5cb532 Extract a condition from a method 
Change-Id: I6b0262fe7cb3f7a31cc19d724c301467be932640
 2012-03-09 21:37:44 +09:00
Jean Chalard
36c1b37914 Remove a useless argument 
Change-Id: I713433a3225193489fad5bdafcf302b529903116
 2012-03-09 21:24:47 +09:00
Jean Chalard
28e59b98c6 Remove a useless escape 
Change-Id: I1ef0685cc9888c9cef9f60015d32b66dde75ef9b
 2012-03-09 21:10:55 +09:00
Jean Chalard
d5f618e90a Remove a useless test 
If we are not composing a word here, we have already returned

Change-Id: I63281abace777e3658286d4df6781d2cd5a29c33
 2012-03-09 20:53:45 +09:00
Jean Chalard
c5d2bb786e Don't use an intermediate object with a different meaning 
Change-Id: Ie89916b49c852a51385ffd61cb596a58f23a46a0
 2012-03-09 20:51:33 +09:00
Jean Chalard
ed9986824e Move some auto-correction logic to where it belongs 
Change-Id: I897c5ec3a630a4a6bfc593906df4d3fc7b244482
 2012-03-09 20:45:37 +09:00
Jean Chalard
dfd4abe818 Fix a shameful bug 
I must have been sleeping when I wrote that

Change-Id: I887180ab610785a2000636adeeed99230b3c5390
 2012-03-09 19:31:35 +09:00
Jean Chalard
0cf422fbb7 Reduction, step 8 
Change-Id: I54334039597e235e24f169e34c1d44109180ee88
 2012-03-09 19:00:29 +09:00
Jean Chalard
a333ff19ef Reduction, step 7 
Change-Id: I177ef2f29c8b6000c5e3d021c016c5d216fe3fc6
 2012-03-09 18:59:20 +09:00
Jean Chalard
a3ee019331 Reduction, step 6 
Change-Id: I22ad4cea0e0cac23813da7e788f5c94974ce0ebf
 2012-03-09 18:58:01 +09:00
Jean Chalard
dbd140504d Reduction, step 5 
Change-Id: Iac52e62c2bdffad14f916f69eade2b785bb41767
 2012-03-09 18:44:23 +09:00
Jean Chalard
0b96bc4b2b Reduction, step 4 
Change-Id: Ib27dc6e9486c3f0f2ec1e94a88a52d12c1af2d38
 2012-03-09 18:44:20 +09:00
Jean Chalard
5a61d03f31 Reduction, step 3 
Change-Id: I0e08b102c9539d97c473505b9d42176c4a7c8853
 2012-03-09 18:44:16 +09:00
Jean Chalard
8abd15b59f Reduction, step 2 
Change-Id: I06e117df43d25dbaf9fc7a7366efd9355a6215ce
 2012-03-09 18:44:10 +09:00
Jean Chalard
f08f30176b Reduction, step 1 
Change-Id: Ic3ed04300cfd4c0b69b93b27379aca4093b32f67
 2012-03-09 18:38:44 +09:00
Jean Chalard
de165aed2a Separate bigram prediction from suggestion process 
Change-Id: Ibdef206fbd6688a45cebbd7fb8a9f6cd175d03b0
 2012-03-09 18:38:20 +09:00
Jean Chalard
6f722c8301 Remove useless stuff 
Change-Id: I462d24da2d26661990d6aab2a13fde851763fd61
 2012-03-09 18:36:52 +09:00
Jean Chalard
67af2a2415 Export some more logic out of Latin IME 
Change-Id: Ib264533a05e9e09347bf254789e6ab5beec92400
 2012-03-09 18:36:49 +09:00
Jean Chalard
df9fce5df1 Export some logic out of LatinIME 
Hopefully that will end in Suggest/SuggestedWords being autonomous
and won't need the logic spoon-fed to them

Change-Id: I915661bce13c69c8a5b8e5d4a8c41e18fea594cf
 2012-03-09 18:36:45 +09:00
Jean Chalard
91e55ac000 Small optimization 
We only use some of those results in one branch of an if() test.
Let's not compute those that are not needed.

Change-Id: I6ca068646b86d2980fb88e75b110ad077362c4ff
 2012-03-09 16:47:43 +09:00
Jean Chalard
195419b1ec Small reorganization 
...resulting in a slight optimization

Change-Id: I83a9b8c92c3d93ce75988285997ec138b3ffe52e
 2012-03-09 16:41:35 +09:00
Jean Chalard
838629aea0 Remove useless test 
typedWord may not be null here

Change-Id: I9e7afb89fafbf6fcbc91fbc132aecc06aec8979f
 2012-03-09 15:52:23 +09:00
Jean Chalard
d48b76267a Merge "Remove a useless test (B7)" 2012-03-08 22:26:20 -08:00
Jean Chalard
2d82757fc6 Merge "Rename a parameter (B6)" 2012-03-08 22:23:33 -08:00
Jean Chalard
de19ab878d Merge "Remove useless tests (B5)" 2012-03-08 22:22:56 -08:00
Jean Chalard
5a7cb9305a Merge "Remove a provably useless test (B4)" 2012-03-08 22:22:20 -08:00
Jean Chalard
54392438c5 Merge "Optimize and clean up (B2)" 2012-03-08 22:00:02 -08:00
Jean Chalard
90bd4efd10 Remove a useless test (B7) 
consideredWord is provably never null.

Change-Id: Ifaa0d2471c46f14967e70ad004d2b82f841a4566
 2012-03-09 14:55:46 +09:00
Jean Chalard
cf8bc92ba0 Rename a parameter (B6) 
This is not necessarily the typed word. Actually, the parameter
that's passed here has trailing single quotes culled out of it.

Change-Id: Ia2038faa2cbbd3a5b8263e6c0fb5b8e670993fe9
 2012-03-09 14:52:35 +09:00
Jean Chalard
92146f2926 Remove useless tests (B5) 
WordComposer#getTypedWord() may not return null. Don't test for it.

Change-Id: I6aff14892503d0c275a3328c404ed99d2f40a687
 2012-03-09 14:52:04 +09:00
Jean Chalard
31a5da28e3 Merge "Move some code around (B1)" 2012-03-08 21:15:25 -08:00
Jean Chalard
8cd847c2fa Remove a provably useless test (B4) 
If !mInputAttributes.mInputTypeNoAutoCorrect then mCorrectionMode
will not have allowed #hasAutoCorrection() to return true.

Change-Id: I1b498d5aeb26194c765cc9b9dcb24d980de43894
 2012-03-09 12:56:48 +09:00
Jean Chalard
94b20c90d8 Optimize and clean up (B2) 
Stop parameters from escaping and don't do useless work and
simplify the code.
Yay.

Change-Id: I0dfc3e14b1cb50e0730f6d9c1d52b54516baa90e
 2012-03-09 12:51:55 +09:00
Jean Chalard
dc5dfe37e0 Move some code around (B1) 
The goal is to make the creation of the Builder closer to
the #build() call

Change-Id: I48d76d4efdc180479829016582edd9de47e7332c
 2012-03-09 12:33:23 +09:00
Jean Chalard
13fb8fb775 Limit escape of parameters 
Change-Id: I3a7ab069042d5542ab2e033d1eeb13d718cd7698
 2012-03-09 12:30:23 +09:00
Jean Chalard
23a5e9d1a7 Merge "Make AutoCorrection static and non-instantiable (A5)" 2012-03-08 19:05:30 -08:00
Jean Chalard
2621fe2256 Merge "Move a memory in the container class (A4)" 2012-03-08 19:04:56 -08:00
Jean Chalard
427dfe37ec Merge "Remove an unused method" 2012-03-08 18:31:26 -08:00
Jean Chalard
cbbfa15765 Merge "Make AutoCorrection a step closer to being static (A3)" 2012-03-08 18:30:19 -08:00
Jean Chalard
58722d83f0 Merge "Stop uselessly remembering a value (A2)" 2012-03-08 18:30:10 -08:00
Jean Chalard
caae6df0ce Remove an unused method 
Who would have guessed this wasn't being called at all.

Change-Id: Ib74a212356ea44e9bf149619ed5464c14684a1ba
 2012-03-09 11:10:55 +09:00
Jean Chalard
21af2f40c5 Merge broadcast receivers again 
It's probably simpler not to have registers dance around,
and just message the feedback manager when the audio event
happens.

Change-Id: Id0710ed102d10d01f1af93ad8cb660653bb3a9f8
 2012-03-09 11:00:23 +09:00
Jean Chalard
7b77c683d7 Fix a crash 
Bug: 6137076
Change-Id: I05f9f72a2678d10d3400dab5fc71544276739dcf
 2012-03-09 10:29:51 +09:00
Jean Chalard
39286f98bc Merge "Remove useless stuff (A1)" 2012-03-08 04:02:46 -08:00
Tadashi G. Takaoka
f686211183 Merge "Split Utils class to StringUtils, SubtypeUtils, and JniUtils" 2012-03-08 03:59:59 -08:00
Jean Chalard
82adfdaeae Make AutoCorrection static and non-instantiable (A5) 
This needs change Ic6756baa to not break the build

Change-Id: I1c772dd99d63fec5d3ad67a0eb7fbc28ec7a0f0f
 2012-03-08 20:56:59 +09:00
Jean Chalard
7a580a4769 Move a memory in the container class (A4) 
This allows us to make AutoCorrection a purely static class.

Change-Id: I15b81bd7f3d6ea487154a5b09a81bc323be82ce1
 2012-03-08 20:56:11 +09:00
Jean Chalard
9254dbcd7e Make AutoCorrection a step closer to being static (A3) 
Change-Id: Ide3d9785661a672af9bc8dc0cf91cab816dd6caa
 2012-03-08 20:55:49 +09:00
Jean Chalard
719f92fc77 Stop uselessly remembering a value (A2) 
The value is only used in debug mode, and it can be recomputed
at the time.
This change does not impact the logic. There is however a side
effect: in debug mode, the normalized score will be displayed
also when the word comes out of the whitelist or is a valid word.
It's actually a good thing.

The end purpose is to make all methods in AutoCorrection static.

Change-Id: I1642b1fdfa6ae62b8aa2fed94a8a26ff4a7e4d0e
 2012-03-08 20:55:37 +09:00
Jean Chalard
ec0fca8a8b Remove useless stuff (A1) 
Remove an unused method and avoid doing a useless computation

Change-Id: I29593c2e93f15857249b35bdd72ca28045056302
 2012-03-08 20:55:25 +09:00
Tadashi G. Takaoka
cc8c8b99bd Split Utils class to StringUtils, SubtypeUtils, and JniUtils 
Change-Id: I09e91675fe7d573dad8c933ad513b21d7e409144
 2012-03-08 20:30:38 +09:00
Tadashi G. Takaoka
7d6d98ecc5 Merge "Cleanup keyboard theme switching code" 2012-03-08 03:24:38 -08:00
Tadashi G. Takaoka
b43f2aeb69 Merge "Fix centering more suggestions panel on tablet" 2012-03-08 03:24:07 -08:00
Jean Chalard
2b1280c0f0 Merge "Return a value for tests instead of saving it" 2012-03-08 03:10:18 -08:00
Jean Chalard
32c181bfe0 Return a value for tests instead of saving it 
Change-Id: I54fa32b92e89d03a53866bd1c0ee65955dd6b3d3
 2012-03-08 20:07:54 +09:00
Jean Chalard
2bb29c4674 Simplification 
Change-Id: Ibced83da2398f1e9ab6a0d6a22c2ad7c8f25cb7b
 2012-03-08 19:50:47 +09:00
Jean Chalard
0f1efae262 Merge "Cleanup unused imports (A7)" 2012-03-08 02:32:48 -08:00
Jean Chalard
663aabca0c Merge "Get the view for haptic feedback as a parameter (A6)" 2012-03-08 02:32:39 -08:00
Jean Chalard
85e88d30c1 Merge "Remove a useless member (A5)" 2012-03-08 02:32:25 -08:00
Jean Chalard
60705c9ed3 Merge "Simplification of sound settings (A4)" 2012-03-08 02:32:16 -08:00
Jean Chalard
d2b5ea2084 Merge "Make a condition positive (A3)" 2012-03-08 02:32:07 -08:00
Jean Chalard
d749fb86ab Merge "Simplify audio management (A2)" 2012-03-08 02:31:57 -08:00
Jean Chalard
7cfae83434 Merge "Export audio and haptic feedback to a specialized class. (A1)" 2012-03-08 02:31:45 -08:00
Tadashi G. Takaoka
411749a4ba Cleanup keyboard theme switching code 
Change-Id: I023769b765d07237b2129d8f1b2a02ffd4c4f09d
 2012-03-08 19:17:31 +09:00
Tadashi G. Takaoka
bcbaffd9dd Fix centering more suggestions panel on tablet 
Bug: 6129726
Change-Id: I8dac3251eec68ad3fb523c632ff39f3cc661c81f
 2012-03-08 19:02:22 +09:00
Jean Chalard
8667bbeab3 Small rename 
Left/Right is wrong terminology here

Change-Id: I58c55849e45d9984dd3fb7b75a64e07667c9eba4
 2012-03-08 18:49:38 +09:00
Jean Chalard
41a2929282 Cleanup unused imports (A7) 
Change-Id: I48ba12e4311cbf2982ee8f5312b279bc8c1fdfe8
 2012-03-08 18:37:03 +09:00
Jean Chalard
544c3c2952 Get the view for haptic feedback as a parameter (A6) 
It's rather annoying (and possibly dangerous) to keep this as a member.
Get it from outside.

Change-Id: I00c42db96395fb65204fb140aeedc82bf312a86e
 2012-03-08 18:37:00 +09:00
Jean Chalard
29d967fdcb Remove a useless member (A5) 
Change-Id: Ibaaeb8dbcb012f5e973e27ed9928401515656e9e
 2012-03-08 18:36:56 +09:00
Jean Chalard
bdbb22bb33 Simplification of sound settings (A4) 
Change-Id: I0c6e207bae1e08c45a95b3479e1d67228d696792
 2012-03-08 18:36:43 +09:00
Jean Chalard
2651b17fc4 Make a condition positive (A3) 
mSoundOn is much easier to understand than mSilentModeOn

Change-Id: Ie51c5c75fcad62e13e0fb578a266af80f15dc440
 2012-03-08 18:36:19 +09:00
Jean Chalard
793791cdf0 Simplify audio management (A2) 
There is little point in deferring loading for this. Getting the
service at startup time is not very expensive anyway, plus we
can avoid getting it in a later change if sound is off in settings.

Change-Id: I08d65467f245fa2f9f617eb23257c327b3115673
 2012-03-08 18:35:48 +09:00
Jean Chalard
564496bad6 Export audio and haptic feedback to a specialized class. (A1) 
Change-Id: I957d883d1ccf188cb98eb11031aa0a32fce4ed76
 2012-03-08 18:35:20 +09:00
Jean Chalard
f8b39f39cd Merge "Remove a useless class (B4)" 2012-03-08 01:14:33 -08:00
Jean Chalard
4b656a3fef Merge "Remove stuff that's not used any more (B3)" 2012-03-08 01:13:06 -08:00
Jean Chalard
d8447ec353 Merge "Use the simple auto-correction status (B2)" 2012-03-08 01:12:46 -08:00
Jean Chalard
fbe767cec5 Merge "Remember auto-correction status simply (B1)" 2012-03-08 00:54:30 -08:00
Jean Chalard
bedb1d33f3 Merge "Give InputLogicTests the ability to change language" 2012-03-07 23:51:29 -08:00
Jean Chalard
274a0643b1 Give InputLogicTests the ability to change language 
Also fix a typo, and increase the time allowed to load the main
dictionary to 2 secs instead of 1.

Bug: 6114326
Change-Id: I5f70b34fc4277c55977b18466253152aa98a2507
 2012-03-08 16:39:29 +09:00
satok
f0d5a78388 Merge "Add functions to calculate proximity characters in the native code" 2012-03-07 23:31:17 -08:00
Tadashi G. Takaoka
3e2d385810 Restart LatinIME service when keyboard theme is changed 
Bug: 6023947
Change-Id: I779da32708fca7333aff74929cc98173246ee685
 2012-03-08 15:08:16 +09:00
satok
a70ee6e3b3 Add functions to calculate proximity characters in the native code 
Bug: 4343280

Change-Id: I17f8f6295b01900948b98680d0267753f33a46cf
 2012-03-08 12:55:15 +09:00
Tadashi G. Takaoka
c648b88779 Merge "Dynamically determine key preview backing view height" 2012-03-07 04:17:52 -08:00
Tadashi G. Takaoka
c8b0e5797e Dynamically determine key preview backing view height 
Bug: 6023947
Change-Id: I53a5c0eb99100a0dfe3e025808f5dc55747d1287
 2012-03-07 20:33:17 +09:00
Tadashi G. Takaoka
cb8d5fa7e2 Merge "Fix duplicate flag value in Key" 2012-03-07 01:53:10 -08:00
Jean Chalard
dab392c6f4 Merge "Fix a bug with successive manual picks" 2012-03-07 01:51:59 -08:00
Tadashi G. Takaoka
8e14e78377 Fix duplicate flag value in Key 
Change-Id: I98e77e5432a228e4455998bf09a2cc671b113c4e
 2012-03-07 18:41:38 +09:00
Jean Chalard
3dd4bcb283 Merge "Recompute suggestions on language change." 2012-03-07 01:35:12 -08:00
Jean Chalard
b84ee82e66 Recompute suggestions on language change. 
Bug: 6106407
Change-Id: I43d9c89610a9ed7a9f6825bd90334d7b343df52c
 2012-03-07 17:35:32 +09:00
Jean Chalard
845b24d9d3 Fix a bug with successive manual picks 
Bug: 6121571
Change-Id: Ib16fbef1087da3b7da5539901ec57156f242f089
 2012-03-07 17:32:42 +09:00
Jean Chalard
f773ef19e8 Remove a useless class (B4) 
\o/

Bug: 5975068
Change-Id: Ia18b55af6d555e7ee7af1cdd7c6227fc1ee6786b
 2012-03-07 15:34:15 +09:00
Jean Chalard
a0beebf711 Remove stuff that's not used any more (B3) 
Change-Id: Ie86675ff2facd37430051bf129ddd930fb933dc9
 2012-03-07 15:32:55 +09:00
Jean Chalard
0a59ac2ba8 Use the simple auto-correction status (B2) 
Change-Id: I9d2f053b6f7bad20fc6afe5f5086a965e5014a5c
 2012-03-07 15:31:22 +09:00
Jean Chalard
70852c91dc Remember auto-correction status simply (B1) 
This duplicates the functionality in ComposingStateManager at
a fraction of the cost. It's not used yet.

Change-Id: Ica2607fb2f7c41e11189fcb566e253db8f62596f
 2012-03-07 15:20:01 +09:00
Tadashi G. Takaoka
65fe7f7994 Merge "Add language switch key only to the phone layouts" 2012-03-06 18:19:45 -08:00
Tadashi G. Takaoka
81d4e3cd66 Add language switch key only to the phone layouts 
Bug: 5759092
Change-Id: Ic7d7d4812976654c0e85fecabd1128eadfc52c5c
 2012-03-07 10:03:21 +09:00
Jean Chalard
89ffb212b4 Make the keyboardswitcher and the subtypeswitcher final. 
Change-Id: Ifcc79357adcc53f93b190b6e98d5569f42f74655
 2012-03-06 19:07:21 +09:00
Jean Chalard
3cd1a00eca Resolve a todo 
This exports some voiceproxy complexity to voiceproxy rather
than keeping it in latinime

Change-Id: I0b3523e77af4104cc3ed28417956059c734c8bfe
 2012-03-06 18:43:18 +09:00
satok
691f1c174b Fix coordinates sent to native code 
Change-Id: I2c8b093b59ad36ffe860c3c4d360d87251d101c4
 2012-03-06 16:38:00 +09:00
satok
231ef8fa3e Merge "Integrate the logic to calculate the proximities" 2012-03-05 23:25:29 -08:00
satok
ca7ec2097c Integrate the logic to calculate the proximities 
Bug: 4343280

Change-Id: I0f6a7e6912ed4abea07c10d266da4c7ccb0dae76
 2012-03-06 15:34:27 +09:00
Jean Chalard
00ed3be95c Correct special space handling of punctuation 
This fixes two defects:
- One where some separators should promote a phantom space to
a real space. This bug had a unit test but wasn't tracked.
- One where French punctuations would behave incorrectly. Tracked
Bug: 6113693

Change-Id: Ia7f86fc960e00141757632ab2c9bce9168dd6966
 2012-03-06 14:00:34 +09:00
Tadashi G. Takaoka
e79b1a8312 Make SuggestedWords immutable completely 
Change-Id: I1b0f7b857e89307c987187c1969a2846aa97fdcc
 2012-03-05 23:06:37 +09:00
Tadashi G. Takaoka
40b6e666e1 Merge "Make SuggestedWords partially immutable" 2012-03-05 05:29:14 -08:00
Tadashi G. Takaoka
8cc8f26adf Make SuggestedWords partially immutable 
Change-Id: I72a2f71d7f6565a30c06e563b0a64f496542cde9
 2012-03-05 22:11:13 +09:00
satok
717f12472f Merge "Remove unused code" 2012-03-05 04:46:09 -08:00
satok
433be45fce Merge "Refactor to suppress null worning" 2012-03-05 04:08:23 -08:00
satok
add6dfb8fe Remove unused code 
Change-Id: I894c0850e803bdfc7b590a62ddd4076a3a4e4658
 2012-03-05 21:07:03 +09:00
Tadashi Takaoka
d5b6360549 Merge "Revert "Make SuggestedWords immutable"" 2012-03-05 02:57:00 -08:00
Tadashi Takaoka
d62fa834c6 Revert "Make SuggestedWords immutable" 
This reverts commit c208f4dfb7
 2012-03-05 02:54:21 -08:00
Jean Chalard
6a830277df Merge "Refactoring" 2012-03-05 01:49:46 -08:00
Jean Chalard
611a5bdf65 Refactoring 
Change-Id: I2f92c01fa1ff6b318128d387f26942b5d47de3e0
 2012-03-05 18:36:51 +09:00
satok
370674422a Refactor to suppress null worning 
Change-Id: I4b4dc6f86d659491d8b9a74ed120092eab964345
 2012-03-05 18:15:29 +09:00
Tadashi G. Takaoka
8c80fb9bcb Fix Key to use a disabled icon when the key is disabled 
Bug: 6114350
Change-Id: I419bc1736c27046dfea254ac510f5da478b6412c
 2012-03-05 18:01:33 +09:00
Tadashi G. Takaoka
c208f4dfb7 Make SuggestedWords immutable 
Change-Id: I26bd82aee5ead84e40abfc3db5a48ed6d1e42361
 2012-03-05 17:24:30 +09:00
Tadashi G. Takaoka
e5cbc94d10 Merge "Support embedded more key" 2012-03-04 22:10:22 -08:00
Jean Chalard
895b70b8af Move some treatment to a more sensical place. 
It makes more sense to catch words with the safety net in
updateSuggestions() than in showSuggestions(). Also, it's useless
to do it in updateBigramPredictions, because the result will
always be provably false.
This will also help with writing unit tests.

Change-Id: Ifab81e6c5a74b1aa75cf85ef7742fee69a98f5ce
 2012-03-05 14:27:49 +09:00
Tadashi G. Takaoka
e491be6e86 Support embedded more key 
This is a followup change to Ie10b3e0b.

Change-Id: I1f91d96e32357b83bd0546537d561d638b6ff0c6
 2012-03-05 14:22:52 +09:00
Jean Chalard
9b01890254 Move a method to a more sensical place. 
Change-Id: I11f87448f689cf828bff960ad7a3e4739a3457dc
 2012-03-05 14:19:35 +09:00
Jean Chalard
611ec69413 Remove a useless method 
Change-Id: I2002662ee07af2fcc626a52ea4e9ad8977b29ca2
 2012-03-05 12:46:35 +09:00
Jean Chalard
428178aca6 Merge "Replace a useless computation with a constant" 2012-03-04 19:35:11 -08:00
Jean Chalard
4ab5486bf2 Merge "Remove a useless test" 2012-03-04 19:35:02 -08:00
Jean Chalard
4e112d0782 Replace a useless computation with a constant 
This is provably always false

Change-Id: I88d783fa59fec0b7a729558ba974a6a58c158645
 2012-03-05 11:57:36 +09:00
Jean Chalard
a04d2358c0 Remove a useless test 
With the current logic, this test provably always resolves
to false.

Change-Id: Iba84ef5f3a14cd8ac48c6a813519ab283bf605f8
 2012-03-05 11:38:45 +09:00
Tadashi G. Takaoka
50b82dca62 Merge "Fix comment" 2012-03-04 18:28:01 -08:00
Tadashi G. Takaoka
49079df8ec Merge "Omit InputMethodManagerCompatWrapper argument from some utility methods" 2012-03-04 18:12:47 -08:00
Tadashi G. Takaoka
04bc787ce7 Fix comment 
This is follow up of  Ie10b3e0.

Change-Id: Idefbe1575915bb87f1c86cb3ddb5efe578c5b760
 2012-03-05 11:10:28 +09:00
Tadashi G. Takaoka
2d25ba2750 Omit InputMethodManagerCompatWrapper argument from some utility methods 
Change-Id: Ic837018c702c8c575de3e5e81fe8e31fee16fe22
 2012-03-05 10:43:12 +09:00
Jean Chalard
c2136c4e63 Merge "Some renaming" 2012-03-04 17:26:22 -08:00
Svetoslav Ganov
0af449aa64 Merge "Added virtual view hierarchy for keyboard accessibility." 2012-03-02 15:39:12 -08:00
Jean Chalard
a157249014 Merge "Remove a useless method" 2012-03-02 05:57:48 -08:00
Jean Chalard
e53840d216 Merge "Some more simplification" 2012-03-02 05:56:58 -08:00
Tadashi G. Takaoka
508ded5827 Fix long press behavior of akye that has altCode defined 
This issue has been introduced by I2bd4daf2

Change-Id: Ie10b3e0bb360986597a0f5a8e5b8253400f924c4
 2012-03-02 21:29:51 +09:00
Tadashi G. Takaoka
3a1844c33b Merge "Support dividers in MoreKeysKeyboard" 2012-03-02 03:58:13 -08:00
Tadashi G. Takaoka
5ef4fccbb9 Support dividers in MoreKeysKeyboard 
Bug: 6080806
Change-Id: Iacd78c6aab6abf948717d34da7489a79c41316d2
 2012-03-02 20:52:25 +09:00
Jean Chalard
a83a53ba24 Some renaming 
Change-Id: I445277cb3af469a0145a8da0ffb801b7e19048cd
 2012-03-02 20:46:54 +09:00
Jean Chalard
5edda4111e Remove a useless method 
Change-Id: I038e6a82b6463a2a8ec494171a596d76fbc75fe1
 2012-03-02 20:38:41 +09:00
Jean Chalard
dd931c47be Some more simplification 
I wish "are we autocorrecting?" was not computed in a dozen
places all depending on a hundred code paths
More than likely, this fixes very subtle discrepancies
between auto-correction indicator with the underline and with
the LED on the spacebar - which is not displayed any more in
the current version anyway. Especially, the LED probably
would have been off when the word was caught by the safety net.

Change-Id: Idda3021771081d6155b06915e728ecd64d9e042e
 2012-03-02 20:34:10 +09:00
Jean Chalard
e2a50bd804 Optimization 
Avoid doing some useless processing.

Change-Id: I4ce0a188e10db30322bd25751dc5c09492cea301
 2012-03-02 20:26:51 +09:00
Jean Chalard
7204eab3da Precompute two values that never change 
Change-Id: Ic54e7926028ea8374564da5e5004d710f42c53e1
 2012-03-02 20:04:42 +09:00
Jean Chalard
38e535e596 Change a parameter type to make a call clearer 
Change-Id: I2918d0a8b00da743689b919f80128bbf36973f24
 2012-03-02 20:01:34 +09:00
Jean Chalard
5bc2b61274 Move a method up a level 
Change-Id: I6b9a697480127e4745698ab19f8a360b86ff39ca
 2012-03-02 19:59:55 +09:00
Jean Chalard
d02783cb63 Break out a method 
Change-Id: Ia14fc320422b7f198c33ba522bb93dd70fbcb2c1
 2012-03-02 19:52:06 +09:00
Jean Chalard
5a2c19d4fb Merge "Revert "Make a member read-only"" 2012-03-02 02:49:42 -08:00
Jean Chalard
f1967ce322 Revert "Make a member read-only" 
This reverts commit 6a43e39bf0
 2012-03-02 02:49:24 -08:00
Jean Chalard
9727aea418 Merge "Small refactor (A1)" 2012-03-02 02:47:42 -08:00
Jean Chalard
d153228013 Merge "Make a member read-only" 2012-03-02 02:29:41 -08:00
Jean Chalard
6a43e39bf0 Make a member read-only 
Change-Id: I9a718eaf07e1b6c659e649350d3605f365db2839
 2012-03-02 19:17:57 +09:00
Jean Chalard
d992fa847d Small refactor (A1) 
Change-Id: Ia0838bbce47a2b60067f464685ad6d55ee4ec934
 2012-03-02 18:55:04 +09:00
Jean Chalard
7293b65841 Remove a useless method 
Change-Id: Ic00520b18f74838fe1002a679952f62bc7226c15
 2012-03-02 18:49:24 +09:00
Tadashi G. Takaoka
025a16c31c Readable debug output 
Change-Id: I4110791832d2ab1d681b01c9e8a237567442c827
 2012-03-02 14:48:10 +09:00
Tadashi G. Takaoka
ede2133cb1 Support time, date, and datetime keyboard 
Bug: 6030364
Change-Id: I2bd4daf264757d8f3fa7c946d10a39c36ccf5905
 2012-03-02 14:01:07 +09:00
Tadashi G. Takaoka
961703841e Merge "Explicitly specify that labels might be in more keys" 2012-03-01 03:56:32 -08:00
Tadashi G. Takaoka
e4c45c6ef9 Explicitly specify that labels might be in more keys 
Bug: 6080806
Bug: 6081427
Change-Id: I455a0210e65ea2a7774e0e0071cea5f4a99577bd
 2012-03-01 20:03:47 +09:00
Jean Chalard
895da64b62 Merge "Change a dangerous ID" 2012-03-01 02:28:08 -08:00
Jean Chalard
fa12acb8b7 Change a dangerous ID 
The message id 0 is used intrinsically by the framework
for all messages without a specific ID. Using 0 here
we can't reliably use the post(Runnable) method on our
handler, because these would in *some* respects be taken
for update_suggestion messages, but not all.
For example, they'd be removed on removeMessage() but
they would not trigger the actual process. This would
lead to utter confusion.

Change-Id: I5d9b01d38e2ff090cd0d80c27421dc8a41c317b8
 2012-03-01 19:05:51 +09:00
Tadashi G. Takaoka
42fd1d2d72 Refactor more keys spec handling 
Change-Id: Ibd95eff0725724ea35ad58e1d1ec7ec3d02a6e90
 2012-03-01 16:07:02 +09:00
Jean Chalard
870a1ab156 Merge "Try to survive unavailability of local storage" 2012-02-29 17:05:20 -08:00
Jean Chalard
f3f90e6d35 Try to survive unavailability of local storage 
Bug: 6035465
Change-Id: Ibe2d542349ec598824f78b91d374a977082fc2d1
 2012-03-01 09:43:29 +09:00
Tadashi G. Takaoka
d054aa17da Merge "Reset previous symbols shifted state when auto switch backed" 2012-02-29 08:05:58 -08:00
Tadashi G. Takaoka
4ba2216219 Reset previous symbols shifted state when auto switch backed 
Bug: 6072517
Change-Id: I00337b3ed5c85df4627e8f5a02465d406c4d9178
 2012-03-01 01:01:09 +09:00
Tadashi G. Takaoka
b19a6b9fc5 Fix spacebar icon position on phone/number keyboard 
Change-Id: I4d6bb0f2f12e7b263ff951f3173cac8e41d0f23e
 2012-03-01 00:37:51 +09:00
alanv
9a81ce92c3 Added virtual view hierarchy for keyboard accessibility. 
Bug: 5829051
Change-Id: Ied1b6267eec616bd3b9337f6e761b0c740aa0eb2
 2012-02-28 10:01:40 -08:00
Jean Chalard
5e4d2a0fa9 Remove logs now that we don't need them any more. 
This has served its purpose, we don't need this any more.
The logging function itself can be kept since it's not called
any more. It may come in handy later.
Bug: 6053661

Change-Id: Icb40dad131793a704dbe6514cf7433e43ea04450
 2012-02-22 20:45:43 -08:00
Jean Chalard
3f65960e16 Add debug prints to help with debugging 
This is intended to help tracking #6048808.
Another bug has been filed to remove this once we're done with
the debugging: #6053661

Change-Id: I4547fb71926af6dc2e9c23ee4b44e4e345be6657
 2012-02-22 16:16:32 -08:00
Jean Chalard
5935950d44 Rename cancelCommit to revertCommit 
This wording is easier to understand, and it matches the other
revert* functions.

Change-Id: Ibc2ec79fb5a0f9bf508e5cdeb75e54abd9241d0c
 2012-02-22 01:09:23 -08:00
Jean Chalard
4fef31510d Remove a useless code path (A7) 
This is never called any more, since we now use the cancelCommit
path to react to a backspace after a manual pick.
This concludes the run of changes to implement feature
request #5968922

Change-Id: I23df653bb2a3de2ba0152394d5d616a42ac7519b
 2012-02-22 01:05:36 -08:00
Jean Chalard
bdf89ce5fe Rename cancelAutoCorrect to cancelCommit (A6) 
Also remove a test in debug mode that would check for absence of
a situation which is now expected.

Change-Id: Ia5be350bc98a604b3bf8f6057652c5534f6a19af
 2012-02-22 00:59:01 -08:00
Jean Chalard
2aa16dd81f Merge "Activate the code to cancel a manual pick (A5)" 2012-02-22 00:50:13 -08:00
Jean Chalard
80c25df49d Merge "Implement cancelling a manual pick (A4)" 2012-02-22 00:29:23 -08:00
Jean Chalard
8db74d0fae Merge "Use the stored separator instead of reading it back (A3)" 2012-02-22 00:24:19 -08:00
Jean Chalard
9271b770e8 Activate the code to cancel a manual pick (A5) 
This finally makes active the behavior described in
Bug: 5968922

Change-Id: I363ed23270c3dea75411ea806011225097b5d07c
 2012-02-22 00:05:19 -08:00
Jean Chalard
32f0af1fc4 Implement cancelling a manual pick (A4) 
This is new code, but simple code. The new code path is never
used for now, but it will be in an upcoming change. This serves
to implement feature request #5968922

Change-Id: I3e67731ec6e9fc0b86c5cbd972e9c081781c11a9
 2012-02-22 00:00:51 -08:00
Jean Chalard
193d23f40e Use the stored separator instead of reading it back (A3) 
Now that we have stored our committing separator, we can use
it directly instead of reading it back from the text view
paying the IPC cost. This prepares for feature request #5968922.

Change-Id: Ifeaa2d659cf12b91c89d28e6ff7d07a669258184
 2012-02-21 23:56:36 -08:00
Jean Chalard
e043bf02f2 Merge "Give LastComposedWord knowledge of the separator (A2)" 2012-02-21 23:42:21 -08:00
Jean Chalard
1dfdc8056c Merge "Give LastComposedWord knowledge of the committed word (A1)" 2012-02-21 23:41:42 -08:00
Jean Chalard
66bb563535 Give LastComposedWord knowledge of the separator (A2) 
This stores the separator that was used to commit the word in
the LastComposedWord. It may be NOT_A_SEPARATOR if there was
no separator (for example, the cursor moved causing a commit,
or there was a manual pick). This is necessary to implement
feature request #5968922.

Change-Id: I5fcf19a78ec66d68d4df89418eaef13952588207
 2012-02-21 23:33:58 -08:00
Jean Chalard
cf9d92629c Give LastComposedWord knowledge of the committed word (A1) 
There is no point storing the prospective autocorrect - we are
recomputing it anyway. The committed word however will be necessary
to implement feature request #5968922.

Change-Id: I588c18e1a5a1050a791d601de465f421ccbe36cd
 2012-02-21 23:12:21 -08:00
Tadashi G. Takaoka
1b3c16c183 Merge "Add next/prev navigate action more keys and remove tab key" 2012-02-21 23:09:58 -08:00
Tadashi G. Takaoka
05bfd189a8 Add next/prev navigate action more keys and remove tab key 
Bug: 6037537
Bug: 5961814
Change-Id: I9c6dedf953452a180fcd5bce7bfadfd3c821f224
 2012-02-21 22:50:50 -08:00
Jean Chalard
5262fe8832 Dismiss the hint on a non-word-starting non-separator 
This would happen when a character is not a separator but is not
a word starter. Such characters include single quote and
dollar, and others non-letter, non-separator chars.
We set the bigram predictions if any - if not so configured, this
will fallback on setting back punctuations into the strip.

Bug: 6010408
Change-Id: Id203bbe87f8c13de0d5027b555c9067c7ec98f92
 2012-02-21 21:16:18 -08:00
Jean Chalard
b141c9cd3f Rename resources to reflect current usage 
Bug: 6010403
Change-Id: Ia02ff31007296fdf6901504f238dfd9e4621f658
 2012-02-21 18:54:44 -08:00
Jean Chalard
8a3d369840 Remove a useles parens 
...I could swear I had compiled :/

Change-Id: I4e1fb2b1dda0a4ceffe2082935395d05297c63ec
 2012-02-21 16:53:05 -08:00
Jean Chalard
9a2a11e65b Rewrite a condition 
Change-Id: I805c9579788d99b015feb2075ad4771756c7adc5
 2012-02-21 15:46:53 -08:00
Jean Chalard
2649e42d75 Extract a method to reset the ime state 
Change-Id: I921184b85b94418cf360508ee3f67e85b10b3d72
 2012-02-21 15:12:01 -08:00
Jean Chalard
5eeff7cf54 Converge paths of an if() branch 
This is to help with further refactoring.

Change-Id: Ib2459903862570cf7022fd90f2d5c524a6bbbe19
 2012-02-19 18:02:40 -08:00
Jean Chalard
1044539080 Rename variables and add comments 
Change-Id: I746f2364d9f02f22aa6ab57d7060013ee114f4e3
 2012-02-19 17:26:41 -08:00
Jean Chalard
1fead1d5f1 Read the initial selection value. 
It turns out this was available in an unexpected place.
Fixes both the following bugs
Bug: 5948469
Bug: 6023118

Change-Id: Ie1a91b8268540ea0f0df02bee94c3bbdeb0fa4c5
 2012-02-17 20:54:48 -08:00
Jean Chalard
1950964157 Merge "Don't assume a word has been added to the user dict" 2012-02-17 15:29:52 -08:00
Tadashi G. Takaoka
97bde43740 Settings key always exists in more keys of shortcut/f1 key 
This change also
  * Fix comman/f1 key for Arabic keyboard.
  * Removes "show settings key option" and related stuff.
  * Renames and simplifies F2 key to shortcut key on 7 inch tablet.

Change-Id: Ib1cf99ad00d9780a2f0d170260e756771e161521
 2012-02-17 01:04:11 -08:00
Tadashi G. Takaoka
fed72d6038 Merge "Support fixed order more keys" 2012-02-17 01:01:28 -08:00
Tadashi G. Takaoka
aeeed75848 Support fixed order more keys 
Change-Id: I979f54e8b54243da4d23cfbe08198d2aa495f870
 2012-02-17 00:49:18 -08:00
Jean Chalard
8e4b3bbf9f Don't assume a word has been added to the user dict 
The user may now cancel or edit a word upon adding to the
user dictionary. We can no longer assume the word has been
added as is and for the current locale. We should just rely
on standard mechanisms that inform us of new insertions.

Bug: 6015347
Change-Id: I069b19c0c844ca29d6de4c4d162306f9413adea8
 2012-02-16 19:19:05 -08:00
Tadashi G. Takaoka
03c3018492 Merge "Use additional proximity chars even when no key is detected." 2012-02-16 19:17:48 -08:00
Tadashi G. Takaoka
9025c55e9f Use additional proximity chars even when no key is detected. 
Change-Id: I06a8c66421fcdd43066934ec31d0a38a7cf12bf2
 2012-02-16 18:58:47 -08:00
Tadashi G. Takaoka
beb08b398f Remove unnecessary and harmful KeyboardState.onUpdateShiftState call 
This change also cancels double tap and long press timers if other
letter key is pressed after shift key.

Bug: 5693999
Bug: 6017610
Change-Id: I3b5f3debfb8915fa73a93b409a38afadf24132e9
 2012-02-16 18:02:17 -08:00
Jean Chalard
ad290d6505 Activate bigram predictions from the binary dictionary 
Change-Id: If1cc50539d7677b854b1cd3bea3423c8c0865de5
 2012-02-15 19:51:24 -08:00
Tadashi G. Takaoka
6213983fa1 Refactor MoreKeysKeyboard.Builder 
Change-Id: Ib5f58b1143be60c748b81299ccc3b237d2587846
 2012-02-10 18:53:54 +09:00
Tadashi G. Takaoka
b9e10c318a Merge "Key should be distinguished also by moreKeys contents and etc." 2012-02-09 23:51:18 -08:00
Charles Chen
4baf767fac Merge "Improved shift key and symbol/alpha switch key accessibility feedback." 2012-02-09 15:33:40 -08:00
Tadashi G. Takaoka
fdb6999e55 Key should be distinguished also by moreKeys contents and etc. 
Change-Id: Ib2caabee6af78153b5a7be0e4df522288f2a7d48
 2012-02-10 03:17:39 +09:00
Jean Chalard
accd2a9f61 Merge "Add finals" 2012-02-08 19:08:09 -08:00
Jean Chalard
a828f613a8 Merge "Some more simplification" 2012-02-08 19:05:46 -08:00
Jean Chalard
8ff0564f6a Add finals 
Change-Id: Ib81be9a0df34c5e9fc49d2b5d9bf02297ea2b499
 2012-02-09 11:40:54 +09:00
Jean Chalard
6a800b253f Some more simplification 
Remove useless method calls, and ultimately remove useless
method.

Change-Id: I3f353b1b37460d5e9ceae5cb5dde3fff0da81c21
 2012-02-09 11:38:03 +09:00
Jean Chalard
4721427c7d Allow revert swap punctuation again 
This may not be the best behavior, but it's the same as ICS.
Bug: 5981844

Change-Id: Ibb7798e2a315312310ed3be4e731d0fe1ac04456
 2012-02-09 11:34:00 +09:00
Tadashi G. Takaoka
5962312b07 Custom action label should be a part of keyboard identifier 
Change-Id: Ia14cabc3d49fbdcb11dd00225d225fbb91cc4012
 2012-02-08 20:09:39 +09:00
Tadashi G. Takaoka
7a39bd4454 Shift+Smiley key will register newline character of textMultiLine 
This change also
 * Honors the custom action label in EditorInfo.actionLabel.
 * Invokes InputConnection.performeEditorAction if action is specifed
   at EditorInfo.imeOptions or actionLabel/actionId.
 * Stops using InputMethodService.sendKeyChar. Implements
   sendKeyCodePoint instead.

Bug: 2498607
Bug: 5961809
Bug: 5368408
Change-Id: If4cd5eb3dacfc6b6a7ea434b0617c2438e06e42d
 2012-02-08 19:31:35 +09:00
Jean Chalard
82efc941ba Merge "More simplification" 2012-02-08 01:43:23 -08:00
Jean Chalard
e771fc2f1a More simplification 
A suggested punctuation is sure to be 1 character and a word separator,
so the isSuggestedPunctuation() test is redundant.

Change-Id: I3d31f0825f069f64d514682e46be62afdae25291
 2012-02-08 18:17:51 +09:00
Tadashi G. Takaoka
614cb02a91 Merge "Rename mini keyboard to more keys keyboard" 2012-02-08 00:04:16 -08:00
Tadashi G. Takaoka
2affaf91a0 Rename mini keyboard to more keys keyboard 
Change-Id: Ie4c85e8ca5a1f41a420aae5c1cd9c1cb07e237e5
 2012-02-08 16:12:31 +09:00
Jean Chalard
1bd1cd19c0 Merge "Fix the auto-composer to support supplementary chars" 2012-02-07 22:46:22 -08:00
Jean Chalard
9159b9953d Fix the auto-composer to support supplementary chars 
Change-Id: I61ff218ae2ca4eb443a370e581b677755258670a
 2012-02-08 15:45:51 +09:00
Tadashi G. Takaoka
71a14420d8 Merge "Fix obvious bug" 2012-02-07 22:42:18 -08:00
Tadashi G. Takaoka
93bc5e7fda Fix obvious bug 
Change-Id: I3a0e5c699bbe4e9274dacdbdf92dff14148bd2c1
 2012-02-08 15:35:56 +09:00
Jean Chalard
8174373a0e Merge "Remove a nested edition occurence" 2012-02-07 19:42:35 -08:00
Jean Chalard
5a6daf46cf Merge "Cleanup" 2012-02-07 19:42:26 -08:00
Jean Chalard
862f950da3 Cleanup 
Remove a useless test (we can only come here if the code
is not a separator, as we are only called from onCodeInput
inside an explicit test).

Change-Id: Icd996a5a1c18a550117a144a1d35f167b96211f7
 2012-02-08 12:06:18 +09:00
Jean Chalard
2124bc5bf5 Remove a nested edition occurence 
This was harmless but confusing

Change-Id: Ic271f80d3dadf01b29e3875c6a8ad51b99a936f9
 2012-02-08 12:03:55 +09:00
Jean Chalard
2e2d6b4d40 Small simplification 
Change-Id: I55f81f3ab427fd5b28bb1f31960077cd1897cbd0
 2012-02-08 11:41:15 +09:00
Jean Chalard
1b986cc488 Merge "Fix a bug with manual pick then dotcom key" 2012-02-07 16:59:47 -08:00
alanv
8d4f0d5d1d Improved shift key and symbol/alpha switch key accessibility feedback. 
Bug: 5933165
Change-Id: Id71f38874640785b7ad43b7a70e27f40c13be748
 2012-02-07 13:14:18 -08:00
Tadashi G. Takaoka
c217dc9237 Convert one letter Key.outputText to Key.code 
This change also uses Key.code instead of Key.outputText for the
variety of parentheses keys taht introduced by I85998f17.

Bug: 5975484
Change-Id: I86879c9942d264edc71e5893325a2f582763d12f
 2012-02-07 22:34:20 +09:00
Tadashi G. Takaoka
69f672a4b3 Merge "Remove unused InputConnection argument" 2012-02-07 04:15:07 -08:00
Jean Chalard
12d67e6d5d Fix a bug with manual pick then dotcom key 
Inhibit adding phantom space for tld keys even if the last
character inserted in the textview is not a dot

Change-Id: Ie92554ead7a18c932480905c5738aff7c0159a32
 2012-02-07 20:36:48 +09:00
Tadashi G. Takaoka
64eaa67eb5 Remove unused InputConnection argument 
Change-Id: Ic45c8c6e7730775654317fb6e2d1cb64f9031f46
 2012-02-07 19:38:06 +09:00
Jean Chalard
cfec7e72fd Merge "Fix a race condition that makes tests unstable" 2012-02-07 02:28:12 -08:00
Jean Chalard
816a8a0fd8 Fix a race condition that makes tests unstable 
Change-Id: Ic19d380eb64855884bc6ded8547c200dd772ffe9
 2012-02-07 19:22:37 +09:00
Tadashi G. Takaoka
4a3c0918dc Merge "Fix KeyStyles to be able to override the value in style" 2012-02-07 02:04:22 -08:00
Tadashi G. Takaoka
17f53103ee Fix KeyStyles to be able to override the value in style 
Change-Id: Ib7476cdc0f81dfeb6292ef663e9dbab6d2b949ba
 2012-02-07 18:51:51 +09:00
Jean Chalard
172a013ab5 Fix a bug with the auto-correct indicator 
Bug: 5969106
Change-Id: I02d4b9184bb2c3fc0d08ffd5db77a9f9d816631f
 2012-02-07 17:20:23 +09:00
Jean Chalard
a7f2500001 Fix a bug with common objects. 
Bug: 5961179
Change-Id: I452efc552c6ab390931f25557d7aee5a64bf054e
 2012-02-06 18:41:00 +09:00
Tadashi G. Takaoka
f6cf387edc Merge "Recursively resolve @string/resource reference in key key spec parsing" 2012-02-03 03:20:37 -08:00
Tadashi G. Takaoka
aca8870128 Recursively resolve @string/resource reference in key key spec parsing 
Change-Id: I9d172605e90e828e00f7c4c8d49548498aa3b50d
 2012-02-03 20:03:23 +09:00
Jean Chalard
9f17de5b4d Merge "Stop inserting a space after a manually picked word." 2012-02-03 02:09:05 -08:00
Tadashi G. Takaoka
24cd2617f5 Filter out empty entry from more keys CSV 
Change-Id: I9a26aaa58f0f502b3bfef9de422370d2b0add8d8
 2012-02-03 18:48:01 +09:00
Jean Chalard
fb684cebe8 Stop inserting a space after a manually picked word. 
Bug: 4994861
Change-Id: I6ae256a94dbaddea4304304779d17025620c5025
 2012-02-03 18:45:44 +09:00
Tadashi G. Takaoka
909b2940db Merge "Get rid of Key.setIcon(Drawable)" 2012-02-02 21:51:51 -08:00
Tadashi G. Takaoka
e7948a8692 Get rid of Key.setIcon(Drawable) 
Change-Id: If6ebbdefcbfd0cc14c72858f9bb44861e8abe079
 2012-02-03 14:38:17 +09:00
Jean Chalard
825e2bbd91 Fix a bug when deleting the last char 
And unit test

Change-Id: Ic4fc3626f8b86e10156d770d41cd6deab5d31f39
 2012-02-03 13:03:54 +09:00
Jean Chalard
71915a3722 Merge "Fix string iterations in a couple places." 2012-02-02 18:40:19 -08: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
Tadashi G. Takaoka
32c54c4dbe Fix key repeat interval timeout 
Bug: 5960472
Change-Id: I27d4b81d393f2ace946740a0b0801cea8c63b5b8
 2012-02-03 10:02:22 +09:00
Tadashi G. Takaoka
44e0e4f99e Fix Key.equals(Key) 
Bug: 5956068
Change-Id: I2901ae28bd9121ec4f4429a53b83aae128b75e0c
 2012-02-02 21:33:50 +09:00
Tadashi G. Takaoka
5852a2594f Parse escaped sequence strictly in CSV parser 
This change alters the CSV parser behavior. The parser only resolves
  * String resource reference. ["@string/res" -> "<content_of_res>"]
  * Other occurrence of escape sequence will be intact. ["\x" -> "\x"]

Before this change, escape sequence in moreKeys string is parsed three
times. At first in parsing string resource, next in CSV parser, and at
last in KeySpecParser. So that representing single escape character
itself is a bit annoying, "\\\\\\\\".

Now we can represent single escape character itself in string resource by "\\\\".

Change-Id: Ib978e17b779cc82585eed8241ac3857508b14bc7
 2012-02-02 20:19:26 +09:00
Tadashi G. Takaoka
8261a4cad7 Merge "Move CSV parser to KeySpecParser" 2012-02-01 23:25:17 -08:00
Tadashi G. Takaoka
0086861d5a Move CSV parser to KeySpecParser 
Change-Id: I424fb47bc70e9b6aaa5a16ae9b2500d23da75c26
 2012-02-02 16:10:14 +09:00
satok
e05b3f4b3a Support additional proximity characters 
Change-Id: Ifbe0d7e4eafea1926bbce968eae4724dd5769689
 2012-02-02 16:07:16 +09:00
Tadashi G. Takaoka
8ca325f437 Merge "Make KeySpecParser and CSV parser code point aware" 2012-02-01 22:56:54 -08:00
Tadashi G. Takaoka
e01d272603 Make KeySpecParser and CSV parser code point aware 
This change also renames MoreKeySpecParser to KeySpecParser

Change-Id: I35733cdbb344f16b57ffa2cfe79055c089b4e409
 2012-02-02 15:51:40 +09:00
Jean Chalard
51fd1632f5 Stop throwing an exception in some corner cases. 
When the application is modifying the text under our feet,
we may come through this code path. We should log the error
rather than crash.

Bug: 5869235
Change-Id: Ic0fd24c3bc805d44c5db0ad781ddebeca0450614
 2012-02-02 15:15:55 +09:00
alanv
c603409f28 Removed CODE_CAPSLOCK from keyboard accessibility (fixing build). 
Change-Id: Ibc7ef979276f563444f3c24e69ac32de5d4eb6e8
 2012-02-01 10:27:52 -08:00
Charles Chen
02dd837805 Merge "Removed spoken descriptions for characters supported by TTS or TalkBack." 2012-02-01 10:00:17 -08:00
Charles Chen
9737351775 Merge "Refactored shift key spoken description into separate method." 2012-02-01 09:59:59 -08:00
Tadashi G. Takaoka
71c695da22 Remove BIDI mirroring hack from Key 
This change also removes isRtlKeyboard attribute from <Keyboard/>

Bug: 5948247
Change-Id: I85998f17ae146a4c8cd0f419ab820b746cb8974f
 2012-02-01 22:58:16 +09:00
Tadashi G. Takaoka
40e9012276 Fix wrong long press timeout for shift key 
Change-Id: Ifafbed1bcdaf662ee6a69050043739fa71986841
 2012-02-01 21:15:34 +09:00
Tadashi G. Takaoka
ff858c7ff5 Use MoreKeySpecParser to parse puctuations strip resources 
This change also
  * Doesn't use Key.getRtlParenthesisCode to get correct parentheses
    code in RTL context. Intead uses the outputText feature of
    moreKeys specification.
  * Move CVS string parser from KeyStyles to Utils.

Bug: 5948247
Change-Id: I45752c7d01b4f7d3f3da900b110a2185b336a1f0
 2012-02-01 19:33:26 +09:00
Tadashi G. Takaoka
a5c96f376a Move long press shift handling from PointerTracker to KeyboardState 
This change also
  * Rename phone shift keyboard to phone symbols keyboard.
    Use CODE_SWITCH_ALPHA_SYMBOL code to switch between phone and phone symbols keyboard.
  * Remove phone symbols keyboard from tablet.
  * Introduces enableLongPress flag of Key.keyActionFlags attribute.
  * Remove clumsy long press code from PointerTracker.
  * Remove CODE_CAPSLOCK handling from LatinIME.
  * Make KeyboardSwitcher to invoke haptic and audio feedback.

Change-Id: I00e1f697a10ab5112aec75e36853b96246ff5054
 2012-02-01 19:04:21 +09:00
alanv
7ca1249797 Refactored shift key spoken description into separate method. 
Change-Id: I183462a68fdfd339404740fa1564f737430d73d9
 2012-01-31 13:03:39 -08:00
alanv
f3e951b259 Removed spoken descriptions for characters supported by TTS or TalkBack. 
Change-Id: Iddef18559bc6af9487e536a33607b0a0b07df282
 2012-01-31 13:02:33 -08:00
Tadashi G. Takaoka
3feb99fa6c Merge "Save/restore alphabet shift locked state while rotating even in symbols mode" 2012-01-31 02:26:41 -08:00
Tadashi G. Takaoka
49bd49c8fb Save/restore alphabet shift locked state while rotating even in symbols mode 
Bug: 5730212
Change-Id: Id2342dacd149d6385d61001f880ebcd1883cf0b4
 2012-01-31 19:11:39 +09:00
Tadashi G. Takaoka
aab33aac0a Merge "Cleanup redundant methods of KeyboardSwitcher" 2012-01-31 01:33:17 -08:00
Tadashi G. Takaoka
88e079ae6b Cleanup redundant methods of KeyboardSet 
Change-Id: I69fa1b5661695d0323222c2969679f4792b6ef0d
 2012-01-31 18:27:37 +09:00
Tadashi G. Takaoka
0ed2d3a449 Fix double tap shift key enable/disable shift locked mode 
Bug: 5942452
Change-Id: I2c7b1605bceac2b2f929cd4d97c417ef15c6f754
 2012-01-31 18:06:54 +09:00
Tadashi G. Takaoka
433ca6a46d Cleanup redundant methods of KeyboardSwitcher 
Change-Id: I2ebeb8852177f6c6e30578d0bb3f372f488dc6c1
 2012-01-31 17:18:14 +09:00
Tadashi G. Takaoka
30964843db Merge "Auto generate various shift states alphabet keyboard automatically" 2012-01-30 20:07:26 -08:00
Tadashi G. Takaoka
ca2f051cc1 Auto generate various shift states alphabet keyboard automatically 
If any shift state variants of alphabet keyboard layout is not
specified in KeyboardSet.Element, it will be automatically generated
from base alphabet keyboard definition.

This change also
  * Eliminates KeyboardShiftState object from Keyboard.
  * Removes various set shift state methods from Keyboard.
  * Removes KeyboardSet.Element.elementAutoGenerate attribute.
  * Separates "sticky" Key.backgroundType to "stickyOff" and "stickyOn"
  * Add preserveCase flag to smiley, .com, and labeled special keys.
  * Rename KeyboardShiftState class to AlphabetShiftState.
  * Rename some attributes from *UppercaseLetter* to *ShiftedLetterHint*.
  * Introduce shiftedLetterActivated to Key.keyLabelFlags

Change-Id: I01a0a8efeeaa76820ae728a5bdfa8d02b6ce74b7
 2012-01-31 12:55:45 +09:00
alanv
16f7439682 Removed unused "no item selected" notification & supporting code from keyboard accessibility. 
Change-Id: Ia6323ad0c1e2a0db5a2cf830e97765eddaa32cee
 2012-01-30 13:45:59 -08:00
Tadashi G. Takaoka
3b0f2bf169 Merge "Support addtionalMoreKeys" 2012-01-30 00:11:29 -08:00
Tadashi G. Takaoka
15c99e9f1a Support addtionalMoreKeys 
This change also removes
  * Unused more_keys_for_q, w, and p.

Change-Id: Idb99e5f6d8c2ad2d28437f42b35b21c282cd181f
 2012-01-30 17:04:25 +09:00
Ken Wakasa
6029b43a3d Add "size" and "pressure" for MotionEvent logs 
bug: 5722703
Change-Id: I8e08942324b666de96682ce63e70c8d324535782
 2012-01-30 12:22:15 +09:00
Tadashi G. Takaoka
a1e370ee4f Support keyXPos/keyWidth override in <include> 
Change-Id: I03576a6fb7916f2f66f2035a04872fe89b573cdc
 2012-01-27 21:20:57 +09:00
Tadashi G. Takaoka
425e1996b8 Add inactivatedLabel and inactivatedUppercaseLetter flags for Key.keyLabelFlags 
Change-Id: I6c7dc79cbad360602b278283f4c3a24c54040622
 2012-01-27 18:11:43 +09:00
Tadashi G. Takaoka
c882d619bf Merge "Save and restore previous mode keyboard state at KeyboardState.toggleAlphabetAndSymbols" 2012-01-26 23:45:36 -08:00
Tadashi G. Takaoka
f057b25cdd Save and restore previous mode keyboard state at KeyboardState.toggleAlphabetAndSymbols 
Bug: 5881820
Change-Id: I9b1718b16c60f27c05ba727724c0189aa5284334
 2012-01-27 16:03:51 +09:00
Jean Chalard
449415c72f Cleanup (A9) 
Deactivate the LastComposedWord when the commit was not the right
type, instead of fooling it by passing it a null auto-correction.

Change-Id: I032b477dc691bd151a644ca4b0c9f0a9b5512e45
 2012-01-26 20:10:49 +09:00
Jean Chalard
5971a0a0bb Remove a useless member (A8) 
It turns out this can be removed entirely.

Change-Id: I6f23703cef1666311989a825285317eef696487f
 2012-01-26 20:10:49 +09:00
Jean Chalard
5ef094f816 Merge "Remove the CharacterStore class (A7)" 2012-01-26 03:09:31 -08:00
Tadashi G. Takaoka
1112a545cc Merge "Add KeyboardState.SwitchActions.setAlphabetShiftLockShifted" 2012-01-26 03:05:47 -08:00
Jean Chalard
be79227dc9 Remove the CharacterStore class (A7) 
Remove the now useless WordComposer.CharacterStore class
and merge back its members inside WordComposer. This should
simplify the word composer a bit.

Change-Id: I5fe32418c62a583cd558dce98758a4701559bdf5
 2012-01-26 20:03:44 +09:00
Jean Chalard
c7c152de4b Guard against wrong auto-correction cancellation (A6) 
This deactivates the cancellation at each separator pressed while
not composing a word. The net effect is to fix
Bug: 5875776

Change-Id: I67aa3f842ddff250828c60596ad5a7e466c1ddaa
 2012-01-26 19:57:37 +09:00
Jean Chalard
b6b8729374 Straighten out resuming suggestion on kept word (A5) 
This is cleanup.
This also introduces a "deactivated" state to the last committed
word, that can be used for
Bug: 5875776

Change-Id: I1855adb8ac8123f6d2c5365b0ae899145e5c3ba1
 2012-01-26 19:24:36 +09:00
Jean Chalard
2712f23acb Remove mCommittedWordSavedForSuggestionResuming (A4) 
Change-Id: Ia62ef33b5c777a258b02280bda1b8368780a7eef
 2012-01-26 18:36:28 +09:00
Tadashi G. Takaoka
757f8d96ee Add KeyboardState.SwitchActions.setAlphabetShiftLockShifted 
Change-Id: I6c49d8eb0a8272840ff03e0940d88a31c3d20bd9
 2012-01-26 18:25:48 +09:00
Jean Chalard
2692a87007 Move some functionality into LastComposedWord (A3) 
Change-Id: Ie0ea02a061dd0cb84db5f33113ff433584636bc7
 2012-01-26 18:25:08 +09:00
Jean Chalard
1f8fc62ccb Add useful information to LastComposedWord (A2) 
Change-Id: Idf47f2e2bdd1d6394fc4b1ab7df28d64a808da1e
 2012-01-26 17:49:55 +09:00
Jean Chalard
95eeb2df63 Merge "Add a class for previously composed data (A1)" 2012-01-26 00:43:57 -08:00
Jean Chalard
267563d1bb Add a class for previously composed data (A1) 
Change-Id: I87498799e6a48b8fa65924a098bb0ceb7626dce1
 2012-01-26 17:22:52 +09:00
Tadashi G. Takaoka
736d740aa5 Merge "Get rid of Resource reference from KeyboardView, LatinKeyboardView and PointerTracker" 2012-01-26 00:17:56 -08:00
Tadashi G. Takaoka
160f01211d Get rid of Resource reference from KeyboardView, LatinKeyboardView and PointerTracker 
This change introduces the following attributes.
 * KeyboardView
   - keyPreviewLingerTimeout
 * LatinKeboardView
   - keyHysteresisDistance
   - touchNoiseThresholdTime
   - touchNoiseThresholdDistance
   - slidingKeyInputEnable
   - keyRepeatStartTimeout
   - keyRepeatInterval
   - longPressKeyTimeout
   - longPressShiftKeyTimeout
   - longPressSpaceKeyTimeout
   - ignoreSpecialKeyTimeout
   - showMiniKeyboardAtTouchedPoint

Change-Id: I25159a87289b12447e20031add173523070e9b03
 2012-01-26 16:10:20 +09:00
Tadashi G. Takaoka
bd51aaf98f Merge "Warn deprecated privateImeOptions, "nm" and "forceAscii"" 2012-01-25 22:20:35 -08:00
Jean Chalard
051ac1ef14 Merge "Add a guard against OOB." 2012-01-25 21:22:18 -08:00
Jean Chalard
8be16f78b1 Add a guard against OOB. 
...and avoid crashing in one case where the application may
change the text while we are typing.

Bug: 5685922
Change-Id: I4a22c63168986f43ac84f512aaa4267023d536e3
 2012-01-26 14:17:48 +09:00
Jean Chalard
5a38ff305f Merge "Convert an internal enum into an int of same underlying value." 2012-01-25 21:13:56 -08:00
Tadashi G. Takaoka
4f5c3a2898 Warn deprecated privateImeOptions, "nm" and "forceAscii" 
Public API EditorInfo.IME_FLAG_FORCE_ASCII has been supported by
I6665b483.

Change-Id: I0ffdee15d8177d126cd8fe86a6bc4ab21be58c36
 2012-01-26 13:37:35 +09:00
Jean Chalard
6e082cb30d Convert an internal enum into an int of same underlying value. 
Goes together with Id4f4e066

Bug: 5922118
Change-Id: I1e39dd01c67e9284d9d7fe008d868847e69986d7
 2012-01-26 13:07:51 +09:00
Jean Chalard
fda847a870 Small cleanup 
All calls to this method are done with the same parameter,
and it's really hard to understand if we call upon this
member inside.

Change-Id: I787664bb59053ab0fe666ed812fb12b2b9090918
 2012-01-26 11:40:16 +09:00
Tadashi G. Takaoka
09f8b126e5 Add Key preserveCase enum to keyLabelOptions attribute 
To support auto generate key depending keyboard element id, the
KeysCache class is introduced to hold whole keys and reuse.

Change-Id: Icb81b5f1c1b3aaa31968dcdb93aa0a856e737f78
 2012-01-25 20:16:21 +09:00
Tadashi G. Takaoka
bcf2b79365 Prepare to get rid of Drawable reference from Key 
Change-Id: If435f95b2863e0af8d8916c643e6b01feabd3ea5
 2012-01-25 19:41:15 +09:00
Tadashi G. Takaoka
2419a31c98 Merge "Add element predicator to <switch><case> condition of Keyboard" 2012-01-25 02:37:27 -08:00
Tadashi G. Takaoka
9650e85662 Merge "Draw language name on spacebar on the fly" 2012-01-25 02:37:22 -08:00
Jean Chalard
d9702a375a Merge "Add a test for auto-correction." 2012-01-25 02:33:39 -08:00
Jean Chalard
0bfe359ee4 Add a test for auto-correction. 
Fix two related subtle bugs:
- Stop singling out fat-finger-only corrections for rejection
  when touch coordinates are not available.
- Remove a racy check that would happen only in debug mode

Change-Id: Ic904f9b27c091ca6b369052c4e65a630bff81257
 2012-01-25 19:29:40 +09:00
Tadashi G. Takaoka
83306b914f Add element predicator to <switch><case> condition of Keyboard 
Change-Id: I8f9eb8eb28707d23e421e88f979022d844a3b3ee
 2012-01-25 19:09:18 +09:00
Tadashi G. Takaoka
bd93eddb52 Draw language name on spacebar on the fly 
Change-Id: If54251acbd40d0dda37df1b368ed76dcdf3c8ac0
 2012-01-25 19:05:58 +09:00
Tadashi G. Takaoka
f9521c6f37 Change scope of some methods in KeyboardView 
Change-Id: I6569b413b20a2e683c6c636aafd755f51868dd28
 2012-01-25 18:50:27 +09:00
Tadashi G. Takaoka
f9c6715b17 Merge "Use PointerTracker.getPointerTracker() class method" 2012-01-25 00:51:22 -08:00
Tadashi G. Takaoka
38d6a18821 Use String instaed of CharSequence in Key class 
Change-Id: Ia76a41daede402ed2a509e110ae97d6bb660c760
 2012-01-25 17:04:00 +09:00
Tadashi G. Takaoka
117c124c13 Add autoGenerateFromAlphabet enum to KeyboardSet.Element.elementKeyboard 
This is the first step to support separate Keyboard for elementName.
This change is the second attempt of Icef66564.

Change-Id: I78ea6cb9ea3d965ff89e0ff5d896a6b11ba5c670
 2012-01-25 13:19:53 +09:00
Tadashi G. Takaoka
e88e1b22c8 Use PointerTracker.getPointerTracker() class method 
Change-Id: Ieab5d43d2bfe9bdf2b499834dff267df84b8d76d
 2012-01-25 11:08:30 +09:00
Tadashi Takaoka
af4efd5a3e Merge "Revert "Add autoGenerateFromAlphabet enum to KeyboardSet.Element.elementKeyboard"" 2012-01-24 15:22:25 -08:00
Tadashi Takaoka
8bb20bc682 Revert "Add autoGenerateFromAlphabet enum to KeyboardSet.Element.elementKeyboard" 
This reverts commit b5b92f9b78

Bug: 5908440
 2012-01-24 15:20:05 -08:00
Tadashi G. Takaoka
a34f66de2d Merge "Add autoGenerateFromAlphabet enum to KeyboardSet.Element.elementKeyboard" 2012-01-24 01:34:31 -08:00
Tadashi G. Takaoka
b5b92f9b78 Add autoGenerateFromAlphabet enum to KeyboardSet.Element.elementKeyboard 
This is the first step to support separate Keyboard for elementName.

Change-Id: Icef66564b6938910fa06ecab664dce4be84c9505
 2012-01-24 18:31:11 +09:00
Jean Chalard
20f437cc49 Merge "Test that delete actually removes any selected text." 2012-01-24 01:19:26 -08:00
Jean Chalard
1e4684ad24 Test that delete actually removes any selected text. 
Bug: 5699301
Change-Id: I09a967eb03690251e8bd69503285c982d6958a7d
 2012-01-24 18:17:09 +09:00
Jean Chalard
196da4a7be Merge "Fix a bug where backspace would not delete the selection" 2012-01-24 01:13:34 -08:00
Jean Chalard
77da3d5a3b Fix a bug where backspace would not delete the selection 
Bug: 5699301
Change-Id: I6c5a8470464d045349ac38e191c859b5c34cbeee
 2012-01-24 18:07:23 +09:00
Tadashi G. Takaoka
25971b5a14 Clean up symbol key chording state from KeyboardState 
Change-Id: I575da2bf2941c8a2e7b1fe0a455cbcdebb201276
 2012-01-24 17:59:35 +09:00
Tadashi G. Takaoka
83d81f2e34 Fix sliding shift input in caps lock mode 
Bug: 5881820
Change-Id: I4cbe3eda83c09edc9da8efbdff7d3359c1e140d5
 2012-01-24 17:58:23 +09:00
Tadashi G. Takaoka
747ed9e99a For get the symbols shifted state when switch back from alphabet layout 
Bug: 5881820
Change-Id: Ic478264e1cd366affc34fbf4cd59f1b6e7efede7
 2012-01-24 17:28:00 +09:00
Tadashi G. Takaoka
0f05076990 Get rid of setShifted/setShiftLocked from SwitchActions 
Change-Id: Ib54b0575be190556690ef2dfb14077842745f038
 2012-01-24 12:27:09 +09:00
Jean Chalard
5fd11a7f33 Fix a typo 
Change-Id: I358350c959d5610214a752b14d7744fe83eb3821
 2012-01-24 11:58:07 +09:00
Tadashi G. Takaoka
4eb240eb2c Force KeyboardShiftState reset by setShiftLocked(false) 
Change-Id: Ib00d598e6e6a91e594ae01cfc51fb688601f6b8f
 2012-01-23 13:18:06 +09:00
Tadashi G. Takaoka
69fa792184 Merge "Get rid of useless updateShiftState" 2012-01-22 20:16:46 -08:00
Tadashi G. Takaoka
b6357bddd5 Merge "Add more debug message to KeyboardState" 2012-01-22 20:15:38 -08:00
Tadashi G. Takaoka
457e506e1a Add more debug message to KeyboardState 
Change-Id: Ie0bceb494b0521bf406418d5ecbc16752c818aba
 2012-01-23 13:14:02 +09:00
Tadashi G. Takaoka
56518d424d Get rid of useless updateShiftState 
Because KeyboardState.onLoadKeyboard will invoke
SwitcherActions.requestUpdateShiftState eventually, the calling
updateShiftState at the end of KeyboardSwitcher.onLoadKeyboard is
useless.

Change-Id: Ib6e746b1516ef1b4c981807a9b8785a046ba50e0
 2012-01-23 12:47:03 +09:00
Jean Chalard
35e9a7ac55 Merge "Squash a ridiculously improbable NPE" 2012-01-22 18:37:29 -08:00
Tadashi G. Takaoka
b009a24b83 Support @icon/icon_name for more keys specification 
Change-Id: I8842e5ce77f9d27a0969df947de292c1830e36b7
 2012-01-20 20:09:02 +09:00
Tadashi G. Takaoka
54c2dd67b0 Merge "Support @string reference in moreKeys attribute" 2012-01-20 01:59:31 -08:00
Tadashi G. Takaoka
e54a4005d5 Support @string reference in moreKeys attribute 
Change-Id: If0056d0601149d2ddd0e231a81e7b2409b37fc06
 2012-01-20 18:46:33 +09:00
Jean Chalard
7c177e82af Merge "Fix a bug where a check would fail" 2012-01-20 01:16:44 -08:00
Jean Chalard
7546ff6e34 Fix a bug where a check would fail 
Bug: 5894393
Change-Id: I810de58730f2cabcaf7b8dc1d85b3725f959094b
 2012-01-20 18:09:59 +09:00
Tadashi G. Takaoka
3eede315dc Merge "Move MoreKeySpecParser.getResourceId to Utils" 2012-01-20 00:01:29 -08:00
Tadashi G. Takaoka
86641ef6e8 Merge "Change more key specification type to String from CharSequence" 2012-01-20 00:01:24 -08:00
Tadashi G. Takaoka
0718590486 Move MoreKeySpecParser.getResourceId to Utils 
Change-Id: I0640dbe76a8ff2dc45b504eca631942811571736
 2012-01-20 16:28:18 +09:00
Tadashi G. Takaoka
bd7b160cfb Change more key specification type to String from CharSequence 
Change-Id: I5e910f8225a248fc6403771836dec4c0b7294caa
 2012-01-20 16:27:32 +09:00
Jean Chalard
af9fe5c5fc Fix a bug where the user typed word would not be passed. 
Bug: 5894271
Change-Id: I4f02ff322697159e08f5e898608c0aff11dacb2f
 2012-01-20 15:39:06 +09:00
Tadashi G. Takaoka
0ef9bfe593 Merge "Fix KeyboardState switching back from alphabet-chording input correctly" 2012-01-19 02:14:20 -08:00
Tadashi G. Takaoka
085b659463 Merge "Fix KeyboardState to pass KeyboardStateMultiTouchTests" 2012-01-19 02:14:15 -08:00
Tadashi G. Takaoka
4d229410f0 Merge "Cleanup KeyboardState a bit" 2012-01-19 02:14:10 -08:00
Jean Chalard
250cf0a781 Merge "Fix a bug with backspace happening after a manual pick." 2012-01-19 01:55:30 -08:00
Tadashi G. Takaoka
f36f90a173 Fix KeyboardState switching back from alphabet-chording input correctly 
Bug: 5881820
Change-Id: I108bbc25baa331cc87f00955b48188b3557d10dd
 2012-01-19 18:53:38 +09:00
Tadashi G. Takaoka
d26d63b35d Fix KeyboardState to pass KeyboardStateMultiTouchTests 
Change-Id: If2b9ee7cf3fad7633d64b98758f802792d66f7a8
 2012-01-19 18:48:02 +09:00
Tadashi G. Takaoka
01d9fc966a Cleanup KeyboardState a bit 
Rename KeyboardShiftState variable and reorder some statements.

Change-Id: I7e8842836f35876f8697f9906343f7d4a1f9db4f
 2012-01-19 18:42:11 +09:00
Jean Chalard
3b2112e70a Fix a bug with backspace happening after a manual pick. 
Bug: 5884397
Change-Id: I01f462075bcbf7da38e9af2084ecd37143923e8b
 2012-01-19 18:41:02 +09:00
Jean Chalard
8ae770f39b Merge "Small code simplification." 2012-01-19 01:33:21 -08:00
Jean Chalard
95a6e58ebc Small code simplification. 
I'm pretty sure the test here was useless.

Change-Id: Iaece641fbd5455406533b19555f2b639759a525f
 2012-01-19 18:03:45 +09:00
Tadashi G. Takaoka
23bacdb6a5 Fix MoreKeySpecParser to be able to handle outputText correctly 
The issue was introduced by Id2320f4d.

Bug: 5887936
Change-Id: Ifec3aefb5b168f790de696ece104b84cdab46539
 2012-01-19 12:51:27 +09:00
Jean Chalard
af480be66e Squash a ridiculously improbable NPE 
This probably can't be triggered by anything that is not
a monkey, but still, let's fix this

Bug: 5797549
Change-Id: I9a7d9fd6664c97787ce676a28675e96f46df7658
 2012-01-19 12:06:00 +09:00
Tadashi G. Takaoka
06bc1db017 Add more multitouch tests 
Change-Id: I424a4b608fec084cb787003ef4417ccf273366ae
 2012-01-18 19:35:01 +09:00
Tadashi G. Takaoka
60c4594ee6 Get rid of hasDistinctMultitouch reference from KeyboardState 
Change-Id: I0a783a425302fbc381d056f5b0d757c27f2a9f14
 2012-01-18 18:11:46 +09:00
Tadashi G. Takaoka
5731b939c7 Remove KeyboardSwicther.toggleCapslock 
Change-Id: Id613c06e2df770659095d78d42637aed063d0c70
 2012-01-17 19:26:24 +09:00
Tadashi G. Takaoka
2a88440419 Rename KeyboardActionListener methods 
* Rename KeyboardActionListener.onPress to onPressKey
* Rename KeyboardActionListener.onRelease to onReleaseKey
* Merge KeyboardSwicther.onPressShift, onPressSymbol, and onPressOtherKey to onPressKey.
* Merge KeyboardSwitcher.onReleaseShift and onReleaseSymbol to onReleaseKey.
* Merge KeyboardState.onPressShift, onPressSymbol, and onPressOtherKey to onPressKey.
* Merge KeyboardState.onReleaseShift and onReleaseSymbol to onReleaseKey.

Change-Id: Icf28fd18e238c5e534c292893e4ab5b6b98e72f8
 2012-01-17 19:07:20 +09:00
Tadashi G. Takaoka
c9fade6b87 Merge "Remove toggleShift and toggleAlphabetAndSymbols from KeyboardSwitcher" 2012-01-17 00:07:38 -08:00
Tadashi G. Takaoka
87e025da11 Remove toggleShift and toggleAlphabetAndSymbols from KeyboardSwitcher 
Change-Id: I9bb8f78b0a766cd7937d5cbe1c1e5e35898b2997
 2012-01-17 16:49:33 +09:00
Jean Chalard
d104a7aac8 Merge "Fix a bug where words disappear on inserting separators" 2012-01-16 23:22:03 -08:00
Jean Chalard
edc6395d9b Fix a bug where words disappear on inserting separators 
The basic idea is that in some situations, we would restart
suggestions, but before evaluating them we would bail out
because suggestions were not requested. This would lead to
the "correction" set to null, so we would commit a null word.

This fix does two things:
- Do not restart suggestions when not requested.
- If we still end up with a composing word when suggestions
  are not requested, we select the typed word as the
  correct version.

Bug: 5846646
Change-Id: Ic35351841d0cb20afa99092ef681ecb7bd68bec6
 2012-01-17 16:16:52 +09:00
Jean Chalard
aed5819a84 Merge "Fix a bug where suggestion would restart at a bad time" 2012-01-16 22:51:23 -08:00
Jean Chalard
fbd1ac8083 Fix a bug where suggestion would restart at a bad time 
Bug: 5846646
Change-Id: I7c907d0a9478e0878b92ead94173caefc21b627b
 2012-01-17 15:50:18 +09:00
Tadashi G. Takaoka
1ef6fc7e15 Support EditorInfo.IME_FLAG_FORCE_ASCII 
Bug: 5850605
Change-Id: I6665b483f775094903f2e26f5584e4b141592ab5
 2012-01-17 14:38:00 +09:00
Tadashi G. Takaoka
edf107e2a6 Merge "Add "force non-distinct multitouch" debug option" 2012-01-16 20:22:36 -08:00
Tadashi G. Takaoka
2764e1dffe Merge "Remove duplicate logic from KeyboardSwitcher and KeyboardState" 2012-01-16 20:22:34 -08:00
Tadashi G. Takaoka
06b7c256b1 Add "force non-distinct multitouch" debug option 
Change-Id: I9fd6fabf03515011cedb8aaa30fdb7a77f2d4d12
 2012-01-17 13:19:01 +09:00
Jean Chalard
a8ba49c253 Small cleanup 
The method deleteWordAtCursor would call finishComposingText,
which is a very unexpected state change and would probably cause
surprising bugs to any parent that would call it.
As it happens, it's not used anywhere any more so let's just
remove it.

Change-Id: Iaa9200866e40b4e914f76baa987279948300679c
 2012-01-17 11:55:23 +09:00
Jean Chalard
72d285f4d7 Add some comments about resuming auto-suggestion 
Bug: 5846646
Change-Id: Ib2c76ec173972eb7acadbfaae7e930849d546721
 2012-01-17 10:29:11 +09:00
Tadashi G. Takaoka
58e782a225 Remove duplicate logic from KeyboardSwitcher and KeyboardState 
Change-Id: I1d331ee7f71501baa4ec2df01df39340499834e4
 2012-01-16 19:16:26 +09:00
Tadashi G. Takaoka
7bc61ca183 Fix double tap shift key to turn off capslock mode 
Bug: 5873562
Change-Id: If1f5ae1684905c1418ae43e55df38509444d29e2
 2012-01-16 18:54:25 +09:00
Tadashi G. Takaoka
9751a626ec Don't cache resource value that depends on orientation 
Bug: 5794655
Change-Id: Ib324366c772e20bb54aba63c2f4540dc0f9de515
 2012-01-16 12:26:34 +09:00
Tadashi G. Takaoka
c88026e1df Update shift state when alphabet keyboard has been set 
Bug: 5857492
Change-Id: I5ef78af21a76e8cf645e223d1ffa6212690bb1eb
 2012-01-16 11:08:29 +09:00
Tadashi G. Takaoka
ca132ce8e2 Merge "Remove reference of SubtypeSwitcher and SettingsValues from KeyboardSet" 2012-01-13 01:39:50 -08:00
Tadashi G. Takaoka
211680e375 Merge "Fix SuggestTests" 2012-01-13 01:39:43 -08:00
Tadashi G. Takaoka
4087ba69fa Remove reference of SubtypeSwitcher and SettingsValues from KeyboardSet 
Change-Id: I6c1150eea5f0a931d01578b0157f06e0aff0cc65
 2012-01-13 18:05:28 +09:00
Tadashi G. Takaoka
9c735b8038 Fix SuggestTests 
We need revised scoring test because dictionary look up algorithm has
been changed significantly since this SuggestTests was made.

Change-Id: I69d527a6bfa24ed0dc189fddad1afab0566c6eb8
 2012-01-13 15:25:28 +09:00
Tadashi G. Takaoka
76dede6b3b Merge "Fix SubtypeLocaleTests" 2012-01-12 22:17:20 -08:00
Tadashi G. Takaoka
4015a64a26 Fix SubtypeLocaleTests 
Change-Id: Id85814aa3bcd9cacbe446b2dfda3ca2ab9146c13
 2012-01-13 14:35:43 +09:00
satok
4da8e8e4d3 Merge "Fix a bug in the logic to show 3 dots of the ime switcher" 2012-01-12 19:41:12 -08:00