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

2662 commits

Author SHA1 Message Date
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
satok
83a018419a Fix a bug in the logic to show 3 dots of the ime switcher 
Bug: 5806103
Change-Id: I67b3f0bb25d5fb9cfb902c03f41ae3e582107187
 2012-01-13 11:50:31 +09:00
satok
21814c56f0 Merge "Move auto correction thresthold to the native code" 2012-01-12 02:58:35 -08:00
satok
be0cf72253 Move auto correction thresthold to the native code 
bug: 5858137

Change-Id: Ic4b6270c6e51ef4ed25a6a1d8ddd7fdfa70fd78d
 2012-01-12 19:56:15 +09:00
Jean Chalard
ab34a4a7f5 Merge "Fix a bug where last candidate would not be reset" 2012-01-11 21:47:35 -08:00
Jean Chalard
cda8a42cbe Merge "Add a sanity check" 2012-01-11 21:47:26 -08:00
Jean Chalard
a8c8ab1cb4 Remove an excessive parens 
Change-Id: If8aa4253ab0f664e628ed7f4d7a3adc02a898cc7
 2012-01-12 14:07:56 +09:00
Jean Chalard
852630ba34 Add a sanity check 
Check if any character is both a magic space swapper and
a magic space stripper for the current language, and throw
an exception if found. Since this is expensive, it's done
only in debug mode.

Change-Id: Ibd166db87c91495b76878ea0e4f420a62c7bb276
 2012-01-12 12:44:49 +09:00
Jean Chalard
9de5cfc67a Fix a crash where revertSwap would be wrongly called 
This would crash the program when inputting a punctuation
symbol that should not swap with a weak space through the
suggestion strip, then press backspace.
Those include all two-part punctuation symbols in French for
example, as well as magic space strippers like the dash in
English. For English all suggestion strips symbols happen to
be magic space swappers so this would not happen in English
by default.
Also fix a typo.

Change-Id: Ia40678c264e978509b5786290a75a3c57181648e
 2012-01-12 11:55:40 +09:00
Jean Chalard
cd2286fff1 Fix a bug where last candidate would not be reset 
Bug: 5851148
Change-Id: Ic270318842d8e16bc62d78d5fe0d6be0ca1fb532
 2012-01-12 11:16:51 +09:00
Tadashi G. Takaoka
8cab0b56eb Get rid of Keyboard.CODE_DUMMY 
Change-Id: Id2320f4d9b5f22f0ac844ab20ce42b0c4e7c6880
 2012-01-10 18:19:36 +09:00
Tadashi G. Takaoka
ee4be6e3c6 Call KeyboardState.onUpdateShiftState from onCodeInput if code is a normal letter 
This will be helpful to write unit test code.

Change-Id: Ib61cc46ac547084e0dc9ecd3a50814fecf08ace2
 2012-01-10 15:13:05 +09:00
Tadashi G. Takaoka
0fe45eac18 Merge "Optimize KeybaordView.invalidateAllKeys a bit" 2011-12-26 06:50:31 -08:00
Tadashi G. Takaoka
9f6485a448 Optimize KeybaordView.invalidateAllKeys a bit 
Change-Id: I118c792219f649b7297477c78fa725c678650159
 2011-12-26 23:43:53 +09:00
Tadashi G. Takaoka
07145a3706 Fix automatic temporary upper case mode shift key graphics 
Bug: 5802387
Change-Id: I4f59fb2f971c543748ed32b37af528767a0549e4
 2011-12-26 21:05:33 +09:00
Ken Wakasa
0d0f01da67 Fix a typo. A follow up to I68dd6b8d 
Change-Id: I16fa4099c75faac35344b0e4d3c2b866ddac896a
 2011-12-21 22:34:08 +09:00
Jean Chalard
0fd625bcfd Fix a bug with wrong auto-correct cancellation 
Auto-correct cancellation would sometimes kick in at
wrong times, causing crashes.

Bug: 5784542
Change-Id: I68dd6b8d9237ce9b66af2dc63e77ba6dd5fd69dd
 2011-12-21 19:28:02 +09:00
Jean Chalard
752d8cc4fc Fix a bug with TYPE_TEXT_CLASS 
This was introduced by a badly-rebased commit. The culprit was
I103d6851. There was also another bug lurking there introduced
by a previous commit that this fixes.

Bug: 5775347
Change-Id: I133b54a5159e19714f4bcae8ffbb4824cff9f466
 2011-12-20 15:31:55 +09:00
Jean Chalard
715a203501 Merge "Reorganize the auto-correction memory" 2011-12-19 02:22:49 -08:00
Ken Wakasa
4f7d278af6 Follow-up fix for I68c667b0 
Should have preserved the logic of LatinKeyboard.getNearestKeys().

Change-Id: I97b05aa24006402be03088a215fa07abda9477df
 2011-12-19 17:58:36 +09:00
