Commit Graph

2615 Commits

Author SHA1 Message Date
Tadashi G. Takaoka
8acbce1f78 Merge "Separate leftward arrow from "add to dictionary" hint text" 2012-03-29 01:20:07 -07:00
Tadashi G. Takaoka
20b4c223b4 Merge "Fix some obvious compiler warnings" 2012-03-29 00:18:36 -07:00
Tadashi G. Takaoka
499c5e8ad8 Merge "Don't send touch coordinates if proximity characters correction is disabled" 2012-03-29 00:18:28 -07:00
Tadashi G. Takaoka
8dcad2ed47 Don't send touch coordinates if proximity characters correction is disabled
Bug: 6225317
Change-Id: I4fa65e020d838f53066d4a071f58fb6f40583e0b
2012-03-29 16:11:54 +09:00
Tadashi G. Takaoka
aaa9e8626a Merge "Fix race condition while changing the system locale" 2012-03-29 00:10:35 -07:00
Tadashi G. Takaoka
2eb8781dc2 Separate leftward arrow from "add to dictionary" hint text
Bug: 6008875
Change-Id: I2be1698e485bc6541163771f41b8b82eaa3cee7a
2012-03-29 15:58:26 +09:00
Tadashi G. Takaoka
c61cd79229 Fix some obvious compiler warnings
Change-Id: I10a634f7492b45d5a72345f14d36cf341946387d
2012-03-29 15:07:53 +09:00
Tadashi G. Takaoka
7769b76fc9 Fix race condition while changing the system locale
Bug: 6128216
Change-Id: Ie153e3eb18feeb97aada6a7708075f5152f11999
2012-03-29 14:36:45 +09:00
Kurt Partridge
2d9483ff16 make ResearchLogger log write only
Bug: 6188932
Change-Id: I8a8f944b1d4ee858d5ecaad0d3adc6dc7af54f68
2012-03-28 17:36:05 -07:00
Jean Chalard
428484d6f9 Merge "Remove useless adding of shortcut as unigrams." 2012-03-28 04:41:05 -07:00
Jean Chalard
e705a122d1 Remove useless adding of shortcut as unigrams.
Change-Id: I1f50ebf00d6dd0dad4114fad86ace5b7b304613a
2012-03-28 20:40:38 +09:00
Jean Chalard
aacffad8ef Merge "Add read support for string shortcuts for makedict." 2012-03-28 04:40:28 -07:00
Jean Chalard
752996540f Add read support for string shortcuts for makedict.
Change-Id: I48ee4fc9ac703ad2a680b3cd848de91c415ea3c8
2012-03-28 20:40:08 +09:00
Jean Chalard
7b49efdea6 Merge "Change the format of the shortcuts in the binary dict." 2012-03-28 04:39:55 -07:00
Tadashi G. Takaoka
a501caa9a5 Merge "Remove SupportTouchPositionCorrection from subtype extra value" 2012-03-28 04:36:27 -07:00
Jean Chalard
3bbb31f3f0 Change the format of the shortcuts in the binary dict.
This only includes the write part of the change. The read part is
coming in a different commit.

Change-Id: Iabe7af6cd134462dc19245f5400719920ed31c8f
2012-03-28 20:24:07 +09:00
Tadashi G. Takaoka
e07db71d26 Remove SupportTouchPositionCorrection from subtype extra value
Change-Id: Ieedff9ec212f5567405ca276b0f2194132ba7b0c
2012-03-28 19:45:28 +09:00
satok
6ba8de2a60 Good bye the proximity logic in Java code
Bug: 4343280
Change-Id: I82f7d08703647a3492ce6e2d3b741146df58927e
2012-03-28 18:42:30 +09:00
satok
67094f5bde Do not re-calculate primary code in WordComposer
Bug: 4343280
Test: Ib43c0f1d1a19d067ea0

