Satoshi Kataoka
894a8ffcfd
am 9f419592: am c3c1b4db: am 5d9459df: am 67d1bdd4: am ac2d54b5: am 0cc63149: am c1c3e03c: am 140b6705: Merge "Fix appname"
...
* commit '9f419592ff7d5a67cc978814cfa1fe443ab35407':
2013-04-10 19:34:37 -07:00
Tadashi G. Takaoka
680d689d85
am c61393c8: am 56642281: am d7bcc52d: am f510d154: am bb0c999b: am dbb90d08: am bd7b4fcc: am ee91bde1: Clean up InflateException reference from KeyboardBuilder
...
* commit 'c61393c8ef6f6c1fd7e48b9c505fb3300bf992a2':
2013-04-10 19:34:35 -07:00
The Android Open Source Project
5d674b166d
am 55172624: am b2c2ce31: (-s ours) am 7de82b0e: am 6ab186a1: am c4176236: (-s ours) am 210226c5: (-s ours) am 54f0ae27: am a6fae701: (-s ours) am 0849a4b9: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '5517262476b8bb22953f8491fb88dd01c0880a7e':
2013-04-10 19:34:34 -07:00
Alan Viverette
e592be5809
am 046a311a: am d19c71d9: am 3c082157: am 44678fcf: am f1bcc1d7: am 9ecac40d: am 4f11af0c: am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view.
...
* commit '046a311a134a15c5f3d9465e03a4e796def1b6b9':
2013-04-10 19:34:32 -07:00
Jean Chalard
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
Jean Chalard
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
Baligh Uddin
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
Baligh Uddin
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
Baligh Uddin
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
Satoshi Kataoka
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
Satoshi Kataoka
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
Kurt Partridge
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
The Android Open Source Project
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
The Android Open Source Project
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
Baligh Uddin
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
Baligh Uddin
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
Baligh Uddin
8acb56b60b
am 128ab7e5: Import translations. DO NOT MERGE
...
* commit '128ab7e5e36e133169f649232a5193f35f9932ca':
Import translations. DO NOT MERGE
2013-04-10 19:34:14 -07:00
Satoshi Kataoka
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
Jean-Baptiste Queru
d9f35e3226
am a21bec13: am 30667266: (-s ours) am 5bcb3876: Merge 2caa1d81ce
- do not merge
...
* commit 'a21bec13357c02f5964e93aaec444f620bf83f60':
2013-04-10 19:34:12 -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
The Android Automerger
9320b6def7
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-08 05:57:08 -07: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
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