Jean Chalard
9e8761c440 Reorganize the auto-correction memory 
Change-Id: I31cce9db471dcd4a7b3477bcb037a8ff482b7696
 2011-12-19 17:33:15 +09:00
Tadashi G. Takaoka
42fcb2de64 Get rid of public reference to KeyboardIconsSet.ICON_* constants 
As a consequence,
  * Add Key.iconDisabledKey has been introduced and Key.getIcon honors
    the enabled state of the key.
  * The attribute id of disabled icon for shortcut key,
    Keyboard_iconShortcutKeyDisabled, is renamed to
    Keyboard_iconDisbledShortcutKey
  * KeyboardIconsSet has getIconByIconId and getIconByAttrId methods
    instead of getIcon.

Bug: 5778201
Change-Id: Ica93b073b9a04acd18ead7a33b60e3c6d813e7a1
 2011-12-19 01:11:09 +09:00
Tadashi G. Takaoka
4e1dab8cfa Move KeyboardBuilder and KeyboardParams classes into Keyboard class 
This change also moves XmlParseUtils to com.android.inputmethod.latin package.

Bug: 5778201
Change-Id: I7d9faa344460753ce178ad4048e0fadb65c75614
 2011-12-18 20:19:16 +09:00
Tadashi G. Takaoka
3708787fe9 Remove LatinKeyboard class 
Change-Id: I68c667b00dadf2ed9f1c62fb7da37d2cf499cd81
 2011-12-18 19:10:42 +09:00
Tadashi G. Takaoka
4112dc0500 Move spacebar drawing code from LatinKeyboard to LatinKeyboardView 
Also this change moves LatinKeyboard attributes,
autoCorrectionSpacebarLedEnabled, autoCorrectionSpacebarLedIcon,
spacebarTextRatio, spacebarTextColor, and spacebarTextShadowColor to
LatinKeyboardView.

Change-Id: I7cc27ce1fc550e9f620a9ed0fbe4b8172902d5a1
 2011-12-18 19:07:12 +09:00
Tadashi G. Takaoka
7bd714c086 Add extra key icons to KeyboardIconsSet 
* Get rid of Key.keyIconShifted attribute.
    Add Keyboard.iconShiftKeyShifted to KeyboardIconsSet.
  * Get rid of LatinKeyboardView.disabledShortcutIcon attribute.
    Add Keyboard.iconShortcurKeyDisabled to KeyboardIconsSet.
  * Add Keyboard.iconSpaceKeyForNumber to KeyboardIconsSet.
  * Fix misplaced autoCorrectionSpacebarLedIcon resources.

Change-Id: I381bff3789254977ab3cb18f58f95b3c433b1e1a
 2011-12-18 18:25:29 +09:00
Tadashi G. Takaoka
1ebedd7a15 Remove LatinKeyboard.adjustLabelCase override 
Change-Id: If032605c1cd6bb8e913d465e20dec70798c4b8fb
 2011-12-18 16:46:44 +09:00
Tadashi G. Takaoka
5afc3ae2d9 Add LatinKeyboardView style 
As a result, this change moves shortcut related update code to
LatinKeyboardView from LatinKeyboard.

Change-Id: I1882672577f61e73c90d6c018b7dbb61f3fe21e4
 2011-12-18 16:42:23 +09:00
Tadashi G. Takaoka
22b48de11c Get rid of Key.needsSpecialPopupHint and related 
Change-Id: I28e87ea3af9581f12094770b42f113e9018886c4
 2011-12-18 16:08:28 +09:00
Tadashi G. Takaoka
bc781e963f Can override key drawing methods of KeyboardView 
Change-Id: Ie303df4f5e944ea868f5c28ba3bb72a57cc9a35f
 2011-12-18 16:08:00 +09:00
Tadashi G. Takaoka
605f730959 Merge "Add LatinKeyboard.spacebarTextRatio attribute" 2011-12-17 08:43:34 -08:00
Tadashi G. Takaoka
40a6739645 Fix broken build 
This is a followup change of I8376f4f5

Change-Id: I4de4cbc903beb71d805e62b5172076a949854bc0
 2011-12-18 01:36:11 +09:00
Tadashi G. Takaoka
7cc2595b6f Add LatinKeyboard.spacebarTextRatio attribute 
Bug: 5776979
Change-Id: Ia568d1170ed33a000eb3bb02ecdf611e4b5ff2d5
 2011-12-18 01:00:06 +09:00
Tadashi G. Takaoka
ebec5259b7 Get rid of LatinKeyboardParam class 
Change-Id: I8376f4f570e72929679c5e4955986c48881abd75
 2011-12-18 00:39:40 +09:00
Ken Wakasa
67394a394f Preparatory small clean up for bug: 5776979 
Change-Id: I96b20d3775180366fac50c2bb4e0b47a92ee4cdb
 2011-12-17 20:45:39 +09:00
