Commit graph

12302 commits

Author SHA1 Message Date
Kurt Partridge
abf6452955 am 66366029: am a6092dc8: am 504bbe38: am 798820ab: am 3012c891: am 867b2380: am 35e02ccd: am bf62dc03: am ef103e1f: Merge "Close ResearchLogger upon onFinishInputView"
* commit '663660295b2f9b64421b02ae0ef34d959cdf06fb':
2013-04-17 19:44:05 -07:00
The Android Open Source Project
740243cb69 am cf0c1a7d: am 19289df5: am e279de02: (-s ours) 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 'cf0c1a7d6ea4f05c46addde2bfd961abcff656f8':
2013-04-17 19:44:04 -07:00
The Android Open Source Project
1996320a72 am faa9a5ec: am d9f9ba39: am 4b176a01: (-s ours) am 83346295: am 2c7b1b82: am d2582473: (-s ours) am 22953740: Reconcile with jb-mr2-release - do not merge
* commit 'faa9a5ecc799e39a203c032762db0c3f13f7786e':
2013-04-17 19:44:02 -07:00
Baligh Uddin
403354bae9 am bc5075e0: am 536ec3bf: am b4fbb295: (-s ours) am d3ae58ef: am 3bc22c56: am e7d91194: (-s ours) am 370070ae: am 4cdb7ccb: Import translations. DO NOT MERGE
* commit 'bc5075e0dacdf6caeaf0880e3dae560c1844158b':
2013-04-17 19:44:01 -07:00
Baligh Uddin
2c71e8266e am 4d5ebdf5: am f420e3bf: am 792abb73: (-s ours) am 3c163ec1: am ac68b5ce: am 4b8494c4: (-s ours) Import translations. DO NOT MERGE
* commit '4d5ebdf53f4e0732ab1ae24b5d7262dff080d9ce':
2013-04-17 19:43:59 -07:00
Baligh Uddin
9f2573e465 am ea0d7ecd: am 82c49d74: am c1f3a801: (-s ours) am 8acb56b6: am 128ab7e5: Import translations. DO NOT MERGE
* commit 'ea0d7ecd979d1e339a27841dd9aece281fd751d9':
2013-04-17 19:43:58 -07:00
Satoshi Kataoka
4c767c8169 am b2230d90: am 62f52e4f: am a514e958: am a2b129e9: am 0b0d9827: am 95fe8267: Move suggest logic to AOSP
* commit 'b2230d9073211e6d460cc5c3a5245bff4ca1cfa6':
2013-04-17 19:43:56 -07:00
Jean-Baptiste Queru
6e5857cba2 am 67953e4d: am 626dd2a0: am 784eda74: (-s ours) am d9f35e32: am a21bec13: am 30667266: (-s ours) am 5bcb3876: Merge 2caa1d81ce - do not merge
* commit '67953e4da485596dea42c2f952b3207e29c77ed0':
2013-04-17 19:43:55 -07:00
Kurt Partridge
89ccc962e5 am 9cf39372: am 94c441a4: am cdaee868: Merge "Preserve a class for testing"
* commit '9cf3937281092c45efd14c9f4cadadd60ba8e245':
2013-04-17 19:43:54 -07:00
Tom Ouyang
44eabffc26 am e9de986d: am f08c75f2: am fd9f3d97: Add ability to handle digraphs in gesture and tap typing
* commit 'e9de986d412e8512e6d63aa058b14355a872ca5f':
2013-04-17 19:43:52 -07:00
Tom Ouyang
0de0fa3baf am 0ca76c94: am 38a9e5a5: am b6e1777d: Merge "Add mechanism to handle digraphs in DicNode"
* commit '0ca76c94f5c669a83483edd90c3e000c05edfaf0':
2013-04-17 19:43:51 -07:00
Kurt Partridge
eba670d073 am 6267ec68: am 3e1f652c: am 099dd3f2: Merge "Better release build reporting"
* commit '6267ec688ef8f2a5fb6b338170b3f1342c35e93d':
2013-04-17 19:43:49 -07:00
Baligh Uddin
7c0257aef5 am 60ffda41: am 5bbf4f30: am cc42e139: (-s ours) Import translations. DO NOT MERGE
* commit '60ffda411fa78e7a4df044ba1bc47cd356a6eac8':
2013-04-17 19:43:48 -07:00
Baligh Uddin
b155cedc58 am 855b8053: am d86e14ae: Import translations. DO NOT MERGE
* commit '855b80531222e419b65d915c78f6dbab90c76626':
  Import translations. DO NOT MERGE
