Commit graph

8811 commits

Author SHA1 Message Date
Yuichiro Hanada
3cff0dab82 am 0295a398: am eae7b293: Check the length of the word when add to FusionDictionary.
* commit '0295a39845da87f6f082d50a5c3b1b403f5e07c2':
  Check the length of the word when add to FusionDictionary.
2012-09-10 17:13:07 -07:00
Keisuke Kuroyanagi
0e34469f2a am 33164f32: am 096f35ff: Fix the condition of continuation for gesture input and make ProximityInfoState incremental.
* commit '33164f3287e46c7199493a31a36e32a939a75b2a':
  Fix the condition of continuation for gesture input and make ProximityInfoState incremental.
2012-09-10 17:12:55 -07:00
The Android Open Source Project
f1ccd39ba1 am 3992de13: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '3992de13e2520cd144ed939205325251b4db6398':
2012-09-10 17:07:17 -07:00
alanv
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
The Android Automerger
e09b15f67b merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-10 06:59:57 -07:00
Satoshi Kataoka
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
Satoshi Kataoka
2935276110 Merge "Add debug utils for geometric input" into jb-mr1-dev 2012-09-10 03:42:55 -07:00
Satoshi Kataoka
d45c0faec3 Add debug utils for geometric input
Change-Id: If01bd5593cfc7428572aa43253d6d72409ac6b8e
2012-09-10 19:36:38 +09:00
Satoshi Kataoka
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
Satoshi Kataoka
c80b3a29a8 Merge "Add DEBUG_GEO_FULL flag" into jb-mr1-dev 2012-09-10 02:02:55 -07:00
Satoshi Kataoka
23a57eafbb Add DEBUG_GEO_FULL flag
Change-Id: Ibf8eb5fc2056fd138e9e6af1c13fbc065b44a6f1
2012-09-10 17:59:17 +09:00
Jean Chalard
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
Jean Chalard
32e85fdacf Merge "Have makedict support the new file format." into jb-mr1-dev 2012-09-10 01:49:27 -07:00
Yuichiro Hanada
debe3b4555 Have makedict support the new file format.
Change-Id: Idcbba71b397f87a5d59e16bb4061d62261c73282
2012-09-10 17:47:06 +09:00
Ken Wakasa
0d2c0878d4 am 8223086e: Merge "Variable type cleanups" into jb-mr1-dev
* commit '8223086e238e403f6ad342843583d1c89ad55c04':
  Variable type cleanups
2012-09-10 00:56:03 -07:00
Ken Wakasa
8223086e23 Merge "Variable type cleanups" into jb-mr1-dev 2012-09-10 00:54:13 -07:00
Ken Wakasa
5964d4e607 Variable type cleanups
Change-Id: I5d892494200c09f8cb8a46c327c29bbd63eab093
2012-09-10 16:49:36 +09:00
Ken Wakasa
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
Ken Wakasa
9a7e02d6fe Merge "Add new binary dictionary format." into jb-mr1-dev 2012-09-10 00:28:46 -07:00
Satoshi Kataoka
3ea851b84d am 14faf7a4: Merge "Fix backtrace tool" into jb-mr1-dev
* commit '14faf7a47e7415744d628726c596b63d4228aff0':
  Fix backtrace tool
2012-09-09 22:33:37 -07:00
Satoshi Kataoka
14faf7a47e Merge "Fix backtrace tool" into jb-mr1-dev 2012-09-09 22:31:30 -07:00
Yuichiro Hanada
e55b644aef Add new binary dictionary format.
Change-Id: Ia99411d4009857d5e420ca87ef8acf1f1826d3ed
2012-09-10 13:05:46 +09:00
Ken Wakasa
a4717f27cd am 60af4f03: Fix dicttool_aosp build
* commit '60af4f03a82e8af71e1eb56cd4caed567c003fd4':
  Fix dicttool_aosp build