Change-Id: I3393a6099cb7fb824994f4656ccfef884f9c6bc4
2012-03-28 17:23:10 +09:00
satok
9611b281e1 Fix AIOOBE
Bug: 6236912
Change-Id: Ie09e5ef1c23eb48621ac3f2f2dc28dc2e46ca288
2012-03-28 13:02:14 +09:00
Ken Wakasa
f71aee8f4f Tighten up the "define" classes.
Change-Id: I854b1dd56b676d0a492a15c16bfe4c6a1bcccdf7
2012-03-27 22:43:25 +09:00
Tadashi G. Takaoka
b10e06feea Merge "Use FontMetrics.top and padding to place keyHintLetter" 2012-03-27 02:51:02 -07:00
Tadashi G. Takaoka
72fb8e05f9 Use FontMetrics.top and padding to place keyHintLetter
Bug: 6225638
Change-Id: Ia3680d84bd1e7ccbdb87aedca106641c6d270677
2012-03-27 17:47:33 +09:00
satok
0a1b00869d Merge "Put a misspelled flag if the word is not valid by the same logic of Android spell checker." 2012-03-27 01:16:54 -07:00
satok
356776a9b7 Put a misspelled flag if the word is not valid by the same logic of Android spell checker.
Bug: 6222722

Currently, the flags of the suggestion span from the Latin IME is different from the flags from Android spell checker.

Change-Id: I2f7a54ae0d63235a0b94e039109ab8b2f1311055
2012-03-27 17:11:48 +09:00
satok
01ab7c8b59 ongoing cleanup 2
Change-Id: I66b61cbe491cf8375144e834390beae3209a777d
2012-03-27 16:28:48 +09:00
Ken Wakasa
c166697e3f Optimization: Start making use of ProductionFlag.IS_EXPERIMENTAL for ResearchLogger
Move GodMode specific tests to relevant directories as well.

This goes along with I9dc4d469

Change-Id: I4a21c53846b26eede346cb1da13e6abbdf9ec27f
2012-03-27 11:55:23 +09:00
satok
2ac1fad645 Merge "Add a flag file for the experimental mode" 2012-03-26 04:53:49 -07:00
satok
9b2f77f2b1 Add a flag file for the experimental mode
Change-Id: I880b7c85dbc20f8d7590b7f65b5f898bfb2266f9
2012-03-26 18:52:46 +09:00
Jean Chalard
d2cd3d54f9 Merge "Split a method for reuse" 2012-03-26 02:12:20 -07:00
Kurt Partridge
400ff86c7b Merge "add tests for ResearchLogger" 2012-03-26 01:49:09 -07:00
Kurt Partridge
2482e6c386 add tests for ResearchLogger
Bug: 6188932
Change-Id: Icf407f9d145d2b25b70d5d7bc30ee3d64561620c
2012-03-26 17:21:50 +09:00
Jean Chalard
8403611960 Split a method for reuse
Change-Id: I9a82e538903f05bedad51bc195866abbd9daf957
2012-03-26 16:34:29 +09:00
Tadashi G. Takaoka
27bb631f4c Merge "Add ZWNJ and ZWJ icons" 2012-03-25 23:46:29 -07:00
Tadashi G. Takaoka
39390d3f94 Add ZWNJ and ZWJ icons
Bug: 5456620
Change-Id: I7238f41c841803746ca2ab6cd332b2be8498a3ee
2012-03-26 13:05:29 +09:00
Tadashi G. Takaoka
99eb2d3404 Merge "Convert dimension unit "in" and "mm" to "dp"" 2012-03-25 20:21:00 -07:00
Jean Chalard
a77bbc64f0 Merge "Correct a shaky processing and move it to a better place" 2012-03-25 17:57:49 -07:00
Kurt Partridge
e327628855 update ResearchLogger times to report SystemClock.uptime()
Bug: 6188932
Change-Id: I852537caed46958e4d9c3251664edaa69652205c
2012-03-24 22:41:11 +09:00
Kurt Partridge
d05afa3f4c move usability log code to new class (ResearchLogger) and clean api
This change also undoes the effects of I8694eb9016, which was an initial
effort built on Utils.UsabilityStudyLogs.  Now Utils operates as it did
previously, for backward compatibility, but the ResearchLogger retains
the new log format.

Coordinated with  I274b75c5.

Bug: 6188932
Change-Id: I41208bdc6b511f69a010c9fc38a936521beba7d5
2012-03-24 20:14:42 +09:00
Jean Chalard
08baf5ff8e Merge "Fix a native crash" 2012-03-23 06:40:50 -07:00
Jean Chalard
b0b89c87f6 Fix a native crash
-1 & 0xFFFF is 65536 :p

