The Android Open Source Project
8e01cc768d
am 2d1bdcf6: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '2d1bdcf6d591a3014b6ee5c583246ae3fd9603eb':
2012-10-02 09:24:48 -07:00
The Android Open Source Project
2d1bdcf6d5
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I3545b3a031bfc602b6d61db2039c8232fe41588a
2012-10-02 09:20:31 -07:00
The Android Automerger
d8e03757cb
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-02 07:00:18 -07:00
Tadashi G. Takaoka
c3aea8ea9f
Merge "Avoid calling switchToLastInputMethod when other IMEs are in effect"
2012-10-02 01:36:37 -07:00
Tadashi G. Takaoka
aec5cc8476
Avoid calling switchToLastInputMethod when other IMEs are in effect
...
Bug: 7268389
Change-Id: I4d960cbf063002b4dc0ea813c966366b56c0346d
2012-10-02 17:29:15 +09:00
Tadashi G. Takaoka
fe3fb2502d
am 58e1be74: am de102ede: am 15281adb: Show gesture floating preview text by default
...
* commit '58e1be74a989637b0b71ebf990ed1b3c9a21e7af':
Show gesture floating preview text by default
2012-10-01 23:41:38 -07:00
Baligh Uddin
61fa98b89b
am 7321aa8a: (-s ours) am 988482a1: am d80fd305: Import translations. DO NOT MERGE
...
* commit '7321aa8abf05541ee42aedc20f0fc103fe699124':
Import translations. DO NOT MERGE
2012-10-01 23:41:33 -07:00
Tadashi G. Takaoka
58e1be74a9
am de102ede: am 15281adb: Show gesture floating preview text by default
...
* commit 'de102ede499cd3baf93561d06c5fe3e663276d2e':
Show gesture floating preview text by default
2012-10-01 23:38:12 -07:00
Baligh Uddin
7321aa8abf
am 988482a1: am d80fd305: Import translations. DO NOT MERGE
...
* commit '988482a1154b15c0bfcfe82a9d349828471605b6':
Import translations. DO NOT MERGE
2012-10-01 23:38:06 -07:00
Baligh Uddin
6c3e2c9bad
am 996b142f: (-s ours) am 3ab7fb85: Import translations. DO NOT MERGE
...
* commit '996b142f76d5da131da9b27f02438020d21b1e14':
Import translations. DO NOT MERGE
2012-10-01 23:35:37 -07:00
Baligh Uddin
996b142f76
am 3ab7fb85: Import translations. DO NOT MERGE
...
* commit '3ab7fb8575d1df42aa1fc0535177216183aad6d8':
Import translations. DO NOT MERGE
2012-10-01 23:33:10 -07:00
Tadashi G. Takaoka
de102ede49
am 15281adb: Show gesture floating preview text by default
...
* commit '15281adbc1580262888aba6fc73bbbe7fa9e0de8':
Show gesture floating preview text by default
2012-10-01 23:32:56 -07:00
Baligh Uddin
988482a115
am d80fd305: Import translations. DO NOT MERGE
...
* commit 'd80fd3058c28fae43d45f239684e3058995424c3':
Import translations. DO NOT MERGE
2012-10-01 23:32:55 -07:00
Tadashi G. Takaoka
15281adbc1
Show gesture floating preview text by default
...
Bug: 7244214
Change-Id: Ib4ab810ef50798828dd10c39a8077466165772e4
2012-10-01 21:23:00 -07:00
Baligh Uddin
6fd7fe5033
Merge "Import translations. DO NOT MERGE"
2012-10-01 21:10:47 -07:00
Baligh Uddin
a8caa7f4d0
Import translations. DO NOT MERGE
...
Change-Id: I7516d2d74ab4f4c46dc39ec32cdeb44c97bba462
Auto-generated-cl: translation import
2012-10-01 16:17:19 -07:00
Baligh Uddin
d80fd3058c
Import translations. DO NOT MERGE
...
Change-Id: I8f8c7f722d6fe55146428305f0a12b5e1b1d8dce
Auto-generated-cl: translation import
2012-10-01 16:12:25 -07:00
Baligh Uddin
3ab7fb8575
Import translations. DO NOT MERGE
...
Change-Id: I85f32f807aa6ce5383eab778ce11363583b8357f
Auto-generated-cl: translation import
2012-10-01 16:10:55 -07:00
Baligh Uddin
24663a0f72
am 6a35388b: (-s ours) am c08e11a1: am 541b9945: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '6a35388bad75502903f82c97ba8eb65cfe3fcf22':
Import translations. DO NOT MERGE
2012-10-01 13:47:28 -07:00
Baligh Uddin
2c62dfff13
am 86e22491: (-s ours) am 1d992beb: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '86e22491a223e887ea4de9e9fba6b1d43440c43f':
Import translations. DO NOT MERGE
2012-10-01 13:47:26 -07:00
Jean Chalard
37688ae8c1
am 86db54df: am 137203d4: am 574b80aa: Remove debug prints.
...
* commit '86db54df74b821a15f7a3081c3737f8a63f91214':
Remove debug prints.
2012-10-01 13:46:16 -07:00
Baligh Uddin
6a35388bad
am c08e11a1: am 541b9945: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'c08e11a1db6d7ce6b001d304ffc9623ba6195d74':
Import translations. DO NOT MERGE
2012-10-01 10:36:45 -07:00
Baligh Uddin
c08e11a1db
am 541b9945: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '541b99451285a0e3842710b3325d7922c98f7579':
Import translations. DO NOT MERGE
2012-10-01 10:34:56 -07:00
Baligh Uddin
86e22491a2
am 1d992beb: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '1d992beb3acddc048764006cb31a2c2efdadd913':
Import translations. DO NOT MERGE
2012-10-01 10:33:06 -07:00
Baligh Uddin
033010382c
Merge "Import translations. DO NOT MERGE"
2012-10-01 10:33:00 -07:00
Baligh Uddin
541b994512
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-01 10:32:20 -07:00
Baligh Uddin
1d992beb3a
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-01 10:31:56 -07:00
Jean Chalard
86db54df74
am 137203d4: am 574b80aa: Remove debug prints.
...
* commit '137203d49317e05a482a34cfd25452fc0dce6d60':
Remove debug prints.
2012-10-01 10:17:06 -07:00
The Android Automerger
5479212935
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-01 06:59:38 -07:00
Yuichiro Hanada
7f438aa12f
Make writeCharGroup return a size of a new group.
...
bug: 6669677
Change-Id: I56f6a07b04b08443f2c052927404318c2018fc9d
2012-10-01 22:02:04 +09:00
Ken Wakasa
00e1d421c2
Merge "Add writeCharGroup."
2012-10-01 05:53:24 -07:00
Yuichiro Hanada
fb7e08ea8f
Add writeCharGroup.
...
bug: 6669677
Change-Id: I36792ba9c511a5148c963096cc93ca8c2e0ee04e
2012-10-01 21:50:38 +09:00
Jean Chalard
137203d493
am 574b80aa: Remove debug prints.
...
* commit '574b80aacee95df26e85e6b78876a73d7076a672':
Remove debug prints.
2012-10-01 01:58:32 -07:00
Jean Chalard
574b80aace
Remove debug prints.
...
Bug: 7226098
Change-Id: Ibacb740022a6af56c9d555d6797dd402a89f6ca4
2012-10-01 17:03:15 +09:00
Tadashi G. Takaoka
fb7b9ded1f
Merge "Add '+' sign to more keys of '-' key"
2012-09-30 23:23:45 -07:00
Tadashi G. Takaoka
7e3779e37a
Add '+' sign to more keys of '-' key
...
Note that the tablet number/phone layout has its own '+' key.
Bug: 7255318
Change-Id: I5cc0431cf772a859eb456e9c36b07bfd0cc1278d
2012-10-01 14:55:55 +09:00
Tadashi G. Takaoka
7339a62a13
Fix NPE observed only by monkey test
...
Bug: 7258660
Change-Id: I286c704b32efeada8505d953438f2595166f7e8f
2012-10-01 14:55:18 +09:00
The Android Automerger
8722e0eed1
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-30 07:00:18 -07:00
Jean-Baptiste Queru
c3a7d483ca
am 173ee75e: Merge from jb-mr1-aah-dev
...
* commit '173ee75e84ec9ea9383b0f8c335646c3717d914f':
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
2012-09-28 13:54:20 -07:00
Jean-Baptiste Queru
173ee75e84
Merge from jb-mr1-aah-dev
...
Change-Id: I7ca9b62574a89ca2c2d17daed100792c05133529
2012-09-28 13:52:00 -07:00
Baligh Uddin
8aef47d9b1
Import translations. DO NOT MERGE
...
Change-Id: I44aae7ccdfe1b4494ba70b80276c92e78fef9a6f
Auto-generated-cl: translation import
2012-09-28 13:19:23 -07:00
Baligh Uddin
1c2853f8f6
Import translations. DO NOT MERGE
...
Change-Id: I4ae7e56a20803cc9c3d5ba2d85db1ea63c943303
Auto-generated-cl: translation import
2012-09-28 13:15:05 -07:00
Baligh Uddin
fb399838c0
Import translations. DO NOT MERGE
...
Change-Id: Idf7a11a42010e160247babd47fdd90b292d671b7
Auto-generated-cl: translation import
2012-09-28 13:13:43 -07:00
The Android Automerger
58598e058f
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-28 07:00:04 -07:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
6052a81e08
Merge "Fix gesture detection algorithm" into jb-mr1-dev
2012-09-28 06:49:24 -07:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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