Ken Wakasa
3425852be4 Remove redundant logs 
bug: 5722703
Change-Id: I6b7285ad6f5c0c8486d24712f22249f83a1c6396
 2011-12-17 00:22:01 +09:00
Tadashi G. Takaoka
4af75010a1 Merge "Use Set to group Keys in Keyboard instead of List" 2011-12-16 04:26:25 -08:00
Tadashi G. Takaoka
7c69397f14 Merge "Fix swapped alphabet and symbols keyboards" 2011-12-16 04:15:35 -08:00
Tadashi G. Takaoka
510ebb9b16 Merge "Get rid of key index from ProxymityInfo" 2011-12-16 04:13:38 -08:00
Tadashi G. Takaoka
854302282d Fix swapped alphabet and symbols keyboards 
Change-Id: I956684332d607cb9ab01d12af7a924c15def7fce
 2011-12-16 21:12:06 +09:00
Tadashi G. Takaoka
4a019a9c96 Use Set to group Keys in Keyboard instead of List 
In deriving various shift stated alphabet keyboards from base/main
keyboard, almost all keys should be shared among variants.  Grouping
keys in Set instead of List is a essential refactor to have.

Bug: 5002108
Bug: 5679585
Change-Id: Idd5644d1c45a3276a24b61c984619c03d4e4c54c
 2011-12-16 21:04:04 +09:00
Tadashi G. Takaoka
0c0ca874fe Get rid of key index from ProxymityInfo 
Change-Id: I9bee0a643d09cdd89e42ae913285c9e78d875c1c
 2011-12-16 21:03:36 +09:00
Jean Chalard
43c0a034bd Merge "Pretty print for InputAttributes" 2011-12-16 04:01:49 -08:00
Jean Chalard
4d0f03bd66 Remove a write-only variable. 
Change-Id: I825307a429f46b31ed9bd940b5a97d2713127dfe
 2011-12-16 20:54:58 +09:00
Jean Chalard
6fa003ee23 Pretty print for InputAttributes 
Change-Id: I5e4b2b6f3cd943c8f6187aaed21d67ec786bf5df
 2011-12-16 20:53:44 +09:00
Jean Chalard
2b2c0b574c Merge "Use the WordComposer to check if we are composing a word" 2011-12-16 03:47:34 -08:00
Jean Chalard
80b66bb166 General cleanup. 
Move variables around, inline useless functions, remove
useless local variables.

Change-Id: Icb89d8b211a2ad4bc3619137c2276a649c2a5e34
 2011-12-16 20:36:32 +09:00
Jean Chalard
644c8b7c96 Initialize input attributes in the InputAttribute class 
Change-Id: I103d6851f54f47cbffdb567fb0f4c505c4697b05
 2011-12-16 20:35:16 +09:00
Jean Chalard
3b7aceca60 Merge "Make applicationSpecifiedCompletionOn final." 2011-12-16 03:20:00 -08:00
Tadashi G. Takaoka
bf7ed75e4f Merge "Move KeyboardSwitcher.getKeyboard to KeyboardSet" 2011-12-16 03:13:38 -08:00
Tadashi G. Takaoka
645128af71 Move KeyboardSwitcher.getKeyboard to KeyboardSet 
This change also gets rid of XML id from KeyboardId.

Bug: 5002108
Bug: 5679585
Change-Id: I7086c7da3c01ba4ade7f77ee5cc731310da46404
 2011-12-16 20:10:57 +09:00
Jean Chalard
ccc35f7fa7 Make applicationSpecifiedCompletionOn final. 
This is the last one (whew)
Also move a somewhat unrelated initialization out of the
input attribute initialization function.

Change-Id: Icc77b32fd16b112ab43786715061b1c9dca31c04
 2011-12-16 19:09:01 +09:00
Jean Chalard
9cc1312eee Make inputTypeAutoCorrect final. 
Change-Id: I550eba1fc3fa2843d007a8208d81fad208c1196b
 2011-12-16 19:08:52 +09:00
Jean Chalard
13db05f930 Make isSettingsSuggestionStripOn final. 
Change-Id: Iabb99a7f8f3f1777f9a87ae2bddff9795a50fa92
 2011-12-16 19:08:13 +09:00
Jean Chalard
1ba17f97d5 Small refactoring 
This helps to make following changes smaller

Change-Id: I95ba2901ac3bf1ed70a748c35a0babdd9af1df63
 2011-12-16 18:21:26 +09:00
Jean Chalard
4fc0f6ab02 Merge "Make insertSpaceOnPickSuggestionManually final." 2011-12-16 01:15:35 -08:00
Jean Chalard
2ad14a2ea7 Merge "Use temporary variables for computing editor attributes" 2011-12-16 01:07:56 -08:00
Jean Chalard
520e69056e Merge "Create a class for input attributes." 2011-12-16 01:06:12 -08:00
Jean Chalard
ae0c109d11 Make insertSpaceOnPickSuggestionManually final. 
Change-Id: I32fce0ea8c5c58b6f920d0758c8bf57769f39a12
 2011-12-16 18:04:39 +09:00
