82793f2f85
Merge "Avoid using interface member, use concrete collection class instead"
2012-03-13 06:25:39 -07:00
ce96959518
Avoid using interface member, use concrete collection class instead
...
Change-Id: I8b647e8c260aec58c557ce07f3a2d8987c24d7be
2012-03-13 22:20:34 +09:00
0bd4699f9c
Merge "Update other alt keys' graphics"
2012-03-13 06:19:53 -07:00
faad353fea
Update other alt keys' graphics
...
Change-Id: I12699907a514f5fc2e110a0a711fb91c14a8756f
2012-03-13 22:12:40 +09:00
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
e1a91d0b26
Merge "Avoid using collection interface, using array instead"
2012-03-13 05:19:47 -07:00
b4fbbe57f5
Avoid using collection interface, using array instead
...
Change-Id: Ie0554362b73967bfcbbab6ad19c24683066a608e
2012-03-13 20:53:15 +09:00
e3afb7d192
Make the Builder fully immutable at last
...
Change-Id: Ie399ca7a9e76ccab44a92bc378d11f92392fed2c
2012-03-13 20:33:13 +09:00
6ffb5018c1
Straighten out the last bastion of the Builder
...
...and go for the kill
Change-Id: I5ad57211b250d2578ca22a5dae93344d52f9da80
2012-03-13 20:26:47 +09:00
ec471c72f8
Add to SuggestedWords a missing parameter, and use it.
...
Also stop using Builder between its creation and the call to
the #build() method.
Change-Id: Ie1fc3ec7b6f4c7c3789f672f4e26b4bf58c3e062
2012-03-13 20:19:21 +09:00
2e2519ee91
Make still more members of the Builder final.
...
Change-Id: Ic455f97247da5e40d4939555ab639ecffef36e2d
2012-03-13 20:05:00 +09:00
edf5daa8ed
Merge "Support invalidating multiple keys in KeyboardView"
2012-03-13 04:00:15 -07:00
bd4ba23d2b
Some code reorganization.
...
Use the same local variable inside both branches of an if.
Change-Id: I61f7d506d984f3723ec90604416d1875dd97cd8c
2012-03-13 19:54:56 +09:00
b5eeb724fc
Make some more Builder attributes final.
...
Change-Id: I3132b7fe4ee97c566736bfc21c3783cfc79fc7ff
2012-03-13 19:53:38 +09:00
c60fea852d
Make the suggested word list final in Builder.
...
Change-Id: I2ddfab00dc8c141fc989a051f16eb2b3571b7e86
2012-03-13 19:37:17 +09:00
08adb09e14
Remove unused stuff.
...
Remove 2 methods that were left only for tests to compile in
another project, but are not used any more now that the tests
have been updated.
Also remove an attribute that is never read.
Change-Id: Ic9ba1f52a465199c82c923d77ed7450460e8a4b9
2012-03-13 19:37:16 +09:00
9ffaae71d9
Merge "Make an add into a set."
2012-03-13 03:35:17 -07:00
728fd52b63
Merge "Pass the locale to the native code"
2012-03-13 03:27:11 -07:00
7ef1dabd92
Pass the locale to the native code
...
Change-Id: I8f73b9b33cca56b3fa44ec6259c0896be22f4a47
2012-03-13 19:16:33 +09:00
674ffcdf93
Make an add into a set.
...
This method now only sets words, so it should be named set.
The functionality is identical since there are no more places
where the list is reused.
This will also allow to make the list final in an upcoming change.
Change-Id: I25b0c7d7f13c3fa5d89806f01f48f1026769603f
2012-03-13 19:07:42 +09:00
299ac263b3
Support invalidating multiple keys in KeyboardView
...
Change-Id: I347ccfc2cf60c17f5f0eddec6566662cb3a954ca
2012-03-13 18:55:05 +09:00
d6662ecd30
Cleanup
...
Remove an unused method, make others static, fix a formatting
issue
Change-Id: I40cb0b5e01a6f8e2f7b953bd9aad3168dfee71d1
2012-03-13 18:34:19 +09:00
4ee186920e
Remove a method that causes annoying side-effects.
...
...and replace by a call to a central method.
Change-Id: I93d0a2c2e99963a5b69923d1062d0e01853216b6
2012-03-13 18:22:49 +09:00
b8753eb31c
Merge "Kill the StringBuilderPool."
2012-03-13 02:14:37 -07:00
adf218eed5
Kill the StringBuilderPool.
...
The intention may have been nice originally but these end up
being copied anyway :/
Let's remove them now, and in a later change, just keep
references to the created objects.
Change-Id: Ifba8357c20384f9eb40cd916665ed1fc6dc8cab1
2012-03-13 17:59:49 +09:00
8e08bfb8de
Merge "Implement additional proximity characters in the native code Bug: 4343280"
2012-03-13 01:41:46 -07:00
552c3c27f0
Implement additional proximity characters in the native code
...
Bug: 4343280
Change-Id: I9bbc5cab2fef1ee80c1fe32017df811ef8af10bc
2012-03-13 17:38:50 +09:00
aee5f03d6e
Use integer alpha value instead of factor for animation
...
Change-Id: I3099a7625e0176a1d2be42e58d6eb5fa95797bcb
2012-03-13 16:47:45 +09:00
95fcb0cce9
Merge "Remove a useless parameter."
2012-03-13 00:26:06 -07:00
dabf96896e
Move language on spacebar parameters to LatinKeyboardView attributes
...
Change-Id: I06e5d7d158a9b14b00df34e68b12cd012faf17d1
2012-03-13 16:17:13 +09:00
d0d4074392
Remove a useless parameter.
...
Change-Id: I7625bf17158c207ad7e8cd496bef825704173c4c
2012-03-13 15:34:06 +09:00
6fbcd0d219
Merge "Use Animator to draw language name on spacebar"
2012-03-12 22:57:57 -07:00
4c0c638a18
Use Animator to draw language name on spacebar
...
Note that Animator class exists in framework only on Honeycomb or
later.
Change-Id: Ie3392dbf8acc1547ebb2d16e04086c911d961aed
2012-03-13 14:25:57 +09:00
7c9bff96f0
Kill methods with side-effects, take 2
...
...working this time
Change-Id: I80e377e6250d3817f1e067a551bca2a557740764
2012-03-13 14:18:30 +09:00
041c3d3841
Merge "Tweak 7 inch layout a bit"
2012-03-12 21:01:56 -07:00
70a9bcf8c0
Merge "Revert "Kill methods with side-effects""
2012-03-12 19:42:42 -07:00
b26af7eae7
Revert "Kill methods with side-effects"
...
This reverts commit ca0e048688
2012-03-12 19:42:29 -07:00
ae649580f4
Merge "Kill methods with side-effects"
2012-03-12 19:17:21 -07:00
8b4148e757
Import translations. DO NOT MERGE
...
Change-Id: I8546456a3d567b821a5a409a7459f9043fa04315
2012-03-12 15:25:23 -07:00
ca0e048688
Kill methods with side-effects
...
Change-Id: I42baeec68eb2540e7d8f8538ae2dceeef5594391
2012-03-12 19:48:32 +09:00
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
f62d6f50f2
Merge "Consolidate words into SuggestedWordInfo"
2012-03-12 03:14:54 -07:00
c3c4ed91cf
Consolidate words into SuggestedWordInfo
...
We can't get rid of SuggestedWordInfo because it conveys
the information about whether a suggestion is outdated or
not. It is always created anyway. So it makes sense not
to have separate lists and to just keep everything in the
SuggestedWordInfo object.
Change-Id: Idd79dc267d97633901d3d2869da457736963e178
2012-03-12 18:58:20 +09:00
fe2dc348e5
Add AZERTY compatible symbols/symbols shifted layouts for tablet
...
This change also adds Spanish compatible symbols/symbols shifted
layouts for tablet.
Bug: 6100832
Change-Id: Ib5ed9856573657b2680e08f9e64fd09b12a0a27d
2012-03-12 17:53:23 +09:00
546692daac
Merge "Support disableAdditionalMoreKeys and disableKeyLabelHint"
2012-03-12 01:48:05 -07:00
b03529aa01
Support disableAdditionalMoreKeys and disableKeyLabelHint
...
Change-Id: Idfa586417acd4a223380d52f044e3a86eb780b21
2012-03-12 17:45:57 +09:00
a3f2ce1f31
Merge "Fix an OOB"
2012-03-12 01:12:40 -07:00
c0c20b386f
Fix an OOB
...
The combination of I6b0262fe which removes the internal
size() > 1 test in the safety net calculation and I642a5893
which assumed DBG means there is at least one suggestion.
This change writes the test correctly.
Change-Id: Ib63bce4e163a785f408dd145c23d64cd58fa8c90
2012-03-12 16:50:58 +09:00
b6895aec05
Merge "Rename keyboard XML files"
2012-03-12 00:42:03 -07:00
47141f7011
Rename keyboard XML files
...
* Slavic to East Slavic
* Serbian to South Slavic
* Scandinavian to Nordic
Bug: 6150183
Change-Id: I8f5641aa07b83cbb225f5fd73e351a6f8abe0784
2012-03-12 16:39:29 +09:00
30936116d8
Merge "Make a method accessible for tests"
2012-03-12 00:23:29 -07:00
9dedec7c29
Make a method accessible for tests
...
Tests are using a wrapper method that's going to disappear soon.
The method that becomes package-visible now is destined to be
removed too a little later.
Change-Id: If99b1c77ed52e050b47216cc7afab5f35c4bbb38
2012-03-12 16:11:16 +09:00
1dfef0336d
Make a method static
...
Change-Id: Ie1d460562d38105abe91ae2da17cafd49e2cd394
2012-03-12 15:00:36 +09:00
2de0c4b754
Merge "Separate Greek semicolon key from row"
2012-03-11 21:01:53 -07:00
0acfaa77ac
Merge "Breakdown Slavic keyboard into rows"
2012-03-11 21:01:48 -07:00
b30e719286
Separate Greek semicolon key from row
...
Change-Id: Ie568da868a0bed4f72652cf7475bdeb752be1f5b
2012-03-12 12:30:24 +09:00
df22f71a16
Merge "Breakdown Serbian keyboard into rows"
2012-03-11 20:06:47 -07:00
b577005a36
Breakdown Serbian keyboard into rows
...
This change also slightly re-design 7-inch and 10-inch tablet layout
Change-Id: Ibfe11386d865f7c3becf4a60286557921f95036d
2012-03-12 11:30:12 +09:00
2f85034c5d
Breakdown Slavic keyboard into rows
...
Change-Id: Iff2048839a51e14351ba235ef9d7f5ecbef159e3
2012-03-12 11:29:27 +09:00
fd7b510b24
Breakdown Hebrew keyboard into rows
...
Change-Id: I25c928a3251424280e2ac4f065126c3019734d20
2012-03-12 10:25:13 +09:00
c1ca8815f5
Fix an obvious bug in handleLanguageSwitchKey()
...
bug: 5759092
Change-Id: I8c7b2ef024cbab399d96f6b3ec553da4e9d2fb18
2012-03-11 00:44:47 +09:00
1ce5ff63b1
Import translations. DO NOT MERGE
...
Change-Id: Ie0609f97096ad1e9dfa8f9b778047723dcf9868f
2012-03-09 14:04:54 -08:00
1a85b74adb
Entirely remove safety net memory.
...
mHasAutoCorrectionCandidate now includes the fact that this
did not get caught by the safety net. This is more intuitive.
Change-Id: I6502bbf1ca64a0a6d64f55d723305cf78352a656
2012-03-09 22:10:25 +09:00
68823ae08e
Make the safety net memory private
...
Change-Id: I10959d47c980d2e8f2ea995955acf02193e3ff7b
2012-03-09 22:01:15 +09:00
ebbb7e9665
Recompute safety net in debug cases instead of memorizing
...
Change-Id: I67f3a31db081afa4871ec441dd461c56e098c668
2012-03-09 22:00:23 +09:00
682c2d53cc
Make access to the safety net calculation easier
...
Change-Id: If33897b38af94ae81b05e5ef140a542724b9f34a
2012-03-09 21:44:40 +09:00
151d5cb532
Extract a condition from a method
...
Change-Id: I6b0262fe7cb3f7a31cc19d724c301467be932640
2012-03-09 21:37:44 +09:00
36c1b37914
Remove a useless argument
...
Change-Id: I713433a3225193489fad5bdafcf302b529903116
2012-03-09 21:24:47 +09:00
28e59b98c6
Remove a useless escape
...
Change-Id: I1ef0685cc9888c9cef9f60015d32b66dde75ef9b
2012-03-09 21:10:55 +09:00
d5f618e90a
Remove a useless test
...
If we are not composing a word here, we have already returned
Change-Id: I63281abace777e3658286d4df6781d2cd5a29c33
2012-03-09 20:53:45 +09:00
c5d2bb786e
Don't use an intermediate object with a different meaning
...
Change-Id: Ie89916b49c852a51385ffd61cb596a58f23a46a0
2012-03-09 20:51:33 +09:00
ed9986824e
Move some auto-correction logic to where it belongs
...
Change-Id: I897c5ec3a630a4a6bfc593906df4d3fc7b244482
2012-03-09 20:45:37 +09:00
dfd4abe818
Fix a shameful bug
...
I must have been sleeping when I wrote that
Change-Id: I887180ab610785a2000636adeeed99230b3c5390
2012-03-09 19:31:35 +09:00
0cf422fbb7
Reduction, step 8
...
Change-Id: I54334039597e235e24f169e34c1d44109180ee88
2012-03-09 19:00:29 +09:00
a333ff19ef
Reduction, step 7
...
Change-Id: I177ef2f29c8b6000c5e3d021c016c5d216fe3fc6
2012-03-09 18:59:20 +09:00
a3ee019331
Reduction, step 6
...
Change-Id: I22ad4cea0e0cac23813da7e788f5c94974ce0ebf
2012-03-09 18:58:01 +09:00
dbd140504d
Reduction, step 5
...
Change-Id: Iac52e62c2bdffad14f916f69eade2b785bb41767
2012-03-09 18:44:23 +09:00
0b96bc4b2b
Reduction, step 4
...
Change-Id: Ib27dc6e9486c3f0f2ec1e94a88a52d12c1af2d38
2012-03-09 18:44:20 +09:00
5a61d03f31
Reduction, step 3
...
Change-Id: I0e08b102c9539d97c473505b9d42176c4a7c8853
2012-03-09 18:44:16 +09:00
8abd15b59f
Reduction, step 2
...
Change-Id: I06e117df43d25dbaf9fc7a7366efd9355a6215ce
2012-03-09 18:44:10 +09:00
f08f30176b
Reduction, step 1
...
Change-Id: Ic3ed04300cfd4c0b69b93b27379aca4093b32f67
2012-03-09 18:38:44 +09:00
de165aed2a
Separate bigram prediction from suggestion process
...
Change-Id: Ibdef206fbd6688a45cebbd7fb8a9f6cd175d03b0
2012-03-09 18:38:20 +09:00
6f722c8301
Remove useless stuff
...
Change-Id: I462d24da2d26661990d6aab2a13fde851763fd61
2012-03-09 18:36:52 +09:00
67af2a2415
Export some more logic out of Latin IME
...
Change-Id: Ib264533a05e9e09347bf254789e6ab5beec92400
2012-03-09 18:36:49 +09:00
df9fce5df1
Export some logic out of LatinIME
...
Hopefully that will end in Suggest/SuggestedWords being autonomous
and won't need the logic spoon-fed to them
Change-Id: I915661bce13c69c8a5b8e5d4a8c41e18fea594cf
2012-03-09 18:36:45 +09:00
0cb7b00704
Merge "Small optimization"
2012-03-09 00:40:19 -08:00
d17ff7225a
Merge "Small reorganization"
2012-03-09 00:40:10 -08:00
91e55ac000
Small optimization
...
We only use some of those results in one branch of an if() test.
Let's not compute those that are not needed.
Change-Id: I6ca068646b86d2980fb88e75b110ad077362c4ff
2012-03-09 16:47:43 +09:00
195419b1ec
Small reorganization
...
...resulting in a slight optimization
Change-Id: I83a9b8c92c3d93ce75988285997ec138b3ffe52e
2012-03-09 16:41:35 +09:00
d492e2bf8d
Merge "Breakdown Greek keyboard into rows"
2012-03-08 23:37:02 -08:00
b4fba675f9
Merge "Breakdown Georgian keyboard into rows"
2012-03-08 23:36:55 -08:00
df0c7711a7
Merge "Breakdown Bulgarian keyboard into rows"
2012-03-08 23:24:57 -08:00
e955323ae0
Breakdown Greek keyboard into rows
...
Change-Id: I160c0e26058b3841b3820ec95b91d59b295339ca
2012-03-09 16:24:48 +09:00
af8092e093
Merge "Remove useless test"
2012-03-08 23:15:49 -08:00
d2732d459f
Breakdown Georgian keyboard into rows
...
Change-Id: Id257ea33586e07a91674f654c33003ec2d5aa73d
2012-03-09 16:10:50 +09:00
258bd90853
Breakdown Bulgarian keyboard into rows
...
Change-Id: Ie0da26a48b186be081ad61858116e519019d1973
2012-03-09 16:00:57 +09:00
838629aea0
Remove useless test
...
typedWord may not be null here
Change-Id: I9e7afb89fafbf6fcbc91fbc132aecc06aec8979f
2012-03-09 15:52:23 +09:00
4e67085a15
Breakdown Arabic keyboard into rows
...
Change-Id: Ie2215d8baf501dc7dd87c464deb47fe4267171f6
2012-03-09 15:50:54 +09:00
9a6ccf9bb0
Merge "Breakdown AZERTY keyboard into rows"
2012-03-08 22:32:24 -08:00
efe029be2f
Merge "Breakdown QWERTY keyboard into rows and share"
2012-03-08 22:29:15 -08:00
d48b76267a
Merge "Remove a useless test (B7)"
2012-03-08 22:26:20 -08:00
22375e025b
Breakdown AZERTY keyboard into rows
...
Change-Id: Ibd202d7b141209b3e4310499134522cbd1a8c16c
2012-03-09 15:26:16 +09:00
2d82757fc6
Merge "Rename a parameter (B6)"
2012-03-08 22:23:33 -08:00
de19ab878d
Merge "Remove useless tests (B5)"
2012-03-08 22:22:56 -08:00
5a7cb9305a
Merge "Remove a provably useless test (B4)"
2012-03-08 22:22:20 -08:00
85d594a80e
Breakdown QWERTY keyboard into rows and share
...
Change-Id: I0b8ad39120a73395ff5a5b1a32e0f3fe681c062b
2012-03-09 15:02:27 +09:00
54392438c5
Merge "Optimize and clean up (B2)"
2012-03-08 22:00:02 -08:00
90bd4efd10
Remove a useless test (B7)
...
consideredWord is provably never null.
Change-Id: Ifaa0d2471c46f14967e70ad004d2b82f841a4566
2012-03-09 14:55:46 +09:00
cf8bc92ba0
Rename a parameter (B6)
...
This is not necessarily the typed word. Actually, the parameter
that's passed here has trailing single quotes culled out of it.
Change-Id: Ia2038faa2cbbd3a5b8263e6c0fb5b8e670993fe9
2012-03-09 14:52:35 +09:00
92146f2926
Remove useless tests (B5)
...
WordComposer#getTypedWord() may not return null. Don't test for it.
Change-Id: I6aff14892503d0c275a3328c404ed99d2f40a687
2012-03-09 14:52:04 +09:00
31a5da28e3
Merge "Move some code around (B1)"
2012-03-08 21:15:25 -08:00
1dba7c2d67
Merge "Split tablet symbols and symbols shifted layout into separated rows"
2012-03-08 21:05:53 -08:00
6460a83546
Merge "Add ":" to ";" key on Greek keyboard"
2012-03-08 21:05:47 -08:00
8cd847c2fa
Remove a provably useless test (B4)
...
If !mInputAttributes.mInputTypeNoAutoCorrect then mCorrectionMode
will not have allowed #hasAutoCorrection() to return true.
Change-Id: I1b498d5aeb26194c765cc9b9dcb24d980de43894
2012-03-09 12:56:48 +09:00
94b20c90d8
Optimize and clean up (B2)
...
Stop parameters from escaping and don't do useless work and
simplify the code.
Yay.
Change-Id: I0dfc3e14b1cb50e0730f6d9c1d52b54516baa90e
2012-03-09 12:51:55 +09:00
174d29f468
Split tablet symbols and symbols shifted layout into separated rows
...
Bug: 6100832
Change-Id: I6771364ceca2c152bd9c55e22159f57c3468cc31
2012-03-09 12:41:56 +09:00
dc5dfe37e0
Move some code around (B1)
...
The goal is to make the creation of the Builder closer to
the #build() call
Change-Id: I48d76d4efdc180479829016582edd9de47e7332c
2012-03-09 12:33:23 +09:00
13fb8fb775
Limit escape of parameters
...
Change-Id: I3a7ab069042d5542ab2e033d1eeb13d718cd7698
2012-03-09 12:30:23 +09:00
b1de2912b8
Add ":" to ";" key on Greek keyboard
...
Bug: 5679585
Change-Id: I92d4b4d1eff9561adbb1bae607a1c27b4b5168ba
2012-03-09 12:22:34 +09:00
23a5e9d1a7
Merge "Make AutoCorrection static and non-instantiable (A5)"
2012-03-08 19:05:30 -08:00
2621fe2256
Merge "Move a memory in the container class (A4)"
2012-03-08 19:04:56 -08:00
427dfe37ec
Merge "Remove an unused method"
2012-03-08 18:31:26 -08:00
cbbfa15765
Merge "Make AutoCorrection a step closer to being static (A3)"
2012-03-08 18:30:19 -08:00
58722d83f0
Merge "Stop uselessly remembering a value (A2)"
2012-03-08 18:30:10 -08:00
0d2d451aa2
Merge "Merge broadcast receivers again"
2012-03-08 18:28:11 -08:00
caae6df0ce
Remove an unused method
...
Who would have guessed this wasn't being called at all.
Change-Id: Ib74a212356ea44e9bf149619ed5464c14684a1ba
2012-03-09 11:10:55 +09:00
21af2f40c5
Merge broadcast receivers again
...
It's probably simpler not to have registers dance around,
and just message the feedback manager when the audio event
happens.
Change-Id: Id0710ed102d10d01f1af93ad8cb660653bb3a9f8
2012-03-09 11:00:23 +09:00
bbc7adabd2
Merge "Import translations. DO NOT MERGE"
2012-03-08 17:52:40 -08:00
7b77c683d7
Fix a crash
...
Bug: 6137076
Change-Id: I05f9f72a2678d10d3400dab5fc71544276739dcf
2012-03-09 10:29:51 +09:00
ff29b1f8e8
Import translations. DO NOT MERGE
...
Change-Id: Idab425b956341eb8556df92fb0ac33e4036e5a6e
2012-03-08 14:15:38 -08:00
9c7db965cd
Fix forgotten resource name change
...
Change-Id: I27ea28c7ea93e50ea8f0d947df95e3ab6d146f11
2012-03-08 21:53:37 +09:00
39286f98bc
Merge "Remove useless stuff (A1)"
2012-03-08 04:02:46 -08:00
f686211183
Merge "Split Utils class to StringUtils, SubtypeUtils, and JniUtils"
2012-03-08 03:59:59 -08:00
82adfdaeae
Make AutoCorrection static and non-instantiable (A5)
...
This needs change Ic6756baa to not break the build
Change-Id: I1c772dd99d63fec5d3ad67a0eb7fbc28ec7a0f0f
2012-03-08 20:56:59 +09:00
7a580a4769
Move a memory in the container class (A4)
...
This allows us to make AutoCorrection a purely static class.
Change-Id: I15b81bd7f3d6ea487154a5b09a81bc323be82ce1
2012-03-08 20:56:11 +09:00
9254dbcd7e
Make AutoCorrection a step closer to being static (A3)
...
Change-Id: Ide3d9785661a672af9bc8dc0cf91cab816dd6caa
2012-03-08 20:55:49 +09:00
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
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
cc8c8b99bd
Split Utils class to StringUtils, SubtypeUtils, and JniUtils
...
Change-Id: I09e91675fe7d573dad8c933ad513b21d7e409144
2012-03-08 20:30:38 +09:00
7d6d98ecc5
Merge "Cleanup keyboard theme switching code"
2012-03-08 03:24:38 -08:00
b43f2aeb69
Merge "Fix centering more suggestions panel on tablet"
2012-03-08 03:24:07 -08:00
2b1280c0f0
Merge "Return a value for tests instead of saving it"
2012-03-08 03:10:18 -08:00
32c181bfe0
Return a value for tests instead of saving it
...
Change-Id: I54fa32b92e89d03a53866bd1c0ee65955dd6b3d3
2012-03-08 20:07:54 +09:00
2bb29c4674
Simplification
...
Change-Id: Ibced83da2398f1e9ab6a0d6a22c2ad7c8f25cb7b
2012-03-08 19:50:47 +09:00
0f1efae262
Merge "Cleanup unused imports (A7)"
2012-03-08 02:32:48 -08:00
663aabca0c
Merge "Get the view for haptic feedback as a parameter (A6)"
2012-03-08 02:32:39 -08:00
85e88d30c1
Merge "Remove a useless member (A5)"
2012-03-08 02:32:25 -08:00
60705c9ed3
Merge "Simplification of sound settings (A4)"
2012-03-08 02:32:16 -08:00
d2b5ea2084
Merge "Make a condition positive (A3)"
2012-03-08 02:32:07 -08:00
d749fb86ab
Merge "Simplify audio management (A2)"
2012-03-08 02:31:57 -08:00
7cfae83434
Merge "Export audio and haptic feedback to a specialized class. (A1)"
2012-03-08 02:31:45 -08:00
411749a4ba
Cleanup keyboard theme switching code
...
Change-Id: I023769b765d07237b2129d8f1b2a02ffd4c4f09d
2012-03-08 19:17:31 +09:00
bcbaffd9dd
Fix centering more suggestions panel on tablet
...
Bug: 6129726
Change-Id: I8dac3251eec68ad3fb523c632ff39f3cc661c81f
2012-03-08 19:02:22 +09:00
8667bbeab3
Small rename
...
Left/Right is wrong terminology here
Change-Id: I58c55849e45d9984dd3fb7b75a64e07667c9eba4
2012-03-08 18:49:38 +09:00
41a2929282
Cleanup unused imports (A7)
...
Change-Id: I48ba12e4311cbf2982ee8f5312b279bc8c1fdfe8
2012-03-08 18:37:03 +09:00
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
29d967fdcb
Remove a useless member (A5)
...
Change-Id: Ibaaeb8dbcb012f5e973e27ed9928401515656e9e
2012-03-08 18:36:56 +09:00
bdbb22bb33
Simplification of sound settings (A4)
...
Change-Id: I0c6e207bae1e08c45a95b3479e1d67228d696792
2012-03-08 18:36:43 +09:00
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
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
564496bad6
Export audio and haptic feedback to a specialized class. (A1)
...
Change-Id: I957d883d1ccf188cb98eb11031aa0a32fce4ed76
2012-03-08 18:35:20 +09:00
f8b39f39cd
Merge "Remove a useless class (B4)"
2012-03-08 01:14:33 -08:00
4b656a3fef
Merge "Remove stuff that's not used any more (B3)"
2012-03-08 01:13:06 -08:00
d8447ec353
Merge "Use the simple auto-correction status (B2)"
2012-03-08 01:12:46 -08:00
fbe767cec5
Merge "Remember auto-correction status simply (B1)"
2012-03-08 00:54:30 -08:00
bedb1d33f3
Merge "Give InputLogicTests the ability to change language"
2012-03-07 23:51:29 -08:00
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
f0d5a78388
Merge "Add functions to calculate proximity characters in the native code"
2012-03-07 23:31:17 -08:00
3e2d385810
Restart LatinIME service when keyboard theme is changed
...
Bug: 6023947
Change-Id: I779da32708fca7333aff74929cc98173246ee685
2012-03-08 15:08:16 +09:00
a70ee6e3b3
Add functions to calculate proximity characters in the native code
...
Bug: 4343280
Change-Id: I17f8f6295b01900948b98680d0267753f33a46cf
2012-03-08 12:55:15 +09:00
77541fc92e
Import translations. DO NOT MERGE
...
Change-Id: Iab45cb6beb91770c53ca6a8c0947f9e7ab838bf4
2012-03-07 14:44:44 -08:00
c648b88779
Merge "Dynamically determine key preview backing view height"
2012-03-07 04:17:52 -08:00
c8b0e5797e
Dynamically determine key preview backing view height
...
Bug: 6023947
Change-Id: I53a5c0eb99100a0dfe3e025808f5dc55747d1287
2012-03-07 20:33:17 +09:00
898d84190b
Merge "Tweak vertical corrections for more keys in the "ICS" theme"
2012-03-07 02:06:46 -08:00
78b31d37ce
Merge "Add readable unicode point names"
2012-03-07 02:06:40 -08:00
cb8d5fa7e2
Merge "Fix duplicate flag value in Key"
2012-03-07 01:53:10 -08:00
dab392c6f4
Merge "Fix a bug with successive manual picks"
2012-03-07 01:51:59 -08:00
8e14e78377
Fix duplicate flag value in Key
...
Change-Id: I98e77e5432a228e4455998bf09a2cc671b113c4e
2012-03-07 18:41:38 +09:00
3dd4bcb283
Merge "Recompute suggestions on language change."
2012-03-07 01:35:12 -08:00
48f6321630
Tweak vertical corrections for more keys in the "ICS" theme
...
Bug: 6129435
Change-Id: I3800a7a6926967c456e1b9b0dead94717063039a
2012-03-07 18:34:15 +09:00
b84ee82e66
Recompute suggestions on language change.
...
Bug: 6106407
Change-Id: I43d9c89610a9ed7a9f6825bd90334d7b343df52c
2012-03-07 17:35:32 +09:00
845b24d9d3
Fix a bug with successive manual picks
...
Bug: 6121571
Change-Id: Ib16fbef1087da3b7da5539901ec57156f242f089
2012-03-07 17:32:42 +09:00
e9bfc13bff
Add readable unicode point names
...
Change-Id: I5689711429526a2bad409f235b6825a7ed4c7bc2
2012-03-07 16:35:51 +09:00
f773ef19e8
Remove a useless class (B4)
...
\o/
Bug: 5975068
Change-Id: Ia18b55af6d555e7ee7af1cdd7c6227fc1ee6786b
2012-03-07 15:34:15 +09:00
a0beebf711
Remove stuff that's not used any more (B3)
...
Change-Id: Ie86675ff2facd37430051bf129ddd930fb933dc9
2012-03-07 15:32:55 +09:00
0a59ac2ba8
Use the simple auto-correction status (B2)
...
Change-Id: I9d2f053b6f7bad20fc6afe5f5086a965e5014a5c
2012-03-07 15:31:22 +09:00
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
65fe7f7994
Merge "Add language switch key only to the phone layouts"
2012-03-06 18:19:45 -08:00
81d4e3cd66
Add language switch key only to the phone layouts
...
Bug: 5759092
Change-Id: Ic7d7d4812976654c0e85fecabd1128eadfc52c5c
2012-03-07 10:03:21 +09:00
89ffb212b4
Make the keyboardswitcher and the subtypeswitcher final.
...
Change-Id: Ifcc79357adcc53f93b190b6e98d5569f42f74655
2012-03-06 19:07:21 +09:00
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
691f1c174b
Fix coordinates sent to native code
...
Change-Id: I2c8b093b59ad36ffe860c3c4d360d87251d101c4
2012-03-06 16:38:00 +09:00
231ef8fa3e
Merge "Integrate the logic to calculate the proximities"
2012-03-05 23:25:29 -08:00
ca7ec2097c
Integrate the logic to calculate the proximities
...
Bug: 4343280
Change-Id: I0f6a7e6912ed4abea07c10d266da4c7ccb0dae76
2012-03-06 15:34:27 +09:00
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
e31060dc77
Merge "Fix LatinIME's ProGuard config for support libs using flags copied from Email app."
2012-03-05 16:49:19 -08:00
97b6343a38
Import translations. DO NOT MERGE
...
Change-Id: If76e0272d3a4b1ec294ce905accf7bd0280b96dd
2012-03-05 15:49:15 -08:00
bdf1ef00c5
Fix LatinIME's ProGuard config for support libs using flags copied from Email app.
...
Bug: 5829051
Change-Id: Ie1784d1ba1a4515ab492a06d7adc10c7d54a64c5
2012-03-05 15:18:02 -08:00
e79b1a8312
Make SuggestedWords immutable completely
...
Change-Id: I1b0f7b857e89307c987187c1969a2846aa97fdcc
2012-03-05 23:06:37 +09:00
40b6e666e1
Merge "Make SuggestedWords partially immutable"
2012-03-05 05:29:14 -08:00
8cc8f26adf
Make SuggestedWords partially immutable
...
Change-Id: I72a2f71d7f6565a30c06e563b0a64f496542cde9
2012-03-05 22:11:13 +09:00
717f12472f
Merge "Remove unused code"
2012-03-05 04:46:09 -08:00
433be45fce
Merge "Refactor to suppress null worning"
2012-03-05 04:08:23 -08:00
add6dfb8fe
Remove unused code
...
Change-Id: I894c0850e803bdfc7b590a62ddd4076a3a4e4658
2012-03-05 21:07:03 +09:00
d5b6360549
Merge "Revert "Make SuggestedWords immutable""
2012-03-05 02:57:00 -08:00
d62fa834c6
Revert "Make SuggestedWords immutable"
...
This reverts commit c208f4dfb7
2012-03-05 02:54:21 -08:00
6a830277df
Merge "Refactoring"
2012-03-05 01:49:46 -08:00
611a5bdf65
Refactoring
...
Change-Id: I2f92c01fa1ff6b318128d387f26942b5d47de3e0
2012-03-05 18:36:51 +09:00
370674422a
Refactor to suppress null worning
...
Change-Id: I4b4dc6f86d659491d8b9a74ed120092eab964345
2012-03-05 18:15:29 +09:00
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
749048f4e4
Merge "Make SuggestedWords immutable"
2012-03-05 00:56:06 -08:00
c208f4dfb7
Make SuggestedWords immutable
...
Change-Id: I26bd82aee5ead84e40abfc3db5a48ed6d1e42361
2012-03-05 17:24:30 +09:00
907371b54f
Merge "Change the name of AOSP LatinIME spell checker"
2012-03-04 23:11:46 -08:00
e54723d84d
Change the name of AOSP LatinIME spell checker
...
Change-Id: I8b93f66c272d91ba02888da31d56a9811ba2a1f0
2012-03-05 15:39:07 +09:00
e5cbc94d10
Merge "Support embedded more key"
2012-03-04 22:10:22 -08:00
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
e491be6e86
Support embedded more key
...
This is a followup change to Ie10b3e0b.
Change-Id: I1f91d96e32357b83bd0546537d561d638b6ff0c6
2012-03-05 14:22:52 +09:00
9b01890254
Move a method to a more sensical place.
...
Change-Id: I11f87448f689cf828bff960ad7a3e4739a3457dc
2012-03-05 14:19:35 +09:00
f1a559c516
Merge "Remove a useless method"
2012-03-04 19:58:24 -08:00
611ec69413
Remove a useless method
...
Change-Id: I2002662ee07af2fcc626a52ea4e9ad8977b29ca2
2012-03-05 12:46:35 +09:00
584361a196
Merge "Suppress more keys that share the same meaning with the parent key's imeAction"
2012-03-04 19:42:08 -08:00
428178aca6
Merge "Replace a useless computation with a constant"
2012-03-04 19:35:11 -08:00
4ab5486bf2
Merge "Remove a useless test"
2012-03-04 19:35:02 -08:00
c7b0105114
Suppress more keys that share the same meaning with the parent key's imeAction
...
Bug: 6080806
Change-Id: Ifc3145fd79f10b39442b95432a8d19a624c2fdfd
2012-03-05 12:24:28 +09:00
4e112d0782
Replace a useless computation with a constant
...
This is provably always false
Change-Id: I88d783fa59fec0b7a729558ba974a6a58c158645
2012-03-05 11:57:36 +09:00
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
50b82dca62
Merge "Fix comment"
2012-03-04 18:28:01 -08:00
49079df8ec
Merge "Omit InputMethodManagerCompatWrapper argument from some utility methods"
2012-03-04 18:12:47 -08:00
04bc787ce7
Fix comment
...
This is follow up of Ie10b3e0.
Change-Id: Idefbe1575915bb87f1c86cb3ddb5efe578c5b760
2012-03-05 11:10:28 +09:00
2d25ba2750
Omit InputMethodManagerCompatWrapper argument from some utility methods
...
Change-Id: Ic837018c702c8c575de3e5e81fe8e31fee16fe22
2012-03-05 10:43:12 +09:00
c2136c4e63
Merge "Some renaming"
2012-03-04 17:26:22 -08:00
0af449aa64
Merge "Added virtual view hierarchy for keyboard accessibility."
2012-03-02 15:39:12 -08:00
a157249014
Merge "Remove a useless method"
2012-03-02 05:57:48 -08:00
e53840d216
Merge "Some more simplification"
2012-03-02 05:56:58 -08:00
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
13057e7c05
Support Greek Keyboard
...
Bug: 5679585
Change-Id: I540d5ea42a830be8b85440e794cfcee92a23838e
2012-03-02 21:00:38 +09:00
3a1844c33b
Merge "Support dividers in MoreKeysKeyboard"
2012-03-02 03:58:13 -08:00
5ef4fccbb9
Support dividers in MoreKeysKeyboard
...
Bug: 6080806
Change-Id: Iacd78c6aab6abf948717d34da7489a79c41316d2
2012-03-02 20:52:25 +09:00
a83a53ba24
Some renaming
...
Change-Id: I445277cb3af469a0145a8da0ffb801b7e19048cd
2012-03-02 20:46:54 +09:00
3790353472
Merge "Support Macedonian Keyboard"
2012-03-02 03:43:46 -08:00
5edda4111e
Remove a useless method
...
Change-Id: I038e6a82b6463a2a8ec494171a596d76fbc75fe1
2012-03-02 20:38:41 +09:00
775d8d8885
Support Macedonian Keyboard
...
This change also fixes missing Cyrillic DJE key of Seribian keyboard
on 10-inch tablet.
Bug: 5934396
Change-Id: I18ae5f0e54f788b65f649a52bdbbef1813334d96
2012-03-02 20:35:44 +09:00
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
e2a50bd804
Optimization
...
Avoid doing some useless processing.
Change-Id: I4ce0a188e10db30322bd25751dc5c09492cea301
2012-03-02 20:26:51 +09:00
7204eab3da
Precompute two values that never change
...
Change-Id: Ic54e7926028ea8374564da5e5004d710f42c53e1
2012-03-02 20:04:42 +09:00
38e535e596
Change a parameter type to make a call clearer
...
Change-Id: I2918d0a8b00da743689b919f80128bbf36973f24
2012-03-02 20:01:34 +09:00
5bc2b61274
Move a method up a level
...
Change-Id: I6b9a697480127e4745698ab19f8a360b86ff39ca
2012-03-02 19:59:55 +09:00
d02783cb63
Break out a method
...
Change-Id: Ia14fc320422b7f198c33ba522bb93dd70fbcb2c1
2012-03-02 19:52:06 +09:00
5a2c19d4fb
Merge "Revert "Make a member read-only""
2012-03-02 02:49:42 -08:00
f1967ce322
Revert "Make a member read-only"
...
This reverts commit 6a43e39bf0
2012-03-02 02:49:24 -08:00
9727aea418
Merge "Small refactor (A1)"
2012-03-02 02:47:42 -08:00
d153228013
Merge "Make a member read-only"
2012-03-02 02:29:41 -08:00
6a43e39bf0
Make a member read-only
...
Change-Id: I9a718eaf07e1b6c659e649350d3605f365db2839
2012-03-02 19:17:57 +09:00
d992fa847d
Small refactor (A1)
...
Change-Id: Ia0838bbce47a2b60067f464685ad6d55ee4ec934
2012-03-02 18:55:04 +09:00
7293b65841
Remove a useless method
...
Change-Id: Ic00520b18f74838fe1002a679952f62bc7226c15
2012-03-02 18:49:24 +09:00
025a16c31c
Readable debug output
...
Change-Id: I4110791832d2ab1d681b01c9e8a237567442c827
2012-03-02 14:48:10 +09:00
ede2133cb1
Support time, date, and datetime keyboard
...
Bug: 6030364
Change-Id: I2bd4daf264757d8f3fa7c946d10a39c36ccf5905
2012-03-02 14:01:07 +09:00
961703841e
Merge "Explicitly specify that labels might be in more keys"
2012-03-01 03:56:32 -08:00
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
895da64b62
Merge "Change a dangerous ID"
2012-03-01 02:28:08 -08:00
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
42fd1d2d72
Refactor more keys spec handling
...
Change-Id: Ibd95eff0725724ea35ad58e1d1ec7ec3d02a6e90
2012-03-01 16:07:02 +09:00
870a1ab156
Merge "Try to survive unavailability of local storage"
2012-02-29 17:05:20 -08:00
f3f90e6d35
Try to survive unavailability of local storage
...
Bug: 6035465
Change-Id: Ibe2d542349ec598824f78b91d374a977082fc2d1
2012-03-01 09:43:29 +09:00
d054aa17da
Merge "Reset previous symbols shifted state when auto switch backed"
2012-02-29 08:05:58 -08:00
4ba2216219
Reset previous symbols shifted state when auto switch backed
...
Bug: 6072517
Change-Id: I00337b3ed5c85df4627e8f5a02465d406c4d9178
2012-03-01 01:01:09 +09:00
297132ec08
Merge "Fix spacebar icon position on phone/number keyboard"
2012-02-29 07:57:55 -08:00
b19a6b9fc5
Fix spacebar icon position on phone/number keyboard
...
Change-Id: I4d6bb0f2f12e7b263ff951f3173cac8e41d0f23e
2012-03-01 00:37:51 +09:00
9b764e0cc5
Shift+Smiley can register enter in textMultiLine field
...
Bug: 2498607
Change-Id: Ied2217c49665394a01c7d3451a93c0bc647d392f
2012-02-29 17:21:55 +09:00
9a81ce92c3
Added virtual view hierarchy for keyboard accessibility.
...
Bug: 5829051
Change-Id: Ied1b6267eec616bd3b9337f6e761b0c740aa0eb2
2012-02-28 10:01:40 -08:00
5a0661eae8
Import translations. DO NOT MERGE
...
Change-Id: I6e4e75a7713a683dcb4d9159179103b412ab41be
2012-02-24 14:15:04 -08:00
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
d80ffe2eff
Merge "Add debug prints to help with debugging"
2012-02-22 16:19:43 -08:00
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
e2d43ef528
Import translations. DO NOT MERGE
...
Change-Id: Ibcf6712652c6faf320cefb3fe408b172adf130e0
2012-02-22 14:58:07 -08:00
f127fb7960
Merge "Import translations. DO NOT MERGE"
2012-02-22 09:38:51 -08:00
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
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
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
2aa16dd81f
Merge "Activate the code to cancel a manual pick (A5)"
2012-02-22 00:50:13 -08:00
80c25df49d
Merge "Implement cancelling a manual pick (A4)"
2012-02-22 00:29:23 -08:00
8db74d0fae
Merge "Use the stored separator instead of reading it back (A3)"
2012-02-22 00:24:19 -08:00
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
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
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
e043bf02f2
Merge "Give LastComposedWord knowledge of the separator (A2)"
2012-02-21 23:42:21 -08:00
1dfdc8056c
Merge "Give LastComposedWord knowledge of the committed word (A1)"
2012-02-21 23:41:42 -08:00
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
8fe892945a
Merge "Add Georgian keyboard"
2012-02-21 23:27:12 -08:00
0771671a39
Add Georgian keyboard
...
Bug: 5002108
Change-Id: Ia5751181bffc96e2e6c5daed3c7de8408078f91b
2012-02-21 23:24:13 -08:00
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
1b3c16c183
Merge "Add next/prev navigate action more keys and remove tab key"
2012-02-21 23:09:58 -08:00
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
c6993e4947
Merge "Add "#" and "%" to punctuation more keys"
2012-02-21 22:43:38 -08:00
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
3710a04740
Add "#" and "%" to punctuation more keys
...
Bug: 6029665
Change-Id: I976326a900876a0d39067a760459366f52101c96
2012-02-21 19:43:47 -08:00
b141c9cd3f
Rename resources to reflect current usage
...
Bug: 6010403
Change-Id: Ia02ff31007296fdf6901504f238dfd9e4621f658
2012-02-21 18:54:44 -08:00
8a3d369840
Remove a useles parens
...
...I could swear I had compiled :/
Change-Id: I4e1fb2b1dda0a4ceffe2082935395d05297c63ec
2012-02-21 16:53:05 -08:00
9a2a11e65b
Rewrite a condition
...
Change-Id: I805c9579788d99b015feb2075ad4771756c7adc5
2012-02-21 15:46:53 -08:00
2649e42d75
Extract a method to reset the ime state
...
Change-Id: I921184b85b94418cf360508ee3f67e85b10b3d72
2012-02-21 15:12:01 -08:00
da21000957
Import translations. DO NOT MERGE
...
Change-Id: Ic09c089b8b42fdd672138d14f52a0ffb21733677
2012-02-21 14:57:14 -08:00
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
1044539080
Rename variables and add comments
...
Change-Id: I746f2364d9f02f22aa6ab57d7060013ee114f4e3
2012-02-19 17:26:41 -08:00
9dc0eeae55
Merge "Read the initial selection value."
2012-02-19 16:08:48 -08:00
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
3753a75c65
Merge "Import translations."
2012-02-17 16:38:51 -08:00
d1a37520d0
Import translations.
...
Change-Id: I59fdeb4d9df08e82e56d5545ffaaa66e5a04304e
2012-02-17 16:31:50 -08:00
1950964157
Merge "Don't assume a word has been added to the user dict"
2012-02-17 15:29:52 -08:00
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
fed72d6038
Merge "Support fixed order more keys"
2012-02-17 01:01:28 -08:00
aeeed75848
Support fixed order more keys
...
Change-Id: I979f54e8b54243da4d23cfbe08198d2aa495f870
2012-02-17 00:49:18 -08:00
823b8a4a57
Merge "Import translations."
2012-02-16 21:16:40 -08:00
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
03c3018492
Merge "Use additional proximity chars even when no key is detected."
2012-02-16 19:17:48 -08:00
9025c55e9f
Use additional proximity chars even when no key is detected.
...
Change-Id: I06a8c66421fcdd43066934ec31d0a38a7cf12bf2
2012-02-16 18:58:47 -08:00
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
482e0ef983
Import translations.
...
Change-Id: I20bcfc0d6296dc3606ab027e9c78f17e960e62dc
2012-02-16 15:29:44 -08:00
25ff89a75c
Merge "Activate bigram predictions from the binary dictionary"
2012-02-15 20:00:54 -08:00
ad290d6505
Activate bigram predictions from the binary dictionary
...
Change-Id: If1cc50539d7677b854b1cd3bea3423c8c0865de5
2012-02-15 19:51:24 -08:00
a252e0547f
Reactivate the bigram prediction option
...
Change-Id: Ib4dcd05c4ecf38bdf3d28371fcd9e2259a59ec0c
2012-02-15 19:25:12 -08:00
05f09b6d58
Merge "Import translations."
2012-02-14 16:36:51 -08:00
a476f75209
Import translations.
...
Change-Id: I9ee2da4706d6847b00f37766f79e73f83ea930d8
2012-02-14 16:32:59 -08:00
95dc18a7c4
Follow up to Ie2416ccd
...
space   got lost in some parsing process
Change-Id: I36f5a9ca7172013ce049041886b9cd98659d38f9
2012-02-15 08:23:34 +09:00
a56639613b
Use more standard Unicode notations in keyboard layout resource files.
...
bug: 5988656
Change-Id: Ie2416ccd790f29934a37e9dc77d7525e5113048a
2012-02-15 06:44:09 +09:00
b396ea9ede
Import translations. DO NOT MERGE
...
Change-Id: I8be564ef6befc36c59caa155f4b9c6c74740d75b
2012-02-13 15:19:16 -08:00
f6f40539aa
Minor string updates in Android keyboard settings
...
bug: 5999345
Change-Id: I77560b02c71c3ba0c525572b7062ebbfd66b3b85
2012-02-14 03:32:39 +09:00
09c677f56a
Replace UTF-8 string resources with their hex representations
...
bug: 5988656
Change-Id: Ifc3c3a2eccfc23d75b4066c2c9c02c48dacda55b
2012-02-11 23:05:23 +09:00
1bd181fefa
Import translations.
...
Change-Id: I126a880289de548e914ac442740e789e067e5124
2012-02-10 14:14:38 -08:00
6213983fa1
Refactor MoreKeysKeyboard.Builder
...
Change-Id: Ib5f58b1143be60c748b81299ccc3b237d2587846
2012-02-10 18:53:54 +09:00
b9e10c318a
Merge "Key should be distinguished also by moreKeys contents and etc."
2012-02-09 23:51:18 -08:00
4baf767fac
Merge "Improved shift key and symbol/alpha switch key accessibility feedback."
2012-02-09 15:33:40 -08:00
0d1a5bad54
Import translations. DO NOT MERGE
...
Change-Id: I221670b8e4796346d13a44848f8958904e9bac80
2012-02-09 12:46:37 -08:00
fdb6999e55
Key should be distinguished also by moreKeys contents and etc.
...
Change-Id: Ib2caabee6af78153b5a7be0e4df522288f2a7d48
2012-02-10 03:17:39 +09:00
accd2a9f61
Merge "Add finals"
2012-02-08 19:08:09 -08:00
a828f613a8
Merge "Some more simplification"
2012-02-08 19:05:46 -08:00
8ff0564f6a
Add finals
...
Change-Id: Ib81be9a0df34c5e9fc49d2b5d9bf02297ea2b499
2012-02-09 11:40:54 +09:00
6a800b253f
Some more simplification
...
Remove useless method calls, and ultimately remove useless
method.
Change-Id: I3f353b1b37460d5e9ceae5cb5dde3fff0da81c21
2012-02-09 11:38:03 +09:00
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
7ef97ea1f9
Import translations. DO NOT MERGE
...
Change-Id: I02629c1f8dd311899b3aba89bfb1390150ace7ac
2012-02-08 13:56:30 -08:00
5962312b07
Custom action label should be a part of keyboard identifier
...
Change-Id: Ia14cabc3d49fbdcb11dd00225d225fbb91cc4012
2012-02-08 20:09:39 +09:00
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
82efc941ba
Merge "More simplification"
2012-02-08 01:43:23 -08:00
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
614cb02a91
Merge "Rename mini keyboard to more keys keyboard"
2012-02-08 00:04:16 -08:00
2affaf91a0
Rename mini keyboard to more keys keyboard
...
Change-Id: Ie4c85e8ca5a1f41a420aae5c1cd9c1cb07e237e5
2012-02-08 16:12:31 +09:00
1bd1cd19c0
Merge "Fix the auto-composer to support supplementary chars"
2012-02-07 22:46:22 -08:00
9159b9953d
Fix the auto-composer to support supplementary chars
...
Change-Id: I61ff218ae2ca4eb443a370e581b677755258670a
2012-02-08 15:45:51 +09:00
71a14420d8
Merge "Fix obvious bug"
2012-02-07 22:42:18 -08:00
93bc5e7fda
Fix obvious bug
...
Change-Id: I3a0e5c699bbe4e9274dacdbdf92dff14148bd2c1
2012-02-08 15:35:56 +09:00
8174373a0e
Merge "Remove a nested edition occurence"
2012-02-07 19:42:35 -08:00
5a6daf46cf
Merge "Cleanup"
2012-02-07 19:42:26 -08:00
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
2124bc5bf5
Remove a nested edition occurence
...
This was harmless but confusing
Change-Id: Ic271f80d3dadf01b29e3875c6a8ad51b99a936f9
2012-02-08 12:03:55 +09:00
2e2d6b4d40
Small simplification
...
Change-Id: I55f81f3ab427fd5b28bb1f31960077cd1897cbd0
2012-02-08 11:41:15 +09:00
1b986cc488
Merge "Fix a bug with manual pick then dotcom key"
2012-02-07 16:59:47 -08:00
8d4f0d5d1d
Improved shift key and symbol/alpha switch key accessibility feedback.
...
Bug: 5933165
Change-Id: Id71f38874640785b7ad43b7a70e27f40c13be748
2012-02-07 13:14:18 -08:00
5b7f50b10b
Import translations. DO NOT MERGE
...
Change-Id: I01b1e6476b50108810eb61ad45a198db2b52b7de
2012-02-07 11:14:31 -08:00
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
69f672a4b3
Merge "Remove unused InputConnection argument"
2012-02-07 04:15:07 -08:00
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
64eaa67eb5
Remove unused InputConnection argument
...
Change-Id: Ic45c8c6e7730775654317fb6e2d1cb64f9031f46
2012-02-07 19:38:06 +09:00
cfec7e72fd
Merge "Fix a race condition that makes tests unstable"
2012-02-07 02:28:12 -08:00
816a8a0fd8
Fix a race condition that makes tests unstable
...
Change-Id: Ic19d380eb64855884bc6ded8547c200dd772ffe9
2012-02-07 19:22:37 +09:00
4a3c0918dc
Merge "Fix KeyStyles to be able to override the value in style"
2012-02-07 02:04:22 -08:00
17f53103ee
Fix KeyStyles to be able to override the value in style
...
Change-Id: Ib7476cdc0f81dfeb6292ef663e9dbab6d2b949ba
2012-02-07 18:51:51 +09:00
172a013ab5
Fix a bug with the auto-correct indicator
...
Bug: 5969106
Change-Id: I02d4b9184bb2c3fc0d08ffd5db77a9f9d816631f
2012-02-07 17:20:23 +09:00
a7f2500001
Fix a bug with common objects.
...
Bug: 5961179
Change-Id: I452efc552c6ab390931f25557d7aee5a64bf054e
2012-02-06 18:41:00 +09:00
3f8fc4de9a
Import translations. DO NOT MERGE
...
Change-Id: I9e403e4199935cbb8f356f78316671373324d452
2012-02-03 13:02:58 -08:00
f6cf387edc
Merge "Recursively resolve @string/resource reference in key key spec parsing"
2012-02-03 03:20:37 -08:00
aca8870128
Recursively resolve @string/resource reference in key key spec parsing
...
Change-Id: I9d172605e90e828e00f7c4c8d49548498aa3b50d
2012-02-03 20:03:23 +09:00
9f17de5b4d
Merge "Stop inserting a space after a manually picked word."
2012-02-03 02:09:05 -08:00
24cd2617f5
Filter out empty entry from more keys CSV
...
Change-Id: I9a26aaa58f0f502b3bfef9de422370d2b0add8d8
2012-02-03 18:48:01 +09:00
fb684cebe8
Stop inserting a space after a manually picked word.
...
Bug: 4994861
Change-Id: I6ae256a94dbaddea4304304779d17025620c5025
2012-02-03 18:45:44 +09:00
909b2940db
Merge "Get rid of Key.setIcon(Drawable)"
2012-02-02 21:51:51 -08:00
98aa476131
Merge "Shift + smiley key become return key"
2012-02-02 21:46:50 -08:00
e7948a8692
Get rid of Key.setIcon(Drawable)
...
Change-Id: If6ebbdefcbfd0cc14c72858f9bb44861e8abe079
2012-02-03 14:38:17 +09:00
825e2bbd91
Fix a bug when deleting the last char
...
And unit test
Change-Id: Ic4fc3626f8b86e10156d770d41cd6deab5d31f39
2012-02-03 13:03:54 +09:00
56d1dc5a58
Shift + smiley key become return key
...
Bug: 2498607
Change-Id: Iec902d8f0035a81e4e793251006d905025bd81cf
2012-02-03 12:28:57 +09:00
71915a3722
Merge "Fix string iterations in a couple places."
2012-02-02 18:40:19 -08:00
ebfae7f5e0
Merge "Fix key repeat interval timeout"
2012-02-02 18:22:24 -08:00
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
32c54c4dbe
Fix key repeat interval timeout
...
Bug: 5960472
Change-Id: I27d4b81d393f2ace946740a0b0801cea8c63b5b8
2012-02-03 10:02:22 +09:00
fbd83a8712
Restore deleted string still referenced from code to fix the build.
...
Change-Id: Ideb39da09730960f555f2b928d699819c986531b
2012-02-02 13:57:15 -08:00
8a0bb00989
Import translations. DO NOT MERGE
...
Change-Id: I5d9c89dfe2e5667ef004d1e8b9106279bd23f6f5
2012-02-02 13:10:41 -08:00
44e0e4f99e
Fix Key.equals(Key)
...
Bug: 5956068
Change-Id: I2901ae28bd9121ec4f4429a53b83aae128b75e0c
2012-02-02 21:33:50 +09:00
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
8261a4cad7
Merge "Move CSV parser to KeySpecParser"
2012-02-01 23:25:17 -08:00
0086861d5a
Move CSV parser to KeySpecParser
...
Change-Id: I424fb47bc70e9b6aaa5a16ae9b2500d23da75c26
2012-02-02 16:10:14 +09:00
e05b3f4b3a
Support additional proximity characters
...
Change-Id: Ifbe0d7e4eafea1926bbce968eae4724dd5769689
2012-02-02 16:07:16 +09:00
8ca325f437
Merge "Make KeySpecParser and CSV parser code point aware"
2012-02-01 22:56:54 -08:00
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
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
c603409f28
Removed CODE_CAPSLOCK from keyboard accessibility (fixing build).
...
Change-Id: Ibc7ef979276f563444f3c24e69ac32de5d4eb6e8
2012-02-01 10:27:52 -08:00
02dd837805
Merge "Removed spoken descriptions for characters supported by TTS or TalkBack."
2012-02-01 10:00:17 -08:00
9737351775
Merge "Refactored shift key spoken description into separate method."
2012-02-01 09:59:59 -08:00
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
40e9012276
Fix wrong long press timeout for shift key
...
Change-Id: Ifafbed1bcdaf662ee6a69050043739fa71986841
2012-02-01 21:15:34 +09:00
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
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
7ca1249797
Refactored shift key spoken description into separate method.
...
Change-Id: I183462a68fdfd339404740fa1564f737430d73d9
2012-01-31 13:03:39 -08:00
Tadashi G. Takaoka
Jean Chalard
satok
Eric Fischer
Ken Wakasa
alanv
Svetoslav Ganov
Charles Chen