Commit Graph

3504 Commits (7c38b73ff2afe86e35ac8df83db7abcc6865fae3)

Author SHA1 Message Date
Tadashi G. Takaoka 73a46bfeb7 Gray out "alt-code-while-typing" key icon while typing
Bug: 6128215
Change-Id: Ie9c13d9d38aad6e92cc465e22f3ef20c80e0a36a
2012-03-14 19:36:24 +09:00
Tadashi G. Takaoka b8c471af47 Merge "Fix SuggestedWords.toString" 2012-03-14 03:28:22 -07:00
Tadashi G. Takaoka ea51bfd8a8 Fix SuggestedWords.toString
Change-Id: Ide3f605ce40e8c230f217bbf37ab016457ee91f1
2012-03-14 19:23:15 +09:00
satok 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
Tadashi G. Takaoka 02e70cf999 Merge "Use HashSet to hold keys in Keyboard" 2012-03-14 02:54:21 -07:00
Tadashi G. Takaoka a5f7969f5b Use HashSet to hold keys in Keyboard
This partially reverts Ie0554362.

Change-Id: I0de971c5efb4e8eb093be2a0793a08bd79baee22
2012-03-14 18:51:01 +09:00
Jean Chalard 271e5b6cb7 Some readability improvement
In-place replacements of visibly identical things.

Change-Id: I02b51bd7f63597e3428f0650b239e9a39ef5a7c7
2012-03-14 18:50:08 +09:00
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
Tadashi G. Takaoka 0bae6abffd Merge "ZWNJ key on Persian shouldn't be altCodeWhileTyping key" 2012-03-13 20:35:25 -07: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 f71c2cfb65 ZWNJ key on Persian shouldn't be altCodeWhileTyping key
Change-Id: I69301a2c61c2e465058309337672f983669e7967
2012-03-14 10:27:02 +09:00
Tadashi G. Takaoka 9319e94606 Merge "Support Persian Keyboard" 2012-03-13 17:39:58 -07:00
Eric Fischer c56ef928d5 Import translations. DO NOT MERGE
Change-Id: I23a7371b635d689966afe63c2c1e42032579a193
2012-03-13 15:42:07 -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 fe8555536a Support Persian Keyboard
This is a first trial implementation based on Arabic layout.

Bug: 5456620
Change-Id: Ifa21d7fbd408853a44678623c13b9c078283732c
2012-03-13 22:02: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
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