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
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
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
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
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
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
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
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
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
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
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