Commit Graph

3451 Commits (3848ca6729da79803b4829cea6986762c5e1f680)

Author SHA1 Message Date
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
Tadashi G. Takaoka 041c3d3841 Merge "Tweak 7 inch layout a bit" 2012-03-12 21:01:56 -07:00
Jean Chalard 70a9bcf8c0 Merge "Revert "Kill methods with side-effects"" 2012-03-12 19:42:42 -07:00
Jean Chalard b26af7eae7 Revert "Kill methods with side-effects"
This reverts commit ca0e048688
2012-03-12 19:42:29 -07:00
Jean Chalard ae649580f4 Merge "Kill methods with side-effects" 2012-03-12 19:17:21 -07:00
Eric Fischer 8b4148e757 Import translations. DO NOT MERGE
Change-Id: I8546456a3d567b821a5a409a7459f9043fa04315
2012-03-12 15:25:23 -07:00
Jean Chalard ca0e048688 Kill methods with side-effects
Change-Id: I42baeec68eb2540e7d8f8538ae2dceeef5594391
2012-03-12 19:48:32 +09:00
Tadashi G. Takaoka 9aa13b58d1 Tweak 7 inch layout a bit
* For 10-9-7 (qwerty, qwertz), keys' width are 9.0%-9.0%-9.0%
* For 10-10-7 (azerty, hebrew, spanish), keys' width are 8.5%-8.5%-8.5%
* For 11-11-{7,8} (arabic, bulgarian, nordic), keys' width are 7.6%-7.6%-7.6%
* For {11,12}-11-9 (south_slavic, east_slavic), keys' width are 7.6%-7.6%-7.363%

Change-Id: Ife4ce0ac587bd179afcfce0cb5dffb8d82fee4f1
2012-03-12 19:29:58 +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 fe2dc348e5 Add AZERTY compatible symbols/symbols shifted layouts for tablet
This change also adds Spanish compatible symbols/symbols shifted
layouts for tablet.

Bug: 6100832
Change-Id: Ib5ed9856573657b2680e08f9e64fd09b12a0a27d
2012-03-12 17:53:23 +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
Tadashi G. Takaoka 2de0c4b754 Merge "Separate Greek semicolon key from row" 2012-03-11 21:01:53 -07:00
Tadashi G. Takaoka 0acfaa77ac Merge "Breakdown Slavic keyboard into rows" 2012-03-11 21:01:48 -07:00
Tadashi G. Takaoka b30e719286 Separate Greek semicolon key from row
Change-Id: Ie568da868a0bed4f72652cf7475bdeb752be1f5b
2012-03-12 12:30:24 +09:00
Tadashi G. Takaoka df22f71a16 Merge "Breakdown Serbian keyboard into rows" 2012-03-11 20:06:47 -07:00
Tadashi G. Takaoka b577005a36 Breakdown Serbian keyboard into rows
This change also slightly re-design 7-inch and 10-inch tablet layout

Change-Id: Ibfe11386d865f7c3becf4a60286557921f95036d
2012-03-12 11:30:12 +09:00
Tadashi G. Takaoka 2f85034c5d Breakdown Slavic keyboard into rows
Change-Id: Iff2048839a51e14351ba235ef9d7f5ecbef159e3
2012-03-12 11:29:27 +09:00
Tadashi G. Takaoka fd7b510b24 Breakdown Hebrew keyboard into rows
Change-Id: I25c928a3251424280e2ac4f065126c3019734d20
2012-03-12 10:25:13 +09:00
Ken Wakasa c1ca8815f5 Fix an obvious bug in handleLanguageSwitchKey()
bug: 5759092

Change-Id: I8c7b2ef024cbab399d96f6b3ec553da4e9d2fb18
2012-03-11 00:44:47 +09:00
Eric Fischer 1ce5ff63b1 Import translations. DO NOT MERGE
Change-Id: Ie0609f97096ad1e9dfa8f9b778047723dcf9868f
2012-03-09 14:04:54 -08: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 0cb7b00704 Merge "Small optimization" 2012-03-09 00:40:19 -08:00
Jean Chalard d17ff7225a Merge "Small reorganization" 2012-03-09 00:40:10 -08: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
Tadashi G. Takaoka d492e2bf8d Merge "Breakdown Greek keyboard into rows" 2012-03-08 23:37:02 -08:00
Tadashi G. Takaoka b4fba675f9 Merge "Breakdown Georgian keyboard into rows" 2012-03-08 23:36:55 -08:00
Tadashi G. Takaoka df0c7711a7 Merge "Breakdown Bulgarian keyboard into rows" 2012-03-08 23:24:57 -08:00
Tadashi G. Takaoka e955323ae0 Breakdown Greek keyboard into rows
Change-Id: I160c0e26058b3841b3820ec95b91d59b295339ca
2012-03-09 16:24:48 +09:00
Jean Chalard af8092e093 Merge "Remove useless test" 2012-03-08 23:15:49 -08:00
Tadashi G. Takaoka d2732d459f Breakdown Georgian keyboard into rows
Change-Id: Id257ea33586e07a91674f654c33003ec2d5aa73d
2012-03-09 16:10:50 +09:00
Tadashi G. Takaoka 258bd90853 Breakdown Bulgarian keyboard into rows
Change-Id: Ie0da26a48b186be081ad61858116e519019d1973
2012-03-09 16:00:57 +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
Tadashi G. Takaoka 4e67085a15 Breakdown Arabic keyboard into rows
Change-Id: Ie2215d8baf501dc7dd87c464deb47fe4267171f6
2012-03-09 15:50:54 +09:00
Tadashi G. Takaoka 9a6ccf9bb0 Merge "Breakdown AZERTY keyboard into rows" 2012-03-08 22:32:24 -08:00
Tadashi G. Takaoka efe029be2f Merge "Breakdown QWERTY keyboard into rows and share" 2012-03-08 22:29:15 -08:00
Jean Chalard d48b76267a Merge "Remove a useless test (B7)" 2012-03-08 22:26:20 -08:00
Tadashi G. Takaoka 22375e025b Breakdown AZERTY keyboard into rows
Change-Id: Ibd202d7b141209b3e4310499134522cbd1a8c16c
2012-03-09 15:26:16 +09: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
Tadashi G. Takaoka 85d594a80e Breakdown QWERTY keyboard into rows and share
Change-Id: I0b8ad39120a73395ff5a5b1a32e0f3fe681c062b
2012-03-09 15:02:27 +09: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
Tadashi G. Takaoka 1dba7c2d67 Merge "Split tablet symbols and symbols shifted layout into separated rows" 2012-03-08 21:05:53 -08:00
Tadashi G. Takaoka 6460a83546 Merge "Add ":" to ";" key on Greek keyboard" 2012-03-08 21:05:47 -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
Tadashi G. Takaoka 174d29f468 Split tablet symbols and symbols shifted layout into separated rows
Bug: 6100832
Change-Id: I6771364ceca2c152bd9c55e22159f57c3468cc31
2012-03-09 12:41:56 +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
Tadashi G. Takaoka b1de2912b8 Add ":" to ";" key on Greek keyboard
Bug: 5679585
Change-Id: I92d4b4d1eff9561adbb1bae607a1c27b4b5168ba
2012-03-09 12:22:34 +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