Change-Id: I8ecb882b6d6c5bcc91b52e23eb9cc02b04fcdd34
2012-03-23 22:36:00 +09:00
Tadashi G. Takaoka
fce9ca4202 Merge "Remove verbose debug message" 2012-03-23 06:25:13 -07:00
Tadashi G. Takaoka
61f24842c7 Remove verbose debug message
Change-Id: I05bfe24228a6fbe806987d2a0d81e59611c3b476
2012-03-23 22:23:56 +09:00
Jean Chalard
380ad509e6 Merge "Optimization and typo fix" 2012-03-23 06:20:58 -07:00
Tom Ouyang
b163f91621 Merge "Add support for updating and adding bigrams to existing nodes." 2012-03-23 05:57:55 -07:00
Tom Ouyang
7cfe20efbe Add support for updating and adding bigrams to existing nodes.
Bug: 6188977
Change-Id: I48aca8ba199247d73395ab13b9d1976f4e739208
2012-03-23 21:52:39 +09:00
Jean Chalard
71f9d30b18 Correct a shaky processing and move it to a better place
The old code would remove caps from the first letter if
auto-capsed but that makes very little sense when the word
is camel-cased. Also, it would not correctly handle
surrogate pairs, and would require a direct reference to
LatinIME and a specific method to do the processing in an
unexpected place.

Change-Id: I416d6a805242788a2473f007ca7452c9fe3f5205
2012-03-23 21:40:07 +09:00
Jean Chalard
3ee7d97587 Optimization and typo fix
Change-Id: Iafa414b8bcf2cca4569b3753bfac58f301a72269
2012-03-23 21:29:30 +09:00
Tadashi G. Takaoka
2a04637f60 Convert dimension unit "in" and "mm" to "dp"
Bug: 6183561
Change-Id: I06d74705fd49566684815853b8f2df7b5a9f9d7e
2012-03-23 21:21:26 +09:00
Tadashi G. Takaoka
ad29273553 Merge "Override the keyboard height per device" 2012-03-23 05:19:36 -07:00
Tadashi G. Takaoka
e49a987c23 Override the keyboard height per device
Bug: 6183561
Change-Id: I7432552fbe41212e8f412962b16877a2af07eb9c
2012-03-23 21:17:05 +09:00
satok
8980bd4a25 Merge "Cleanup jni 1" 2012-03-23 03:24:08 -07:00
satok
9df4a4527a Cleanup jni 1
Change-Id: Ieb6af8385356e259720b50f1fe46a694a098b30f
2012-03-23 19:03:20 +09:00
Jean Chalard
c4f69e7d68 Merge "Stop creating useless objects" 2012-03-23 02:56:10 -07:00
Jean Chalard
0e134a4477 Merge "Small optimization" 2012-03-23 02:47:54 -07:00
Jean Chalard
a492790982 Stop creating useless objects
Man that was bad, it's heavy, it's called quite often, and it's
totally useless

Change-Id: Ia7e23e0e60ff4a929b226f3f4ccabedbc3ea2c06
2012-03-23 17:55:11 +09:00
Jean Chalard
e5f02cff7a Small optimization
Change-Id: I5dd7c848f2aaec20325e7ee85f27e282e1ba7a85
2012-03-23 17:03:55 +09:00
Jean Chalard
cc78d03a62 Add processing for French ligatures.
Bug: 5140033
Change-Id: I1c2751fc617e662aad9f67506e28a622f81d0bc9
2012-03-23 16:50:59 +09:00
Ken Wakasa
066866954a Add a missing comparison in Word.equals()
Follow up to I94e2e29c

bug: 6209651
Change-Id: Iff2daca8c2678e2d1796f98d6db738f109e3d03f
2012-03-23 14:41:16 +09:00
Ken Wakasa
6ef88a8901 Merge "Add missing Word.hashCode()" 2012-03-22 22:11:51 -07:00
Ken Wakasa
9f0ea52a5d Add missing Word.hashCode()
Some cleanups too.

