Commit graph

25596 commits

Author SHA1 Message Date
Kurt Partridge
f336fccb63 am b3608866: am 3ddabfbc: am 73160e42: am aaa2f25b: am 194dc02b: am 00e0b840: am fd5d440d: am 681f1239: am e72d1a07: Merge "Allow downloadable dictionaries in development builds"
* commit 'b360886600c16af5044378b3fbcdc5be1ecd9ca8':
2013-10-09 19:59:58 -07:00
Kurt Partridge
94513750a8 am 2b863565: am 9848eb44: am 7a9bf276: am 7e82fb19: am adbffeb7: am ba713adb: am 8b70f58b: am 37621957: am 3d9ebf21: Merge "Make intents unique to AOSP"
* commit '2b863565f3755d790d0aa1205f86412adaeb78a4':
2013-10-09 19:59:54 -07:00
Kurt Partridge
e7f2157d62 am 02ba7194: am 2e5f2684: am b5d184fe: am 3a967590: am 351d88cf: am 5fd7b2bc: am 051d61ba: am 5062442f: am 14dd52b8: Merge "Adjust settings for development-only versions"
* commit '02ba71941a84e1e36be9ee0b439a07580def0d02':
2013-10-09 19:59:51 -07:00
Kurt Partridge
7bae241da2 am f9394369: am afc157be: am 2e0a0a55: am d66e4187: am b16c1e2a: am 5dbd4043: am fd3600a4: am 3cdea37c: am eac0eb89: Merge "Fix ResearchLogger feedback bug"
* commit 'f9394369f740d971808dba1e0cc168aef6433beb':
2013-10-09 19:59:49 -07:00
Tadashi G. Takaoka
f0595a504c am ec51b534: am 5ec75c80: am 59efffbc: am 5fa1d839: am 16f87a57: am 62074b25: am 282ebe38: am e18732ef: am dfd96be0: Retun an empty Path instead of null
* commit 'ec51b5346511bae54d9a555edd7701bad30dac1c':
2013-10-09 19:59:46 -07:00
Baligh Uddin
63c1bff14f am a56166d7: (-s ours) am 2d6c0a37: (-s ours) am be703ac9: (-s ours) am 6efa1603: (-s ours) 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 'a56166d7cd89c07d55f6ab75fc0d599a40c3f905':
2013-10-09 19:59:43 -07:00
Ken Wakasa
203d9561c7 am 2f71ad32: am 100248b4: am 5b473eb3: am 208e37b8: am 40454690: am 09f96dac: am dad82a7c: am 2c895d4d: am f473f4b1: Remove unused macros in defines.h
* commit '2f71ad32faa00c213f0aa0bd3203da9d25aa9891':
2013-10-09 19:59:40 -07:00
Keisuke Kuroynagi
df000e5556 am c34e8dba: am a1840784: am a46e10aa: am 080f55a1: am c7974d25: am 6e55ad53: am 5ab662de: am 61e9de73: am 0b7cd6a0: Fix: Android.mk for autocorrection_threshold_utils.
* commit 'c34e8dba1aa9e9130f0ba6b729dfc9e79c7a657f':
2013-10-09 19:59:35 -07:00
Keisuke Kuroynagi
dc8505c340 am 95de1ec0: am 355e0b1b: am cfd64125: am 32e629e4: am d1d3789c: am 16587c7d: am 8b6de7a8: am 67550776: am 527c1283: Remove unused methods.
* commit '95de1ec0b8bc010872e391561373a0cba590e3c8':
2013-10-09 19:59:32 -07:00
Jean Chalard
70269acb9c am 5f0c0cb5: am 7be62b26: am db220ee4: am 9174ec8c: am aa790699: am 1c18e064: am d51f4e69: am 35b514bd: am cd4edc15: Merge "Cache three main keyboards to improve average switch time"
* commit '5f0c0cb550f9cbd0ee44eb194e140fa88b3dba53':
2013-10-09 19:59:29 -07:00
Keisuke Kuroynagi
6dfd385960 am 7f9e7fa4: am b7910d5d: am ab62d803: am 68bba884: am 090fa205: am 6f146f24: am bf71301e: am 1784d92e: am e3338420: Merge "Introduce BinaryDictionaryHeader to access binary dictionary header."
* commit '7f9e7fa4426e3c8b7baf814eb99ef90a5008612e':
2013-10-09 19:59:26 -07:00
The Android Open Source Project
b95153085c am 838a0997: am 32363a88: am 050cb0b5: (-s ours) am 7ef9b61e: (-s ours) 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 '838a0997f4f08f6a38101d1afc73456ddbdfcce2':
2013-10-09 19:59:23 -07:00
Baligh Uddin
1322e6fb71 am 5208b6eb: (-s ours) am 93d504ad: (-s ours) am e4351946: (-s ours) am dbf6adca: (-s ours) 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 '5208b6eba4ed7407c7a7d1c94c797481c5e018a4':
2013-10-09 19:59:20 -07:00
Satoshi Kataoka
90dce8ce63 am 128c878a: am 3b796399: am 7520c475: am 547ebb76: am 2e5e3edd: am d0fb2b41: am c1eccc94: am 28c7e634: am fe95e7b1: Merge "Fix possible NPE"
* commit '128c878a3214e561fcbb4b1526f4f234d1bcbead':
2013-10-09 19:59:17 -07:00
Tadashi G. Takaoka
bb0264ca54 am 7cea1827: am 1275ce1e: am 5f1ec034: am 85c2ce7c: am 81e36c3c: am 0800da99: am 0b5b3f7b: am c68632af: am 77f63c8a: Don\'t use RichInputMethodManager in setup wizard
* commit '7cea18273d62ca5864fdee21d24b0375f0d0ddd9':
2013-10-09 19:59:14 -07:00
Tadashi G. Takaoka
149490bd0b am 54247b09: am fea1db68: am 6d7c5ab0: am e4442e86: am 3edb2b8b: am 8f4ed0b8: am ac48cca4: am 60261af5: am b0e0c5a8: Merge "Defer getting no language subtype"
* commit '54247b09c0c098121f12224ca75ee071793d7149':
2013-10-09 19:59:12 -07:00
Jean Chalard
67b931913b am 3b73c7bc: am b0a9aefd: am 97e9b4ef: am ebeefea1: am 450e3af1: am 76c87e8c: am 13a02a8d: am f637bb33: am d3c283d5: Merge "Fix an illegal argument exception"
* commit '3b73c7bc537f18b8a0c9627cb7502439cbcdf2d2':
2013-10-09 19:59:09 -07:00
Tadashi G. Takaoka
96aab7a0a6 am 6f152929: am 7f47cbf3: am 57ccd8e8: (-s ours) am e64fc097: (-s ours) 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 '6f152929433bb14baccb27233a1a65282f2234bf':
2013-10-09 19:59:05 -07:00
Tadashi G. Takaoka
d07a0d66bf am 320b5030: am 11687191: am 9b07afcb: am 99f115bf: am 3872c243: am b2a18515: am e162eb7e: am 48f20fb8: am 091a4532: Merge "Add HTC One special edition"
* commit '320b5030bacef586851527f1a27e615ac0747e15':
2013-10-09 19:59:02 -07:00
Jean Chalard
da06f2f665 am ed51dd65: am 67940e30: am 628b1ebd: am b56edf6f: am f022548e: am 37a44353: am f01644c4: am 323dd492: am 69100329: Merge "Use an iterator to remove stuff from an ArrayList."
* commit 'ed51dd65bc5865a9af41dd402deaaaf2cf525451':
2013-10-09 19:58:59 -07:00
Satoshi Kataoka
d1c28ace1f am 95e5ce2b: am 9288df53: am fda37961: am 8452422b: am 21f21877: am 9b91243f: am ff6a5581: am 2fa14bc5: am f6a1a765: Merge "Fix a possible NPE"
* commit '95e5ce2b0158fbc6df609302556f24cf80ac30c6':
2013-10-09 19:58:56 -07:00
Tadashi G. Takaoka
a0f2ec7581 am eab57f47: am b82c878c: am 4aef55d9: am 684732a1: am 3f75c760: am b8d0dad0: am a4d4cae3: am 596652cc: am cbd219a7: Move Base64Reader to utils package
* commit 'eab57f47da23a644336eae6319387cbf8ef0d6c6':
2013-10-09 19:58:53 -07:00
Tadashi G. Takaoka
a4772d7c30 am 1ef056f8: am a85daec2: am 93d9f1b2: am 393cb4d9: am 8fa567c7: am 8b4fad97: am 9bd148eb: am d8177b3a: am 9c440d13: Merge "Remove unnecessary Drawable.setState"
* commit '1ef056f82866eebc558486e4a80fe49fdac45570':
2013-10-09 19:58:51 -07:00
Tadashi G. Takaoka
45e99e88b5 am 771f3681: am 69ff2d83: am 3ef35fe3: am 23e27aae: am 99771a81: am 0dd57b18: am c86c1294: am 8235d940: am 9d4e2518: Merge "Add CsvUtils that conform to RFC 4180"
* commit '771f368120177f5cb88767af8b16d8d297f5a038':
2013-10-09 19:58:48 -07:00
Tadashi G. Takaoka
01c6fd0c0a am 070ffc62: am f3e5c12a: am d43c17f1: am 7bb1019d: am 019ea417: am 7a4c7d05: am 30183b22: am e10f4b6b: am 0bfc2bc4: Merge "Add CODE_CAPSLOCK for long press shift key"
* commit '070ffc62626b9fde0d59fc7ef8d71e51c46af45f':
2013-10-09 19:58:45 -07:00
Ken Wakasa
0daf87a437 am 5d90c081: am a4b29aa1: am 89356a2b: am d1090278: am 26aed3a5: am 33ec5357: am 49b9d16b: am 34a9e8bd: am ad0c6d7b: Cleanups in JNI related code
* commit '5d90c08196d111798b45ad4437faa30047286638':
2013-10-09 19:58:42 -07:00
Ken Wakasa
c6a67fa078 am 4d0ac436: am eec6c548: am 6ce09940: am 9147aa06: am e7726dea: am 23fe55d0: am 020a5704: am 496bb8af: am 11dc3a37: Clean up macro variables
* commit '4d0ac4361456fa34fe7aa6a2eec46b1fa4759335':
2013-10-09 19:58:39 -07:00
Kurt Partridge
a96c872ac0 am 8a4078aa: am 7fa4026c: am 990a9b33: am 2953da4f: am a6c275c1: am e8be6f74: am 4865f818: am 0486b377: am 0dbae774: Merge "Avoid an NPE"
* commit '8a4078aa33caff1341d75a26f488b858973e810b':
2013-10-09 19:58:36 -07:00
Baligh Uddin
a6d5209521 am 09ff83d4: (-s ours) am 12a8e54e: (-s ours) am 07b83868: (-s ours) am 2159d77e: (-s ours) 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 '09ff83d4e7a186f7efd88718322be97a5dd8bafd':
2013-10-09 19:58:33 -07:00
The Android Open Source Project
18fe7d501b am bd65e610: am 60aa327d: am 68b247d8: (-s ours) am d1938819: (-s ours) 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 'bd65e6107f37f9b462d8a24dca4699f2c2252e1f':
2013-10-09 19:58:31 -07:00
Tadashi G. Takaoka
776bd37003 am 8b8eca04: am e1890566: am d19697b0: am 599e9481: am 71159b59: am 3c3d8404: am 5834fbb9: am 15aab5b1: am cbc7acb6: Merge "Expand suggestion strip when center suggestion is long"
* commit '8b8eca046dc1df11d1abd1a67aff2ff1f874b92a':
2013-10-09 19:58:28 -07:00
Kurt Partridge
66ed4984ba am 7cb81dff: am b2578efb: am e0a874f9: am 43d56da0: am 6e619633: am 28b85db8: am 4dfaaae8: am afbaac36: am 763fd9d5: Merge "Fix revert of committed words"
* commit '7cb81dff40d07e43bb4ee27a1ee3c4a81f040fd9':
2013-10-09 19:58:21 -07:00
Ken Wakasa
4a3a45cd23 am c44ca2ba: am f9e06fd6: am eccd780e: am 682edd51: am be181a22: am 8cc42f32: am 2f3ac8e8: am 3888cc24: am 156d3930: Remove a bunch macros that are no longer used
* commit 'c44ca2ba8ce84c0ab6cc1605f72d1e0d0f2b9b22':
2013-10-09 19:58:18 -07:00
Satoshi Kataoka
4942e98625 am 69e2fd3e: am ae9edb23: am bd05c5e7: am 728217a6: am cd42b44e: am b783f3b0: am 1b09a3f3: am b593ec88: am db0aa747: Merge "Purge WordsPriorityQueue"
* commit '69e2fd3e22634e4831730e1d198ffcdfd0e3df50':
2013-10-09 19:58:15 -07:00
Ken Wakasa
4780eb6f4e am 27ee51bd: am 590a06f2: am 4f4ac50a: am 0d3d4f4a: am 54415777: am 9ca395b7: am b5cda658: am 887b635d: am 4caf5941: Follow up to I907150be994c4f9ffc030c063de521eeb177d3e1
* commit '27ee51bd4584de8a6e975e68a8aaf55a3a29404f':
2013-10-09 19:58:12 -07:00
Satoshi Kataoka
0ffb00e4ab am f6560ae6: am 81c4c752: am 6b57cd1a: am ef8e1ead: am 19ae94c7: am b0e02abb: am 130e1f95: am 31bd7b17: am cbb1ee48: Fix build
* commit 'f6560ae60d725993f5cc74a172c136496d32ec39':
2013-10-09 19:58:10 -07:00
Tadashi G. Takaoka
7946358e25 am c7961c0b: am 713dcb8d: am 1fa7277a: am d15f772b: am a946ab7a: am ea632ca2: am f2beae9e: am adf68c58: am b4ae86f0: Merge "Rename methods for readability"
* commit 'c7961c0b55c47a28c8995e58ee4a8efd568bf136':
2013-10-09 19:58:07 -07:00
Satoshi Kataoka
1e99c86a15 am 30c0a9b7: am 71f2df97: am 685776a7: am 2884dabe: am b6c875f6: am 8fae9707: am b65bee7a: am f4f547f0: am dceebee4: Purge UnigramDictionary
* commit '30c0a9b7927dc7b143fb11dcae79845031c9054a':
2013-10-09 19:58:04 -07:00
Satoshi Kataoka
e48c1e989a am d3ea5036: am 50a1e3ca: am 52776463: am 560efcc9: am 039cef26: am 62efdff2: am 6d811db7: am c8335703: am eb6a7c82: Merge "Migrate used functions in UnigramDicitonary"
* commit 'd3ea5036eb16e43024d52dd8a0c41856ad3b5fa1':
2013-10-09 19:58:00 -07:00
Tadashi G. Takaoka
15b5649fcd am 2b1a3784: am 1d27d8df: am 71e6182a: am 98ee25da: am 75a13052: am 5935d961: am 9edecd76: am 3e543e27: am 2a529b85: Merge "Clear previous suggestions when gesture typing starts"
* commit '2b1a37843a5bb51c95916ab651acda34cda266e9':
2013-10-09 19:57:57 -07:00
Satoshi Kataoka
47e5187e29 am 32eb8fe5: am 1f37cf87: am 445183d2: am 6141f237: am 4b4edf8f: am 436a6c49: am 33bb4fa5: am b7974e8c: am d858b581: Move obsolete files to obsolete dir 2
* commit '32eb8fe53d32b8382bc182ec056876604dc6d515':
2013-10-09 19:57:54 -07:00
Satoshi Kataoka
f7a9176f3e am fd21d89d: am 781f3169: am bf132663: am d5ba7513: am d13a713a: am b6d60e29: am e82cfe1f: am 9b5d603e: am e0bbb98d: Fix build
* commit 'fd21d89d96ce5ca0f428e7be9b11fdce7664267d':
2013-10-09 19:57:51 -07:00
Satoshi Kataoka
da844e308c am 2a0e1f7f: am 52d60bc1: am 27c47877: am 0047bea0: am b6efea52: am 75647fb9: am cdf85ea5: am b4379f9c: am 01cae939: Move obsolete files to obsolete dir
* commit '2a0e1f7f37de8e3cf8e8bdc9bbeb9b4a78a7f2fb':
2013-10-09 19:57:48 -07:00
Jean Chalard
5ecb75745b am 10c32f1e: am 110b5cf8: am 8c35265a: am 014b05f3: am 7f6ee228: am 8d30f473: am f1f39730: am 994b2858: am 3b94fd7b: Merge "Update dictionaries"
* commit '10c32f1e9d81f411aaf9d7d36f63a2429b006e92':
2013-10-09 19:57:45 -07:00
Satoshi Kataoka
1b612a5bcc am 63ff6300: am ff26deee: am e5d58254: am a7ecf8c3: am 10876211: am 8397dbe6: am a4fa2681: am 26ae9aa8: am 7c92b421: Purge DicTraverseWrapper
* commit '63ff6300509742eba03a7c398e59227869334d8d':
2013-10-09 19:57:42 -07:00
Tadashi G. Takaoka
c6434a0acb am 841cc412: am 34c666fd: am 68966f90: am ddc57756: am f952acee: am 79aca608: am 4eb8117d: am c6b7cd35: am 0e66ab74: Merge "Fix ArrayIndexOutOfBoundException"
* commit '841cc412c47e6b6e494266c8ccf5cae84b2d71c1':
2013-10-09 19:57:40 -07:00
Kurt Partridge
95760be70c am a506e73e: am ffc136ee: am d85afb57: am a2b94101: am a6b1c601: am 26afe795: am 15f3de26: am 420532cc: am c4119c80: Merge "Uncommit an extra LogUnit"
* commit 'a506e73e0a86813f81686ec275ed3d94bc31e115':
2013-10-09 19:57:37 -07:00
Satoshi Kataoka
eba48abd2d am b9485e72: am d1afce4c: am e586baf7: am 36cfd857: am c613917f: am db10c9a5: am 52831bac: am b13b977d: am d1811204: Move bigram_dictionary
* commit 'b9485e72fc12fa256d3fcb939f3f130dbd44c013':
2013-10-09 19:57:33 -07:00
Ken Wakasa
5317352cea am b7f5d4cd: am 32b8f1bd: am 50616095: am ee119b18: am d1042932: am 8ab03f1f: am aa512f24: am 67942c48: am 0bf8c0bf: Merge "Create "src/utils" directory"
* commit 'b7f5d4cd0c3f96ba21d2009420d18ceabe2744d2':
2013-10-09 19:57:30 -07:00
Kurt Partridge
a3414b4712 am 01031531: am 6fa0fdbe: am 9130d288: am 8690602b: am 1fb6e4a3: am 4d656472: am 9dcb846d: am ef827a99: am a2f3f17d: Merge "Compare scrubbed strings when uncommitting LogUnits"
* commit '01031531d86d47bba5eb63d01c8f402042ff947e':
2013-10-09 19:57:28 -07:00