bf639e3c05
am 84f6b2c0: am 5f8eba02: Merge "Revert inconsistent assets"
...
* commit '84f6b2c0ee452414dc92117916d070c01db3b019':
Revert inconsistent assets
2013-10-03 10:20:20 -07:00
ce78149b14
am 0171de25: am 10b56df4: Merge "Prepare dictionary file creating in native code."
...
* commit '0171de2563310b08406b34469206f3dc4655ad5a':
Prepare dictionary file creating in native code.
2013-10-03 10:20:17 -07:00
0028be8428
am b8098b3c: am c6015327: Merge "Add empty PtNode checking for PatriciaTriePolicy."
...
* commit 'b8098b3c9b01463cb9da4a2a570ae19f4a565def':
Add empty PtNode checking for PatriciaTriePolicy.
2013-10-03 10:20:14 -07:00
853cd794f3
am 42c716be: am 36f45921: Merge "Refactoring header attribute reading."
...
* commit '42c716bed2aa50001ab77bb56a93c79ab90577d8':
Refactoring header attribute reading.
2013-10-03 10:20:11 -07:00
7225cbf8c8
am 1a8d1cbc: (-s ours) am d28ea2b5: (-s ours) am 1e4ab88d: (-s ours) am 5a1d1557: (-s ours) Import translations. DO NOT MERGE
...
* commit '1a8d1cbc64f9d1069d9b9b444fa52a6c712496f6':
2013-10-03 10:20:07 -07:00
99a15f84d4
am 2f11bc9b: am 009dcac3: Boundary check for children creating of PatriciaTriePolicy.
...
* commit '2f11bc9bae8c9514e96874ac4ded028461934228':
Boundary check for children creating of PatriciaTriePolicy.
2013-10-03 10:20:04 -07:00
086ffdcc30
am 6c0e48b1: am 4350a93a: Merge "Fix the offdevice regression test build"
...
* commit '6c0e48b1adffd3ad9d2ccbc2bb2044555ff5a510':
Fix the offdevice regression test build
2013-10-03 10:20:00 -07:00
6f5d2ded3f
am a2174bad: am 5fa96540: Merge "Clear traverse sessions when closing."
...
* commit 'a2174bad22c722f31f864ec1b673661061591fd6':
Clear traverse sessions when closing.
2013-10-03 10:19:57 -07:00
2d514c81db
am c536d27c: am 6e41d9a4: Merge "Input delete onUpKey"
...
* commit 'c536d27c697d5851f27302c875654b0545b2696d':
Input delete onUpKey
2013-10-03 10:19:57 -07:00
257f59fb02
am b2956ef5: am 399422f4: Merge "Make Ver4DictEncoder write an address table of terminal nodes."
...
* commit 'b2956ef5cfb752c8f758f682b216dbff021415b8':
Make Ver4DictEncoder write an address table of terminal nodes.
2013-10-03 10:16:11 -07:00
95c7dfd05a
am 5512b300: am 1e69f3e6: Fix emoji page
...
* commit '5512b300efabe65c7102ca2b10a265dfd9ade049':
Fix emoji page
2013-10-03 10:16:07 -07:00
16c85695ee
am 400ec7c5: am 0938fb69: Allow gesture from the delete key
...
* commit '400ec7c5a6cc483fe4064bfb0d5462d2ad2c694e':
Allow gesture from the delete key
2013-10-03 10:16:04 -07:00
73575763f6
am daa9eac9: am 9c3b2dbe: Fix emoji state
...
* commit 'daa9eac90d627e807e24f99e169f8ed011e4b4c3':
Fix emoji state
2013-10-03 10:15:59 -07:00
7b94f85acc
am 6460cc71: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
...
* commit '6460cc71cde6db3488805ffa0703343ec1d19d0a':
Import translations. DO NOT MERGE
2013-10-03 10:15:56 -07:00
b17084a462
am 0f75a055: am 431158c9: Turn off emoji palette on JB-MR2
...
* commit '0f75a055bcb2503e6efc4a5b3be1404e0a30ff1a':
Turn off emoji palette on JB-MR2
2013-10-03 10:15:51 -07:00
0693c6d2ff
am d484b1f4: (-s ours) am 46fdc6fd: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit 'd484b1f4a23015b166cc19b6007264a8e760d062':
Import translations. DO NOT MERGE
2013-10-03 10:15:49 -07:00
3576e1029d
am 0f6eca4a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
...
* commit '0f6eca4af41c6d5646732b5c713e114fd37f0d86':
Import translations. DO NOT MERGE
2013-10-03 10:15:46 -07:00
2f14418c31
am e628cd3c: (-s ours) Use reentrant lock for main dictionaries. DO NOT MERGE
...
* commit 'e628cd3c325d97243d4ef1c991f07c084d0cbaac':
Use reentrant lock for main dictionaries. DO NOT MERGE
2013-09-30 18:02:52 -07:00
a0c9846fb9
am ceb364c0: Fix PrioritizedSerialExecutor.
...
* commit 'ceb364c0411dbcb38f2bd94f1d2b54eef3b985c1':
Fix PrioritizedSerialExecutor.
2013-09-30 18:02:49 -07:00
cecb793ff3
am ef63947f: (-s ours) Add boundary checking for PtNode Array reading. DO NOT MERGE
...
* commit 'ef63947f7d10bcbb3237661ad480b430d4208833':
Add boundary checking for PtNode Array reading. DO NOT MERGE
2013-09-30 18:02:48 -07:00
e628cd3c32
Use reentrant lock for main dictionaries. DO NOT MERGE
...
cherrypick of Iaa9b79fc770d8ae2ec9d7c362c90c28bc9f65ea8
Bug: 10964805
Change-Id: Id5e67b00bf9594be0591c87407a78146297e0e78
2013-10-01 02:15:05 +09:00
ceb364c041
Fix PrioritizedSerialExecutor.
...
It was possible that fetchNextTasks() would be called by multiple
threads concurrently.
If it happens, some tasks in the task queues might be ignored.
cherrypick of Idc81c43c45e382da3850cc55b9a42c281548d2a8
bug: 10957075
Change-Id: I41bf90dda15306ee879350f96a791d940ea31da1
2013-09-29 11:41:13 +09:00
ef63947f7d
Add boundary checking for PtNode Array reading. DO NOT MERGE
...
cheery-pick of Iea5e19d98d2fc26f137046dd5f8e339239672351
Bug: 10957075
Change-Id: I3f1806c32fe480f2e7422d3a945932b9cc0cd98b
2013-09-29 11:39:09 +09:00
10fa6a2e51
Stop reading dictionary while regenerating. (DO NOT MERGE)
...
Cherrypick of Iead7268a9371b48d729a5f65074ccbc05f3185db
Bug: 10831272
Change-Id: Ib6f314ac68696616532ff9c05c7f35813137bf9f
2013-09-28 00:36:39 +09:00
5130ebb9c9
am 7281fb14: am 5c2eb205: am e7386e15: am f61ff3af: am 13b32ee1: am 368427e2: am de51abf1: am bfe5c07f: am ededdc6a: Merge "Avoid NPE"
...
* commit '7281fb144bd78283c7df136dcc58a34f88780907':
2013-09-26 06:30:50 -07:00
1771df3486
am b86d0a25: am 96f8f9c2: am 548ff78b: am 6d908ce9: am e4e1964f: am d902228e: am f080123d: am 8895e5fb: am 128961ad: Fix failing tests
...
* commit 'b86d0a2566275561d727e05214e2fbaeeded7a58':
2013-09-26 06:30:45 -07:00
2f26d17495
am 94c91022: am 8b715de6: am c2b51cf8: am c1aec8ee: am fd4c38c8: am 5e225afa: am 38011d29: am 41e59b62: am 2cd1136b: Merge "Remove the dialog to insert words to the dictionary."
...
* commit '94c91022d2a97138466757af8a4fd1f5bb024c0a':
2013-09-26 06:30:40 -07:00
1f75c94c53
am 46aa843c: am 09f4b598: am 3076b0cd: am 433396e1: am 4d45fbe0: am 5e783427: am 7b81296f: am cb633e37: am 91bcf5eb: Merge "Restart suggestions when the cursor moves."
...
* commit '46aa843c96b1c41412edcca9549ecbc90b33b183':
2013-09-26 06:30:35 -07:00
883ed059b0
am 620e2724: am 5c91fb7f: am 00e2c9d2: am 3caf964d: am 6aefd57a: am b8b0ca34: am fda69c44: am 991b1ef8: am 02ce3dc2: Fix a bug with bad application completions
...
* commit '620e2724a0b4c1b2d50a9de9ad894bd04e214e4e':
2013-09-26 06:30:30 -07:00
9acfef112e
am b3a47867: am fa75f500: am d78a7952: am abaccadc: am 5184bfe4: am 012dc7f5: am 5351510d: am 68b392cc: am d24f9397: Merge "Make shortcut-only user dict entry non-words."
...
* commit 'b3a47867abda8084f255243e7d104896e65f0704':
2013-09-26 06:30:26 -07:00
c70156b414
am 6451d473: am 8aab2696: am aadc3209: am 097ec0c0: am 29aa47b1: am ed580a43: am 91290810: am 907a95c2: am fb5869e9: Merge "Add a class to encapsulate getting the metadata URI"
...
* commit '6451d473e77531da8d0256aa3ec996a0e769d25f':
2013-09-26 06:30:21 -07:00
f4d115f54e
am 9c672b53: am 4552b014: am 0d4ade91: am 112db204: am b0c84b8e: am 03c4f795: am fb49fb9e: am 0ea30200: am 676c97eb: Merge "Remove voodoo magic."
...
* commit '9c672b5316d52ecccb59c1b097a23bf94b07ee96':
2013-09-26 06:30:15 -07:00
6bc0b184d2
am 482e6f48: am 04c8a642: am 82b8d414: am 9f272ae6: am 2a3fb325: am eeb23c88: am b78f35de: am 78e61041: am 2daea197: am 47bb8d7d: am 4fffa27d: Fix a native crash in AOSP LatinIME
...
* commit '482e6f4858470b16424a21d9f820fcfdbb063b08':
2013-09-26 06:30:10 -07:00
ec0bf1acc1
am febee11e: am 1dd9aeac: am 14ed8d7a: am f32684ea: am df4e24fe: am 24965bb7: am 5875362b: am 9613be01: am d0623ad7: Merge "Move some values to a place where they are easier to override"
...
* commit 'febee11ef23a90d620e9a223869f736d0bd63b41':
2013-09-26 06:30:05 -07:00
da26964c5e
am f17b22f3: am ac1d2d7a: am dcad4ed8: am 1015c58b: am 8d58b400: am e8deca68: am a5613e63: am bdce031e: am 2927223e: Merge "Better isolate ResearchLogging data"
...
* commit 'f17b22f323d9353118dc0633ee25059bcd18bca5':
2013-09-26 06:30:00 -07:00
5e7a962e5e
am 4f1efa48: am 51f8be38: am 9bae4911: am f3161c20: am 5f68231b: am 2fb79605: am dfc81359: am 3d6b7431: am cd692be1: Merge "Change the default vibration duration to 20msec"
...
* commit '4f1efa48ca37a10645e726574ed431bc524533f8':
2013-09-26 06:29:54 -07:00
55af45de07
am aa8ed024: am 37e3d1a8: am fe6708a7: am c80e1227: am d25155ce: am c2b8f469: am 27dede24: am 2e4352c5: am b5d5190d: Merge "Add some utility functions."
...
* commit 'aa8ed024b4b15564f6a966b98ca69dbba1644d59':
2013-09-26 06:29:49 -07:00
c5a380a22c
am 1c18e924: am f4b048ed: am b90bb7ab: am 5b80c6c7: am bef0bb7c: am 253b54df: am 3be1c748: am 05314bf0: am 4f5f81d5: Reorder advanced settings menu
...
* commit '1c18e924ce0f8d7a7a63d1f063a770abc79a48f7':
2013-09-26 06:29:45 -07:00
e84ad7a159
am 850b01de: am c31e9f8c: am 60f20444: am 8ce77079: am ff231781: am eba96f3e: am 46762bf5: am 206ce637: am bd8e92d8: Add debug message to detect unusual zero width condition
...
* commit '850b01de8f18d2a8e44f50fd2e177e332e382412':
2013-09-26 06:29:40 -07:00
4ddebdaf9c
am ecbd003a: am f2604bde: am c9b8d7a8: am a8425224: am 2c2dd9e7: am 5cbe78dd: am 1ba1c411: am 93fe83a1: am f67a3881: Merge "Add TypefaceUtils"
...
* commit 'ecbd003abfc71008c1ffb914fb7a78fed94f3e7b':
2013-09-26 06:29:35 -07:00
94bc0ecaef
am 0b8bf274: am a3742e66: am 44d2f4a2: am a4c26b8a: am da4f353d: am 74f7fb1d: am d0594519: am 4945b656: am 6c7d008e: Merge "add a debug flag to evaluate the most probable string"
...
* commit '0b8bf27438771f1e210b6c8e89547c91106213d8':
2013-09-26 06:29:30 -07:00
9d4e97739c
am e98ba42b: am e8dd50ad: am 229c7a19: am 663809c9: am 83af8482: am 9b888ca4: am 24b39f16: am 18819688: am 6d0027a4: Merge "Use SparseIntArray instead of TreeMap<Integer, Integer>"
...
* commit 'e98ba42b2ea7ddd91da81f818609f86e8d4a8da6':
2013-09-26 06:29:24 -07:00
a16c27beff
am 45892476: am 9ca372e6: am e2834d8f: am 8aefc778: am 5c6fcf61: am 1c3bc4af: am dabcd969: am 1dc7fd3f: am cee512b6: Merge "More precise geometry checking for more keys keyboard"
...
* commit '458924762593b8e6444b8c0accb8e1afe507362e':
2013-09-26 06:29:19 -07:00
7770839d3b
am d1f279e0: am 253e5eeb: am bc6f49ba: am 09ddc933: am 852e031c: am 6743a354: am e910a9c9: am b7917ee3: am 3722f087: Merge "Fix two bugs in dicttool"
...
* commit 'd1f279e0364c66d23ded843c30f26fc9a72382e9':
2013-09-26 06:29:14 -07:00
e765b721bd
am 36e9a049: (-s ours) am 1e1b2e1d: (-s ours) am a29f9ab9: (-s ours) am 3a2b13a4: (-s ours) am 46ef1ae8: am a4cd9ff5: (-s ours) am 42674ece: am 0afbd6fd: am 269f141b: (-s ours) am cfdc91b9: am 58df3cfa: Import translations. DO NOT MERGE
...
* commit '36e9a04924eddfb1131b380bd9b6ed098a7933d7':
2013-09-26 06:29:05 -07:00
d43365d066
am ca2bcde0: am 17424cb0: am ece78ab3: am eefc719f: am 5582d07e: am 47b7fe24: am 330d0330: am e3dcbd80: am ac018da6: am 9620943c: am d9a22235: Hide Setup Wizard icon for stock keyboard
...
* commit 'ca2bcde0380288a730106b11fac7a0a8af42b7fe':
2013-09-26 06:29:00 -07:00
259dd5f2e2
am 0b772ff6: am b4aa5c2a: am e22bdaae: am 1555f75b: am f5214d22: am 0e957017: am cdf19f12: am 9bca1daf: am defd2950: am 1aaaa64d: am 75618c33: am 19dcd154: Merge "Offer to add any OOV typed word to the dictionary."
...
* commit '0b772ff66bd217fb64af415a0f33a9fb59c979fa':
2013-09-26 06:28:55 -07:00
af11cd5748
am af1fa668: am e5fca3d1: am 08474770: am a03026b2: am 8ef42ea5: am 37e9a69f: am 472591fe: am ea8c4731: am d355283f: am fd89cd20: am daef4e8f: am f31553bc: Merge "Fix touch coordinate calibration"
...
* commit 'af1fa6689f69aae8166aeef26f17dba83d5cf185':
2013-09-26 06:28:50 -07:00
b7687c79f8
am a2c6d2e0: am b6f0345e: am a1b9258e: am b907a631: am 6c76c651: am cae4c914: am 0dc8c6e9: am 41ac21dd: am e040aa19: am 0d72a230: am 04bb419c: am ddafcf82: Merge "Fix bugs and add tests"
...
* commit 'a2c6d2e0eacaea9ce10bbf6c4d6c37fcb1dd7b21':
2013-09-26 06:28:45 -07:00
19b75973a5
am 2fa15f80: am fa0d5038: am 29867576: am 219aca5b: am 0014e8db: am 6225fc10: am 8728b9d6: am 2f7ff3cf: am e2bdf686: am bea42fc5: am 5bd24642: am 1f70a4d6: Merge "Allow logging while replaying"
...
* commit '2fa15f80e92f4c207776e63963f982d2b886b383':
2013-09-26 06:28:40 -07:00
Ken Wakasa
Keisuke Kuroyanagi
Baligh Uddin
Satoshi Kataoka
Yuichiro Hanada
Kurt Partridge
Jean Chalard
Tadashi G. Takaoka