2013-04-17 19:43:47 -07:00
Jean Chalard
9129c0d1f6 am 7503ef33: am cd51b80a: am fb3e8057: Merge "Fix a bug where a space would not be inserted before a gesture"
* commit '7503ef330c2c700a701b2ad991afdd3c97ccc741':
2013-04-17 19:43:46 -07:00
Tadashi G. Takaoka
ef2d15553b am c627f642: am 9a6ff5dc: am c7d41589: Merge "Use private object as a lock instead of synchronized method"
* commit 'c627f6427428a9fd2a2e1571b27a6a8971679198':
2013-04-17 19:43:45 -07:00
Tadashi G. Takaoka
4490531676 am 45163044: am 1502d977: am 12e77de2: Merge "Use private lock object instead of synchronized method"
* commit '45163044364ec25186da1cb4098d528d756919d4':
2013-04-17 19:43:43 -07:00
Tadashi G. Takaoka
70a79ee60d am 8ea774eb: am 14950497: am 1e256f58: Merge "Protect simultaneously modifying gesture preview data"
* commit '8ea774ebf23f18e34d4ff98bd54062b75659221f':
2013-04-17 19:43:42 -07:00
Jean Chalard
f514024aaf am 818b7d46: am 80d7ed0b: am 4f430763: Fix a faulty test
* commit '818b7d4686d9fe68ea463eae3b903142978c8e7b':
2013-04-17 19:43:40 -07:00
Jean Chalard
8e7e9df145 am 99e91fc8: am 2dd2e2d7: am 99b93d17: Fix a bug where autocorrection status would be wrong.
* commit '99e91fc8ec21fec3dc16a12004f9c69d5a4f47da':
2013-04-17 19:43:39 -07:00
Tadashi G. Takaoka
21dd8537db am 9a0f6ef8: am c35bca68: am 262d5bd9: Don\'t override EXTRA_SHOW_FRAGMENT if exists
* commit '9a0f6ef8472401df3241cf2a85e344c11e38267a':
2013-04-17 19:43:37 -07:00
Tadashi G. Takaoka
f8a1317f4d am f0a4508a: am f5aa2fd5: am 10af4b6e: Merge "Separate StringUtils.capitalizeFirstCharacter"
* commit 'f0a4508ad52f3b3cd685da81d3bcfcbbb34b9304':
2013-04-17 19:43:36 -07:00
Keisuke Kuroynagi
cde2172412 am 5c7c36e3: am e81c1678: am 87fdde6e: Typing double letters via a \'circle\' on the key.
* commit '5c7c36e31f609dbaba4a04bbeff2b273b9ee16fc':
2013-04-17 19:43:35 -07:00
Tadashi G. Takaoka
86726e2197 am 6f6edd76: am ae8a941e: am f606fd85: Hide Setup Wizard icon for stock keyboard
* commit '6f6edd76f82cc229441b9fcd4111ad49f72b0a6e':
2013-04-17 19:43:33 -07:00
Tadashi G. Takaoka
a51ddebb7c am 0d9164ec: am 0d7499bc: am 4fdfce6d: Merge "Refactor SpellCheckerProximityInfo as extending ProximityInfo"
* commit '0d9164ecd812c1cbfd5393a82dee4cf5cd982daa':
2013-04-17 19:43:32 -07:00
Tom Ouyang
20d54cab2a am 6a0f11cc: am ff981cc3: am 43779c04: Merge "Add method to get dictionary flags from DicTraverseSession"
* commit '6a0f11cc91c77fea781b736171718211f27415b9':
2013-04-17 19:43:30 -07:00
Baligh Uddin
fe4c83c6bf am 1646267f: am 8e7ca6be: am 224e969e: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '1646267fdfba63c1dad25274bd8d5a168dabfa58':
2013-04-17 19:43:29 -07:00
Baligh Uddin
79dcc4f009 am 2eede9f4: am 13811400: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit '2eede9f46d46b8961b02403197cf78a8fbc356a8':
  Import translations. DO NOT MERGE