satok
cadc0f7d79 Merge "Send touch event in usability study mode" 2011-12-16 01:04:26 -08:00
Jean Chalard
4e8922f1be Use temporary variables for computing editor attributes 
The ultimate intent is to make these variables final,
which will allow to move the computing function to the
InputAttributes class.

Change-Id: Ifb1fc7321a19b10d60aa63fa0daaa2708deda2cf
 2011-12-16 18:04:17 +09:00
Jean Chalard
dc9d0fcc11 Create a class for input attributes. 
Change-Id: I834390c83865aac59fb758d5c66cf9b74103abd8
 2011-12-16 18:03:16 +09:00
satok
15d4793911 Send touch event in usability study mode 
Change-Id: I0cdcd57bfd31c9b21cfb932d7ff91bd013cde6d7
 2011-12-16 17:56:14 +09:00
Tadashi G. Takaoka
289544d6e4 Use Params instead of Builder as an argument of KeyboardSet constructor 
Change-Id: I4c576a0b0b632cdf413f2ccd5c69dbd37747fbd3
 2011-12-16 16:41:49 +09:00
Jean Chalard
196d82cdd7 Use the WordComposer to check if we are composing a word 
...instead of the hard-to-understand mHasUncommittedTypedChars.
This is possible because now the word composer is actually aware
of commits.

Change-Id: I36b664ce8402a280f801e87b9ebe161f416b0853
 2011-12-16 15:58:29 +09:00
Tadashi G. Takaoka
6ba5f0d341 Merge "Add error log to expensive ArraysCompatUtils.binarySearch" 2011-12-15 22:55:10 -08:00
Jean Chalard
be2f81f055 Merge "Make the word composer aware of commits." 2011-12-15 22:54:23 -08:00
Jean Chalard
c73c26790f Make the word composer aware of commits. 
Change-Id: I04e691fbc9227d4df195429bca89edea93575347
 2011-12-16 15:41:10 +09:00
Tadashi G. Takaoka
f8481883cc Add error log to expensive ArraysCompatUtils.binarySearch 
Change-Id: Id33998e2a99be9249de4011892555f10c5d0968d
 2011-12-16 15:34:11 +09:00
Tadashi G. Takaoka
cfd5b4811f Merge "Cleanup ProximityInfo.calulateSweetSpot" 2011-12-15 22:21:17 -08:00
Tadashi G. Takaoka
f1e05e74e6 Merge "Add com.android.inputmethod.latin.suggestions package" 2011-12-15 22:00:05 -08:00
Tadashi G. Takaoka
6cb72b0f36 Cleanup ProximityInfo.calulateSweetSpot 
Change-Id: I98238359dffd76a620d3b0e73b3b22dd82c56c93
 2011-12-16 14:59:24 +09:00
Tadashi G. Takaoka
8c3d5b6961 Add com.android.inputmethod.latin.suggestions package 
Change-Id: If4b823768ab9c073625da3034ecc8091be1df230
 2011-12-16 14:21:44 +09:00
Tadashi G. Takaoka
8950f259b1 Merge "Make Key.mPreviewIcon public final" 2011-12-15 21:20:46 -08:00
Tadashi G. Takaoka
0b6237da94 Make Key.mPreviewIcon public final 
Change-Id: I280b1fa6a018e095e9b36ea5475dde68e0965350
 2011-12-16 12:47:34 +09:00
Tadashi G. Takaoka
a44685ab32 Add colorValidTypedWord and alphaValidTypedWord 
This change fixes Gingerbread theme.

Change-Id: I142437ac0173df48ab36390f47ed67c6cea24a65
 2011-12-16 12:26:19 +09:00
Tadashi G. Takaoka
e9a0efc242 Merge "Cleanup unused variables and parameters" 2011-12-15 18:02:38 -08:00
Tadashi G. Takaoka
2ac5988f84 Cleanup unused variables and parameters 
Change-Id: Iad756a7a775c93f3344c6962e7b3456ef8339490
 2011-12-15 20:26:12 +09:00
Jean Chalard
05f654d498 Merge "Group all input-related info into an inner class." 2011-12-15 03:21:47 -08:00
Tadashi G. Takaoka
c3ef86d861 Merge "Fix auto correction spacebar LED" 2011-12-15 03:19:32 -08:00
Jean Chalard
27dff63833 Group all input-related info into an inner class. 
Currently, these variables hold the info about the composing
word, or maybe some outdated info, and it's not very clear
which it is. LatinIME is maintaining the freshness info in
a separate boolean, and uses it throughout the code for many,
many things, leading to much confusion.
The idea in grouping this info is, it can be saved in another
instance and restored later. It can be tested against to know
whether there is actually outdated but kept info or not, and
it should allow to straighten out what is actually currently
being typed. Ultimately, it will eliminate the need for
LatinIME to keep track of the status of the info in the
word composer.

