Jean Chalard
ddafcf82dc
Merge "Fix bugs and add tests"
2013-04-09 08:35:28 +00:00
Kurt Partridge
1f70a4d681
Merge "Allow logging while replaying"
2013-04-09 02:33:09 +00:00
Kurt Partridge
d117c1a116
Merge "Do not record log split time when handling separator"
2013-04-09 02:31:48 +00:00
The Android Open Source Project
a8d2908284
am d5c8247f
: Reconcile with jb-mr2-release - do not merge
...
* commit 'd5c8247fe908ddda7f8af9009565b5d9dbf41b96':
2013-04-08 13:40:40 -07:00
The Android Open Source Project
d5c8247fe9
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I0f018ab134e9d80ce71e93fb2462b481f3076fb0
2013-04-08 13:36:39 -07:00
Ken Wakasa
d17c8bd929
Update comments
...
Change-Id: I6aef328ec9041666cc168c8323bed04d39591b71
2013-04-08 23:05:45 +09:00
The Android Automerger
9320b6def7
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-08 05:57:08 -07:00
Ken Wakasa
31f42ba0c2
Tiny clean up in Makefile
...
Change-Id: Iff6f363894f01a4c30c795fe88892c2bb8e0a856
2013-04-08 20:22:37 +09:00
Ken Wakasa
b68e734481
Cleanup the include paths
...
Change-Id: Ic93d39e230170cfc9f5be6d81d42006e1a61e347
2013-04-08 18:45:46 +09:00
Satoshi Kataoka
e320789a62
Suppress bigram native log
...
Change-Id: I0b3900e0a205b6925ab9a2be55d375f6b14c803c
2013-04-08 17:33:32 +09:00
Satoshi Kataoka
f5e18e992b
Merge "Cleanup suggest interface"
2013-04-08 05:59:41 +00:00
Satoshi Kataoka
e67ede12ec
Cleanup suggest interface
...
Change-Id: Ibe334a1d3ab3af69acfa64412c80f0ea24cd2c46
2013-04-08 12:54:04 +09:00
Ken Wakasa
370461ef9f
Clean up a few option strings under the Advanced settings
...
Change-Id: If41ac016128fce401dedcab0fa7d6c23edaca158
2013-04-08 01:16:32 +09:00
Jean Chalard
e9f69e1661
Merge "Move a generic string utility to StringUtils"
2013-04-05 06:39:27 +00:00
Jean Chalard
c87449497c
Fix bugs and add tests
...
Change-Id: I6b56b91ace57f4a49584b5dceb71b145859f839e
2013-04-05 12:11:19 +09:00
Jean Chalard
7d3836d63a
Move a generic string utility to StringUtils
...
Change-Id: I9cc2e9a7ac0b3346af40bcb083f939333336cf09
2013-04-05 12:09:14 +09:00
Tom Ouyang
08fd3d95d5
Merge "Add DigraphUtils class"
2013-04-05 03:08:59 +00:00
Tom Ouyang
2fdf5b70ad
Add DigraphUtils class
...
Add a new DigraphUtils class to manage digraph handling for both
gesture and typing input.
Bug: 8493920
Change-Id: I3a509e1311b9039653f9f488d3c28bb54205f416
2013-04-04 19:56:04 -07:00
Ben Cheng
65534ffc4a
am d0c383e1
: am 5a4949c2
: Merge "Force inlining Correction::isSingleQuote" into jb-mr2-dev
...
* commit 'd0c383e1473c1b302038f4145ba5192fd9af9a5f':
Force inlining Correction::isSingleQuote
2013-04-04 12:20:25 -07:00
Ben Cheng
d0c383e147
am 5a4949c2
: Merge "Force inlining Correction::isSingleQuote" into jb-mr2-dev
...
* commit '5a4949c28b594afe983d1c9163bbe0e71d200757':
Force inlining Correction::isSingleQuote
2013-04-04 12:17:12 -07:00
Ben Cheng
5a4949c28b
Merge "Force inlining Correction::isSingleQuote" into jb-mr2-dev
2013-04-04 19:13:52 +00:00
Ben Cheng
c2fbd7c64d
Force inlining Correction::isSingleQuote
...
Also, only apply -Winline with GCC 4.6. There are some copy constructors
that GCC 4.7/4.8 fail to inline.
Change-Id: I97906045224e89377e8ea6add07a79fa088648af
2013-04-04 11:26:04 -07:00
The Android Automerger
144ff6b0d8
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-04 05:56:07 -07:00
Satoshi Kataoka
f3633e9b8e
Merge "Add flag to turn on new suggest implementation for typing"
2013-04-04 07:35:17 +00:00
Tom Ouyang
609a871da6
Add flag to turn on new suggest implementation for typing
...
Bug: 8277656
Change-Id: I974f560050cc5339d110b97620df1c5b496977fe
2013-04-04 15:37:14 +09:00
Baligh Uddin
5a5db35da9
am 04915a76
: am c33a0ab3
: keep history after reset to jb-ub-latinimegoogle-azuki
...
* commit '04915a76b4e9d1a1097de01b5c2ac4df7a979d3f':
2013-04-03 19:36:19 -07:00
Baligh Uddin
c48fe5d1de
am 51a47422
: am a631cede
: Import translations. DO NOT MERGE
...
* commit '51a474224b192fafa3b0a3f8092336dd57ae3d01':
Import translations. DO NOT MERGE
2013-04-03 19:36:17 -07:00
The Android Automerger
df35f7dd2c
am 02dc06a8
: am 21484175
: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
...
* commit '02dc06a894a1130d08fb6e3bd0d2cf812b726f9d':
Import translations. DO NOT MERGE
2013-04-03 19:36:16 -07:00
Jean Chalard
1e1d61d2b2
am d2a0c614
: am b4e2a3bb
: am 868805ae
: Merge "Change which backdoor the tests goes through"
...
* commit 'd2a0c6145c8051042527c32b5f63870534d8f14f':
2013-04-03 19:36:15 -07:00
Jean Chalard
310f0dbcb8
am c840ec9e
: am 7cd0ffdd
: am 248dcdf0
: Merge "Fix a test."
...
* commit 'c840ec9eb7b905f50eee67f9b9d8154a45d2283a':
2013-04-03 19:36:14 -07:00
Satoshi Kataoka
db377ca613
am 64dd4754
: am 63742fe5
: am d2a04e1e
: Merge "Move typing policy to AOSP"
...
* commit '64dd4754e3da0b43ad83e891f8dcacdb0e0c37dd':
2013-04-03 19:36:13 -07:00
Jean Chalard
e405ec764a
am 1bd8f332
: am 6531bcdc
: am ecb59eff
: (-s ours) Revert "[DO NOT MERGE] Activate hardware keyboard handling"
...
* commit '1bd8f332a90b5e9defb7e0d9b785ffd7104be940':
2013-04-03 19:36:12 -07:00
Jean Chalard
e1f90dced3
am 6b29ef46
: am 558f41d4
: am c741f1f8
: (-s ours) [DO NOT MERGE] Activate hardware keyboard handling
...
* commit '6b29ef46240d1a2bdafda4aac9a0733d8d3370e0':
2013-04-03 19:36:10 -07:00
Kurt Partridge
6c9097fa51
am 3547bd29
: am 228d4533
: am 5779bc91
: Merge "Split LogUnits differently."
...
* commit '3547bd2932161c760353be6cdad7a99ad104e2b7':
2013-04-03 19:36:09 -07:00
Baligh Uddin
7022bd2333
am 2741e56d
: am 0491706a
: am 02fc1ed5
: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '2741e56d56c9e4cb3cf152d391b909fe8a1c83a0':
2013-04-03 19:36:07 -07:00
Baligh Uddin
a35cea3991
am 536e7220
: am 9bf7e74d
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
...
* commit '536e7220332794c101fb6bc25707ffc21871b958':
Import translations. DO NOT MERGE
2013-04-03 19:36:06 -07:00
Baligh Uddin
04915a76b4
am c33a0ab3
: keep history after reset to jb-ub-latinimegoogle-azuki
...
* commit 'c33a0ab34327a48180e26011699468e358cab6b2':
2013-04-03 19:33:10 -07:00
Baligh Uddin
51a474224b
am a631cede
: Import translations. DO NOT MERGE
...
* commit 'a631cedeeed0dddf7b5b770335df5d30b14afba1':
Import translations. DO NOT MERGE
2013-04-03 19:33:08 -07:00
The Android Automerger
02dc06a894
am 21484175
: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
...
* commit '21484175789bd2c56c8f0f287149a02922fda2d0':
Import translations. DO NOT MERGE
2013-04-03 19:33:07 -07:00
Jean Chalard
d2a0c6145c
am b4e2a3bb
: am 868805ae
: Merge "Change which backdoor the tests goes through"
...
* commit 'b4e2a3bb4ededabce573e90fe0d82dda0fb2d8cb':
Change which backdoor the tests goes through
2013-04-03 19:33:06 -07:00
Jean Chalard
c840ec9eb7
am 7cd0ffdd
: am 248dcdf0
: Merge "Fix a test."
...
* commit '7cd0ffdde4f684e00c2f9805706ab9514e9733dd':
Fix a test.
2013-04-03 19:33:05 -07:00
Satoshi Kataoka
64dd4754e3
am 63742fe5
: am d2a04e1e
: Merge "Move typing policy to AOSP"
...
* commit '63742fe53072a9a706c4bfc51dde00c5fbb9829a':
Move typing policy to AOSP
2013-04-03 19:33:04 -07:00
Jean Chalard
1bd8f332a9
am 6531bcdc
: am ecb59eff
: (-s ours) Revert "[DO NOT MERGE] Activate hardware keyboard handling"
...
* commit '6531bcdc82958463a94482acc37d0f23578bb662':
Revert "[DO NOT MERGE] Activate hardware keyboard handling"
2013-04-03 19:33:02 -07:00
Jean Chalard
6b29ef4624
am 558f41d4
: am c741f1f8
: (-s ours) [DO NOT MERGE] Activate hardware keyboard handling
...
* commit '558f41d4020a6714146dfd6f9508742c29ce9edd':
[DO NOT MERGE] Activate hardware keyboard handling
2013-04-03 19:33:01 -07:00
Kurt Partridge
3547bd2932
am 228d4533
: am 5779bc91
: Merge "Split LogUnits differently."
...
* commit '228d45337bdf3bd2bcd0170ddf73ab05b4f7e53f':
Split LogUnits differently.
2013-04-03 19:33:00 -07:00
Baligh Uddin
2741e56d56
am 0491706a
: am 02fc1ed5
: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '0491706a533cde9b3f7e8e9fe3e81e0ac4ed4799':
Import translations. DO NOT MERGE
2013-04-03 19:32:59 -07:00
Baligh Uddin
536e722033
am 9bf7e74d
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
...
* commit '9bf7e74dc4b29978a92d96de5b404c20677a249c':
Import translations. DO NOT MERGE
2013-04-03 19:32:59 -07:00
Kurt Partridge
ae0c5f7965
am 3ec6a8bd
: am 6c522b53
: am 0c0ab2b4
: Merge "Reorder ResearchLogger call"
...
* commit '3ec6a8bdf92b1b60be0dc0a44c84b79b13ba8671':
2013-04-03 19:31:37 -07:00
Jean Chalard
08a5e43d61
am 19fe4d4b
: am bfd7dcd5
: am 0745fe83
: am b8869ec1
: am 0fcc4960
: Deactivate hardware keyboard handling.
...
* commit '19fe4d4b6b6a39d1c66d696b63aa272cb707187e':
2013-04-03 19:31:36 -07:00
Tadashi G. Takaoka
06c1baba54
am b1533116
: am b08506c2
: am 9413e957
: Merge "Interpolate gesture preview trails"
...
* commit 'b1533116f5c88a452cbf4d0573955f2d7e7ed060':
2013-04-03 19:31:35 -07:00