58598e058f
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-28 07:00:04 -07:00
99501896f5
am 9925e487: am 6052a81e: Merge "Fix gesture detection algorithm" into jb-mr1-dev
...
* commit '9925e487b345e4a63d3dc25e3bf156e0fbfbb04d':
Fix gesture detection algorithm
2012-09-28 06:54:04 -07:00
e43623afb4
am 6052a81e: Merge "Fix gesture detection algorithm" into jb-mr1-dev
...
* commit '6052a81e08758c738b80fb8bde6babe97bcdd261':
Fix gesture detection algorithm
2012-09-28 06:52:32 -07:00
9925e487b3
am 6052a81e: Merge "Fix gesture detection algorithm" into jb-mr1-dev
...
* commit '6052a81e08758c738b80fb8bde6babe97bcdd261':
Fix gesture detection algorithm
2012-09-28 06:51:48 -07:00
6052a81e08
Merge "Fix gesture detection algorithm" into jb-mr1-dev
2012-09-28 06:49:24 -07:00
58fe5a421f
Fix gesture detection algorithm
...
This change also
* Introduces adaptive gesture detecting threshold for time domain in addition to length domain.
* Tunes the parameters for detecting gesture after fast typing.
* Fixes a bug in dismissing gesture floating preview text.
* Cleanup debug messages
Bug: 7218902
Change-Id: Iafccd872c6efe0c3b5ae65fa40b04c80d9f139c7
2012-09-28 22:47:55 +09:00
11dbf025c6
am 2626bf08: am c8f25294: Merge "Temporarily suppress key popup preview after gesture input" into jb-mr1-dev
...
* commit '2626bf0889af798e484824737e9973ffb447498f':
Temporarily suppress key popup preview after gesture input
2012-09-28 03:42:38 -07:00
2626bf0889
am c8f25294: Merge "Temporarily suppress key popup preview after gesture input" into jb-mr1-dev
...
* commit 'c8f252940f1a7831885c87b409e15096ed64eaf0':
Temporarily suppress key popup preview after gesture input
2012-09-28 03:40:53 -07:00
e914d4739e
am c8f25294: Merge "Temporarily suppress key popup preview after gesture input" into jb-mr1-dev
...
* commit 'c8f252940f1a7831885c87b409e15096ed64eaf0':
Temporarily suppress key popup preview after gesture input
2012-09-28 03:40:14 -07:00
c8f252940f
Merge "Temporarily suppress key popup preview after gesture input" into jb-mr1-dev
2012-09-28 03:38:20 -07:00
b88c8ac8e4
Merge "Add updateChildrenAddress."
2012-09-28 03:18:18 -07:00
29d2d48182
Temporarily suppress key popup preview after gesture input
...
Bug: 7244317
Change-Id: I39cdb0fbda51f3e4339301d9cc53403b1ad15409
2012-09-28 19:10:56 +09:00
f3aed3ea26
Add updateChildrenAddress.
...
Change-Id: Ic06a755d85612476e719e580469dc1cd9447286c
2012-09-28 18:45:56 +09:00
33f425d74f
am a244d534: am ad6b493c: Merge "Remove dead code for disabling gesture input after fast typing" into jb-mr1-dev
...
* commit 'a244d534af7d74d2865063b1ec96f37e552192c6':
Remove dead code for disabling gesture input after fast typing
2012-09-28 00:51:30 -07:00
9c5f0add4f
am ad6b493c: Merge "Remove dead code for disabling gesture input after fast typing" into jb-mr1-dev
...
* commit 'ad6b493c16e50bbe2a2e8f557c2fed8418f578a2':
Remove dead code for disabling gesture input after fast typing
2012-09-28 00:48:57 -07:00
a244d534af
am ad6b493c: Merge "Remove dead code for disabling gesture input after fast typing" into jb-mr1-dev
...
* commit 'ad6b493c16e50bbe2a2e8f557c2fed8418f578a2':
Remove dead code for disabling gesture input after fast typing
2012-09-28 00:48:43 -07:00
ad6b493c16
Merge "Remove dead code for disabling gesture input after fast typing" into jb-mr1-dev
2012-09-28 00:47:05 -07:00
14295a2efa
am 5052bd07: (-s ours) am 587ab417: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '5052bd070f92320609ce79207896eb20f1d13027':
Import translations. DO NOT MERGE
2012-09-28 00:38:34 -07:00
acaf2bedc1
am e7ad9084: am 7a7d117a: Ignore the broken file.
...
* commit 'e7ad90840786566a2f36b4aa35893bf76449b2ce':
Ignore the broken file.
2012-09-28 00:37:48 -07:00
07f2c193bf
am a1d80e59: (-s ours) am a36c5953: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'a1d80e59b5ffcda1369443e121713075ff0dbc91':
Import translations. DO NOT MERGE
2012-09-28 00:33:04 -07:00
75eed70935
am 4ee91d7f: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '4ee91d7fefa26e019fdc59038271d8316481cf8e':
2012-09-28 00:32:57 -07:00
f9bdb738bd
Import translations. DO NOT MERGE
...
Change-Id: I37ccfcc9a3ccbda4729802b533cc44e3edeebd79
Auto-generated-cl: translation import
2012-09-28 00:17:28 -07:00
e7756577c4
am 587ab417: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '587ab41709416cd7d5f546e87e522b9ed3c9b93c':
Import translations. DO NOT MERGE
2012-09-28 00:16:40 -07:00
5052bd070f
am 587ab417: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '587ab41709416cd7d5f546e87e522b9ed3c9b93c':
Import translations. DO NOT MERGE
2012-09-28 00:16:29 -07:00
bf538ab2c0
Remove dead code for disabling gesture input after fast typing
...
Bug: 7218902
Change-Id: Iccc1d4cf0dd3ac84b30c68e11eee9a6ad89f14c4
2012-09-28 16:15:51 +09:00
587ab41709
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-09-28 00:14:53 -07:00
cf85160dee
Import translations. DO NOT MERGE
...
Change-Id: I3748ecaecef1f07e1537831eb0f7c5503a460b56
Auto-generated-cl: translation import
2012-09-28 00:14:00 -07:00
5f9bf307ec
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-09-28 00:13:14 -07:00
3de5a91080
Import translations. DO NOT MERGE
...
Change-Id: Ic49487218d23bca4403b52cf2455a852ae5889ca
Auto-generated-cl: translation import
2012-09-28 00:12:49 -07:00
e7ad908407
am 7a7d117a: Ignore the broken file.
...
* commit '7a7d117aa7e7157ed429d68c4797218476151d8d':
Ignore the broken file.
2012-09-27 22:45:07 -07:00
7a2bb6ae2f
am 7a7d117a: Ignore the broken file.
...
* commit '7a7d117aa7e7157ed429d68c4797218476151d8d':
Ignore the broken file.
2012-09-27 22:44:34 -07:00
7a7d117aa7
Ignore the broken file.
...
bug: 7249561
Change-Id: If001bf75ef12b4d342a77e54706c7fed90c89afb
2012-09-28 14:19:14 +09:00
61ff9f8559
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-09-27 10:08:15 -07:00
b3b216c892
am a36c5953: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'a36c5953535feae70601f8d93054107fba9a45fe':
Import translations. DO NOT MERGE
2012-09-27 10:06:11 -07:00
4cba185195
Merge "Import translations. DO NOT MERGE"
2012-09-27 10:05:58 -07:00
a1d80e59b5
am a36c5953: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'a36c5953535feae70601f8d93054107fba9a45fe':
Import translations. DO NOT MERGE
2012-09-27 10:05:44 -07:00
a36c595353
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-09-27 10:03:23 -07:00
4ee91d7fef
Reconcile with jb-mr1-release - do not merge
...
Change-Id: If1a0b34f8cfad842a7d95ec26c9a712ceb9218bb
2012-09-27 09:59:40 -07:00
c179aed01e
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-27 07:00:34 -07:00
4e679a6e18
am 94bc0d49: am 6e5c2db5: Merge "Cleanups in LatinIME native source code" into jb-mr1-dev
...
* commit '94bc0d49f82f9d3c62fe04519da55fd963db93ef':
Cleanups in LatinIME native source code
2012-09-27 03:50:38 -07:00
94bc0d49f8
am 6e5c2db5: Merge "Cleanups in LatinIME native source code" into jb-mr1-dev
...
* commit '6e5c2db5710877b2d65edf0f0d28f1e3d3bb1c28':
Cleanups in LatinIME native source code
2012-09-27 03:43:40 -07:00
c19d332887
am 6e5c2db5: Merge "Cleanups in LatinIME native source code" into jb-mr1-dev
...
* commit '6e5c2db5710877b2d65edf0f0d28f1e3d3bb1c28':
Cleanups in LatinIME native source code
2012-09-27 03:42:28 -07:00
6e5c2db571
Merge "Cleanups in LatinIME native source code" into jb-mr1-dev
2012-09-27 03:40:55 -07:00
337274a015
am e7bdd991: am a28a05e9: Cleanup: Make some classes as final
...
* commit 'e7bdd9910141c11701751be32bfed67956a950b6':
Cleanup: Make some classes as final
2012-09-27 03:28:57 -07:00
4358ce2734
am a28a05e9: Cleanup: Make some classes as final
...
* commit 'a28a05e971cc242b338331a3b78276fa95188d19':
Cleanup: Make some classes as final
2012-09-27 03:27:18 -07:00
e7bdd99101
am a28a05e9: Cleanup: Make some classes as final
...
* commit 'a28a05e971cc242b338331a3b78276fa95188d19':
Cleanup: Make some classes as final
2012-09-27 03:27:08 -07:00
5150e154f0
Cleanups in LatinIME native source code
...
Change-Id: I9b5e57583deb2d0c980e66c3dfbfd1e12734bc8e
2012-09-27 19:23:38 +09:00
a28a05e971
Cleanup: Make some classes as final
...
Change-Id: I6009b3c1950ba32b7f1e205a3db2307fe0cd688e
2012-09-27 19:03:30 +09:00
b2c1cd0866
am beb713ed: am 17752016: Calculate default touch position correction data for keys on 4th row
...
* commit 'beb713ed81599d92f08b521f0a872072f9d9c3e0':
Calculate default touch position correction data for keys on 4th row
2012-09-27 02:09:02 -07:00
aa08b55b09
am 17752016: Calculate default touch position correction data for keys on 4th row
...
* commit '17752016713b92a55e9c2356d07b7ed51c67416b':
Calculate default touch position correction data for keys on 4th row
2012-09-27 02:07:14 -07:00
The Android Automerger
Tadashi G. Takaoka
Ken Wakasa
Yuichiro Hanada
Baligh Uddin
The Android Open Source Project