bug: 6209651
Change-Id: I94e2e29c92e90e554e4952d277d590e093766c4f
2012-03-23 13:11:39 +09:00
Jean Chalard
081616cd2f Send correct coordinates for the spell checker
This results in the computation being done in native code
and the correct proximity being used.
Bug: 6181080

Change-Id: I08fa05c781d607e4feca2caeda353ec19c133a3d
2012-03-23 13:02:58 +09:00
Jean Chalard
e7cfe43652 Merge "Don't rely on spell checker proximity in tests" 2012-03-22 02:15:29 -07:00
Jean Chalard
8e31d76983 Merge "Make some constants more explicit." 2012-03-22 02:15:21 -07:00
Jean Chalard
109728193e Don't rely on spell checker proximity in tests
This fixes the input logic tests that were broken and suppresses
their dependency upon the spell checker proximity. Instead, it
gets the Keyboard instance from Latin IME and uses the actual
coordinates, which results in a test run closer to what actually
happens during typing.

Change-Id: I3a81d249ee7fb3ac6ae6940aa2e8b2421e829e5c
2012-03-22 18:08:23 +09:00
Tadashi G. Takaoka
9835808e83 Merge "Use ObjectAnimator" 2012-03-22 01:39:01 -07:00
Jean Chalard
330cd291fa Make some constants more explicit.
This wasn't very obvious, but the actual values are critical, so
make it more readable
Bug: 6181080

Change-Id: I07461d2df4c796dad0cb6f5283e41a28036d023c
2012-03-22 14:28:05 +09:00
Tadashi G. Takaoka
31c94cea82 Use ObjectAnimator
Bug: 6187069
Change-Id: I7df18b470b7e746da601fab3311fb4b086f40d41
2012-03-22 12:44:46 +09:00
Kurt Partridge
19b8a73efa Merge "log through group level abstractions" 2012-03-21 20:30:35 -07:00
Kurt Partridge
fdd68f0657 log through group level abstractions
For the groups:
- LogGroup.MOTION subfields now deteremined in Utils.writeMotionEvent() rather
  than in LatinKeyboardView.processMotionEvent()
- LogGroup.KEY is now logged throguh LatinIME.onCodeInput() rather than
  Utils.push().  This catches keys more generally, including modifiers, and
  records touch positions for everything.  Removed now-redundant
  Utils.writeBackspace() and Utils.writeChar().
- LogGroup.CORRECTION uses Utils.writeCorrection(), and formats instead of
  leaving this to callers.
- LogGroup.STATE_CHANGE uses Utils.writeStateChange().  Optional fields are
  still left to callers, as this group has more variety.

Formats have changed to incorporate new fields.

Minor housekeeping:

ENABLE_USABILITY_STUDY_LOG constants replaced with variable references, as
the logging feature can be changed in Settings and therefore dynamically
changes.

New log format:

