eb5ffdac90
Merge "Some readability improvement"
2012-03-14 18:47:32 -07:00
c787db51ed
Merge "Cut out a private method to make things more readable"
2012-03-14 18:47:26 -07:00
b9a5cb77f0
Merge "Minor optimization"
2012-03-14 18:47:21 -07:00
53d57ad6d3
Merge "Some code simplification"
2012-03-14 18:47:16 -07:00
05c54ffc7f
Merge "Really pass the y - touch correction to the native code"
2012-03-14 06:47:19 -07:00
853d9020ed
Really pass the y - touch correction to the native code
...
Bug: 4343280
Test: I11f8518d9ee
Change-Id: I4b90bdffffed9736af223ac83c1a54019add70bb
2012-03-14 21:54:52 +09:00
6bc9186457
Disabled key should respond if it is in the altCodeWhileTyping state
...
Bug: 6128215
Change-Id: I81e9980f8ffa5c5eaba30676c8433f542645de1d
2012-03-14 20:17:42 +09:00
3848ca6729
Merge "Gray out "alt-code-while-typing" key icon while typing"
2012-03-14 03:36:56 -07:00
73a46bfeb7
Gray out "alt-code-while-typing" key icon while typing
...
Bug: 6128215
Change-Id: Ie9c13d9d38aad6e92cc465e22f3ef20c80e0a36a
2012-03-14 19:36:24 +09:00
b8c471af47
Merge "Fix SuggestedWords.toString"
2012-03-14 03:28:22 -07:00
ea51bfd8a8
Fix SuggestedWords.toString
...
Change-Id: Ide3f605ce40e8c230f217bbf37ab016457ee91f1
2012-03-14 19:23:15 +09:00
2d5c40d873
Send key information even when the touch position correction is not triggered.
...
Bug: 4343280
Change-Id: Id24935f9f0f66ebaa799bb92537d842033427c4c
2012-03-14 19:01:08 +09:00
02e70cf999
Merge "Use HashSet to hold keys in Keyboard"
2012-03-14 02:54:21 -07:00
a5f7969f5b
Use HashSet to hold keys in Keyboard
...
This partially reverts Ie0554362.
Change-Id: I0de971c5efb4e8eb093be2a0793a08bd79baee22
2012-03-14 18:51:01 +09:00
271e5b6cb7
Some readability improvement
...
In-place replacements of visibly identical things.
Change-Id: I02b51bd7f63597e3428f0650b239e9a39ef5a7c7
2012-03-14 18:50:08 +09:00
0d0f182959
Cut out a private method to make things more readable
...
Change-Id: I791700890338e023bd86b8794dbc90379b91dc7d
2012-03-14 18:43:32 +09:00
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
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
4a08b2f0e4
Cleanup & optimization
...
Renaming some variables, and obvious optimizations.
Change-Id: Ib716748e9f3d602cf276dcd4e73f3bcfb819585e
2012-03-14 18:29:06 +09:00
f985efe39c
Remove a useless parameter
...
Change-Id: I03005240238fb004c20b2df0d836796e2e8b307f
2012-03-14 18:12:12 +09:00
bdf6d1b18b
Remove a useless method
...
Change-Id: I208dd2e725e37c2fb3cd51fe48194679e5912f6b
2012-03-14 15:59:04 +09:00
eda7d8af60
Remove the Builder
...
Change-Id: Idef22e6a82d59e3ec95b95ad237debcb07daf000
2012-03-14 15:42:26 +09:00
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
7d55c891af
Make the Builder private
...
Change-Id: I2184084f4b7729c4324f8291d548bd4c4c2872a1
2012-03-14 15:42:14 +09:00
5b0643f50d
Re-sequence the last calls to build()
...
Change-Id: If77ee5aa9483d3ca03c52812f31665dee6468e99
2012-03-14 14:19:24 +09:00
d42b0238f9
Merge "Move up the static methods of the Builder"
2012-03-13 21:22:22 -07:00
7d384c73da
Merge "Kill the last place where the Builder was being used"
2012-03-13 21:22:03 -07:00
88bf1ba526
Move up the static methods of the Builder
...
Change-Id: Ic3e07b745b7b24cae0f772ea49e0de615b44caf9
2012-03-14 13:10:22 +09:00
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
f147da0436
Merge "Use XML animator definition"
2012-03-13 21:10:08 -07:00
d7c4ba1709
Use XML animator definition
...
Change-Id: Ic2f6d3f8fdd2c0b0a00f004f49f95b00d474ee4b
2012-03-14 13:08:27 +09:00
7b2d6a8f98
Merge "Make the Builder fully immutable at last"
2012-03-13 20:30:16 -07:00
76e3861981
Merge "Straighten out the last bastion of the Builder"
2012-03-13 20:23:16 -07:00
febf9929ca
Merge "Add to SuggestedWords a missing parameter, and use it."
2012-03-13 20:15:34 -07:00
82793f2f85
Merge "Avoid using interface member, use concrete collection class instead"
2012-03-13 06:25:39 -07:00
ce96959518
Avoid using interface member, use concrete collection class instead
...
Change-Id: I8b647e8c260aec58c557ce07f3a2d8987c24d7be
2012-03-13 22:20:34 +09:00
0bd4699f9c
Merge "Update other alt keys' graphics"
2012-03-13 06:19:53 -07:00
faad353fea
Update other alt keys' graphics
...
Change-Id: I12699907a514f5fc2e110a0a711fb91c14a8756f
2012-03-13 22:12:40 +09:00
e1a91d0b26
Merge "Avoid using collection interface, using array instead"
2012-03-13 05:19:47 -07:00
b4fbbe57f5
Avoid using collection interface, using array instead
...
Change-Id: Ie0554362b73967bfcbbab6ad19c24683066a608e
2012-03-13 20:53:15 +09:00
e3afb7d192
Make the Builder fully immutable at last
...
Change-Id: Ie399ca7a9e76ccab44a92bc378d11f92392fed2c
2012-03-13 20:33:13 +09:00
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
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
2e2519ee91
Make still more members of the Builder final.
...
Change-Id: Ic455f97247da5e40d4939555ab639ecffef36e2d
2012-03-13 20:05:00 +09:00
edf5daa8ed
Merge "Support invalidating multiple keys in KeyboardView"
2012-03-13 04:00:15 -07:00
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
b5eeb724fc
Make some more Builder attributes final.
...
Change-Id: I3132b7fe4ee97c566736bfc21c3783cfc79fc7ff
2012-03-13 19:53:38 +09:00
c60fea852d
Make the suggested word list final in Builder.
...
Change-Id: I2ddfab00dc8c141fc989a051f16eb2b3571b7e86
2012-03-13 19:37:17 +09:00
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
9ffaae71d9
Merge "Make an add into a set."
2012-03-13 03:35:17 -07:00
728fd52b63
Merge "Pass the locale to the native code"
2012-03-13 03:27:11 -07:00
7ef1dabd92
Pass the locale to the native code
...
Change-Id: I8f73b9b33cca56b3fa44ec6259c0896be22f4a47
2012-03-13 19:16:33 +09:00
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
299ac263b3
Support invalidating multiple keys in KeyboardView
...
Change-Id: I347ccfc2cf60c17f5f0eddec6566662cb3a954ca
2012-03-13 18:55:05 +09:00
d6662ecd30
Cleanup
...
Remove an unused method, make others static, fix a formatting
issue
Change-Id: I40cb0b5e01a6f8e2f7b953bd9aad3168dfee71d1
2012-03-13 18:34:19 +09:00
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
b8753eb31c
Merge "Kill the StringBuilderPool."
2012-03-13 02:14:37 -07:00
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
8e08bfb8de
Merge "Implement additional proximity characters in the native code Bug: 4343280"
2012-03-13 01:41:46 -07:00
552c3c27f0
Implement additional proximity characters in the native code
...
Bug: 4343280
Change-Id: I9bbc5cab2fef1ee80c1fe32017df811ef8af10bc
2012-03-13 17:38:50 +09:00
aee5f03d6e
Use integer alpha value instead of factor for animation
...
Change-Id: I3099a7625e0176a1d2be42e58d6eb5fa95797bcb
2012-03-13 16:47:45 +09:00
95fcb0cce9
Merge "Remove a useless parameter."
2012-03-13 00:26:06 -07:00
dabf96896e
Move language on spacebar parameters to LatinKeyboardView attributes
...
Change-Id: I06e5d7d158a9b14b00df34e68b12cd012faf17d1
2012-03-13 16:17:13 +09:00
d0d4074392
Remove a useless parameter.
...
Change-Id: I7625bf17158c207ad7e8cd496bef825704173c4c
2012-03-13 15:34:06 +09:00
6fbcd0d219
Merge "Use Animator to draw language name on spacebar"
2012-03-12 22:57:57 -07:00
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
7c9bff96f0
Kill methods with side-effects, take 2
...
...working this time
Change-Id: I80e377e6250d3817f1e067a551bca2a557740764
2012-03-13 14:18:30 +09:00
b26af7eae7
Revert "Kill methods with side-effects"
...
This reverts commit ca0e048688
2012-03-12 19:42:29 -07:00
ca0e048688
Kill methods with side-effects
...
Change-Id: I42baeec68eb2540e7d8f8538ae2dceeef5594391
2012-03-12 19:48:32 +09:00
f62d6f50f2
Merge "Consolidate words into SuggestedWordInfo"
2012-03-12 03:14:54 -07:00
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
546692daac
Merge "Support disableAdditionalMoreKeys and disableKeyLabelHint"
2012-03-12 01:48:05 -07:00
b03529aa01
Support disableAdditionalMoreKeys and disableKeyLabelHint
...
Change-Id: Idfa586417acd4a223380d52f044e3a86eb780b21
2012-03-12 17:45:57 +09:00
a3f2ce1f31
Merge "Fix an OOB"
2012-03-12 01:12:40 -07:00
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
b6895aec05
Merge "Rename keyboard XML files"
2012-03-12 00:42:03 -07:00
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
30936116d8
Merge "Make a method accessible for tests"
2012-03-12 00:23:29 -07:00
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
1dfef0336d
Make a method static
...
Change-Id: Ie1d460562d38105abe91ae2da17cafd49e2cd394
2012-03-12 15:00:36 +09:00
c1ca8815f5
Fix an obvious bug in handleLanguageSwitchKey()
...
bug: 5759092
Change-Id: I8c7b2ef024cbab399d96f6b3ec553da4e9d2fb18
2012-03-11 00:44:47 +09:00
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
68823ae08e
Make the safety net memory private
...
Change-Id: I10959d47c980d2e8f2ea995955acf02193e3ff7b
2012-03-09 22:01:15 +09:00
ebbb7e9665
Recompute safety net in debug cases instead of memorizing
...
Change-Id: I67f3a31db081afa4871ec441dd461c56e098c668
2012-03-09 22:00:23 +09:00
682c2d53cc
Make access to the safety net calculation easier
...
Change-Id: If33897b38af94ae81b05e5ef140a542724b9f34a
2012-03-09 21:44:40 +09:00
151d5cb532
Extract a condition from a method
...
Change-Id: I6b0262fe7cb3f7a31cc19d724c301467be932640
2012-03-09 21:37:44 +09:00
36c1b37914
Remove a useless argument
...
Change-Id: I713433a3225193489fad5bdafcf302b529903116
2012-03-09 21:24:47 +09:00
28e59b98c6
Remove a useless escape
...
Change-Id: I1ef0685cc9888c9cef9f60015d32b66dde75ef9b
2012-03-09 21:10:55 +09:00
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
c5d2bb786e
Don't use an intermediate object with a different meaning
...
Change-Id: Ie89916b49c852a51385ffd61cb596a58f23a46a0
2012-03-09 20:51:33 +09:00
ed9986824e
Move some auto-correction logic to where it belongs
...
Change-Id: I897c5ec3a630a4a6bfc593906df4d3fc7b244482
2012-03-09 20:45:37 +09:00
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
0cf422fbb7
Reduction, step 8
...
Change-Id: I54334039597e235e24f169e34c1d44109180ee88
2012-03-09 19:00:29 +09:00
a333ff19ef
Reduction, step 7
...
Change-Id: I177ef2f29c8b6000c5e3d021c016c5d216fe3fc6
2012-03-09 18:59:20 +09:00
a3ee019331
Reduction, step 6
...
Change-Id: I22ad4cea0e0cac23813da7e788f5c94974ce0ebf
2012-03-09 18:58:01 +09:00
dbd140504d
Reduction, step 5
...
Change-Id: Iac52e62c2bdffad14f916f69eade2b785bb41767
2012-03-09 18:44:23 +09:00
0b96bc4b2b
Reduction, step 4
...
Change-Id: Ib27dc6e9486c3f0f2ec1e94a88a52d12c1af2d38
2012-03-09 18:44:20 +09:00
5a61d03f31
Reduction, step 3
...
Change-Id: I0e08b102c9539d97c473505b9d42176c4a7c8853
2012-03-09 18:44:16 +09:00
8abd15b59f
Reduction, step 2
...
Change-Id: I06e117df43d25dbaf9fc7a7366efd9355a6215ce
2012-03-09 18:44:10 +09:00
f08f30176b
Reduction, step 1
...
Change-Id: Ic3ed04300cfd4c0b69b93b27379aca4093b32f67
2012-03-09 18:38:44 +09:00
Jean Chalard
satok
Tadashi G. Takaoka
Ken Wakasa