Change-Id: I00e2c690f303f8320c9be35590a6df4583e9e456
 2011-12-15 19:58:04 +09:00
Tadashi G. Takaoka
2d74806262 Change visibility to avoid synthetic accessor method 
Change-Id: Ie93c7437fb9a3fe63adaa48c2d4a723f96c0a0e1
 2011-12-15 19:50:53 +09:00
Tadashi G. Takaoka
23d27fefcb Fix auto correction spacebar LED 
Change-Id: I4894d188d5612380cc9f8eec7cb72544e37fb2b0
 2011-12-15 17:34:14 +09:00
Tadashi G. Takaoka
b8c2c6e2ec Merge "Add XmlParseUtils class" 2011-12-14 03:02:17 -08:00
Tadashi G. Takaoka
d549d4334f Merge "Remove long press settings key function" 2011-12-14 03:02:09 -08:00
Tadashi G. Takaoka
17dc10724b Remove long press settings key function 
Bug: 5759092
Change-Id: I328e2043075ce5d0d0285febc4a9b7356702c250
 2011-12-14 19:47:17 +09:00
Tadashi G. Takaoka
4665463ccd Add XmlParseUtils class 
Change-Id: Ie288272bc75832db7d743262c4c4fbe73b6dca04
 2011-12-14 19:46:03 +09:00
Tadashi G. Takaoka
6652e45899 Merge "Move Keyboard.themeName to KeyboardSwitcher and make it private" 2011-12-14 02:43:06 -08:00
Tadashi G. Takaoka
90c12077b2 Merge "Remove EditorInfo from KeyboardId" 2011-12-14 02:42:58 -08:00
Tadashi G. Takaoka
7a91deb685 Move Keyboard.themeName to KeyboardSwitcher and make it private 
Change-Id: I101b6927d43e86b3c636c1a527e181df8af9c73e
 2011-12-14 19:01:20 +09:00
Tadashi G. Takaoka
a042150a69 Merge "Just ignore settings/shortcut key while typing on tablet" 2011-12-14 01:59:46 -08:00
Tadashi G. Takaoka
2d603fff64 Remove EditorInfo from KeyboardId 
Change-Id: I70919ff30622afa1d8c29ca45589fa617f2c1f0e
 2011-12-14 18:58:55 +09:00
Jean Chalard
9750165c9a Merge "Cleanup" 2011-12-14 01:50:25 -08:00
Tadashi G. Takaoka
014b755f8a Merge "Cleanup KeyboardId's hasCode method" 2011-12-14 01:48:46 -08:00
Jean Chalard
f3ca6a59a7 Cleanup 
Change-Id: I724df0be7ac07ffb9f1f4974175aed5a2606221b
 2011-12-14 18:42:47 +09:00
Tadashi G. Takaoka
601e411c13 Cleanup KeyboardId's hasCode method 
Change-Id: I5fd8f6ac0f42152fb0e2aaaedc6092f6d82fe677
 2011-12-14 18:42:20 +09:00
Jean Chalard
64361bd66d Merge "Move some code inside a function to simplify flow" 2011-12-14 01:42:17 -08:00
Jean Chalard
676917dea2 Merge "Fail faster in case of a bug" 2011-12-14 01:42:05 -08:00
Tadashi G. Takaoka
2c4b21d7ca Merge "Cleanup settings key related stuff" 2011-12-14 01:36:34 -08:00
Jean Chalard
1c6cf26c37 Move some code inside a function to simplify flow 
Also rename the function to reflect better the behavior.
An upcoming change will clean up the remnants

Change-Id: I19bdf0d9e95f62ee749e1f64fe17132c4a5ef0bc
 2011-12-14 17:56:57 +09:00
Jean Chalard
46798d8f1f Fail faster in case of a bug 
Change-Id: Ibea64133f200dce80034c641d4798b62843a2512
 2011-12-14 17:54:18 +09:00
Tadashi G. Takaoka
623d0155b6 Just ignore settings/shortcut key while typing on tablet 
Bug: 5759096
Change-Id: Ie1f1800d0f32ac0938715c79974e0f382c9c3d27
 2011-12-14 17:14:44 +09:00
Jean Chalard
b588003426 Refactoring. 
Small simplification of the code.

Change-Id: I1f67ae529bbb2c9316bf5e083d367c57040ea22c
 2011-12-14 16:59:25 +09:00
Tadashi G. Takaoka
8b1b8aae9c Cleanup settings key related stuff 
Change-Id: Ie0d1204e94fcdf9d578974256bf2ae3e87797f13
 2011-12-14 16:34:35 +09:00
