Commit graph

3533 commits

Author SHA1 Message Date
satok
c59e383977 Merge "Do not change the proximity orders" 2012-03-15 21:09:46 -07:00
satok
ef08daddea Do not change the proximity orders
Bug: 4343280
Change-Id: I4e2dfb00d9c843a8a285d409ac5ab8fca5fb1694
2012-03-16 12:54:17 +09:00
Jean Chalard
c24f66e180 Streamline some user history dictionary code
A lot of things don't really make sense in the old code.
Let's streamline it for now so that we have a cleaner interface
to work with. This is preliminary work for bug 4192129.

Change-Id: If01a5974cfadc43afced610c57fcf7fde67c1346
2012-03-16 12:22:39 +09:00
Tadashi G. Takaoka
b9720a55b4 Don't reset animation alpha value when keyboard is set
The keys' blinking that mentioned in the bug is caused by switching
keyboard layout resets the animation's alpha value to opaque but the
animation is still running and changing the alpha value
asynchronously.

I think that switching keyboard layout between alphabet and symbols
doesn't imply that the user stops typing. So the keyboard view should
continue typing state timer to keep animations' alpha values changing
and never reset the value.

Bug: 6174273
Change-Id: Id795feaf44750358f30c1b3dc8e783a7e62aefe8
2012-03-16 10:08:48 +09:00
Eric Fischer
40a50ad738 Import translations. DO NOT MERGE
Change-Id: I128134e201273b00478beb3d091952dd5530230c
2012-03-15 15:13:26 -07:00
Tadashi G. Takaoka
5bee1b00c8 Merge "Remove touch dead zone" 2012-03-15 05:16:56 -07:00
Tadashi G. Takaoka
723aaa2eeb Remove touch dead zone
KeyDetector should use the distance from the hit box to detect the
key.

Bug: 6174250
Change-Id: Id1745d90222d1d1a10467f194b45307c12449944
2012-03-15 20:16:43 +09:00
Jean Chalard
3fe263fac6 Extract an annoying method call
Change-Id: I78f22bb38222fea54a55e460fcf728bf941d15e9
2012-03-15 19:30:15 +09:00
Jean Chalard
6ec1209a33 Fix a bug where quotes and dashes are considered letters
Bug: 6174065
Change-Id: I702760d44ead0eeb60d06360aa3bb03c2ec73325
2012-03-15 18:18:52 +09:00
Jean Chalard
2be7a37acf Small cleanup
Exit-fast, update comment, make a method private

Change-Id: Id103bf03aeef43a1a4d064ecabb819490dc5d39a
2012-03-15 15:54:25 +09:00
Jean Chalard
7c5f2bbd2a Remove useless code
I tracked all the calls to the constructor, and the passed
list is never null. It's also final, so it's safe.

Change-Id: I320f907acee0b237bb286a9a183c18106809174a
2012-03-15 15:10:07 +09:00
Jean Chalard
042557b45b De-duplicate a method
Change-Id: Ia1c80eeff00a55573bb311f07e1275da23bdcf98
2012-03-15 15:04:29 +09:00
Jean Chalard
e8ddfe4273 Remove useless code
Change-Id: I58de87c1ba4cd1130419191f63ff83b685604356
2012-03-15 14:51:22 +09:00
Jean Chalard
4e74658883 Optimization
All calls to this methods are made with an actual String. No sense
beating ourselves with an interface stick.

Change-Id: I6ef98286be6f81f73864b04f3a17e68f36a6e542
2012-03-15 14:48:47 +09:00
Jean Chalard
123407261c Stop meaningless explicit null passing
Change-Id: I6950897d262f610d502b7f8293b9dd8d2b53e6e8
2012-03-15 14:37:40 +09:00
Jean Chalard
3187ba5dfe Remove a now-useless flag.
This has been moved to the SuggestedWords object and is now
represented by a single flag instead of a flag in each suggestion.

Change-Id: I6e9a7cff5a7701de7e61b4de13baac25c9a87b1b
2012-03-15 14:21:02 +09:00
Jean Chalard
4f6cf258fe Use the unique flag in SuggestionsView
Also, the first word in a sugestions list can never be
obsolete.

Change-Id: Ib21439aac8db4e6ce5b15b7a2aabe4222bc354db
2012-03-15 14:11:41 +09:00
Jean Chalard
03a3517075 Add info for obsolete suggestions in SuggestedWords
Change-Id: I9684c7b08244b34853ce8a99b6e9d885389f6687
2012-03-15 13:12:08 +09:00
Jean Chalard
5f9593593e Remove useless stuff
Change-Id: I43dae30774c40a9d6e7396f8fa73ed4b82a7c777
2012-03-15 12:47:05 +09:00
Jean Chalard
ca3e7cbdf4 Move a computation closer to where it's used.
Change-Id: I5aee4c36ceaacbb1dbfc47c011f1e4aec4b9dca6
2012-03-15 12:23:16 +09:00
Jean Chalard
eb5ffdac90 Merge "Some readability improvement" 2012-03-14 18:47:32 -07:00
Jean Chalard
c787db51ed Merge "Cut out a private method to make things more readable" 2012-03-14 18:47:26 -07:00
Jean Chalard
b9a5cb77f0 Merge "Minor optimization" 2012-03-14 18:47:21 -07:00
Jean Chalard
53d57ad6d3 Merge "Some code simplification" 2012-03-14 18:47:16 -07:00
Eric Fischer
03bcc5faff Import translations. DO NOT MERGE
Change-Id: I792cacc137b1b782c28b258bf91bf475bd0ced89
2012-03-14 14:45:18 -07:00
satok
05c54ffc7f Merge "Really pass the y - touch correction to the native code" 2012-03-14 06:47:19 -07:00
satok
853d9020ed Really pass the y - touch correction to the native code
Bug: 4343280

Test:  I11f8518d9ee

Change-Id: I4b90bdffffed9736af223ac83c1a54019add70bb
2012-03-14 21:54:52 +09:00
Tadashi G. Takaoka
6bc9186457 Disabled key should respond if it is in the altCodeWhileTyping state
Bug: 6128215
Change-Id: I81e9980f8ffa5c5eaba30676c8433f542645de1d
2012-03-14 20:17:42 +09:00
Tadashi G. Takaoka
3848ca6729 Merge "Gray out "alt-code-while-typing" key icon while typing" 2012-03-14 03:36:56 -07:00
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