1ef00b28a5
am ceb364c0: Fix PrioritizedSerialExecutor.
...
* commit 'ceb364c0411dbcb38f2bd94f1d2b54eef3b985c1':
Fix PrioritizedSerialExecutor.
2013-10-01 05:23:13 -07:00
3b3cb4fe56
am ef63947f: Add boundary checking for PtNode Array reading. DO NOT MERGE
...
* commit 'ef63947f7d10bcbb3237661ad480b430d4208833':
Add boundary checking for PtNode Array reading. DO NOT MERGE
2013-10-01 05:23:12 -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
dd8ea0a33a
am 10fa6a2e: Stop reading dictionary while regenerating. (DO NOT MERGE)
...
* commit '10fa6a2e51ff29b81ffaf33d6bc4e3d78bae83e6':
Stop reading dictionary while regenerating. (DO NOT MERGE)
2013-09-30 17:07:55 -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
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
db6591a384
am d4af111f: am aa9d2ae3: am ce0273c2: am 883905f4: am 7fe67544: am 769427cf: Adjust aspect ratio of setup image
...
* commit 'd4af111fb054b363554af95943597b45aa3c7bda':
2013-09-26 06:59:23 -07:00
c532c51932
am d8ac191f: am 8aec7fad: am e0d3bb2c: am b6161b40: am 66c5f8cb: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
...
* commit 'd8ac191f472f95ff4777d32b360bf23db9a42e5e':
2013-09-26 06:59:19 -07:00
b78340ba25
am ccbb662e: am 6a923429: am ba4e480c: am 39afaf3d: am 6d0f0347: am b2d53be7: Merge "Remove FeedbackLog instance variables."
...
* commit 'ccbb662e21d0a911de101ffbcf1572cd07a7c744':
2013-09-26 06:59:15 -07:00
97e4d4b4fd
am 3cac8bf4: am c1c3df70: am 091bcabf: am 46bf9f49: am 4e3a8afd: am 8b56ad78: Merge "Revise welcome screen video and still image"
...
* commit '3cac8bf4ee82f8716d93661c04696eda10f8d939':
2013-09-26 06:59:10 -07:00
94ee7b395b
am 9da1f073: am 15cec207: am 7a724805: am acb37023: am 23bfac83: am d78c776b: Merge "Adjust sampling interval for gesture stroke drawing a bit."
...
* commit '9da1f0733ad7ae522493467e17c9edaad86159cd':
2013-09-26 06:59:06 -07:00
1f413d845e
am 784a961b: am 212798bf: am d8e8b007: am 5ee11c5d: am 2e0fc8bf: am d6d70e73: Merge "Revert "Fix isSuggestionsStripVisible when keyboard hidden""
...
* commit '784a961b6b63c437d10a523ddcdcff604fad23e4':
2013-09-26 06:59:00 -07:00
b93e782b26
am d16eb1a3: am fe84bbd1: am 315e8fac: am 8e7b1739: am 3fff5179: am 41016aca: Back to previous keyboard layout by canceling sliding input
...
* commit 'd16eb1a3c2b60dbfa80d8a44c52c6999834f3cc6':
2013-09-26 06:58:55 -07:00
5a24061267
am bcccd22e: am 07ba843c: am 7ab91dfe: am 03f2ca6d: am f46eafe2: am c9398a3b: Merge "Fix PointerTrackerQueue.releaseAllPointerOlderThan"
...
* commit 'bcccd22ebb8d396d624a623d97214695ee701ea5':
2013-09-26 06:58:51 -07:00
002039dd31
am 00090e11: am 00d00767: am a1912d14: am 95586abc: am dccad3ef: am cb0d1c4c: Fix isSuggestionsStripVisible when keyboard hidden
...
* commit '00090e1137edad832b795e219d3af4ce63f4e73b':
2013-09-26 06:58:47 -07:00
905f34ff44
am 5576afdb: (-s ours) am 7897e758: (-s ours) am d64589b4: (-s ours) am 8587e879: (-s ours) am 5ec5e0b6: am e69066d1: (-s ours) Import translations. DO NOT MERGE
...
* commit '5576afdb689a155d8f5540fcdfc1b66e1497b965':
2013-09-26 06:58:43 -07:00
a5f03a1f90
am efcd9c78: (-s ours) am fff0c8a9: (-s ours) am 29cfa87b: (-s ours) am fd2c2e62: (-s ours) am 298d8232: (-s ours) Import translations. DO NOT MERGE
...
* commit 'efcd9c7824169786a5386a5ce615a2e13c2337c5':
2013-09-26 06:58:39 -07:00
8185b774e0
am 4e7c1637: am f6270ab2: am b76d1737: am 2d86b73f: am 035c68a1: am b121538e: Tune maximum keypress duration to 100 milliseconds
...
* commit '4e7c163701c9a4b306a710c52952891fff3bd295':
2013-09-26 06:58:35 -07:00
e3748ed955
am a295927b: am c8d6683a: am aeff9902: am 7e52c35d: am 94c54eca: am e8336aa8: Merge "Fix keypress vibration duration of HTC One X"
...
* commit 'a295927b4a75ea9e34c7cfab61fd2082151720e5':
2013-09-26 06:58:30 -07:00
63fc524f6d
am 61629255: am c05c2526: am 93a1540a: am f1973350: am a70da988: am 5f857a35: Merge "Disable functional key while in sliding input mode"
...
* commit '616292552ca69dc1c7dc69a2f183d01e011f9e23':
2013-09-26 06:58:26 -07:00
709120575f
am 00204d85: am a0167db8: am 4103044a: am c731457f: am f6b5484d: am b5f67e7f: Add device specific keypress vibration duration database
...
* commit '00204d855b40d8d8a3a40e82ce1d1b6b38334e42':
2013-09-26 06:58:22 -07:00
84627c433c
am 484545c4: am db40c5d7: am 81fabdb8: am 73673b4c: am f1708394: am 0efd8d1b: Fix landscape override value expression
...
* commit '484545c4eca2a0d512a3e50666031675db4c5146':
2013-09-26 06:58:17 -07:00
df4b9eaaed
am ce291bfc: am 6399108c: am 209a97bb: am 7a876b31: am 813ba9f5: am 6b0bcfba: Merge "Disable long press timer while sliding input mode"
...
* commit 'ce291bfc848e41a2f5e44a68fc57f705b52e3424':
2013-09-26 06:58:13 -07:00
db0cc3d548
am a8aa563b: am 4268fdea: am f05eeecc: am 94ad2ef7: am 094447bd: am ad662ade: Disable delete key repeating while in slide input mode
...
* commit 'a8aa563bc155560bc76f2e5bf1af50bf665ab2ae':
2013-09-26 06:58:08 -07:00
1ace073568
am 7ff5db64: am 7c856e16: am cae4cd7b: am 66e5e05f: am 6780e43d: am 18184eac: Support regular expression for condition pattern
...
* commit '7ff5db64749f77accac7e15c29b1d977f6c06c98':
2013-09-26 06:58:03 -07:00
20d4751f07
am a3ec57b3: am de1115a8: am 4c6fe8ed: am aaf7d70b: am 6f647842: am ec83457d: Merge "Support multiple condition for getDeviceOverrideValue"
...
* commit 'a3ec57b3e91224b46cd9bc3e09d36f1d442667f1':
2013-09-26 06:57:58 -07:00
77d6181739
am 451b6c3b: am 99effbc0: am 645b62fb: am 8738eeaf: am 01c133d7: am cb3bba3c: Rename GesturePreviewTrail.java -> GestureTrail.java
...
* commit '451b6c3b38e98eb207b5db17cc6518fe8bfe7465':
2013-09-26 06:57:53 -07:00
54eb5bbb95
am 1831d86e: am 772990b6: am 22fa8123: am 7bc99237: am 03a32146: am 7d72ca0b: Avoid JsonWriter multi-write error
...
* commit '1831d86e77ec4bcce3d23a29e2e5527f53a8607b':
2013-09-26 06:57:49 -07:00
cbbe8f2e2c
am ceedfcc5: am 1da572e1: am 7c2ca940: am 1e0f8cff: am 697f6abb: am 260df841: Merge "Remove unused code"
...
* commit 'ceedfcc5a792b5830505227c9bfed114d6b9bb7f':
2013-09-26 06:57:44 -07:00
2d82e679ec
am 2325e858: am 5975a02e: am 28b9aec4: am eaf5c227: am 026b2645: am bb17034f: Merge "Remove ref to LatinImeLogger preference."
...
* commit '2325e8584177ac838f5fa94ad24c4c7ba29ff032':
2013-09-26 06:57:40 -07:00
c188bb6186
am 548778d3: am 398e03ea: am 3ffe11a5: am 4ee6df8d: am 1f8b354c: am 4135c2db: Merge "Avoid NPE by fixing ResearchLogger initialization"
...
* commit '548778d3f5970fe4a970f5f48e1f533a9e9f4587':
2013-09-26 06:57:35 -07:00
e17d367edb
am 38a30fb0: am e3158e93: am aca3b625: am 941e8bba: am a01ab9ea: am 565ced45: Merge "Refactor StringUtils.findPrefixedString to findValueOfKey"
...
* commit '38a30fb0e97c93df0b134e67ed008607adb44bad':
2013-09-26 06:57:31 -07:00
7ae37424c5
am 9e533398: am 2ffe29b6: am 4b18d513: am e90fe9c3: am afc40e74: am 4705c0fa: Fix screen flash when launching settings activity
...
* commit '9e533398345b14a9c021ee7ff7c4481d9f833c2a':
2013-09-26 06:57:24 -07:00
575d06f5dd
am 5e0d0242: am dfd21666: am 82e697bf: am 05aa5e75: am 48002809: am 2b5c9726: Introduce another activity to launch setup wizard
...
* commit '5e0d0242b1a6bd414d050a8fdc24a0dc4ddb2463':
2013-09-26 06:57:19 -07:00
218ab2a2c2
am db6feecd: am c7f2031d: am 1784791c: am 82e3ea95: am e7de0ce7: am 5ffa5bf3: Merge "Keep SetupActivity alive to check re-launching from launcher"
...
* commit 'db6feecd6e6f71172c13509edc6d95816adc9aad':
2013-09-26 06:57:15 -07:00
86749e88d1
am 14a54c67: am b5feac06: am b2e4031e: am 28eab9d5: am 07905b6a: am 2564bd09: Merge "Reuse old preferences if possible."
...
* commit '14a54c670a8762551a88d9fc6e06282e690801ce':
2013-09-26 06:57:06 -07:00
faeb31e430
am cb3e8f9c: am bcc04608: am 94734c93: am 1884044e: am 81662dd4: am ba35426f: Merge "Tweak a label in the personal dictionary settings"
...
* commit 'cb3e8f9c0d18c1e396c2cad200c3816330bd95e5':
2013-09-26 06:57:02 -07:00
206eebbda9
am 81b92a35: am 78296e91: am aab8a18b: am 1cb72a09: am 384d4e5b: am 2ad7023c: Fix detecting out of keyboard area
...
* commit '81b92a35f0e93701ebede02462866d34b337f3ff':
2013-09-26 06:56:58 -07:00
0998f0d5d4
am 80698db1: (-s ours) am da09228f: (-s ours) am e31e4a9c: (-s ours) am ad12dfa6: (-s ours) am dfc0adfe: am b0aabbfb: (-s ours) am 8dafc8e8: (-s ours) am 22e6a5c5: Import translations. DO NOT MERGE
...
* commit '80698db18c2e7da0adf4acf6ce3171ed57ab9176':
2013-09-26 06:56:53 -07:00
Yuichiro Hanada
Keisuke Kuroyanagi
The Android Open Source Project
Kurt Partridge
Jean Chalard
Tadashi G. Takaoka
The Android Automerger
Ken Wakasa
Baligh Uddin
Satoshi Kataoka