Commit graph

5704 commits

Author SHA1 Message Date
Jean Chalard
296ee12b8f Merge "Add a replacement character to digraphs system" 2012-03-21 20:12:30 -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
Jean Chalard
d30433837d Add a replacement character to digraphs system
The digraphs system used to allow only the replacement of
a pair (A, B) by (A). This change allows the replacement to
be any character.
Bug: 5140033

Change-Id: Icf5995f0ec553f7b7989af9902cbb2c4c6b51009
2012-03-22 11:37:26 +09:00
Jean Chalard
9c4396abb3 Merge "Generalize the digraph code" 2012-03-21 18:47:10 -07:00
Eric Fischer
2e66afcc10 Import translations. DO NOT MERGE
Change-Id: Iea3ffbd477e54bbccd65266ce4e070efb7a8c3fc
2012-03-21 14:05:45 -07:00
Eric Fischer
96b05034d5 Merge "Move locale-specific configuration out of config.xml." 2012-03-21 09:20:16 -07: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
Tadashi G. Takaoka
26e7ce1fa8 Merge "Use "dp" instead of "dip"" 2012-03-21 04:05:21 -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
3d2ab10d99 Merge "Use "dp" instead of "sp"" 2012-03-21 03:29:49 -07:00
Tadashi G. Takaoka
7c38b73ff2 Use "dp" instead of "dip"
Change-Id: Iaab1032a0ce0f97742288e76221433ef400e4b4f
2012-03-21 19:08:58 +09:00
Tadashi G. Takaoka
a6dd0c2761 Use "dp" instead of "sp"
Change-Id: I772d117d88eb7361d8695c4d97c051f0c7397df8
2012-03-21 18:56:09 +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
6c30061c70 Generalize the digraph code
Bug: 5140033
Change-Id: I19c8c89f79f7c1ce1fba58d50bc2697747052599
2012-03-21 17:50:55 +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
2a7224a611 Merge "Fix a bug where the returned number of bigrams was incorrect" 2012-03-21 00:55:55 -07:00
Jean Chalard
9715cc4ed5 Fix a bug where the returned number of bigrams was incorrect
Bug: 6191885
Change-Id: I1daa4d2eaeec5f5c1a4eef79221fd7de357763e9
2012-03-21 16:55:04 +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
Tadashi G. Takaoka
710c69fc82 Dynamically determine key preview backing view height
Bug: 6023947
Change-Id: I53a5c0eb99100a0dfe3e025808f5dc55747d1287
2012-03-21 11:21:34 +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
Eric Fischer
4216350a2a Move locale-specific configuration out of config.xml.
Having it in a translatable file would sometimes cause the translation
importer to try to replace the locale-specific configuration file.

Change-Id: Ib450454b63c1a4de8b85905561a59224b9410147
2012-03-19 09:22:37 -07: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
Tom Ouyang
226987094a Merge "Change package name for makedict." 2012-03-19 01:51:51 -07:00
Tom Ouyang
cdc51fc6af Change package name for makedict.
Bug: 6188977
Change-Id: I1d82479dc6b678c68835f0a291570f86fe879f5d
2012-03-19 17:43:45 +09: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
Tadashi G. Takaoka
6024e84739 Merge "Support preliminary Hindi Keyboard" 2012-03-16 01:12:37 -07: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
Tadashi G. Takaoka
53eca32f9e Support preliminary Hindi Keyboard
Bug: 5964777
Change-Id: Id12c75966f6302e6f4ebbd4a8f474e05c601c88a
2012-03-16 17:04:58 +09: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