20120322-111203.621+0900        1332382323621   s       [onStartInputView]      com.socialnmobile.dictapps.notepad.color.note   2131624043      147457  1140850694
20120322-111204.912+0900        1332382324912   m       [Down]  2782355 0       243     171     0.5666667       0.895
20120322-111204.975+0900        1332382324975   m       [Move]  2782419 0       240     171     0.6     1.17
20120322-111204.983+0900        1332382324983   m       [Move]  2782428 0       238     171     0.6     1.1899999
20120322-111204.992+0900        1332382324992   m       [Move]  2782437 0       236     171     0.6     1.1899999
20120322-111205.002+0900        1332382325002   m       [Move]  2782446 0       232     170     0.6     1.1899999
20120322-111205.012+0900        1332382325012   m       [Move]  2782456 0       227     169     0.6     1.125
20120322-111205.021+0900        1332382325021   m       [Move]  2782465 0       224     168     0.6     1.125
20120322-111205.031+0900        1332382325031   m       [Move]  2782475 0       221     167     0.6     0.895
20120322-111205.040+0900        1332382325040   m       [Move]  2782483 0       213     164     0.6     0.58
20120322-111205.047+0900        1332382325047   m       [Up]    2782491 0       213     164     0.6     0.58
20120322-111205.052+0900        1332382325052   k       'D'     243     171
20120322-111205.228+0900        1332382325228   m       [Down]  2782622 0       171     71      0.6333334       1.275
20120322-111205.243+0900        1332382325243   m       [Move]  2782677 0       178     69      0.6333334       1.275
20120322-111205.325+0900        1332382325325   m       [Up]    2782750 0       178     69      0.6333334       1.275
20120322-111205.333+0900        1332382325333   k       'e'     171     71
20120322-111205.509+0900        1332382325509   m       [Down]  2782936 0       265     139     0.53333336      0.885
20120322-111205.512+0900        1332382325512   m       [Move]  2782954 0       265     141     0.53333336      1.04
20120322-111205.552+0900        1332382325552   m       [Move]  2782973 0       265     143     0.5666667       1.14
20120322-111205.663+0900        1332382325663   m       [Up]    2783102 0       265     143     0.5666667       1.14
20120322-111205.668+0900        1332382325668   k       'f'     265     139
20120322-111206.140+0900        1332382326140   m       [Down]  2783584 0       348     352     0.53333336      0.675
20120322-111206.206+0900        1332382326206   m       [Move]  2783648 0       348     354     0.5666667       0.73499995
20120322-111206.223+0900        1332382326223   m       [Move]  2783666 0       348     356     0.5666667       0.545
20120322-111206.232+0900        1332382326232   m       [Up]    2783674 0       348     356     0.5666667       0.545
20120322-111206.236+0900        1332382326236   k       ' '     348     352
20120322-111206.245+0900        1332382326245   c       [----]  Def             -1

Bug: 6188932
Change-Id: Iea46a0c683f858b72005b8e81191ef1d70262dca
2012-03-22 12:02:10 +09:00
Ken Wakasa
2aa02b84a4 Revive the Makefile for makedict
Follow up to I4d2ef504.  Address a compiler warning and a small optimization as well.

bug: 6188977
bug: 6209651
Change-Id: Ibc9da51d48ebf0b8815ad0bb2f697242970ba8f7
2012-03-22 11:55:18 +09:00
Tom Ouyang
7ac556216d Merge "Move makedict to LatinIME android keyboard." 2012-03-21 05:50:28 -07:00
Kurt Partridge
221dd3d183 Merge "Add additional structure to output logs to group entries by optional fields." 2012-03-21 05:50:01 -07:00
Tadashi G. Takaoka
4897df803d Merge "Refactor key drawing code in KeyboardView" 2012-03-21 04:31:55 -07:00
Tadashi G. Takaoka
72913f97ed Refactor key drawing code in KeyboardView
Change-Id: Ic7af05caee32eb6cba68d27ba4e2d9072472b34d
2012-03-21 20:29:51 +09:00
Tadashi G. Takaoka
4cc44f9f77 Merge "Refactor to memorize device dependent override parameters" 2012-03-21 04:26:39 -07:00
Kurt Partridge
78bf41b89c Add additional structure to output logs to group entries by optional fields.
The new format has time, time as int, and the new logGroup code
    (m=motionEvent, k=key, s=statechange, c=correction)
    followed by additional text whose format depends on the logGroup code.

The additional text will be cleaned up in later CL's.

20120321-170548.067+0900        1332317148067   m
[Down]143116235,0,691,378,0.40000004,0.435
20120321-170548.133+0900        1332317148133   m
[Up]143116302,0,691,378,0.40000004,0.435
20120321-170548.146+0900        1332317148146   k       <enter> 691     378
20120321-170602.485+0900        1332317162485   s
[onStartInputView]com.socialnmobile.dictapps.notepad.color.note,2131624043,147457,1140850694
20120321-170606.508+0900        1332317166508   m
[Down]143134679,0,40,154,0.4666667,0.64
20120321-170606.567+0900        1332317166567   m
[Move]143134723,0,42,154,0.4666667,0.765
20120321-170606.577+0900        1332317166577   m
[Move]143134746,0,44,154,0.4666667,0.775
20120321-170606.652+0900        1332317166652   m
[Up]143134824,0,44,154,0.4666667,0.775
20120321-170606.662+0900        1332317166662   k       A       40      154
20120321-170607.200+0900        1332317167200   m
[Down]143135372,0,411,390,0.53333336,0.585
20120321-170607.311+0900        1332317167311   m
[Up]143135483,0,411,390,0.53333336,0.585
20120321-170607.313+0900        1332317167313   c       [----]A

