Baligh Uddin
c33a0ab343
keep history after reset to jb-ub-latinimegoogle-azuki
2013-04-03 19:16:52 -07:00
The Android Open Source Project
2c7b1b82c5
am d2582473: (-s ours) am 22953740: Reconcile with jb-mr2-release - do not merge
...
* commit 'd2582473b0ede953ed2a4b40c5033430d2dca969':
2013-04-03 18:10:50 -07:00
The Android Open Source Project
d2582473b0
am 22953740: Reconcile with jb-mr2-release - do not merge
...
* commit '229537407a05b96f9a8bc77de8bb9830c7ad3083':
2013-04-03 18:05:33 -07:00
The Android Open Source Project
229537407a
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I00b5f6a7f1d9578933c846c7614eae3bff5b85f0
2013-04-03 16:43:45 -07:00
Baligh Uddin
3bc22c565e
am e7d91194: (-s ours) am 370070ae: am 4cdb7ccb: Import translations. DO NOT MERGE
...
* commit 'e7d91194545ab8af13e612951f836906085b83e5':
Import translations. DO NOT MERGE
2013-04-03 15:41:47 -07:00
Baligh Uddin
e7d9119454
am 370070ae: am 4cdb7ccb: Import translations. DO NOT MERGE
...
* commit '370070ae6bfe0af7186d76b61fd6c7bc60eb52b4':
Import translations. DO NOT MERGE
2013-04-03 15:37:55 -07:00
Baligh Uddin
ac68b5cebf
am 4b8494c4: (-s ours) Import translations. DO NOT MERGE
...
* commit '4b8494c4fc75685b6acfcf1b1e16835171f1226d':
Import translations. DO NOT MERGE
2013-04-03 15:36:27 -07:00
Baligh Uddin
370070ae6b
am 4cdb7ccb: Import translations. DO NOT MERGE
...
* commit '4cdb7ccb325db33fa812855b6ea6de2533cdb6be':
Import translations. DO NOT MERGE
2013-04-03 15:34:22 -07:00
Baligh Uddin
4b8494c4fc
Import translations. DO NOT MERGE
...
Change-Id: I66b30c5f9673fc4ed3b96753cfec023e7d498dec
Auto-generated-cl: translation import
2013-04-03 13:13:26 -07:00
Baligh Uddin
a631cedeee
Import translations. DO NOT MERGE
...
Change-Id: Icf73894934ceedf45d493c67cdc4018ebcb3f7a1
Auto-generated-cl: translation import
2013-04-03 13:08:04 -07:00
Baligh Uddin
128ab7e5e3
Import translations. DO NOT MERGE
...
Change-Id: Icc098a0e892cee76ccef2492d32798d38a621dfb
Auto-generated-cl: translation import
2013-04-03 13:07:12 -07:00
Baligh Uddin
4cdb7ccb32
Import translations. DO NOT MERGE
...
Change-Id: Ic405d085ced9e64efd9b7da38097734c71808fbc
Auto-generated-cl: translation import
2013-04-03 13:06:22 -07:00
Satoshi Kataoka
0b0d9827a0
am 95fe8267: Move suggest logic to AOSP
...
* commit '95fe8267955ba5bfcc3cf38383f0d13026287082':
Move suggest logic to AOSP
2013-04-03 05:09:22 -07:00
Satoshi Kataoka
95fe826795
Move suggest logic to AOSP
...
Bug: 8197301
Change-Id: I2d0ffbbc9d4d57ebfc2fe43e6cb75e8b44dae466
2013-04-03 21:00:57 +09:00
The Android Automerger
1a65d4684b
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-02 09:19:17 -07:00
Jean-Baptiste Queru
a21bec1335
am 30667266: (-s ours) am 5bcb3876: Merge 2caa1d81ce
- do not merge
...
* commit '30667266dd48326388ae3e2a62429d5766211bfc':
Import translations. DO NOT MERGE
2013-04-02 07:53:03 -07:00
Jean-Baptiste Queru
30667266dd
am 5bcb3876: Merge 2caa1d81ce
- do not merge
...
* commit '5bcb3876e2df2523017b4617102518b1523499b9':
Import translations. DO NOT MERGE
2013-04-02 07:51:33 -07:00
Jean-Baptiste Queru
5bcb3876e2
Merge 2caa1d81ce
- do not merge
...
Change-Id: I49fb6693ae1231235b91c48058bf9d3daa74e38f
2013-04-02 07:49:43 -07:00
The Android Automerger
2148417578
merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
2013-04-02 06:48:58 -07:00
Tadashi G. Takaoka
6e3f307266
Refactor SpellCheckerProximityInfo as extending ProximityInfo
...
Change-Id: I544eec9d661796d57749dbaa2163bc1e2a891353
2013-04-02 19:06:32 +09:00
Jean Chalard
b4e2a3bb4e
am 868805ae: Merge "Change which backdoor the tests goes through"
...
* commit '868805aec49ec1ee5e60e787c23e838ed9f55fb3':
Change which backdoor the tests goes through
2013-04-02 02:37:18 -07:00
Jean Chalard
868805aec4
Merge "Change which backdoor the tests goes through"
2013-04-02 09:36:02 +00:00
Jean Chalard
7cd0ffdde4
am 248dcdf0: Merge "Fix a test."
...
* commit '248dcdf0eb69903368b3c2bf0e9eda574d1ebf9e':
Fix a test.
2013-04-02 02:24:36 -07:00
Jean Chalard
248dcdf0eb
Merge "Fix a test."
2013-04-02 09:23:02 +00:00
Jean Chalard
5d399ec719
Change which backdoor the tests goes through
...
Yes that's even harder to understand. The old technique doesn't work
any more, so I have to drill a new hole in this class.
Bug: 8303100
Change-Id: I70a41b5094dab2bb56a17eaf55b2a2df853e4bb6
2013-04-02 18:20:19 +09:00
Jean Chalard
84bfde0421
Fix a test.
...
The test was not passing the correct input type when it was
creating the text view, resulting in mismatched types seen from
TextView and LatinIME with some bad results. The test would
even go as far as restoring it after it's been fixed by TextView.
Additionally, since we want to enter litteral carriage returns,
the input type should be MULTI_LINE. If not, TextView does
not allow carriage returns.
Bug: 8302690
Change-Id: I1c20bcf6ca554ad981048ec181e19c649f6c742e
2013-04-02 18:20:14 +09:00
Satoshi Kataoka
63742fe530
am d2a04e1e: Merge "Move typing policy to AOSP"
...
* commit 'd2a04e1e791de513c67ac9ded915fdbd074dda05':
Move typing policy to AOSP
2013-04-02 00:57:07 -07:00
Satoshi Kataoka
d2a04e1e79
Merge "Move typing policy to AOSP"
2013-04-02 07:54:43 +00:00
Satoshi Kataoka
a6a4165196
Move typing policy to AOSP
...
Bug: 8197301
Change-Id: Ife9b41a465d7b8d707623a6d3e4c1c88c3c3c4ab
2013-04-02 16:53:53 +09:00
Jean Chalard
6531bcdc82
am ecb59eff: (-s ours) Revert "[DO NOT MERGE] Activate hardware keyboard handling"
...
* commit 'ecb59eff90c6cfd8d3e6ae31961d7f27f8c9eac9':
Revert "[DO NOT MERGE] Activate hardware keyboard handling"
2013-04-02 00:13:32 -07:00
Jean Chalard
ecb59eff90
Revert "[DO NOT MERGE] Activate hardware keyboard handling"
...
This reverts commit c741f1f83b
DO NOT MERGE is ignored and this is merged anyway :(
Change-Id: Ie044cdfc6021933379ec97ad7346c5c8591f70bf
2013-04-02 16:08:48 +09:00
Jean Chalard
558f41d402
am c741f1f8: (-s ours) [DO NOT MERGE] Activate hardware keyboard handling
...
* commit 'c741f1f83b98293bf0040b6b81e95b75ecf3f6bc':
[DO NOT MERGE] Activate hardware keyboard handling
2013-04-01 23:58:35 -07:00
Jean Chalard
c741f1f83b
[DO NOT MERGE] Activate hardware keyboard handling
...
Change-Id: Ifdec9338a454291621b2b87c899f5d4301480b27
2013-04-02 15:38:13 +09:00
Kurt Partridge
30772c3758
Allow logging while replaying
...
Previously logging was disabled during replay. This makes it impossible to use logged data as a
regression test, since the new log was unavailable. This change corrects this problem.
Change-Id: I19dc31def2f2f87fd219dc561c739d18e4ab9c9c
2013-04-01 16:49:39 -07:00
Kurt Partridge
636b8c4231
Do not record log split time when handling separator
...
Previously handleSeparator() caused the ResearchLogger to mark the time at which a LogUnit should be
broken. However, this causes the motion data associated with a separator to be associated with the
LogUnit of the previous word. This change corrects this bug.
Change-Id: I8b4d4fa6de2a013de9e2a28bb668c446a07f1957
2013-04-01 16:48:15 -07:00
Kurt Partridge
228d45337b
am 5779bc91: Merge "Split LogUnits differently."
...
* commit '5779bc91e6d425dc42e444a11057dd286e736203':
Split LogUnits differently.
2013-04-01 16:10:08 -07:00
Kurt Partridge
5779bc91e6
Merge "Split LogUnits differently."
2013-04-01 23:08:21 +00:00
Baligh Uddin
0491706a53
am 02fc1ed5: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '02fc1ed51243e501c14274b9c6646b930117464b':
Import translations. DO NOT MERGE
2013-04-01 13:56:57 -07:00
Baligh Uddin
02fc1ed512
Merge "Import translations. DO NOT MERGE"
2013-04-01 20:54:38 +00:00
Baligh Uddin
9bf7e74dc4
Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
2013-04-01 20:54:08 +00:00
Baligh Uddin
2caa1d81ce
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-04-01 20:53:56 +00:00
Kurt Partridge
6c522b53f0
am 0c0ab2b4: Merge "Reorder ResearchLogger call"
...
* commit '0c0ab2b4d9303274c26ef70f7228f2d54e2d59f5':
Reorder ResearchLogger call
2013-04-01 08:21:01 -07:00
Kurt Partridge
0c0ab2b4d9
Merge "Reorder ResearchLogger call"
2013-04-01 15:19:45 +00:00
Jean Chalard
bfd7dcd5b2
am 0745fe83: am b8869ec1: am 0fcc4960: Deactivate hardware keyboard handling.
...
* commit '0745fe83d4033bdeec807a12fea1da29b41c8a99':
Deactivate hardware keyboard handling.
2013-04-01 05:46:15 -07:00
Jean Chalard
0745fe83d4
am b8869ec1: am 0fcc4960: Deactivate hardware keyboard handling.
...
* commit 'b8869ec1e39c1751825841e790d21fc854dca9ce':
Deactivate hardware keyboard handling.
2013-04-01 05:42:42 -07:00
Jean Chalard
b8869ec1e3
am 0fcc4960: Deactivate hardware keyboard handling.
...
* commit '0fcc4960bcd037b7e1482098f85342743eb2ddee':
Deactivate hardware keyboard handling.
2013-04-01 05:40:07 -07:00
Jean Chalard
0fcc4960bc
Deactivate hardware keyboard handling.
...
Bug: 8000119
Change-Id: I021481343d6d87efd8ff6110e9aa0906a1a3d11d
2013-04-01 21:35:45 +09:00
Tadashi G. Takaoka
b08506c221
am 9413e957: Merge "Interpolate gesture preview trails"
...
* commit '9413e957fafcf4660f2f620f8fe716d9ba448d92':
Interpolate gesture preview trails
2013-04-01 03:25:25 -07:00
Tadashi G. Takaoka
9413e957fa
Merge "Interpolate gesture preview trails"
2013-04-01 10:23:27 +00:00
Tadashi G. Takaoka
75028af28c
Interpolate gesture preview trails
...
There is the boolean flag to kill interpolation.
Bug: 7167303
Change-Id: Iac7e4cb88cf437c2ee77c003c9cddb92416025c7
2013-04-01 19:15:36 +09:00