Commit graph

12813 commits

Author SHA1 Message Date
Satoshi Kataoka
b3796ab2a7 am 82a67bc8: am e3c0cca4: am e8a3e964: am 395e500b: am bb9a8e08: am f463b45d: Merge "Fix Possible NPE"
* commit '82a67bc8bbef7b9553d128f01e0813e63a3ac0ba':
2013-04-10 19:40:13 -07:00
Satoshi Kataoka
9ff33b6dfa am d430c1b6: am d6f56350: am 619d1f73: am 0c99a379: am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE"
* commit 'd430c1b6bfccc11d272ca55894997e0c9efecb0d':
2013-04-10 19:40:12 -07:00
Kurt Partridge
504bbe38f7 am 798820ab: am 3012c891: am 867b2380: am 35e02ccd: am bf62dc03: am ef103e1f: Merge "Close ResearchLogger upon onFinishInputView"
* commit '798820ab1d3c3da6b442f230a2c70ccb83f96ce3':
2013-04-10 19:40:10 -07:00
The Android Open Source Project
e279de0265 am ab6fa041: am e72a088f: am a6dcb55e: (-s ours) am 62adeccd: am 577f08a3: am 22384b57: (-s ours) am 0ed901ff: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit 'ab6fa041587fcca7abd507f25bc07593074a97f2':
2013-04-10 19:40:09 -07:00
The Android Open Source Project
4b176a0104 am 83346295: am 2c7b1b82: am d2582473: (-s ours) am 22953740: Reconcile with jb-mr2-release - do not merge
* commit '83346295ea6fcd4cf29fbe164bb2df76a6449dc9':
2013-04-10 19:40:08 -07:00
Baligh Uddin
b4fbb29551 am d3ae58ef: am 3bc22c56: am e7d91194: (-s ours) am 370070ae: am 4cdb7ccb: Import translations. DO NOT MERGE
* commit 'd3ae58ef1b18e015c4f2fe4b46c78eef7be02bb5':
2013-04-10 19:40:06 -07:00
Baligh Uddin
792abb730b am 3c163ec1: am ac68b5ce: am 4b8494c4: (-s ours) Import translations. DO NOT MERGE
* commit '3c163ec1732d00c9e726f22d27ef92057f685c04':
2013-04-10 19:40:05 -07:00
Baligh Uddin
c1f3a8012c am 8acb56b6: am 128ab7e5: Import translations. DO NOT MERGE
* commit '8acb56b60be5ad5009b7ffe96b035c067e03a958':
  Import translations. DO NOT MERGE
2013-04-10 19:40:04 -07:00
Satoshi Kataoka
a514e95801 am a2b129e9: am 0b0d9827: am 95fe8267: Move suggest logic to AOSP
* commit 'a2b129e9ae369dae3001d2c0efe2b0746421930a':
2013-04-10 19:40:03 -07:00
Jean-Baptiste Queru
784eda74af am d9f35e32: am a21bec13: am 30667266: (-s ours) am 5bcb3876: Merge 2caa1d81ce - do not merge
* commit 'd9f35e322681214ba62e1d89ec6fabfc7ff88c11':
2013-04-10 19:40:01 -07:00
Baligh Uddin
cfdc91b99a am 58df3cfa: Import translations. DO NOT MERGE
* commit '58df3cfaeee020b6703f90feda89a3bc95a3a116':
  Import translations. DO NOT MERGE
2013-04-10 19:35:52 -07:00
Tadashi G. Takaoka
9620943cc8 am d9a22235: Hide Setup Wizard icon for stock keyboard
* commit 'd9a2223570759d622c690b007369cf32f437f7e5':
  Hide Setup Wizard icon for stock keyboard
2013-04-10 19:35:51 -07:00
Jean Chalard
1aaaa64da8 am 75618c33: am 19dcd154: Merge "Offer to add any OOV typed word to the dictionary."
* commit '75618c3321b8eae559886ba5f71e967591da7065':
  Offer to add any OOV typed word to the dictionary.
2013-04-10 19:35:50 -07:00
Satoshi Kataoka
fd89cd20c9 am daef4e8f: am f31553bc: Merge "Fix touch coordinate calibration"
* commit 'daef4e8f194632a501270ea28c0ae8764a9fe97a':
  Fix touch coordinate calibration
2013-04-10 19:35:49 -07:00
Jean Chalard
0d72a23054 am 04bb419c: am ddafcf82: Merge "Fix bugs and add tests"
* commit '04bb419c3290d059c5ccd5e1eda8600d44a0a69d':
  Fix bugs and add tests
2013-04-10 19:35:48 -07:00
Kurt Partridge
bea42fc5bd am 5bd24642: am 1f70a4d6: Merge "Allow logging while replaying"
* commit '5bd2464297db3035b93410c5359accbda74e9f50':
  Allow logging while replaying
2013-04-10 19:35:47 -07:00
Kurt Partridge
41a049a410 am ae144fe9: am d117c1a1: Merge "Do not record log split time when handling separator"
* commit 'ae144fe9c3a6c80150c11d96da84f5868f44ab8a':
  Do not record log split time when handling separator