2013-04-17 19:43:27 -07:00
Kurt Partridge
24ba5149f0 am 436008fe: am d3497938: am ab8f166e: am 09ab6495: Merge "[FileEncap18] Clean up uploading scheduling"
* commit '436008fe8a3959c435b4f1067a0145ace1e3d678':
2013-04-17 19:40:20 -07:00
Satoshi Kataoka
1417566219 am b949db38: am 51c0380f: am d7c3c523: am 7a3bc77b: am b980adab: am a9ef902c: am 70747ad6: am 97a3ce02: Merge "Refactor"
* commit 'b949db38568d02be216a9986ed0992ae57f0c13b':
2013-04-17 19:40:06 -07:00
Jean Chalard
34c0bef675 am 9a181179: am 62e0ee32: am c7163a4c: am 126336be: am 3effa520: am 4c535232: am a38d907b: am 740da0d8: Fix an NPE
* commit '9a181179b2c8ec8ee4b0468158cb565af8ceda8e':
2013-04-17 19:40:04 -07:00
Tadashi G. Takaoka
c01de7259d am 023ed8a6: am 05ed9c76: am 617362fd: am 1b7451af: am 57a7a5c3: am 76c00dec: am 7580e994: am 48d8d8d0: Fix potential NPE in MainKeyboardView.KeyTimerHandler
* commit '023ed8a661c792d6ab0e405469296971c27ddc4c':
2013-04-17 19:40:03 -07:00
Jean Chalard
a6ec1871fe am 3f17ab41: am 724e100e: am 84b246f1: am db993a5f: am ae97a93a: am 86b8b7b4: am 9bf1dfeb: am 2188cbae: Merge "Fix an NPE"
* commit '3f17ab4139e586536ea90a5d7d183ae78f273e00':
2013-04-17 19:40:02 -07:00
Jean Chalard
ccb3dc0225 am 0eb58dfe: am 10373006: am 5c874a7b: am bb94c643: am 5b248590: am 1c63efc9: am a657afc3: am d555a0d7: Merge "Cleanup"
* commit '0eb58dfe0c30b9cbc34771bae2cda48fa94d2f79':
2013-04-17 19:40:00 -07:00
Baligh Uddin
2456eb3a25 am faa708c3: am 36583063: am 8ed884e7: am ca8ea431: am a3ed3254: am 05b7988a: am 53698f8d: am fd0e40ef: am 78b07d8b: am 0cd02c2b: keep history after reset to jb-ub-latinimegoogle-azuki
* commit 'faa708c326b360eb6097587291727aff1a87fe56':
2013-04-17 19:39:59 -07:00
Baligh Uddin
f205c25863 am dbf9168f: am b3fbdd58: (-s ours) am f939332c: am 94065faf: am c6660830: (-s ours) am 68a0afc3: am 0c777365: am fbb6500d: (-s ours) am 5bcbc21a: (-s ours) am c08b8245: (-s ours) Import translations. DO NOT MERGE
* commit 'dbf9168f8616df012dc1faeaf3bffe34d7057d6a':
2013-04-17 19:39:57 -07:00
The Android Automerger
13ac43b3e6 am 2cb2c001: am 6e6f705e: am c82a56b4: am ccc3c232: am 228e26f7: am ea46fdcb: am 65dfe94d: am 1237c872: am a02de1f7: am 5c3d51e2: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
* commit '2cb2c001661383aa79f21992c4d783f2cb856c80':
2013-04-17 19:39:56 -07:00
Tadashi G. Takaoka
f6f20ab26b am 19b5a104: am ae3ead49: am faadc0a7: am b5843222: am 62b07bf9: am 561a04f3: am 1911c513: am abd22393: am 8b120b98: am 50cc14b5: am ef86bbce: Add const_cast to live with host\'s jni.h
* commit '19b5a10407838dd5f05bdca1663d6615313e131b':
2013-04-17 19:39:54 -07:00
Tadashi G. Takaoka
9a2c21bab9 am 6e536321: am 31f350bc: am fc369029: am 9c59fb54: am fc0fc521: am e01d1960: am c17e0bba: am 830a8cbb: am 33fa6a0b: am cc75c950: am 73d00e68: Merge "Use XmlPullParser.getEventType()"
* commit '6e5363219506060390aabc79e60f7a280f5693a6':
2013-04-17 19:39:53 -07:00
Satoshi Kataoka
6a8da44f18 am 5d1d7863: am 4b24e49b: am a1cd7970: am 71f1b270: am 8138c8d2: am f4f4d6c9: am b3438173: am d3c823c1: am dd8ca1f8: am bc586fb1: am 0b327101: Merge "Fix possible NPE"
* commit '5d1d7863d2834dd010ad9e077502a924a4f07f3b':
2013-04-17 19:39:51 -07:00
Tadashi G. Takaoka
b97fe38552 am 47d68e5d: am 6ed9580f: am 098ecd55: am 5283b90a: am 60083e3e: am 49d59d4a: am a469cdfe: am d0495a35: am 56b1bd86: am f892f775: am d17b69ec: Clean up XmlParserUtils
* commit '47d68e5d5a308158d8a39f40bb8a43ff7a75e260':
2013-04-17 19:39:50 -07:00
Baligh Uddin
ce45384074 am 32e84531: am 8632fea5: (-s ours) am 88db1331: am 6626fb25: am 51c7dbea: (-s ours) am 4379dbea: am 324b1880: am f0213d1a: (-s ours) am c1cb4766: (-s ours) am 6537280f: am 5f976d1c: (-s ours) am ff41125b: (-s ours) am fba54597: Import translations. DO NOT MERGE
* commit '32e84531511a214128c1340e4c7b9c1b5c825825':
2013-04-17 19:39:48 -07:00
Baligh Uddin
de5560e254 am 0218ddb3: am 52d6480a: (-s ours) am f81c9132: am 1e8d1f41: am d72347f9: (-s ours) am 67f7bb2e: am 284d4285: am f0346d70: (-s ours) am fc135df5: (-s ours) am 24daa2a1: am 6616188e: (-s ours) Import translations. DO NOT MERGE
* commit '0218ddb3d9b8bbe021df84c6560043243e2bcdc6':
2013-04-17 19:39:47 -07:00
Baligh Uddin
062a6c0255 am dbd8eec7: am 643f8f08: (-s ours) am a3328255: am 38f2bbb3: am 210d473d: (-s ours) am a62edb47: am 3d082f1b: am 14ef11a8: (-s ours) am 93c5c7a4: (-s ours) am 2898aac8: Import translations. DO NOT MERGE
* commit 'dbd8eec733fd8b35fd44b052cf1e0c05d8fdc068':
2013-04-17 19:39:45 -07:00
Tadashi G. Takaoka
2721db44ab am b779b268: am 6ed94c43: am 70252ecf: am 5eb7a00e: am 1047bf17: am 32d89afa: am e2ccd61b: am 2b04e787: am 71fb8af7: am ec183b50: am fb658d6c: Fix possible ArrayIndexOutOfBoundsException
* commit 'b779b268dfcbb304d27ac4cef41d03486f5ab69b':
2013-04-17 19:39:44 -07:00
Baligh Uddin
ac58dcf14e am f3b10815: am 0849b210: (-s ours) am 1cf0e85d: am 97687031: am 0ad31c8d: (-s ours) am a5bc58ac: am 5301db94: am e67698be: (-s ours) am 8051fd0d: (-s ours) am 2a01fc22: am 1e5add78: (-s ours) am 7668deec: (-s ours) am 21160c4e: Import translations. DO NOT MERGE
* commit 'f3b10815250aa2088c0d3a75285c6e18bf84259a':
2013-04-17 19:39:42 -07:00
Baligh Uddin
58a4a153d1 am a9a84c95: am 3d8f50ea: (-s ours) am 755db5bd: am 3a97d388: am 273a21ca: (-s ours) am 772dfa51: am ae8b69fd: am 7ea45c07: (-s ours) am 7f859d68: (-s ours) am 8636ba03: am afe343c1: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit 'a9a84c95f259a6771efe28b37447baba45fa6c42':
2013-04-17 19:39:41 -07:00
Baligh Uddin
b74cc3f96b am 1a24764e: am 03fbe97c: (-s ours) am c46a975c: am 9f291d17: am 2f8e381b: (-s ours) am 92adcda6: am 42c255c2: (-s ours) am 599290d5: (-s ours) am b4039d96: (-s ours) am 5709e859: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit '1a24764ed8a8e0c94fbaccd9ba06d0a1891476f0':
2013-04-17 19:39:39 -07:00
Alan Viverette
3de1ae1a6e am 849c7858: am eff2ee76: am 45b1a302: am 80a2e251: am 14f65cff: am 8e5fa88a: am f518e71a: am c5ec7545: am 8f807582: am e47ee181: am a7b4398c: Don\'t announce changes for A11y within the same keyboard mode.
* commit '849c785807ba536c6a26fbadc7f153f1747d76bc':
2013-04-17 19:39:37 -07:00
Satoshi Kataoka
775ef9bc38 am cb132ce1: am 81295fd2: am 119e6979: am 745725e1: am 103b1118: am 33c91be3: am 40be0244: am 54b85827: am 189c1b0e: am 97ddbf22: am 19a70087: Merge "Fix appname"
* commit 'cb132ce11df59be842f16ec69be16bd6316e234f':
2013-04-17 19:39:36 -07:00