Tadashi G. Takaoka
e35e13fc7d Merge "Record onStartInputView" 2011-12-13 23:31:43 -08:00
Tadashi G. Takaoka
689b901156 Merge "Utilize KeyboardSet XML definitions" 2011-12-13 23:31:00 -08:00
Jean Chalard
dbdb385bb0 Merge "Fix a long-standing race condition." 2011-12-13 23:29:47 -08:00
Tadashi G. Takaoka
f86109ca56 Utilize KeyboardSet XML definitions 
This change introduces KeyboardSet and SubKeyboard XML definitions to
represent a set of keyboard layouts.

Bug: 5002108
Bug: 5679585
Change-Id: Ib6c8d5936187381bb6725c9fe574e93871c01a86
 2011-12-14 16:28:31 +09:00
Jean Chalard
514beb0992 Fix a long-standing race condition. 
Upon autocorrection, there is visual feedback in the text
view that quickly flashes the background of the text that
just changed. This fixes a race condition that happens
upon autocorrection when typing fast, and that results in
flashing one character too far left (typically, the flashing
area includes the whitespace before the corrected word and
not the last character of the corrected word).
This happens because the call to commitCorrection may
happen before or after the IPC sent by sendKeyChar, but the
arguments are fit only for the case where it arrives first.

Change-Id: I9b5442a665aad5a9bc66cd49228075b9056b37fa
 2011-12-14 16:24:18 +09:00
Tadashi G. Takaoka
7ef235f53f Record onStartInputView 
Bug: 5722703
Change-Id: I56bcf6ccde82b4176093de4f197a8736b0cc8c10
 2011-12-14 16:22:30 +09:00
Jean Chalard
8e3faff244 Merge "Decouple member logic from control flow" 2011-12-13 06:28:48 -08:00
Jean Chalard
7b5bc1ff4d Decouple member logic from control flow 
This place is very confusing because a member variable with
a consistent meaning is hijacked for the duration of a function
to mean something else. This is in the way of easy-to-understand
refactoring.

Change-Id: If79bc771950d6bfc0ad5f0e9c51c7ef1dbb45b66
 2011-12-13 23:15:12 +09:00
Jean Chalard
f7d6517d6b Various mini-cleanups 
- Stop the word composer from escaping - take a page from the law
  of Demeter and only report what is actually needed.
- Fix typos in comments.
- Add a comment for a fishy processing.
- Remove a useless local variable.

Change-Id: I5fa78901cbb5483fc9683bfb7094f47244b85df6
 2011-12-13 23:09:22 +09:00
Jean Chalard
edf4995a3b Merge "Remove the input connection sidework from handleCharacter" 2011-12-13 04:28:30 -08:00
Jean Chalard
dafa7a8e15 Remove the input connection sidework from handleCharacter 
Change-Id: I3d376dfda3acd8864274390de3ff5752b18456e0
 2011-12-13 21:12:07 +09:00
Jean Chalard
117fc93f37 Move mBestWord to the word composer. 
mBestWord has a confusing name - it's actually an auto-correction.
It's cleaner if it lives in the word composer because an
auto-correction should be tied to a specific user input, and
should be reset each time the user input changes to avoid
race conditions.

Change-Id: I718d29395bc747372067e6440e090c6a181994ae
 2011-12-13 21:06:51 +09:00
Jean Chalard
7e6f4daa19 Merge "Tighten conditions for space-related cancelling" 2011-12-13 01:23:15 -08:00
Jean Chalard
c525750835 Merge "Consolidate underlining code under one function." 2011-12-13 01:22:08 -08:00
Tadashi G. Takaoka
cfe264bfee Merge "Introduce KeyboardSet to hold related KeyboardIds" 2011-12-13 01:12:10 -08:00
Tadashi G. Takaoka
c42f285b35 Introduce KeyboardSet to hold related KeyboardIds 
This change moves
  * KeyboardSwitcher.getKeyboardId to KeyboardSet.<init> and
    KeyboardSet.getKeyboardId.
  * KeyboardSwitcher.getF2KeyMode to KeyboardSet.
This is the first step to get rid of shift state from Keyboard.

Bug: 5002108
Bug: 5679585
Change-Id: I2a5a97e5e89277bc606916d45c1afbc8d105d773
 2011-12-13 18:10:50 +09:00
satok
3dcba4279a Merge "Extract the jni library name" 2011-12-13 00:46:16 -08:00
Jean Chalard
77d59b0691 Consolidate underlining code under one function. 
Change-Id: I4393ff1ec28a6b3118d1344dd6d82d04899dea42
 2011-12-13 17:42:27 +09:00
Jean Chalard
8ad4013406 Tighten conditions for space-related cancelling 
Instead of ignoring silently a found bug, throw an exception.

Change-Id: I0aa96d0cab022b6a5e7cffe8a592dcc443c3c7a8
 2011-12-13 17:40:06 +09:00