2013-04-10 19:35:45 -07:00
The Android Open Source Project
fb899d85ee am 3019a5e1: am a8d29082: (-s ours) am d5c8247f: Reconcile with jb-mr2-release - do not merge
* commit '3019a5e1d11eca0d9a8396cf6684f72767eb6d6e':
2013-04-10 19:35:45 -07:00
Ken Wakasa
4c896a2fe8 am f71b9640: am d17c8bd9: Update comments
* commit 'f71b96406391fc00c1d3dc45e6b3e827f3595842':
  Update comments
2013-04-10 19:35:44 -07:00
Ken Wakasa
b3cf23de7f am a271f165: am 31f42ba0: Tiny clean up in Makefile
* commit 'a271f165b92069a7684a1dfc2c43533dc79fccdd':
  Tiny clean up in Makefile
2013-04-10 19:35:42 -07:00
Ken Wakasa
ff730a665c am bc2fd24f: am b68e7344: Cleanup the include paths
* commit 'bc2fd24fd3dff57295a1ba4d80d06544e54a820c':
  Cleanup the include paths
2013-04-10 19:35:41 -07:00
Satoshi Kataoka
c7e1caac44 am cd0984a4: am e320789a: Suppress bigram native log
* commit 'cd0984a4ab8f95d40287bb1e450ef169513330df':
  Suppress bigram native log
2013-04-10 19:35:39 -07:00
Satoshi Kataoka
40d8b652b2 am dfb680c4: am f5e18e99: Merge "Cleanup suggest interface"
* commit 'dfb680c4650d527f22046f6924f404eaba56709a':
  Cleanup suggest interface
2013-04-10 19:35:38 -07:00
Ken Wakasa
34cff46a9c am ed8fd94e: am 370461ef: Clean up a few option strings under the Advanced settings
* commit 'ed8fd94e3c4fd16c0c767c1a45f46461313bdcb8':
  Clean up a few option strings under the Advanced settings
2013-04-10 19:35:37 -07:00
Jean Chalard
024d0e4abf am f10e7cbe: am e9f69e16: Merge "Move a generic string utility to StringUtils"
* commit 'f10e7cbe96596971be5de6592c9cab0aba9ad764':
  Move a generic string utility to StringUtils
2013-04-10 19:35:36 -07:00
Tom Ouyang
8ab65b8b4e am 4096fd08: am 08fd3d95: Merge "Add DigraphUtils class"
* commit '4096fd08025f2dbafabc2a558a9e15d1561d6234':
  Add DigraphUtils class
2013-04-10 19:35:34 -07:00
Ben Cheng
f82a5a24cc am 96cb244d: am 65534ffc: am d0c383e1: am 5a4949c2: Merge "Force inlining Correction::isSingleQuote" into jb-mr2-dev
* commit '96cb244d7bedca50fa804d7acdef9767a15cb67e':
2013-04-10 19:35:33 -07:00
Satoshi Kataoka
e90df24386 am 481412bb: am f3633e9b: Merge "Add flag to turn on new suggest implementation for typing"
* commit '481412bb44d6c3b971b28b490babbcbad4283003':
  Add flag to turn on new suggest implementation for typing
