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
29ce1bc48e
am 47218496: am 4e41750d: am 4187499c: Merge "Remove unnecessary methods of KeyboardSwitcher"
...
* commit '472184966c06b665f51cf2f2e5359ec6f721c191':
2013-09-26 07:01:33 -07:00
4022aef47e
am 3a022999: am 5075d07d: am f6797a5e: Fix missing import
...
* commit '3a022999cea946d10ab911e6f7a18de45770dda5':
2013-09-26 07:01:29 -07:00
31b5abf6e6
am 71e5b9dc: am 37c2f94b: am dc22b722: Merge "Clean up unused return value"
...
* commit '71e5b9dc46ed1df25a732fcd5cdaee615e4b2a0f':
2013-09-26 07:01:25 -07:00
1f0af7d494
am d19c84ff: am a1f4af50: am d8835326: Merge "Haptick and audio feedback on key repeat"
...
* commit 'd19c84ffe09e19433a983584e20f9599d69dd24a':
2013-09-26 07:01:21 -07:00
7351ad8dd2
am 8b37abda: am 75b75d8b: am 5fdea477: Merge "Always record word boundaries"
...
* commit '8b37abdacd6402810997acf21fc33bee62578214':
2013-09-26 07:01:16 -07:00
13dd760be0
am 1e0af2e5: am 48346c47: am d9a87eb8: Merge "Fix drawing debug points of gesture trails"
...
* commit '1e0af2e554f8401fd70c32650f0428c0aca35aa5':
2013-09-26 07:00:55 -07:00
a4d9d47d5e
am 3c6388ef: am ea6a59ff: am 44f679bb: Merge "Fix running on device regression test and profile."
...
* commit '3c6388efed6d87277520ff5e6ddc02028aa7070f':
2013-09-26 07:00:48 -07:00
ba626004f6
am fe16b5ab: am 418f8753: am 8a6a15e0: Merge "Clean up IntentCompatUtils a bit"
...
* commit 'fe16b5ab400bafda8b44e99ede90f0c7907ea94d':
2013-09-26 07:00:43 -07:00
af15c95926
am c8d50d47: am e3a72c9b: am ff80ee20: Merge "Modify isAllowedToLog"
...
* commit 'c8d50d472301f7ab55ae5351a79efc379d0c5c50':
2013-09-26 07:00:38 -07:00
626d6e47dd
am 378164a5: (-s ours) am 8b26ab26: (-s ours) am ea88e2ff: (-s ours) am 150da225: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '378164a5f5a58b715c1e2b4b250a8ee32ada3e49':
2013-09-26 07:00:35 -07:00
88ee75d9ac
am 7818c9ff: am bab46b4a: am d96f63d2: am e2bee5b1: am ede3db51: Merge "Fix a crash on a secondary user" into jb-mr2-dev
...
* commit '7818c9ff2ea886db013ff3e243c0ccf1104bc39a':
2013-09-26 07:00:30 -07:00
ddcca5df13
am 13bb5a8a: (-s ours) am 7408a092: (-s ours) am 88fcf65f: (-s ours) am 13d7d568: (-s ours) am 23bff513: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '13bb5a8a03e1746aa5d5619d645c254ce5093f48':
2013-09-26 07:00:26 -07:00
06168df644
am 29ac49d0: (-s ours) am 93125247: (-s ours) am 7f008a62: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '29ac49d0c4aa97cb6049a52009a488a02711a88f':
2013-09-26 07:00:22 -07:00
fc6fa43be7
am f29ecf9b: (-s ours) am 27ee1f20: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
...
* commit 'f29ecf9b592a72b2a9ef04a97939f6040a96ddf4':
2013-09-26 07:00:19 -07:00
b993db062e
am 9b0bc1d3: am 56dba59a: am 05ea7c5d: am 167ba345: am 89fe1f50: Add a method to work around apps broken by recorrection
...
* commit '9b0bc1d34424d6f8450bc63adce52508b2acf26c':
2013-09-26 07:00:14 -07:00
36ba71fa86
am f6a70ad5: am d3cf6715: am a6639636: Merge "Remove unnecessary @UsedForTesting annotation"
...
* commit 'f6a70ad543179321268704eb92860ebae4fbe87f':
2013-09-26 07:00:10 -07:00
50a3cfbf2a
am 5f05a1f3: am 2380f927: am 0013f97d: am 5906b05b: am 7058b02a: Extract a new class for app-specific workarounds.
...
* commit '5f05a1f3dd0d5f250711d87a141a290d54437680':
2013-09-26 07:00:05 -07:00
c9e0852782
am 87fa6995: (-s ours) am f8ce1ffa: (-s ours) am eb724ddb: (-s ours) am 7f78bd5e: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '87fa69953688fd14f1649799fdfc2d5dbdc63c81':
2013-09-26 07:00:01 -07:00
7d4c42af69
am e348a313: am ec6e5d37: am de4e579c: Merge "Fix punctuation logging"
...
* commit 'e348a313e18c262a643c2a511380aa0364457323':
2013-09-26 06:59:57 -07:00
24616efffb
am e6098b20: (-s ours) am 265861dc: (-s ours) am 82c852cb: (-s ours) am b528e251: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit 'e6098b20bda643cd0e0084f510e6d163d87a35a3':
2013-09-26 06:59:53 -07:00
2d9093a134
am a9c36271: am f83050d9: am 17b63ba5: Merge "Remove unnecessary commit/uncommit"
...
* commit 'a9c36271b957eb519d91df134fc0df88c3e21241':
2013-09-26 06:59:49 -07:00
1ea4319b7d
am 77907a94: am 577bc298: am 7af5300c: Merge "Add claifying comment"
...
* commit '77907a94a171d9cfdf47edc4533c6ab816bfbdd9':
2013-09-26 06:59:45 -07:00
9f405afa9e
am f7877678: am 9a606af4: am a404e365: am d40b4729: am b1e37e4a: am f1dcf725: Merge "Don\'t process recorrection or resets when not shown"
...
* commit 'f78776788addba3b027f90db21fed066e75e6df4':
2013-09-26 06:59:41 -07:00
2153eda7b0
am 22e449c6: am a12f001d: am c3c879ed: am ff0bd7db: am 25f0c808: am 96a9f357: Merge "Fix unintentional setup step advance in orientation change"
...
* commit '22e449c601027fcc8119a23194067f6ba8433b05':
2013-09-26 06:59:37 -07:00
0b9b70da13
am 40a295dc: am 84828e15: am ad6df987: am d6a7a26d: am d59c1f83: am 50259c70: Merge "Tune layout parameters of setup wizard"
...
* commit '40a295dcf2d61bc7d0394ee3ba8a3a8483f2c6ff':
2013-09-26 06:59:32 -07:00
7ea5d0793c
am b3a6419d: am 9e990883: am feb169cb: am e7ef9669: am 7d9bd6f5: am 66b87269: Update welcome fallback image (using xhdpi asset)
...
* commit 'b3a6419da948adae5d4feb4ca3b7d5ce024765a0':
2013-09-26 06:59:28 -07:00
Ken Wakasa
Keisuke Kuroyanagi
Baligh Uddin
Satoshi Kataoka
Yuichiro Hanada
Tadashi G. Takaoka
Kurt Partridge
The Android Open Source Project
Jean Chalard