Commit graph

20348 commits

Author SHA1 Message Date
Kurt Partridge
aaa2f25bc3 am 194dc02b: am 00e0b840: am fd5d440d: am 681f1239: am e72d1a07: Merge "Allow downloadable dictionaries in development builds"
* commit '194dc02b20c9ee4d67a90e5cefa6b25d8f0f4f6f':
2013-10-03 14:56:03 -07:00
Kurt Partridge
7e82fb19b9 am adbffeb7: am ba713adb: am 8b70f58b: am 37621957: am 3d9ebf21: Merge "Make intents unique to AOSP"
* commit 'adbffeb7d40dc044fca2285c8e889e78fd4dc53e':
2013-10-03 14:56:01 -07:00
Kurt Partridge
3a96759001 am 351d88cf: am 5fd7b2bc: am 051d61ba: am 5062442f: am 14dd52b8: Merge "Adjust settings for development-only versions"
* commit '351d88cf5342ee92ac997a2303fedddadb9c7905':
2013-10-03 14:55:58 -07:00
Kurt Partridge
d66e418748 am b16c1e2a: am 5dbd4043: am fd3600a4: am 3cdea37c: am eac0eb89: Merge "Fix ResearchLogger feedback bug"
* commit 'b16c1e2a267ef026294a489c37d297ae1585b3cc':
2013-10-03 14:55:50 -07:00
Tadashi G. Takaoka
5fa1d8398f am 16f87a57: am 62074b25: am 282ebe38: am e18732ef: am dfd96be0: Retun an empty Path instead of null
* commit '16f87a574a68e4d1d9e0908cff19e1aa695cb151':
2013-10-03 14:55:46 -07:00
Baligh Uddin
6efa1603d4 am 133242e1: (-s ours) am f121fcd4: (-s ours) am 88fd780f: (-s ours) am 1b2e6fbf: (-s ours) am 2933f9e8: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '133242e182168e3e3b3e72c7fcbe8e0e65fd2051':
2013-10-03 14:55:43 -07:00
Ken Wakasa
208e37b85f am 40454690: am 09f96dac: am dad82a7c: am 2c895d4d: am f473f4b1: Remove unused macros in defines.h
* commit '404546905316b513715232152393890367e79183':
2013-10-03 14:55:41 -07:00
Keisuke Kuroynagi
080f55a185 am c7974d25: am 6e55ad53: am 5ab662de: am 61e9de73: am 0b7cd6a0: Fix: Android.mk for autocorrection_threshold_utils.
* commit 'c7974d25c6f528d53508fe222ae9264273e13e3e':
2013-10-03 14:55:38 -07:00
Keisuke Kuroynagi
32e629e4a1 am d1d3789c: am 16587c7d: am 8b6de7a8: am 67550776: am 527c1283: Remove unused methods.
* commit 'd1d3789c6a6cbbee70e7618853806fcc9b28e9eb':
2013-10-03 14:55:35 -07:00
Jean Chalard
9174ec8cbc am aa790699: am 1c18e064: am d51f4e69: am 35b514bd: am cd4edc15: Merge "Cache three main keyboards to improve average switch time"
* commit 'aa790699d940b3db0a41b90c40d3295ebb6f8687':
2013-10-03 14:55:32 -07:00
Keisuke Kuroynagi
68bba88421 am 090fa205: am 6f146f24: am bf71301e: am 1784d92e: am e3338420: Merge "Introduce BinaryDictionaryHeader to access binary dictionary header."
* commit '090fa205e1c1f2d202d2d866935d906ab27102cf':
2013-10-03 14:55:30 -07:00
The Android Open Source Project
7ef9b61e12 am 680f5e14: am 24bf2475: (-s ours) am 98afd4f9: (-s ours) am f0bdb131: (-s ours) am 96c46273: (-s ours) am 2f387da0: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '680f5e14d41eb1bc4c5c4a26e607d821b446758f':
2013-10-03 14:55:27 -07:00
Baligh Uddin
dbf6adca3d am 7a8ea815: (-s ours) am bc1ad68e: (-s ours) am 8054a056: (-s ours) am 64d0fa40: (-s ours) am 8ea77542: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '7a8ea815cde6b8f026707a2080d6f4474d498e7b':
2013-10-03 14:55:24 -07:00
Satoshi Kataoka
547ebb760d am 2e5e3edd: am d0fb2b41: am c1eccc94: am 28c7e634: am fe95e7b1: Merge "Fix possible NPE"
* commit '2e5e3edd165488adbda0aa8ecb84878a1bc89690':
2013-10-03 14:55:21 -07:00
Tadashi G. Takaoka
85c2ce7cd1 am 81e36c3c: am 0800da99: am 0b5b3f7b: am c68632af: am 77f63c8a: Don\'t use RichInputMethodManager in setup wizard
* commit '81e36c3c353d63e7e8a26e1ff6faa0780ce82b3f':
2013-10-03 14:55:18 -07:00
Tadashi G. Takaoka
e4442e86e2 am 3edb2b8b: am 8f4ed0b8: am ac48cca4: am 60261af5: am b0e0c5a8: Merge "Defer getting no language subtype"
* commit '3edb2b8b13e5342ba2392c5f5aa9e3ac962c5fa1':
2013-10-03 14:55:15 -07:00
Jean Chalard
ebeefea1fb am 450e3af1: am 76c87e8c: am 13a02a8d: am f637bb33: am d3c283d5: Merge "Fix an illegal argument exception"
* commit '450e3af112fcbcbce5eca6170e2e10f80e22fcd4':
2013-10-03 14:55:12 -07:00
Tadashi G. Takaoka
e64fc097ba am e87c22fa: am 8f5921bf: (-s ours) am b17fe378: (-s ours) am bd21edc9: (-s ours) am 1665cc27: (-s ours) am 05ee43dc: (-s ours) am a009d2c9: Add HTC One special edition (DO NOT MERGE)
* commit 'e87c22fa7add581863f2822ce43ea3902e31a475':
2013-10-03 14:55:09 -07:00
Tadashi G. Takaoka
99f115bff7 am 3872c243: am b2a18515: am e162eb7e: am 48f20fb8: am 091a4532: Merge "Add HTC One special edition"
* commit '3872c243f2b04e8e77180e70616afd31dd76cbfb':
2013-10-03 14:55:06 -07:00
Jean Chalard
b56edf6f21 am f022548e: am 37a44353: am f01644c4: am 323dd492: am 69100329: Merge "Use an iterator to remove stuff from an ArrayList."
* commit 'f022548eec7ba1e3e27b38d3eacb1e9cc776e8bc':
2013-10-03 14:55:03 -07:00
Satoshi Kataoka
8452422ba1 am 21f21877: am 9b91243f: am ff6a5581: am 2fa14bc5: am f6a1a765: Merge "Fix a possible NPE"
* commit '21f21877db1950c66af0edfecec6087d5cf91d86':
2013-10-03 14:55:01 -07:00
Tadashi G. Takaoka
684732a15a am 3f75c760: am b8d0dad0: am a4d4cae3: am 596652cc: am cbd219a7: Move Base64Reader to utils package
* commit '3f75c7609f3a9be79a5bff35c3dce73dae3bb672':
2013-10-03 14:54:58 -07:00
Tadashi G. Takaoka
393cb4d9b7 am 8fa567c7: am 8b4fad97: am 9bd148eb: am d8177b3a: am 9c440d13: Merge "Remove unnecessary Drawable.setState"
* commit '8fa567c790c75bb8f80dc9535835bbdef6d8a245':
2013-10-03 14:54:55 -07:00
Tadashi G. Takaoka
23e27aaee2 am 99771a81: am 0dd57b18: am c86c1294: am 8235d940: am 9d4e2518: Merge "Add CsvUtils that conform to RFC 4180"
* commit '99771a81bd9d7527ec945a942a233927ad21db07':
2013-10-03 14:54:52 -07:00
Tadashi G. Takaoka
7bb1019d66 am 019ea417: am 7a4c7d05: am 30183b22: am e10f4b6b: am 0bfc2bc4: Merge "Add CODE_CAPSLOCK for long press shift key"
* commit '019ea4170d36816257ae586c10181ccca8f9906a':
2013-10-03 14:54:49 -07:00
Ken Wakasa
d109027801 am 26aed3a5: am 33ec5357: am 49b9d16b: am 34a9e8bd: am ad0c6d7b: Cleanups in JNI related code
* commit '26aed3a5d74724e9882830d2ef8b39e29cd90919':
2013-10-03 14:54:46 -07:00
Ken Wakasa
9147aa0661 am e7726dea: am 23fe55d0: am 020a5704: am 496bb8af: am 11dc3a37: Clean up macro variables
* commit 'e7726dea85a734c8d6f75265d726b196871fb601':
2013-10-03 14:54:43 -07:00
Kurt Partridge
2953da4fa3 am a6c275c1: am e8be6f74: am 4865f818: am 0486b377: am 0dbae774: Merge "Avoid an NPE"
* commit 'a6c275c1390e1a69bdcf6aca1845de2a5051b49d':
2013-10-03 14:54:41 -07:00
Baligh Uddin
2159d77e7f am 5a6bcbfb: (-s ours) am 3c6d5101: (-s ours) am 14a3c634: (-s ours) am 267928c9: (-s ours) am 981a1944: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '5a6bcbfb6f24bcc3422d58db9edf3b855241f4aa':
2013-10-03 14:54:39 -07:00
The Android Open Source Project
d193881971 am d55e661e: am 3392102c: (-s ours) am 98691110: (-s ours) am 61adf619: (-s ours) am ea3027fe: (-s ours) am 0532b398: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit 'd55e661e886c4ecc4f44d8d6ee6c3ba072be7925':
2013-10-03 14:54:36 -07:00
Tadashi G. Takaoka
599e9481f0 am 71159b59: am 3c3d8404: am 5834fbb9: am 15aab5b1: am cbc7acb6: Merge "Expand suggestion strip when center suggestion is long"
* commit '71159b59c897c3ee6f1eb68c88b759794dd5f805':
2013-10-03 14:54:33 -07:00
Kurt Partridge
43d56da07f am 6e619633: am 28b85db8: am 4dfaaae8: am afbaac36: am 763fd9d5: Merge "Fix revert of committed words"
* commit '6e6196336974f3bee5a8c8778d06b7886d9cd6b5':
2013-10-03 14:54:30 -07:00
Ken Wakasa
682edd51c1 am be181a22: am 8cc42f32: am 2f3ac8e8: am 3888cc24: am 156d3930: Remove a bunch macros that are no longer used
* commit 'be181a227ce34a80067ab3d069189833a63ed028':
2013-10-03 14:54:27 -07:00
Satoshi Kataoka
728217a6e1 am cd42b44e: am b783f3b0: am 1b09a3f3: am b593ec88: am db0aa747: Merge "Purge WordsPriorityQueue"
* commit 'cd42b44e3023d81aa3445891984c9bca1d5a600b':
2013-10-03 14:54:23 -07:00
Ken Wakasa
0d3d4f4a0f am 54415777: am 9ca395b7: am b5cda658: am 887b635d: am 4caf5941: Follow up to I907150be994c4f9ffc030c063de521eeb177d3e1
* commit '544157770cfd3a769591724d7d13fe5fcc5ad122':
2013-10-03 14:54:20 -07:00
Satoshi Kataoka
ef8e1ead6e am 19ae94c7: am b0e02abb: am 130e1f95: am 31bd7b17: am cbb1ee48: Fix build
* commit '19ae94c75a9e9d2b0be7340f5b2ea2aa62414d83':
2013-10-03 14:54:15 -07:00
Tadashi G. Takaoka
d15f772bc0 am a946ab7a: am ea632ca2: am f2beae9e: am adf68c58: am b4ae86f0: Merge "Rename methods for readability"
* commit 'a946ab7abd28690441cbace94a18e007f4f1fdd8':
2013-10-03 14:54:12 -07:00
Satoshi Kataoka
2884dabefe am b6c875f6: am 8fae9707: am b65bee7a: am f4f547f0: am dceebee4: Purge UnigramDictionary
* commit 'b6c875f6a57492d0f22a3ab259f9193fc1f3115a':
2013-10-03 14:54:09 -07:00
Satoshi Kataoka
560efcc9a4 am 039cef26: am 62efdff2: am 6d811db7: am c8335703: am eb6a7c82: Merge "Migrate used functions in UnigramDicitonary"
* commit '039cef260d3e326ef007f87066f5ac4eac27aef1':
2013-10-03 14:54:06 -07:00
Tadashi G. Takaoka
98ee25dac1 am 75a13052: am 5935d961: am 9edecd76: am 3e543e27: am 2a529b85: Merge "Clear previous suggestions when gesture typing starts"
* commit '75a130523f3fae6f9526fabf8c434810ef2a6bbe':
2013-10-03 14:54:03 -07:00
Satoshi Kataoka
6141f237bf am 4b4edf8f: am 436a6c49: am 33bb4fa5: am b7974e8c: am d858b581: Move obsolete files to obsolete dir 2
* commit '4b4edf8fd679f40998b7e98b977494f979bcf97c':
2013-10-03 14:54:00 -07:00
Satoshi Kataoka
d5ba7513cc am d13a713a: am b6d60e29: am e82cfe1f: am 9b5d603e: am e0bbb98d: Fix build
* commit 'd13a713a7cce7cdf4a3fd49e95520e34308ce351':
2013-10-03 14:53:57 -07:00
Satoshi Kataoka
0047bea08c am b6efea52: am 75647fb9: am cdf85ea5: am b4379f9c: am 01cae939: Move obsolete files to obsolete dir
* commit 'b6efea52b91ba0a9e9fc14cbf9e97735d33dab20':
2013-10-03 14:53:54 -07:00
Jean Chalard
014b05f33d am 7f6ee228: am 8d30f473: am f1f39730: am 994b2858: am 3b94fd7b: Merge "Update dictionaries"
* commit '7f6ee228c8e971b6140bb932c8317dc862ec3926':
2013-10-03 14:53:51 -07:00
Satoshi Kataoka
a7ecf8c31e am 10876211: am 8397dbe6: am a4fa2681: am 26ae9aa8: am 7c92b421: Purge DicTraverseWrapper
* commit '1087621156452f67ee11564819289600df7475f1':
2013-10-03 14:53:49 -07:00
Tadashi G. Takaoka
ddc57756a1 am f952acee: am 79aca608: am 4eb8117d: am c6b7cd35: am 0e66ab74: Merge "Fix ArrayIndexOutOfBoundException"
* commit 'f952aceea49c590eb486baea5ac4408b7b104144':
2013-10-03 14:53:46 -07:00
Kurt Partridge
a2b94101e7 am a6b1c601: am 26afe795: am 15f3de26: am 420532cc: am c4119c80: Merge "Uncommit an extra LogUnit"
* commit 'a6b1c6019a307313eda63ad7f0060cb3ebd222fb':
2013-10-03 14:53:43 -07:00
Satoshi Kataoka
36cfd857dd am c613917f: am db10c9a5: am 52831bac: am b13b977d: am d1811204: Move bigram_dictionary
* commit 'c613917ff0111f4b2d39929333154373c9c60378':
2013-10-03 14:53:40 -07:00
Ken Wakasa
ee119b184e am d1042932: am 8ab03f1f: am aa512f24: am 67942c48: am 0bf8c0bf: Merge "Create "src/utils" directory"
* commit 'd1042932d3e5fa08d2f7ca8c89697c25551d3e82':
2013-10-03 14:53:38 -07:00
Kurt Partridge
8690602b51 am 1fb6e4a3: am 4d656472: am 9dcb846d: am ef827a99: am a2f3f17d: Merge "Compare scrubbed strings when uncommitting LogUnits"
* commit '1fb6e4a38f17bc093f5fd3a3622caeb157d2b46f':
2013-10-03 14:53:35 -07:00