Tadashi G. Takaoka
77ecf52a08 Merge "Remove KeyboardSwitcher.updateShiftLockState method" 2011-12-13 00:27:01 -08:00
satok
ba526e3157 Extract the jni library name 
Change-Id: Icc58ccea1178d9f35f5be0dceebab67bbb965b7f
 2011-12-13 17:25:43 +09:00
Tadashi G. Takaoka
34f1820396 Remove KeyboardSwitcher.updateShiftLockState method 
Change-Id: I032fc50a62a573ba4258530e695c8c88467783c6
 2011-12-13 16:57:23 +09:00
Jean Chalard
14cb8448df Remove a useless return 
Change-Id: Iefe10e94e2d88171387351a5b6cab52e281d0f76
 2011-12-13 16:48:28 +09:00
Jean Chalard
8e404536cd Merge "Simplification" 2011-12-12 23:39:12 -08:00
Jean Chalard
cf5cecccfe Merge "Refactoring" 2011-12-12 23:39:00 -08:00
Jean Chalard
024ee9ff02 Merge changes I7888797c,I57b2232f 
* changes:
  Refactor + small bugfix
  Refactoring
 2011-12-12 23:38:17 -08:00
Jean Chalard
2939063947 Simplification 
Both tests have the same meaning. They should be merged.
Also, if "deleteLast()" deletes more than one char (which
never happens in the current implementation, but it's not
guaranteed), the new code is more correct.

Change-Id: I216df7cd45f4a7d76d1d5d6aa7f8d7f9a6e35ea3
 2011-12-13 16:06:00 +09:00
Jean Chalard
d2c69c7d12 Refactoring 
If mHasUncommittedTypedChars is true, then
mWordSavedForAutoCorrectCancellation must always be null, and
spaceState must always be SPACE_STATE_NONE.
Hence, this change is supposed to be very no-op.

Change-Id: I2716f7372d996cc4dec40a4b7ac1ee7f5f4afe91
 2011-12-13 16:04:11 +09:00
Jean Chalard
2245c3b5b3 Refactor + small bugfix 
postUpdateShiftKeyState used to be called also when
mEnteredText is not null => this is a bugfix.
The rest does not change the logic, as posting a message can
be done anywhere within the function with no impact.

Change-Id: I7888797c0778702d64f96701e35b611a55a6a259
 2011-12-13 15:59:36 +09:00
Jean Chalard
a2a85d45e0 Refactoring 
Change-Id: I57b2232f7fde32df5f6e1925aad1df988def34f9
 2011-12-13 15:38:49 +09:00
Tadashi G. Takaoka
dc52e7c646 Remove current keyboard id variable 
Change-Id: Iec19af98209e1ea8ecd176d3be04d628d4b38950
 2011-12-13 12:49:40 +09:00
Jean Chalard
34081186f9 Merge "Fix a bug where revert auto-correct would revert too much" 2011-12-12 04:46:27 -08:00
Jean Chalard
5c3ff4c9c8 Fix a bug where revert auto-correct would revert too much 
If there are no uncommitted chars, we shouldn't enter any of
the tests that follow. We didn't use to, but a change today
made it possible - it should not happen.
There is no point in doing the rest of the tests, they are
sure to fail.

Change-Id: I580dd104aff3585de72a93b38989bfd9713f615b
 2011-12-12 21:27:16 +09:00
Jean Chalard
4f41cbc588 Remove a useless function call 
Change-Id: I1a775cbf90dca301e1e6b596ddac64fdbc023199
 2011-12-12 20:51:43 +09:00
Jean Chalard
dcf8a6b2c6 Merge "Move a settings var to the settings class" 2011-12-12 03:31:42 -08:00
Jean Chalard
2a659b8aa6 Remove a useless variable 
This can be just read when it's needed.

Change-Id: I00753fe55645c244db5d4a96e7fdb8f5325475d9
 2011-12-12 20:22:39 +09:00
Jean Chalard
d567b230b0 Move a settings var to the settings class 
Change-Id: I1331ad6dec3a9d64a77e314f8a1f4c29282df31b
 2011-12-12 19:52:17 +09:00
Jean Chalard
7208af0ecd Remove a messy and unused class. 
Today is a happy day

Change-Id: I3ef484bd258d5a59815bfcb0bd35ea3606b32430
 2011-12-12 19:31:29 +09:00
Jean Chalard
f162ed7ec8 Merge "Remove side-effects from TextEntryState" 2011-12-12 02:20:49 -08:00
Jean Chalard
406d192a9e Remove side-effects from TextEntryState 
Change-Id: Ib98eea9e791e426435cfdfd0c9ab3ed9061664aa
 2011-12-12 19:19:39 +09:00
Tadashi G. Takaoka
267cd0151f Add special handling for "Phone number" layout. 
Bug: 5743584
Change-Id: I821b837a2078afb64b460191c98b28f7733cf2c1
 2011-12-12 18:19:29 +09:00