Bug: 6188932
Change-Id: I8694eb9016d8cf0389ef582f6c7d2820aa4d2c92
2012-03-21 19:41:10 +09:00
Tom Ouyang
e276c2401e Move makedict to LatinIME android keyboard.
Bug: 6188977
Change-Id: I4d2ef504bb983abbda3cb52ee450cb46f58d95cf
2012-03-21 19:30:26 +09:00
Tadashi G. Takaoka
624f1bab39 Refactor to memorize device dependent override parameters
Change-Id: I79482a8ef3846525669979a30dec183ea18138b5
2012-03-21 18:20:18 +09:00
Jean Chalard
32aac4777f Merge "Correctly close the gzip stream" 2012-03-21 01:32:07 -07:00
Jean Chalard
bc89f5d3a5 Correctly close the gzip stream
I had gotten the chain call in reverse.
Bug: 6177523

Change-Id: Ic5b76425de2d5d05d5132f8d2c7ade0d79c14ccc
2012-03-21 17:28:37 +09:00
Jean Chalard
f5f53c2fa6 Merge "Strengthen java code against bad returns from native" 2012-03-21 00:54:25 -07:00
Jean Chalard
6ca3ac08ed Strengthen java code against bad returns from native
This doesn't really fix the following bug but it may alleviate
the symptoms

Bug: 6191885
Change-Id: I0de3f550cc7c6cdf79b291399785ad31b205d2ac
2012-03-21 16:40:26 +09:00
Kurt Partridge
140467b8b6 Updated logger to record touch position within backspace key events.
Bug: 6188932
Change-Id: Ida2aff618153792f9803f30f1251d67c89af1fe0
2012-03-20 23:29:34 +09:00
satok
1fe943aabd Merge "Cleanup proximity related code" 2012-03-19 02:40:25 -07:00
satok
728d1c884e Cleanup proximity related code
Bug: 4343280
Change-Id: I57c0f9e20d9d8911009ea97057251a7f7a81512f
2012-03-19 18:33:59 +09:00
satok
546b8275ab Merge "Add a dummy file and package for make dict" 2012-03-19 02:01:05 -07:00
Kurt Partridge
6d7e0a876b Merge "Fix TAG name" 2012-03-19 00:52:44 -07:00
Kurt Partridge
9a50777890 Fix TAG name
Change-Id: Ibea065bc72e6b5e40cfa3ffa2fb6bcdeb107ffc4
2012-03-19 16:11:17 +09:00
satok
905670bd87 Add a dummy file and package for make dict
Change-Id: I195fd42f2a773bcc6fab0a61336a1c15d97902bb
2012-03-19 15:26:13 +09:00
satok
f9c2773b09 Merge "Make the primary character stable" 2012-03-18 22:01:50 -07:00
satok
d6d0f6976c Make the primary character stable
Bug: 4343280
Change-Id: I3e6eaa3803dc32a837825f3a64403430721b6192
2012-03-19 12:49:16 +09:00
Jean Chalard
9ffb94fa13 Rename the user history dictionary.
UserBigramDictionary -> UserHistoryDictionary.

Also update all methods, strings and comments, except those needed
for backward compatibility (which only include the name of the
database file).

Change-Id: I0bccea29880dc566b90100575b83baaa947b03ae
2012-03-19 12:03:51 +09:00
Ken Wakasa
660776e09b Small performance improvement by removing interface accesses.
Change-Id: I6d91f3b086470b79306dbe2874db9748b9e0eb5f
2012-03-17 01:53:51 +09:00
satok
cbb5053b6c Fix NPE
bug: 6181736

Change-Id: I6522f19555c27f33c9ff4eaa8b2559a51a38f015
2012-03-17 01:37:53 +09:00
satok
a50a34f8b4 Merge "Calculate proximity characters in the native code" 2012-03-16 01:38:07 -07:00
satok
1caff47ecd Calculate proximity characters in the native code
Bug: 4343280