2013-04-10 19:35:32 -07:00
Baligh Uddin
da90ffe048 am 898ec2bf: am 5a5db35d: am 04915a76: am c33a0ab3: keep history after reset to jb-ub-latinimegoogle-azuki
* commit '898ec2bf850f0786a3ebb7883b2b7c926181f4d9':
2013-04-10 19:35:31 -07:00
Baligh Uddin
005df80888 am 12db86a6: am c48fe5d1: (-s ours) am 51a47422: am a631cede: Import translations. DO NOT MERGE
* commit '12db86a653d98efe12f35ef0490bae17e5d72af4':
2013-04-10 19:35:29 -07:00
The Android Automerger
ddb50ffff8 am d4b63931: am df35f7dd: am 02dc06a8: am 21484175: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
* commit 'd4b6393115a8457fce1ae8be6bf43c1807715cf5':
2013-04-10 19:35:28 -07:00
Jean Chalard
edf26bee83 am d1491741: am 1e1d61d2: am d2a0c614: am b4e2a3bb: am 868805ae: Merge "Change which backdoor the tests goes through"
* commit 'd1491741b3674a5794eda4fe2d5800ab4c551dfe':
2013-04-10 19:35:27 -07:00
Jean Chalard
3090e8c861 am b154f10c: am 310f0dbc: am c840ec9e: am 7cd0ffdd: am 248dcdf0: Merge "Fix a test."
* commit 'b154f10c0dd2d18dfa2794ca97d987442435b629':
2013-04-10 19:35:26 -07:00
Satoshi Kataoka
e8f7d669c5 am 9414d75d: am db377ca6: am 64dd4754: am 63742fe5: am d2a04e1e: Merge "Move typing policy to AOSP"
* commit '9414d75d47075eb484bf2ec43b80aa233b8d9fe3':
2013-04-10 19:35:24 -07:00
Jean Chalard
de19e16154 am be9af787: am e405ec76: (-s ours) am 1bd8f332: am 6531bcdc: am ecb59eff: (-s ours) Revert "[DO NOT MERGE] Activate hardware keyboard handling"
* commit 'be9af787ac08d27a5a81aa91b20bcb6d69086857':
2013-04-10 19:35:23 -07:00
Jean Chalard
cb7983e4e2 am ab6ef3b1: am e1f90dce: (-s ours) am 6b29ef46: am 558f41d4: am c741f1f8: (-s ours) [DO NOT MERGE] Activate hardware keyboard handling
* commit 'ab6ef3b14ee09e3903ec5b48138237033b1e54b6':
2013-04-10 19:35:22 -07:00
Kurt Partridge
5d337ad68a am 0c552106: am 6c9097fa: am 3547bd29: am 228d4533: am 5779bc91: Merge "Split LogUnits differently."
* commit '0c55210606d0a751ac04c7ff5544cb295fa920e2':
2013-04-10 19:35:21 -07:00
Baligh Uddin
27fede0b06 am 5db8119d: am 7022bd23: (-s ours) am 2741e56d: am 0491706a: am 02fc1ed5: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '5db8119d8f526a191bbbe1a48e42a9ab4c834ce8':
2013-04-10 19:35:20 -07:00
Baligh Uddin
f4be755819 am c60d81f5: am a35cea39: (-s ours) am 536e7220: am 9bf7e74d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit 'c60d81f5c06a741ed3571269d4b0da03bb10ecab':
2013-04-10 19:35:18 -07:00
Kurt Partridge
538974d0ea am 72c2b423: am ae0c5f79: am 3ec6a8bd: am 6c522b53: am 0c0ab2b4: Merge "Reorder ResearchLogger call"
* commit '72c2b423fb04957250af433e3319ffb2d815a898':
2013-04-10 19:35:17 -07:00
Jean Chalard
a7da57decc am 3b8d54bf: am 08a5e43d: am 19fe4d4b: am bfd7dcd5: am 0745fe83: am b8869ec1: am 0fcc4960: Deactivate hardware keyboard handling.
* commit '3b8d54bf1d45b8112cffe963759fe8c52d7afe8f':
2013-04-10 19:35:16 -07:00
Tadashi G. Takaoka
8a984e8c4d am 2b3f1289: am 06c1baba: am b1533116: am b08506c2: am 9413e957: Merge "Interpolate gesture preview trails"
* commit '2b3f12897e776e0e9feb34d6f800cb869a85b878':
2013-04-10 19:35:15 -07:00
Satoshi Kataoka
bc36fbfc6c am cb4ae59c: am bb229fe1: am 91d468f5: am ac870326: am 54c091d2: Merge "Move policy and session to AOSP"
* commit 'cb4ae59c807cccc13a850643b06cd777d550c72c':
2013-04-10 19:35:13 -07:00
Jean Chalard
2cd99981bd am ed66b232: am cffac321: am 873c20ba: am e40d5633: am 43341ba0: Merge "Ask the client to make itself known when it\'s not"
* commit 'ed66b23231413e8ae97ad0bae037c8e2a65f4dcf':
2013-04-10 19:35:12 -07:00
Jean Chalard
f921a58784 am 76dda675: am c821c723: am 3b9d7fd1: am 151e4e18: am 065f126f: Merge "Fix two nasty bugs with surrogate pairs."
* commit '76dda67548dc8c227b0c0304003ea7a2fdd1c501':
2013-04-10 19:35:11 -07:00
Satoshi Kataoka
5180572736 am 8348fe8a: am 6f7494e6: am fdf3c49c: am bde25a4a: am 38c26dd0: Move dicnode to AOSP
* commit '8348fe8a09f483aefffe10d4b876e09ccf19eb1a':
2013-04-10 19:35:10 -07:00
The Android Open Source Project
cfe49191f7 am 38a9f856: am 228fcdae: (-s ours) am 70616b63: am 08f5b780: am c1dec87a: (-s ours) am b35915fb: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '38a9f856e58e92c10a932602bfe9e29ebf2a6ec9':
2013-04-10 19:35:08 -07:00
Satoshi Kataoka
d7c3c523d9 am 7a3bc77b: am b980adab: am a9ef902c: am 70747ad6: am 97a3ce02: Merge "Refactor"
* commit '7a3bc77b412810c772ad333c2ad459f1c8592ff3':
2013-04-10 19:35:07 -07:00
Jean Chalard
c7163a4c8c am 126336be: am 3effa520: am 4c535232: am a38d907b: am 740da0d8: Fix an NPE
* commit '126336be8e69ea0b473d662e057a1e031eec8658':
2013-04-10 19:35:06 -07:00
Tadashi G. Takaoka
617362fdb9 am 1b7451af: am 57a7a5c3: am 76c00dec: am 7580e994: am 48d8d8d0: Fix potential NPE in MainKeyboardView.KeyTimerHandler
* commit '1b7451af76939636548bf1fd290b081158888229':
2013-04-10 19:35:05 -07:00