b0c693d005
Merge "Stop auto-correcting non-whitelisted one-char strings" into jb-mr1-dev
2012-09-11 01:34:52 -07:00
8c06a468e0
Stop auto-correcting non-whitelisted one-char strings
...
Bug: 7134017
Change-Id: I75cf474dedafda3e1683dd8f7740c13aafdcf5ab
2012-09-11 17:24:08 +09:00
3e53c6d970
am 040f1c50: Merge "Debug flag" into jb-mr1-dev
...
* commit '040f1c50bf2d105b75cb61cac883d6955b955f8e':
Debug flag
2012-09-11 01:10:36 -07:00
040f1c50bf
Merge "Debug flag" into jb-mr1-dev
2012-09-11 01:08:36 -07:00
952ec4977d
Debug flag
...
Change-Id: Ied846162fd5052a33fd3c8596e73dfdd48c446ee
2012-09-11 17:04:10 +09:00
296d7f31d3
am 41c2765b: Remove an unused file.
...
* commit '41c2765b4499b093f1a4b4cba244cb384002037b':
Remove an unused file.
2012-09-10 23:36:27 -07:00
41c2765b44
Remove an unused file.
...
Change-Id: I422d27aae063c4eb17d0e00277cf4492e5b4986e
2012-09-11 14:55:08 +09:00
dc2ee77724
When Accessibility is on, intercept touch events during dispatch.
...
This allows Accessibility code to safely inject events into
onTouchEvent() without accidentally intercepting them.
Bug: 7137557
Change-Id: Ie4fa8e3be5b1bb84f57c6254feab1129cb89998f
2012-09-10 15:47:24 -07:00
e09b15f67b
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-10 06:59:57 -07:00
484aa5174e
am 29352761: Merge "Add debug utils for geometric input" into jb-mr1-dev
...
* commit '2935276110cf3588e2986b833cc78a7bab6253cc':
Add debug utils for geometric input
2012-09-10 03:44:46 -07:00
2935276110
Merge "Add debug utils for geometric input" into jb-mr1-dev
2012-09-10 03:42:55 -07:00
d45c0faec3
Add debug utils for geometric input
...
Change-Id: If01bd5593cfc7428572aa43253d6d72409ac6b8e
2012-09-10 19:36:38 +09:00
01a9801fcf
am c80b3a29: Merge "Add DEBUG_GEO_FULL flag" into jb-mr1-dev
...
* commit 'c80b3a29a872e41c2cdc0532e0496db8c8eff64d':
Add DEBUG_GEO_FULL flag
2012-09-10 02:04:54 -07:00
c80b3a29a8
Merge "Add DEBUG_GEO_FULL flag" into jb-mr1-dev
2012-09-10 02:02:55 -07:00
23a57eafbb
Add DEBUG_GEO_FULL flag
...
Change-Id: Ibf8eb5fc2056fd138e9e6af1c13fbc065b44a6f1
2012-09-10 17:59:17 +09:00
299c32929e
am 32e85fda: Merge "Have makedict support the new file format." into jb-mr1-dev
...
* commit '32e85fdacfb4c865c7e1565d80697e97e21f3484':
Have makedict support the new file format.
2012-09-10 01:51:41 -07:00
32e85fdacf
Merge "Have makedict support the new file format." into jb-mr1-dev
2012-09-10 01:49:27 -07:00
debe3b4555
Have makedict support the new file format.
...
Change-Id: Idcbba71b397f87a5d59e16bb4061d62261c73282
2012-09-10 17:47:06 +09:00
0d2c0878d4
am 8223086e: Merge "Variable type cleanups" into jb-mr1-dev
...
* commit '8223086e238e403f6ad342843583d1c89ad55c04':
Variable type cleanups
2012-09-10 00:56:03 -07:00
8223086e23
Merge "Variable type cleanups" into jb-mr1-dev
2012-09-10 00:54:13 -07:00
5964d4e607
Variable type cleanups
...
Change-Id: I5d892494200c09f8cb8a46c327c29bbd63eab093
2012-09-10 16:49:36 +09:00
a92a0c5c83
am 9a7e02d6: Merge "Add new binary dictionary format." into jb-mr1-dev
...
* commit '9a7e02d6fede5cf7f24f0ceb76ff5ad161fdbf60':
Add new binary dictionary format.
2012-09-10 00:30:38 -07:00
9a7e02d6fe
Merge "Add new binary dictionary format." into jb-mr1-dev
2012-09-10 00:28:46 -07:00
3ea851b84d
am 14faf7a4: Merge "Fix backtrace tool" into jb-mr1-dev
...
* commit '14faf7a47e7415744d628726c596b63d4228aff0':
Fix backtrace tool
2012-09-09 22:33:37 -07:00
14faf7a47e
Merge "Fix backtrace tool" into jb-mr1-dev
2012-09-09 22:31:30 -07:00
e55b644aef
Add new binary dictionary format.
...
Change-Id: Ia99411d4009857d5e420ca87ef8acf1f1826d3ed
2012-09-10 13:05:46 +09:00
a4717f27cd
am 60af4f03: Fix dicttool_aosp build
...
* commit '60af4f03a82e8af71e1eb56cd4caed567c003fd4':
Fix dicttool_aosp build
2012-09-09 21:03:05 -07:00
60af4f03a8
Fix dicttool_aosp build
...
Change-Id: Iabcf420b4120e3d275fdbcb23939a0ab6052ddf0
2012-09-10 12:56:10 +09:00
1c8fc83dce
Fix backtrace tool
...
Change-Id: Icc0e8ad94331e62a569183fa05ada335dcc5e26a
2012-09-10 12:54:42 +09:00
0295a39845
am eae7b293: Check the length of the word when add to FusionDictionary.
...
* commit 'eae7b293e4a854819aa0de663066cd0b6cdd52e7':
Check the length of the word when add to FusionDictionary.
2012-09-09 20:43:37 -07:00
eae7b293e4
Check the length of the word when add to FusionDictionary.
...
Change-Id: Id98d18e90a8b83b597507728b467f56888c8fd12
2012-09-10 12:35:53 +09:00
33164f3287
am 096f35ff: Fix the condition of continuation for gesture input and make ProximityInfoState incremental.
...
* commit '096f35ff4b5413906e2a339663baf16e5dabaf64':
Fix the condition of continuation for gesture input and make ProximityInfoState incremental.
2012-09-09 18:48:48 -07:00
1370e63d84
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-09 07:01:36 -07:00
3992de13e2
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Ia7aa78867ab0f737f847d34983cc41e58d5617cc
2012-09-07 15:04:02 -07:00
096f35ff4b
Fix the condition of continuation for gesture input and make ProximityInfoState incremental.
...
Change-Id: I69ad295b660e0c4ba5bb29c8d3d8805291ec43a8
2012-09-07 21:04:12 +09:00
2554fe1ed1
am b922da84: Merge "Fix bimanual gesture preview trail" into jb-mr1-dev
...
* commit 'b922da847c3ce82b82e445baad5a6c01159608ad':
Fix bimanual gesture preview trail
2012-09-07 03:17:44 -07:00
b922da847c
Merge "Fix bimanual gesture preview trail" into jb-mr1-dev
2012-09-07 03:04:48 -07:00
f117f77766
Fix bimanual gesture preview trail
...
Bug: 7122288
Change-Id: I9f0aabe08628880a8439bfda98844ae60206b8de
2012-09-07 17:20:07 +09:00
f2f61162e5
am b85df9d5: Merge "Fix bug of sampling and become to save corner points for geometric input." into jb-mr1-dev
...
* commit 'b85df9d5effa7c2854ba51c7a5bbd7460d16069b':
Fix bug of sampling and become to save corner points for geometric input.
2012-09-07 00:05:01 -07:00
b85df9d5ef
Merge "Fix bug of sampling and become to save corner points for geometric input." into jb-mr1-dev
2012-09-07 00:03:44 -07:00
aba26e4f63
Fix bug of sampling and become to save corner points for geometric input.
...
Change-Id: I6278a1f7fdcc897c1d6c8d4c8e53730087cc2e5e
2012-09-07 16:02:18 +09:00
217d24101d
am 7914e907: Add comments for meaningless lines
...
* commit '7914e907b5d31ec4b2034a94e393129833770531':
Add comments for meaningless lines
2012-09-06 19:28:10 -07:00
7914e907b5
Add comments for meaningless lines
...
Change-Id: I20ebe246f6980fd3054c2c7e98b5150eaabbcc77
2012-09-07 08:55:16 +09:00
a6921d326a
am 3051966b: Merge "The processNextKey becomes to use actual average duration." into jb-mr1-dev
...
* commit '3051966b8c10802b0ff6490c2ae85ec8553669f4':
The processNextKey becomes to use actual average duration.
2012-09-06 08:23:45 -07:00
3f31e96362
am 3518ed60: Merge "Fix one-off bugs reported by Valgrind" into jb-mr1-dev
...
* commit '3518ed6031a1bcb9a501be4b9e1f5b82568185bd':
Fix one-off bugs reported by Valgrind
2012-09-06 08:23:43 -07:00
23f8c24d79
am 3069e226: Merge "Add tests for readDictionaryBinary with byte array." into jb-mr1-dev
...
* commit '3069e226104d71ec0ce92c62964f6f60efa48332':
Add tests for readDictionaryBinary with byte array.
2012-09-06 08:23:41 -07:00
f56399772e
am a47a17a2: Merge "Revise gesture preview trail design" into jb-mr1-dev
...
* commit 'a47a17a216567e899d811abce3a66103eafbb14c':
Revise gesture preview trail design
2012-09-06 08:23:39 -07:00
4a29e83576
am fc9ea5be: Merge "Refactor BinaryDictIOTests." into jb-mr1-dev
...
* commit 'fc9ea5be47132d3e42fc310331ac89d2f42392c3':
Refactor BinaryDictIOTests.
2012-09-06 08:23:38 -07:00
ccf1f81c13
am f76bb32b: Merge "Check shortcuts in checkDictionary." into jb-mr1-dev
...
* commit 'f76bb32bd7916c75a655e516ac487cc96fa89b11':
Check shortcuts in checkDictionary.
2012-09-06 08:23:36 -07:00
3ef13f7b93
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-06 06:34:46 -07:00
Jean Chalard
Satoshi Kataoka
Ken Wakasa
alanv
The Android Automerger
Yuichiro Hanada
Keisuke Kuroyanagi
The Android Open Source Project
Tadashi G. Takaoka