Change-Id: I6adaf560f7a4f1f96dcb6ec2f61f20ee3001167e
2012-03-16 17:26:36 +09:00
Jean Chalard
d0d25ac8ec Merge "Remove UserUnigramDictionary." 2012-03-16 01:11:52 -07:00
Jean Chalard
f73efa9077 Merge "Move the UserUnigramDictionary functionality over" 2012-03-16 01:05:10 -07:00
Jean Chalard
7dcbed04d9 Remove UserUnigramDictionary.
This isn't used any more.

Change-Id: Ie63ae621bcac9342b869b9f236f35bf66ec3a09b
2012-03-16 17:04:41 +09:00
Jean Chalard
c68d1bbfaf Move the UserUnigramDictionary functionality over
UserBigramDictionary now assumes both functionalities. It will
be renamed to UserHistoryDictionary in a future change.

There are several reasons to do this. First, there is a lot of
duplicate code in User{Unigram,Bigram}Dictionaries that are
factored by the few lines of code in this change. Also, other
dictionaries like BinaryDictionary or ContactsDictionary all
assume both responsibilities, as should be the case
theoretically.

It is also possible to do this because previous versions don't
write any unigram data that we'd want to reuse. For even older
versions that do write data, we can't really make any sense out
of it. Bigram data however can be useful, and this allows us to
reuse it easily.

Change-Id: I755525f92744e1536eaef097527e8151b7859a30
2012-03-16 17:01:57 +09:00
Tadashi G. Takaoka
9945f36406 Merge "Don't reset animation alpha value when keyboard is set" 2012-03-15 21:12:49 -07:00
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
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
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
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
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
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
Jean Chalard
b26af7eae7 Revert "Kill methods with side-effects"
This reverts commit ca0e048688
2012-03-12 19:42:29 -07:00
Jean Chalard
ca0e048688 Kill methods with side-effects
Change-Id: I42baeec68eb2540e7d8f8538ae2dceeef5594391
2012-03-12 19:48:32 +09:00
Jean Chalard
f62d6f50f2 Merge "Consolidate words into SuggestedWordInfo" 2012-03-12 03:14:54 -07:00
Jean Chalard
c3c4ed91cf Consolidate words into SuggestedWordInfo
We can't get rid of SuggestedWordInfo because it conveys
the information about whether a suggestion is outdated or
not. It is always created anyway. So it makes sense not
to have separate lists and to just keep everything in the
SuggestedWordInfo object.

Change-Id: Idd79dc267d97633901d3d2869da457736963e178
2012-03-12 18:58:20 +09:00
Tadashi G. Takaoka
546692daac Merge "Support disableAdditionalMoreKeys and disableKeyLabelHint" 2012-03-12 01:48:05 -07:00
Tadashi G. Takaoka
b03529aa01 Support disableAdditionalMoreKeys and disableKeyLabelHint
Change-Id: Idfa586417acd4a223380d52f044e3a86eb780b21
2012-03-12 17:45:57 +09:00
Jean Chalard
a3f2ce1f31 Merge "Fix an OOB" 2012-03-12 01:12:40 -07:00
Jean Chalard
c0c20b386f Fix an OOB
The combination of I6b0262fe which removes the internal
size() > 1 test in the safety net calculation and I642a5893
which assumed DBG means there is at least one suggestion.
This change writes the test correctly.

Change-Id: Ib63bce4e163a785f408dd145c23d64cd58fa8c90
2012-03-12 16:50:58 +09:00
Tadashi G. Takaoka
b6895aec05 Merge "Rename keyboard XML files" 2012-03-12 00:42:03 -07:00
Tadashi G. Takaoka
47141f7011 Rename keyboard XML files
* Slavic to East Slavic
* Serbian to South Slavic
* Scandinavian to Nordic

Bug: 6150183
Change-Id: I8f5641aa07b83cbb225f5fd73e351a6f8abe0784
2012-03-12 16:39:29 +09:00
Jean Chalard
30936116d8 Merge "Make a method accessible for tests" 2012-03-12 00:23:29 -07:00
Jean Chalard
9dedec7c29 Make a method accessible for tests
Tests are using a wrapper method that's going to disappear soon.
The method that becomes package-visible now is destined to be
removed too a little later.

Change-Id: If99b1c77ed52e050b47216cc7afab5f35c4bbb38
2012-03-12 16:11:16 +09:00