Kurt Partridge
5bd2464297
am 1f70a4d6
: Merge "Allow logging while replaying"
...
* commit '1f70a4d68136a74e89cb9ff0581141eae9d21516':
Allow logging while replaying
2013-04-08 19:36:30 -07:00
Kurt Partridge
ae144fe9c3
am d117c1a1
: Merge "Do not record log split time when handling separator"
...
* commit 'd117c1a11635d6389f63ce939f5f15c7cc6a0bba':
Do not record log split time when handling separator
2013-04-08 19:33:19 -07: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
Tom Ouyang
ede2333640
Add method to get dictionary flags from DicTraverseSession
...
This is needed for the traversal algorithm to know which
digraphs (if any) are associated with the current dictionary.
Bug: 8493920
Change-Id: I6ae088b55e50c0c2c7066d045b304c5068e23390
2013-04-08 18:14:38 -07:00
Baligh Uddin
e4760624ce
Import translations. DO NOT MERGE
...
Change-Id: I3605a7fd941d9ebe76460d114f384b1e233b3440
Auto-generated-cl: translation import
2013-04-08 14:47:06 -07:00
Baligh Uddin
5b7e74d838
Import translations. DO NOT MERGE
...
Change-Id: I435964e615a92c4c7835769112c3f94b8616a143
Auto-generated-cl: translation import
2013-04-08 14:42:05 -07:00
The Android Open Source Project
3019a5e1d1
am a8d29082
: (-s ours) am d5c8247f
: Reconcile with jb-mr2-release - do not merge
...
* commit 'a8d29082843cc22bb37fcd88ae581affdf0eaec7':
2013-04-08 13:45:16 -07: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
f71b964063
am d17c8bd9
: Update comments
...
* commit 'd17c8bd9297607e7318ad2470ae72a27b1d28ec1':
Update comments
2013-04-08 07:14:15 -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
a271f165b9
am 31f42ba0
: Tiny clean up in Makefile
...
* commit '31f42ba0c2a9ed073ca6dfed9d4344ca22d6e23d':
Tiny clean up in Makefile
2013-04-08 04:30:36 -07:00
Ken Wakasa
31f42ba0c2
Tiny clean up in Makefile
...
Change-Id: Iff6f363894f01a4c30c795fe88892c2bb8e0a856
2013-04-08 20:22:37 +09:00
Ken Wakasa
bc2fd24fd3
am b68e7344
: Cleanup the include paths
...
* commit 'b68e73448104714e8f12f89a1e00fb10b5fd14c4':
Cleanup the include paths
2013-04-08 02:51:40 -07:00
Ken Wakasa
b68e734481
Cleanup the include paths
...
Change-Id: Ic93d39e230170cfc9f5be6d81d42006e1a61e347
2013-04-08 18:45:46 +09:00
Satoshi Kataoka
cd0984a4ab
am e320789a
: Suppress bigram native log
...
* commit 'e320789a62e2e1161673657241b664e9cbf31f7f':
Suppress bigram native log
2013-04-08 01:43:16 -07:00
Satoshi Kataoka
e320789a62
Suppress bigram native log
...
Change-Id: I0b3900e0a205b6925ab9a2be55d375f6b14c803c
2013-04-08 17:33:32 +09:00
Satoshi Kataoka
dfb680c465
am f5e18e99
: Merge "Cleanup suggest interface"
...
* commit 'f5e18e992bc10837db4f6cbc0e7c9785677ea7bb':
Cleanup suggest interface
2013-04-07 23:02:41 -07: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
ed8fd94e3c
am 370461ef
: Clean up a few option strings under the Advanced settings
...
* commit '370461ef9f964cf2b118fa6076b77273b7caa917':
Clean up a few option strings under the Advanced settings
2013-04-07 20:51:36 -07: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
f10e7cbe96
am e9f69e16
: Merge "Move a generic string utility to StringUtils"
...
* commit 'e9f69e166109e46cf1685418fb0ed8119575689f':
Move a generic string utility to StringUtils
2013-04-04 23:41:29 -07:00
Jean Chalard
e9f69e1661
Merge "Move a generic string utility to StringUtils"
2013-04-05 06:39:27 +00:00
Tom Ouyang
4096fd0802
am 08fd3d95
: Merge "Add DigraphUtils class"
...
* commit '08fd3d95d52835bf1ada92ce6aa76ba7651c3f8b':
Add DigraphUtils class
2013-04-04 20:11:28 -07: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
96cb244d7b
am 65534ffc
: am d0c383e1
: am 5a4949c2
: Merge "Force inlining Correction::isSingleQuote" into jb-mr2-dev
...
* commit '65534ffc4a539e09d35ed7a1be1e87186009dd19':
Force inlining Correction::isSingleQuote
2013-04-04 12:23:36 -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
481412bb44
am f3633e9b
: Merge "Add flag to turn on new suggest implementation for typing"
...
* commit 'f3633e9b8eb0ccfec3a641449d86a1bc2f712352':
Add flag to turn on new suggest implementation for typing
2013-04-04 00:37:51 -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
898ec2bf85
am 5a5db35d
: am 04915a76
: am c33a0ab3
: keep history after reset to jb-ub-latinimegoogle-azuki
...
* commit '5a5db35da98eb7e93a104a07483f0e8d05159a14':
2013-04-03 19:39:52 -07:00
Baligh Uddin
12db86a653
am c48fe5d1
: (-s ours) am 51a47422
: am a631cede
: Import translations. DO NOT MERGE
...
* commit 'c48fe5d1de4f4166a2464e94a40a4542dd0dd196':
Import translations. DO NOT MERGE
2013-04-03 19:39:51 -07:00
The Android Automerger
d4b6393115
am df35f7dd
: am 02dc06a8
: am 21484175
: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
...
* commit 'df35f7dd2c917869d8c99198b4a61e0f772b6fd9':
Import translations. DO NOT MERGE
2013-04-03 19:39:50 -07:00
Jean Chalard
d1491741b3
am 1e1d61d2
: am d2a0c614
: am b4e2a3bb
: am 868805ae
: Merge "Change which backdoor the tests goes through"
...
* commit '1e1d61d2b2b2c06f205ad2af7ace49f47cc27674':
2013-04-03 19:39:49 -07:00
Jean Chalard
b154f10c0d
am 310f0dbc
: am c840ec9e
: am 7cd0ffdd
: am 248dcdf0
: Merge "Fix a test."
...
* commit '310f0dbcb8c69395441b67a07b500b9fe0a94925':
2013-04-03 19:39:48 -07:00
Satoshi Kataoka
9414d75d47
am db377ca6
: am 64dd4754
: am 63742fe5
: am d2a04e1e
: Merge "Move typing policy to AOSP"
...
* commit 'db377ca613e719be37982a2deed520c85c9c335e':
2013-04-03 19:39:47 -07:00
Jean Chalard
be9af787ac
am e405ec76
: (-s ours) am 1bd8f332
: am 6531bcdc
: am ecb59eff
: (-s ours) Revert "[DO NOT MERGE] Activate hardware keyboard handling"
...
* commit 'e405ec764ac931a18673c3579714c3c568ca4096':
2013-04-03 19:39:46 -07:00
Jean Chalard
ab6ef3b14e
am e1f90dce
: (-s ours) am 6b29ef46
: am 558f41d4
: am c741f1f8
: (-s ours) [DO NOT MERGE] Activate hardware keyboard handling
...
* commit 'e1f90dced3a7f09c3dcececd9a089ec979b7e94d':
2013-04-03 19:39:45 -07:00
Kurt Partridge
0c55210606
am 6c9097fa
: am 3547bd29
: am 228d4533
: am 5779bc91
: Merge "Split LogUnits differently."
...
* commit '6c9097fa5182ce3bb139dc7fc6338e240160c7bb':
2013-04-03 19:39:43 -07:00
Baligh Uddin
5db8119d8f
am 7022bd23
: (-s ours) am 2741e56d
: am 0491706a
: am 02fc1ed5
: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '7022bd2333901f515817f5c09536bf2e557f2a1a':
2013-04-03 19:39:42 -07:00