f8bc6c6295
am 181a9861: am 18fc3bf4: Merge "Make Latin IME aware of its surrounding text." into jb-mr1-dev
...
* commit '181a9861b1815fafca3cbbf48abbd91e821986b6':
Make Latin IME aware of its surrounding text.
2012-09-12 16:58:37 -07:00
0215ce2f5c
am f602b7ca: am 57e95111: Merge "Use offscreen bitmap buffer to draw gesture preview trail" into jb-mr1-dev
...
* commit 'f602b7caed8c314a854545813ec6a6c0c4c89ab9':
Use offscreen bitmap buffer to draw gesture preview trail
2012-09-12 16:58:35 -07:00
30543e01d9
am ec2039aa: am 8d031a63: Add put method to FusionDictionaryBufferInterface.
...
* commit 'ec2039aa66168c475a703e3c4e0798845a948db2':
Add put method to FusionDictionaryBufferInterface.
2012-09-12 16:58:34 -07:00
a698a37f8d
am 36a671ac: am 9182daf9: Output detailed log in ProximityInfoState
...
* commit '36a671ac9719f1b1f092d804a74cc261d8ec54b9':
Output detailed log in ProximityInfoState
2012-09-12 15:36:25 -07:00
856834d2d3
am 13e2b053: am 64c65ce6: Add missing MoreKeySpec.hashCode
...
* commit '13e2b0539517aff08d23f5f8af1e833c7b7af18e':
Add missing MoreKeySpec.hashCode
2012-09-12 15:35:59 -07:00
93e97d1bc8
am 6e52f164: am 655be140: Merge "When Accessibility is on, intercept touch events during dispatch." into jb-mr1-dev
...
* commit '6e52f164e6c7f5ed4f374d79b45a5665ee3d263b':
When Accessibility is on, intercept touch events during dispatch.
2012-09-12 15:15:06 -07:00
40794c90b5
am 5d46fb59: am e30c4e0b: Stabilize gesture recognition algorithm that looks for the nearest key.
...
* commit '5d46fb59d4b3d8c1dd37b8177dc3aed812c28c08':
Stabilize gesture recognition algorithm that looks for the nearest key.
2012-09-12 13:17:45 -07:00
e505c90b11
am 28892e6e: am b0c693d0: Merge "Stop auto-correcting non-whitelisted one-char strings" into jb-mr1-dev
...
* commit '28892e6e6569440530e6cbf7caf882f75dc3acac':
Stop auto-correcting non-whitelisted one-char strings
2012-09-12 13:17:38 -07:00
a0c9c1b6c3
am 3e53c6d9: am 040f1c50: Merge "Debug flag" into jb-mr1-dev
...
* commit '3e53c6d97080fbbd9b09a2d67fb8f933dc5c872b':
Debug flag
2012-09-12 13:17:37 -07:00
fc795e740c
am 296d7f31: am 41c2765b: Remove an unused file.
...
* commit '296d7f31d3a3fcd3d0c3d51864b391d9b380b2ab':
Remove an unused file.
2012-09-12 13:17:30 -07:00
8537026d45
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Id2ab069a952f0872441fc02a89e26fd71ede249a
2012-09-12 07:41:44 -07:00
b9c288c83d
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-12 07:00:23 -07:00
181a9861b1
am 18fc3bf4: Merge "Make Latin IME aware of its surrounding text." into jb-mr1-dev
...
* commit '18fc3bf4c453fe106be254eeb7aefb4a4a7154ba':
Make Latin IME aware of its surrounding text.
2012-09-12 02:09:15 -07:00
18fc3bf4c4
Merge "Make Latin IME aware of its surrounding text." into jb-mr1-dev
2012-09-12 02:07:48 -07:00
f602b7caed
am 57e95111: Merge "Use offscreen bitmap buffer to draw gesture preview trail" into jb-mr1-dev
...
* commit '57e95111138c94b7db7fec6749ca42be9fe92b2e':
Use offscreen bitmap buffer to draw gesture preview trail
2012-09-12 02:03:40 -07:00
57e9511113
Merge "Use offscreen bitmap buffer to draw gesture preview trail" into jb-mr1-dev
2012-09-12 02:01:46 -07:00
28d765ed90
Make Latin IME aware of its surrounding text.
...
This is a preparatory change for
Bug: 4967874
Bug: 6617760
Bug: 6950087
Change-Id: I3abf8e45c0d02c42491421f108370220134b9602
2012-09-12 17:54:16 +09:00
ec2039aa66
am 8d031a63: Add put method to FusionDictionaryBufferInterface.
...
* commit '8d031a63b4d59d4d8670b4310dd9e18a0e03435a':
Add put method to FusionDictionaryBufferInterface.
2012-09-12 01:48:35 -07:00
9ad4b2a894
Use offscreen bitmap buffer to draw gesture preview trail
...
Bug: 7042741
Change-Id: Ie3d7054e786938dc501c7aa2ffc96b5924a7967b
2012-09-12 17:47:17 +09:00
8d031a63b4
Add put method to FusionDictionaryBufferInterface.
...
Change-Id: Iac0b35d2da05e81237d105e8fe13c56d16038de1
2012-09-12 15:41:21 +09:00
36a671ac97
am 9182daf9: Output detailed log in ProximityInfoState
...
* commit '9182daf98c0d1db897e82b77c2196b7f9aad6f01':
Output detailed log in ProximityInfoState
2012-09-11 23:31:38 -07:00
9182daf98c
Output detailed log in ProximityInfoState
...
Change-Id: If6a254e2a116d1b6812f448d38139b7656168be6
2012-09-12 12:19:47 +09:00
13e2b05395
am 64c65ce6: Add missing MoreKeySpec.hashCode
...
* commit '64c65ce6d780175fe606fdd7ee694a3b5af4e37f':
Add missing MoreKeySpec.hashCode
2012-09-11 20:14:27 -07:00
64c65ce6d7
Add missing MoreKeySpec.hashCode
...
Bug: 7149235
Change-Id: I14ba1017dffccc690e24289052a3ad7265a5f5f7
2012-09-12 11:52:44 +09:00
6e52f164e6
am 655be140: Merge "When Accessibility is on, intercept touch events during dispatch." into jb-mr1-dev
...
* commit '655be140a0df4eaeee6789a0a14b765881c46748':
When Accessibility is on, intercept touch events during dispatch.
2012-09-11 13:33:05 -07:00
655be140a0
Merge "When Accessibility is on, intercept touch events during dispatch." into jb-mr1-dev
2012-09-11 13:31:30 -07:00
5d46fb59d4
am e30c4e0b: Stabilize gesture recognition algorithm that looks for the nearest key.
...
* commit 'e30c4e0bb1522f45b3bb37b54c35ee1f6a21dd4b':
Stabilize gesture recognition algorithm that looks for the nearest key.
2012-09-11 05:19:10 -07:00
e30c4e0bb1
Stabilize gesture recognition algorithm that looks for the nearest key.
...
It relies on the order of the key array.
Change-Id: I58fa71a7b330e59cd774fc208e5b6bc1a3decd2e
2012-09-11 20:00:21 +09:00
28892e6e65
am b0c693d0: Merge "Stop auto-correcting non-whitelisted one-char strings" into jb-mr1-dev
...
* commit 'b0c693d005761dc2d2c2e323cc0456bac9a33297':
Stop auto-correcting non-whitelisted one-char strings
2012-09-11 01:36:10 -07:00
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
819bbcd436
am 484aa517: am 29352761: Merge "Add debug utils for geometric input" into jb-mr1-dev
...
* commit '484aa5174ea9a9899591704bf5f2c35c24783485':
Add debug utils for geometric input
2012-09-10 17:13:49 -07:00
2d51ba0d23
am 01a9801f: am c80b3a29: Merge "Add DEBUG_GEO_FULL flag" into jb-mr1-dev
...
* commit '01a9801fcf8f5ab491405b1240319f0120063087':
Add DEBUG_GEO_FULL flag
2012-09-10 17:13:47 -07:00
0dbfa8d759
am 299c3292: am 32e85fda: Merge "Have makedict support the new file format." into jb-mr1-dev
...
* commit '299c32929e5712c1beaca83294866518715ecf1d':
Have makedict support the new file format.
2012-09-10 17:13:45 -07:00
9ac49c5288
am 0d2c0878: am 8223086e: Merge "Variable type cleanups" into jb-mr1-dev
...
* commit '0d2c0878d4a7e15c69d7e2fe60c806d8dcb7126b':
Variable type cleanups
2012-09-10 17:13:41 -07:00
591447fd90
am a92a0c5c: am 9a7e02d6: Merge "Add new binary dictionary format." into jb-mr1-dev
...
* commit 'a92a0c5c83209bf34dd0559b5a927c7fe5434721':
Add new binary dictionary format.
2012-09-10 17:13:28 -07:00
e9c3082b21
am 3ea851b8: am 14faf7a4: Merge "Fix backtrace tool" into jb-mr1-dev
...
* commit '3ea851b84db32ae1fc52caa664493ef55d3e98e5':
Fix backtrace tool
2012-09-10 17:13:20 -07:00
3092962ac6
am a4717f27: am 60af4f03: Fix dicttool_aosp build
...
* commit 'a4717f27cdc2945c2a34b067454145e0104262a1':
Fix dicttool_aosp build
2012-09-10 17:13:10 -07:00
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
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
f1ccd39ba1
am 3992de13: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '3992de13e2520cd144ed939205325251b4db6398':
2012-09-10 17:07:17 -07: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
Jean Chalard
Tadashi G. Takaoka
Yuichiro Hanada
Satoshi Kataoka
Charles Chen
Ken Wakasa
The Android Open Source Project
The Android Automerger
Keisuke Kuroyanagi
alanv