Jean Chalard
e9f69e1661
Merge "Move a generic string utility to StringUtils"
2013-04-05 06:39:27 +00: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
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
Satoshi Kataoka
bb229fe173
am 91d468f5: am ac870326: am 54c091d2: Merge "Move policy and session to AOSP"
...
* commit '91d468f5a09df4c651fb9eeed597e634b5607983':
2013-04-03 19:31:34 -07:00
Jean Chalard
cffac3218f
am 873c20ba: am e40d5633: am 43341ba0: Merge "Ask the client to make itself known when it\'s not"
...
* commit '873c20ba06f8d1067be8cde3b698e0ece9cfd98f':
2013-04-03 19:31:32 -07:00
Jean Chalard
c821c723b8
am 3b9d7fd1: am 151e4e18: am 065f126f: Merge "Fix two nasty bugs with surrogate pairs."
...
* commit '3b9d7fd1792da09c1d436eceb49ee4ea6bc47f07':
2013-04-03 19:31:31 -07:00
Satoshi Kataoka
6f7494e615
am fdf3c49c: am bde25a4a: am 38c26dd0: Move dicnode to AOSP
...
* commit 'fdf3c49c8bd4d4b444d018e5ec8a94a5e1d3ba32':
2013-04-03 19:31:30 -07:00
The Android Open Source Project
228fcdae71
am 70616b63: am 08f5b780: am c1dec87a: (-s ours) am b35915fb: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '70616b635a411f7ad3ba8ade350406d30b5145bb':
2013-04-03 19:31:29 -07:00
Satoshi Kataoka
b980adabe2
am a9ef902c: am 70747ad6: am 97a3ce02: Merge "Refactor"
...
* commit 'a9ef902cd8105169cca5bbdf8fb1e3abab7a2eab':
2013-04-03 19:31:28 -07:00
Jean Chalard
3effa52016
am 4c535232: am a38d907b: am 740da0d8: Fix an NPE
...
* commit '4c535232bccca17eca3b45480d94d5e68108497f':
2013-04-03 19:31:27 -07:00
Tadashi G. Takaoka
57a7a5c33e
am 76c00dec: am 7580e994: am 48d8d8d0: Fix potential NPE in MainKeyboardView.KeyTimerHandler
...
* commit '76c00decc9232f069fef4d6fea89183bfa8974b9':
2013-04-03 19:31:26 -07:00
Jean Chalard
ae97a93ab3
am 86b8b7b4: am 9bf1dfeb: am 2188cbae: Merge "Fix an NPE"
...
* commit '86b8b7b407c8b8d642388c5026931d41eff66aa6':
2013-04-03 19:31:25 -07:00
Jean Chalard
5b2485901b
am 1c63efc9: am a657afc3: am d555a0d7: Merge "Cleanup"
...
* commit '1c63efc9759190e29b9c7120e6b2a66162c5410d':
2013-04-03 19:31:23 -07:00
Baligh Uddin
a3ed3254a7
am 05b7988a: am 53698f8d: am fd0e40ef: am 78b07d8b: am 0cd02c2b: keep history after reset to jb-ub-latinimegoogle-azuki
...
* commit '05b7988a74333ecdcd88090efa224190aeabecd9':
2013-04-03 19:31:22 -07:00
Baligh Uddin
c66608308d
am 68a0afc3: am 0c777365: am fbb6500d: (-s ours) am 5bcbc21a: (-s ours) am c08b8245: (-s ours) Import translations. DO NOT MERGE
...
* commit '68a0afc3b99cf8281cf09f3697ff3368ac0d4cf7':
2013-04-03 19:31:20 -07:00
The Android Automerger
228e26f7c7
am ea46fdcb: am 65dfe94d: am 1237c872: am a02de1f7: am 5c3d51e2: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
...
* commit 'ea46fdcb7b086a3a9c0ce05dec3d041df943784b':
2013-04-03 19:31:19 -07:00
Tadashi G. Takaoka
62b07bf948
am 561a04f3: am 1911c513: am abd22393: am 8b120b98: am 50cc14b5: am ef86bbce: Add const_cast to live with host\'s jni.h
...
* commit '561a04f3140ef701c6477d890d8a841c97cb19bf':
2013-04-03 19:31:18 -07:00
Tadashi G. Takaoka
fc0fc52122
am e01d1960: am c17e0bba: am 830a8cbb: am 33fa6a0b: am cc75c950: am 73d00e68: Merge "Use XmlPullParser.getEventType()"
...
* commit 'e01d1960a2793c083eded84182ba402cf272bdf9':
2013-04-03 19:31:17 -07:00
