288deb7ab9
am 11034c34: am dee08de2: am 724ff298: (-s ours) am 4ddfde7b: am a050834c: am 11b600b9: (-s ours) am 2f73105a: (-s ours) am db5e07f7: Merge "[DO NOT MERGE] Increase string limits" into jb-mr2-dev
...
* commit '11034c340a0b5fc294b69bb1c37e159255dd6ba5':
2013-04-10 19:40:20 -07:00
db3713a1b9
am 9f9050d1: am 2cb50a05: am 93465ea3: am a747d762: am 6e78878f: am 844e5014: Merge "Increase string limits"
...
* commit '9f9050d18fc3708badc6f906744d500458c70d36':
2013-04-10 19:40:18 -07:00
492016265c
am 0b758ec7: am e7edb561: am 1368eeee: (-s ours) am 108ee452: am f980ec6c: am fc801fe8: (-s ours) am c57cf2b7: (-s ours) am 841e6016: Import translations. DO NOT MERGE
...
* commit '0b758ec77fc14f768ddea0693e5d412086a591ef':
2013-04-10 19:40:17 -07:00
14d778b27c
am 3847aa30: am 781195f4: am 119eaf7a: (-s ours) am c1283003: am 6e0e8dd6: am 8ca085db: (-s ours) Import translations. DO NOT MERGE
...
* commit '3847aa30ae68a7e94daa484643ea68f16860d062':
2013-04-10 19:40:16 -07:00
e71516b290
am 5244d637: am 41db26ed: am 68889f1c: (-s ours) am 0b227bb9: am 57b68207: Import translations. DO NOT MERGE
...
* commit '5244d6378ce3df391ea855e8dbc87e5e648ea042':
2013-04-10 19:40:14 -07:00
b3796ab2a7
am 82a67bc8: am e3c0cca4: am e8a3e964: am 395e500b: am bb9a8e08: am f463b45d: Merge "Fix Possible NPE"
...
* commit '82a67bc8bbef7b9553d128f01e0813e63a3ac0ba':
2013-04-10 19:40:13 -07:00
9ff33b6dfa
am d430c1b6: am d6f56350: am 619d1f73: am 0c99a379: am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE"
...
* commit 'd430c1b6bfccc11d272ca55894997e0c9efecb0d':
2013-04-10 19:40:12 -07:00
504bbe38f7
am 798820ab: am 3012c891: am 867b2380: am 35e02ccd: am bf62dc03: am ef103e1f: Merge "Close ResearchLogger upon onFinishInputView"
...
* commit '798820ab1d3c3da6b442f230a2c70ccb83f96ce3':
2013-04-10 19:40:10 -07:00
e279de0265
am ab6fa041: am e72a088f: am a6dcb55e: (-s ours) am 62adeccd: am 577f08a3: am 22384b57: (-s ours) am 0ed901ff: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit 'ab6fa041587fcca7abd507f25bc07593074a97f2':
2013-04-10 19:40:09 -07:00
4b176a0104
am 83346295: am 2c7b1b82: am d2582473: (-s ours) am 22953740: Reconcile with jb-mr2-release - do not merge
...
* commit '83346295ea6fcd4cf29fbe164bb2df76a6449dc9':
2013-04-10 19:40:08 -07:00
b4fbb29551
am d3ae58ef: am 3bc22c56: am e7d91194: (-s ours) am 370070ae: am 4cdb7ccb: Import translations. DO NOT MERGE
...
* commit 'd3ae58ef1b18e015c4f2fe4b46c78eef7be02bb5':
2013-04-10 19:40:06 -07:00
792abb730b
am 3c163ec1: am ac68b5ce: am 4b8494c4: (-s ours) Import translations. DO NOT MERGE
...
* commit '3c163ec1732d00c9e726f22d27ef92057f685c04':
2013-04-10 19:40:05 -07:00
c1f3a8012c
am 8acb56b6: am 128ab7e5: Import translations. DO NOT MERGE
...
* commit '8acb56b60be5ad5009b7ffe96b035c067e03a958':
Import translations. DO NOT MERGE
2013-04-10 19:40:04 -07:00
a514e95801
am a2b129e9: am 0b0d9827: am 95fe8267: Move suggest logic to AOSP
...
* commit 'a2b129e9ae369dae3001d2c0efe2b0746421930a':
2013-04-10 19:40:03 -07:00
784eda74af
am d9f35e32: am a21bec13: am 30667266: (-s ours) am 5bcb3876: Merge 2caa1d81ce - do not merge
...
* commit 'd9f35e322681214ba62e1d89ec6fabfc7ff88c11':
2013-04-10 19:40:01 -07:00
11034c340a
am dee08de2: am 724ff298: (-s ours) am 4ddfde7b: am a050834c: am 11b600b9: (-s ours) am 2f73105a: (-s ours) am db5e07f7: Merge "[DO NOT MERGE] Increase string limits" into jb-mr2-dev
...
* commit 'dee08de2c5bc71fdeb3182a8ddd1a10568ac33ef':
2013-04-10 19:34:31 -07:00
9f9050d18f
am 2cb50a05: am 93465ea3: am a747d762: am 6e78878f: am 844e5014: Merge "Increase string limits"
...
* commit '2cb50a05cd1d35a422666b6893a2a77c69c1b700':
2013-04-10 19:34:30 -07:00
0b758ec77f
am e7edb561: am 1368eeee: (-s ours) am 108ee452: am f980ec6c: am fc801fe8: (-s ours) am c57cf2b7: (-s ours) am 841e6016: Import translations. DO NOT MERGE
...
* commit 'e7edb5617447cf00eaedb33f5df87223c81209cf':
2013-04-10 19:34:28 -07:00
3847aa30ae
am 781195f4: am 119eaf7a: (-s ours) am c1283003: am 6e0e8dd6: am 8ca085db: (-s ours) Import translations. DO NOT MERGE
...
* commit '781195f438226e1f556850198c5e51b19523ba63':
2013-04-10 19:34:27 -07:00
5244d6378c
am 41db26ed: am 68889f1c: (-s ours) am 0b227bb9: am 57b68207: Import translations. DO NOT MERGE
...
* commit '41db26ed189bac6ae46b4f5d346839b8ec03cced':
2013-04-10 19:34:26 -07:00
82a67bc8bb
am e3c0cca4: am e8a3e964: am 395e500b: am bb9a8e08: am f463b45d: Merge "Fix Possible NPE"
...
* commit 'e3c0cca463f9e85657d99cecdf88d4aa3c5c2ee0':
2013-04-10 19:34:24 -07:00
d430c1b6bf
am d6f56350: am 619d1f73: am 0c99a379: am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE"
...
* commit 'd6f56350fcc63a35506023d555ab66ba3481ad30':
2013-04-10 19:34:23 -07:00
798820ab1d
am 3012c891: am 867b2380: am 35e02ccd: am bf62dc03: am ef103e1f: Merge "Close ResearchLogger upon onFinishInputView"
...
* commit '3012c891ba1ce9282b38ad06b3249b682365e7a5':
2013-04-10 19:34:22 -07:00
ab6fa04158
am e72a088f: am a6dcb55e: (-s ours) am 62adeccd: am 577f08a3: am 22384b57: (-s ours) am 0ed901ff: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit 'e72a088fe2858cbc479259bdf858e8b4cb348690':
2013-04-10 19:34:20 -07:00
83346295ea
am 2c7b1b82: am d2582473: (-s ours) am 22953740: Reconcile with jb-mr2-release - do not merge
...
* commit '2c7b1b82c58e75594f0da1121622caba3b542377':
2013-04-10 19:34:19 -07:00
d3ae58ef1b
am 3bc22c56: am e7d91194: (-s ours) am 370070ae: am 4cdb7ccb: Import translations. DO NOT MERGE
...
* commit '3bc22c565eb00ba01582ef7dc6d09679b51022de':
2013-04-10 19:34:18 -07:00
3c163ec173
am ac68b5ce: am 4b8494c4: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ac68b5cebf77a9411626a4ce7b77ab06ebe513e0':
Import translations. DO NOT MERGE
2013-04-10 19:34:17 -07:00
8acb56b60b
am 128ab7e5: Import translations. DO NOT MERGE
...
* commit '128ab7e5e36e133169f649232a5193f35f9932ca':
Import translations. DO NOT MERGE
2013-04-10 19:34:14 -07:00
a2b129e9ae
am 0b0d9827: am 95fe8267: Move suggest logic to AOSP
...
* commit '0b0d9827a01b50d4bbe01ecfa2d42a27dc5069e9':
Move suggest logic to AOSP
2013-04-10 19:34:13 -07:00
d9f35e3226
am a21bec13: am 30667266: (-s ours) am 5bcb3876: Merge 2caa1d81ce - do not merge
...
* commit 'a21bec13357c02f5964e93aaec444f620bf83f60':
2013-04-10 19:34:12 -07:00
cdaee868a3
Merge "Preserve a class for testing"
2013-04-10 23:45:33 +00:00
3684036eed
Preserve a class for testing
...
Addresses b/8583091
Change-Id: I89605223784312d9572dfc7c8aaa7e5eba44c4f6
2013-04-10 16:40:17 -07:00
fd9f3d97ae
Add ability to handle digraphs in gesture and tap typing
...
Example: Gesture the German word "ueber" and the system will now replace
the transliteration "ue" with the correct u-umlaut.
Bug: 8493920
Change-Id: I03e1d6311b4187b6c7f802d8fef43a50eee12721
2013-04-10 22:52:49 +00:00
b6e1777d4b
Merge "Add mechanism to handle digraphs in DicNode"
2013-04-10 22:52:25 +00:00
099dd3f277
Merge "Better release build reporting"
2013-04-10 22:51:21 +00:00
25e8eda9af
Add mechanism to handle digraphs in DicNode
...
This is needed to support for German umlaut handling for both gesture and typing input.
Bug: 8493920
Change-Id: I292e2a4911c54aa5566c38411016a220bb35a1f4
2013-04-10 14:35:49 -07:00
cc42e139c3
Import translations. DO NOT MERGE
...
Change-Id: Icb4c4f32b1549f3d98b99a48b7c2f1b0de1b5a04
Auto-generated-cl: translation import
2013-04-10 13:25:52 -07:00
dfa5628cd3
Better release build reporting
...
The ResearchLogger reports whether a build is a release build or not
to avoid polluting data with IME debugging work by developers.
Previously this was done by checking a constant flag, which was also
serving the dual purpose of masking out debug code in release builds.
This change introduces a heuristic to determine whether a build was
created by a developer (using the package versionName), and annotating
the data sent to the server appropriately.
Change-Id: Icbad17c66b703cabf6d23d05e2c7c41bcceaae45
2013-04-10 11:52:37 -07:00
fb3e805722
Merge "Fix a bug where a space would not be inserted before a gesture"
2013-04-10 11:19:31 +00:00
30b8004b56
Fix a bug where a space would not be inserted before a gesture
...
Bug: 8583675
Change-Id: I14924fef5663f48481994c02c56be45f9f85be65
2013-04-10 20:10:28 +09:00
c7d4158979
Merge "Use private object as a lock instead of synchronized method"
2013-04-10 09:56:27 +00:00
12e77de212
Merge "Use private lock object instead of synchronized method"
2013-04-10 09:35:12 +00:00
1e256f5888
Merge "Protect simultaneously modifying gesture preview data"
2013-04-10 09:34:59 +00:00
951ea3c06d
Use private object as a lock instead of synchronized method
...
Change-Id: I0b9a935d8c97ddfb18ab7950a9d6bf542863072a
2013-04-10 18:34:01 +09:00
ce811f50d2
Use private lock object instead of synchronized method
...
Change-Id: Ifc62bacbd0583a7d102009681a94bdd9ccff7d47
2013-04-10 18:27:11 +09:00
ad205b2e3f
Protect simultaneously modifying gesture preview data
...
Bug: 8556775
Change-Id: I83272e3adbfc0c9cc14f9e8b479e926aabf4fa2a
2013-04-10 18:18:54 +09:00
4f43076370
Fix a faulty test
...
Change-Id: I5c03cea41e9b6e936e8f93b7d756f0fc9520002d
2013-04-10 18:08:27 +09:00
99b93d17d5
Fix a bug where autocorrection status would be wrong.
...
Change-Id: Ic220129dc59f585164dbf63591cd1c96de17fe6f
2013-04-10 17:49:19 +09:00
262d5bd9f9
Don't override EXTRA_SHOW_FRAGMENT if exists
...
Bug: 8541190
Change-Id: I37d3de12558efd55f157389d2e0b51fc83dc5da1
2013-04-10 16:24:17 +09:00
10af4b6e45
Merge "Separate StringUtils.capitalizeFirstCharacter"
2013-04-10 06:30:33 +00:00
Jean Chalard
Baligh Uddin
Satoshi Kataoka
Kurt Partridge
The Android Open Source Project
Jean-Baptiste Queru
Tom Ouyang
Tadashi G. Takaoka