Tadashi G. Takaoka
aa59e24ebe Merge "Add unit test of KeyboardState" 2011-12-12 00:15:42 -08:00
Jean Chalard
c2a76a1529 Remove a useless variable. 
Change-Id: Iea5ce5cfc05bad8b1d9085438e90147bd54b7e9c
 2011-12-12 16:49:32 +09:00
Jean Chalard
205f9ca310 Merge "Straighten out logic for revert word paths" 2011-12-11 23:48:06 -08:00
Jean Chalard
890d13189d Straighten out logic for revert word paths 
This also includes a new memorized string with simpler
logic that will allow to remove other members

Change-Id: I0b97243084902e68fcb835b6163c86fef8190ebc
 2011-12-12 16:41:49 +09:00
Tadashi G. Takaoka
dfbe254de6 Add unit test of KeyboardState 
Bug: 5708602
Change-Id: I1a8a9f4320948bb500a96df8773b0bfa1a1d4167
 2011-12-12 16:34:11 +09:00
Tadashi G. Takaoka
243e034716 Merge "Assign Key.mCode from the label only when outputText is not specified" 2011-12-11 23:32:32 -08:00
Tadashi G. Takaoka
06b886f372 Merge "Move KeyDetector.printableCode to Keyboard" 2011-12-11 23:32:25 -08:00
Tadashi G. Takaoka
7dfd5a3e83 Move KeyDetector.printableCode to Keyboard 
Change-Id: I9cde21fbb45c1e5f1a568bb97b1b1a76524f4bf2
 2011-12-12 16:17:45 +09:00
Tadashi G. Takaoka
de66f3af8a Assign Key.mCode from the label only when outputText is not specified 
Bug: 5742827
Change-Id: I72b55ce246b14a2d8f4fd16211b71dc716db30b2
 2011-12-12 16:15:18 +09:00
Jean Chalard
86344836ee Merge "Remove a duplicated variable." 2011-12-11 21:26:31 -08:00
Tadashi G. Takaoka
2ba1bcccdd Remove unused Keyboard.CODE_CANCEL 
Change-Id: Ic2eab17e525901a1cf7096ebe7d24ae78624ed2e
 2011-12-12 12:56:30 +09:00
Jean Chalard
3651220327 Remove a duplicated variable. 
This is awesome cleanup.

Change-Id: I35ce8940a13f3084630dc26d6e7e397acfdaac36
 2011-12-12 12:06:41 +09:00
Ken Wakasa
9260422423 Build God Mode keyboard with API level 14 
Change-Id: I29ab9e9041c9faac91dc303175625221bfdb3af8
 2011-12-10 03:45:40 +09:00
satok
4af5e3c5f4 Fix isResearcherPackage 
Change-Id: I286450fe89a37d75cb398f17d300ddc6f5857ffd
 2011-12-10 01:16:16 +09:00
Ken Wakasa
2edd109f84 Some tweaks for Researcher Mode 
Change-Id: I6b16dd2fe6d7356c747ba0ee2da5976738003ded
 2011-12-10 00:35:50 +09:00
satok
2a89e36db0 Merge "Add a functionality to attach a log file to Gmail app Bug: 5722703" 2011-12-09 05:59:36 -08:00
satok
a8b6292cee Add a functionality to attach a log file to Gmail app 
Bug: 5722703

Change-Id: I089f944bdbf2cbb036eb59dd9b5b414370c770f1
 2011-12-09 22:38:15 +09:00
Tadashi G. Takaoka
963abf4bcc Merge "Remove unused public methods from KeyboardState and KeyboardSwitcher" 2011-12-09 04:38:14 -08:00
Jean Chalard
74671cf6c5 Resolve TODOs: add members to hold preferences 
Change-Id: I34f6c76bf9318e1fbe8eb5ffab6772a98ff824e0
 2011-12-09 21:24:13 +09:00
Tadashi G. Takaoka
df9deffba2 Remove unused public methods from KeyboardState and KeyboardSwitcher 
Bug: 5708602
Change-Id: I3dbc3cd00aa9ddf611e2078ff2cfea8945fa09bf
 2011-12-09 21:14:13 +09:00
Jean Chalard
0fe3611bee Resolve TODOs: add some members to store prefs 
Change-Id: Idf09cb5d801e8008eb63cbb5138058faeb7db136
 2011-12-09 20:16:57 +09:00
Jean Chalard
85b063f97e Resolve TODOs: add members to store raw settings 
Change-Id: I481eadb6a73faf239e24d05b7e220fcb01194fa4
 2011-12-09 19:03:55 +09:00
Jean Chalard
12f10e1585 Read options in the declaration order 
Change-Id: I1a7c4d0bcaedad6d4045c36c79280c23234db5b3
 2011-12-09 18:58:24 +09:00