2012-09-09 21:03:05 -07:00
Ken Wakasa
60af4f03a8 Fix dicttool_aosp build
Change-Id: Iabcf420b4120e3d275fdbcb23939a0ab6052ddf0
2012-09-10 12:56:10 +09:00
Satoshi Kataoka
1c8fc83dce Fix backtrace tool
Change-Id: Icc0e8ad94331e62a569183fa05ada335dcc5e26a
2012-09-10 12:54:42 +09:00
Yuichiro Hanada
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
Yuichiro Hanada
eae7b293e4 Check the length of the word when add to FusionDictionary.
Change-Id: Id98d18e90a8b83b597507728b467f56888c8fd12
2012-09-10 12:35:53 +09:00
Keisuke Kuroyanagi
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
The Android Automerger
1370e63d84 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-09 07:01:36 -07:00
The Android Open Source Project
3992de13e2 Reconcile with jb-mr1-release - do not merge
Change-Id: Ia7aa78867ab0f737f847d34983cc41e58d5617cc
2012-09-07 15:04:02 -07:00
Keisuke Kuroyanagi
096f35ff4b Fix the condition of continuation for gesture input and make ProximityInfoState incremental.
Change-Id: I69ad295b660e0c4ba5bb29c8d3d8805291ec43a8
2012-09-07 21:04:12 +09:00
Tadashi G. Takaoka
34e9791dbd am 2554fe1e: am b922da84: Merge "Fix bimanual gesture preview trail" into jb-mr1-dev
* commit '2554fe1ed1a3e78f199964cdd607d82e004b2ed4':
  Fix bimanual gesture preview trail
2012-09-07 03:19:52 -07:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
b922da847c Merge "Fix bimanual gesture preview trail" into jb-mr1-dev 2012-09-07 03:04:48 -07:00
Tadashi G. Takaoka
f117f77766 Fix bimanual gesture preview trail
Bug: 7122288
Change-Id: I9f0aabe08628880a8439bfda98844ae60206b8de
2012-09-07 17:20:07 +09:00
Ken Wakasa
5269f845fc am f2f61162: am b85df9d5: Merge "Fix bug of sampling and become to save corner points for geometric input." into jb-mr1-dev
* commit 'f2f61162e5ef61791fe54b59278f5283a0c7770b':
  Fix bug of sampling and become to save corner points for geometric input.
2012-09-07 00:07:04 -07:00
Ken Wakasa
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
Ken Wakasa
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
Keisuke Kuroyanagi
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
Ken Wakasa
c144e8889e am 217d2410: am 7914e907: Add comments for meaningless lines
* commit '217d24101dd74dbd66f0ef81cbf04da3f6d0305d':
  Add comments for meaningless lines
2012-09-06 19:29:18 -07:00
Ken Wakasa
217d24101d am 7914e907: Add comments for meaningless lines
* commit '7914e907b5d31ec4b2034a94e393129833770531':
  Add comments for meaningless lines
2012-09-06 19:28:10 -07:00
Ken Wakasa
7914e907b5 Add comments for meaningless lines
Change-Id: I20ebe246f6980fd3054c2c7e98b5150eaabbcc77
2012-09-07 08:55:16 +09:00
Satoshi Kataoka
2a5ad57707 am a6921d32: am 3051966b: Merge "The processNextKey becomes to use actual average duration." into jb-mr1-dev
* commit 'a6921d326a3fae8354ee904c43b837fbc59a00e5':
  The processNextKey becomes to use actual average duration.
2012-09-06 09:12:32 -07:00
Jean Chalard
59e20c987a am 3f31e963: am 3518ed60: Merge "Fix one-off bugs reported by Valgrind" into jb-mr1-dev
* commit '3f31e96362a38e090a822b36b1de788a1ee04ed2':
  Fix one-off bugs reported by Valgrind
2012-09-06 09:12:31 -07:00
Ken Wakasa
e0fef5067d am 23f8c24d: am 3069e226: Merge "Add tests for readDictionaryBinary with byte array." into jb-mr1-dev
* commit '23f8c24d795dec9634c6d2df4c2e7b4d8323d65d':
  Add tests for readDictionaryBinary with byte array.
2012-09-06 09:12:29 -07:00
Tadashi G. Takaoka
568cca5004 am f5639977: am a47a17a2: Merge "Revise gesture preview trail design" into jb-mr1-dev
* commit 'f56399772e11cc27a076357645cc98f59df2df97':
  Revise gesture preview trail design
2012-09-06 09:12:28 -07:00
Ken Wakasa
b3b78f8152 am 4a29e835: am fc9ea5be: Merge "Refactor BinaryDictIOTests." into jb-mr1-dev
* commit '4a29e83576bf41e3253cfb8d46dd58473556a123':
  Refactor BinaryDictIOTests.
2012-09-06 09:12:25 -07:00
Ken Wakasa
5303b5cc92 am ccf1f81c: am f76bb32b: Merge "Check shortcuts in checkDictionary." into jb-mr1-dev
* commit 'ccf1f81c13c78893bac4ab186b7ff69d66fc4256':
  Check shortcuts in checkDictionary.
2012-09-06 09:12:23 -07:00
Satoshi Kataoka
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
Jean Chalard
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