Kurt Partridge
|
023bee608b
|
am abf64529: am 66366029: am a6092dc8: am 504bbe38: am 798820ab: am 3012c891: am 867b2380: am 35e02ccd: am bf62dc03: am ef103e1f: Merge "Close ResearchLogger upon onFinishInputView"
* commit 'abf645295569f6529c6eb0e9250cc2b69abcbb2d':
|
2013-04-17 19:49:31 -07:00 |
|
The Android Open Source Project
|
b241b243c8
|
am 740243cb: (-s ours) 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 '740243cb69e39efee5f70eedb03ee3ce17529d18':
|
2013-04-17 19:49:27 -07:00 |
|
The Android Open Source Project
|
3675b5bb96
|
am 1996320a: (-s ours) 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 '1996320a72581fbb91c0b8bc5ad187fe4f86379c':
|
2013-04-17 19:49:25 -07:00 |
|
Baligh Uddin
|
480ebe7969
|
am 403354ba: (-s ours) 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 '403354bae96595cb51676a77d8737ea468dba9a1':
|
2013-04-17 19:49:23 -07:00 |
|
Baligh Uddin
|
7c9a29d578
|
am 2c71e826: (-s ours) am 4d5ebdf5: am f420e3bf: am 792abb73: (-s ours) am 3c163ec1: am ac68b5ce: am 4b8494c4: (-s ours) Import translations. DO NOT MERGE
* commit '2c71e8266e2f7b754bae433f69327d0baac0e6c0':
|
2013-04-17 19:49:22 -07:00 |
|
Baligh Uddin
|
dd3aa37321
|
am 9f2573e4: (-s ours) am ea0d7ecd: am 82c49d74: am c1f3a801: (-s ours) am 8acb56b6: am 128ab7e5: Import translations. DO NOT MERGE
* commit '9f2573e465e7c22c3a1fe36e5b7da7068daf2da6':
|
2013-04-17 19:49:20 -07:00 |
|
Satoshi Kataoka
|
24c86a666d
|
am 4c767c81: am b2230d90: am 62f52e4f: am a514e958: am a2b129e9: am 0b0d9827: am 95fe8267: Move suggest logic to AOSP
* commit '4c767c8169e03c0d10ac69355af9908384771553':
|
2013-04-17 19:49:19 -07:00 |
|
Jean-Baptiste Queru
|
68dcdeed72
|
am 6e5857cb: (-s ours) am 67953e4d: am 626dd2a0: am 784eda74: (-s ours) am d9f35e32: am a21bec13: am 30667266: (-s ours) am 5bcb3876: Merge 2caa1d81ce - do not merge
* commit '6e5857cba258f0aa993f3e043b44f061ac447508':
|
2013-04-17 19:49:17 -07:00 |
|
Kurt Partridge
|
fb4da9692b
|
am 89ccc962: am 9cf39372: am 94c441a4: am cdaee868: Merge "Preserve a class for testing"
* commit '89ccc962e507d574f0603391b9bc994309632b19':
|
2013-04-17 19:49:15 -07:00 |
|
Tom Ouyang
|
bcefab0cb9
|
am 44eabffc: am e9de986d: am f08c75f2: am fd9f3d97: Add ability to handle digraphs in gesture and tap typing
* commit '44eabffc26c379688138817e6e000b418374257e':
|
2013-04-17 19:49:14 -07:00 |
|
Tom Ouyang
|
0fe18452df
|
am 0de0fa3b: am 0ca76c94: am 38a9e5a5: am b6e1777d: Merge "Add mechanism to handle digraphs in DicNode"
* commit '0de0fa3baf4014e54340e5539e8b6b62d12bd1e2':
|
2013-04-17 19:49:12 -07:00 |
|
Kurt Partridge
|
d40d2f3536
|
am eba670d0: am 6267ec68: am 3e1f652c: am 099dd3f2: Merge "Better release build reporting"
* commit 'eba670d07396ecc131b4d827c1f91d1935dd5c7c':
|
2013-04-17 19:49:11 -07:00 |
|
Baligh Uddin
|
265eed2bca
|
am 7c0257ae: (-s ours) am 60ffda41: am 5bbf4f30: am cc42e139: (-s ours) Import translations. DO NOT MERGE
* commit '7c0257aef54be4147b9d1db9c04a23cd1f3648fa':
|
2013-04-17 19:49:09 -07:00 |
|
Baligh Uddin
|
93e873cf71
|
am b155cedc: (-s ours) am 855b8053: am d86e14ae: Import translations. DO NOT MERGE
* commit 'b155cedc5815e0d67a95304feb12b658306fe406':
|
2013-04-17 19:49:07 -07:00 |
|
Jean Chalard
|
56e03dd351
|
am 9129c0d1: am 7503ef33: am cd51b80a: am fb3e8057: Merge "Fix a bug where a space would not be inserted before a gesture"
* commit '9129c0d1f655eee970199b1476557d26ca01ccee':
|
2013-04-17 19:49:06 -07:00 |
|
Tadashi G. Takaoka
|
7d4f0961d4
|
am ef2d1555: am c627f642: am 9a6ff5dc: am c7d41589: Merge "Use private object as a lock instead of synchronized method"
* commit 'ef2d15553babb9236dc53373c8750281a65ab46f':
|
2013-04-17 19:49:04 -07:00 |
|
Tadashi G. Takaoka
|
38af721f10
|
am 44905316: am 45163044: am 1502d977: am 12e77de2: Merge "Use private lock object instead of synchronized method"
* commit '44905316760e68a12aa867d08103e37f93fd6215':
|
2013-04-17 19:49:02 -07:00 |
|
Tadashi G. Takaoka
|
45a1fbd488
|
am 70a79ee6: am 8ea774eb: am 14950497: am 1e256f58: Merge "Protect simultaneously modifying gesture preview data"
* commit '70a79ee60dab73a84c6fa763c6027d985472c49b':
|
2013-04-17 19:49:00 -07:00 |
|
Jean Chalard
|
1792b8925f
|
am f514024a: am 818b7d46: am 80d7ed0b: am 4f430763: Fix a faulty test
* commit 'f514024aaf5e97b47c9062016261e113cddf611f':
|
2013-04-17 19:48:57 -07:00 |
|
Jean Chalard
|
0cfbc7c67c
|
am 8e7e9df1: am 99e91fc8: am 2dd2e2d7: am 99b93d17: Fix a bug where autocorrection status would be wrong.
* commit '8e7e9df145a52fe3b12d2699163933dbef70b1ce':
|
2013-04-17 19:48:56 -07:00 |
|
Tadashi G. Takaoka
|
b3f31ea66a
|
am 21dd8537: am 9a0f6ef8: am c35bca68: am 262d5bd9: Don\'t override EXTRA_SHOW_FRAGMENT if exists
* commit '21dd8537dba215acd4a639d2ca0d69b79214642f':
|
2013-04-17 19:48:54 -07:00 |
|
Tadashi G. Takaoka
|
367fe0c313
|
am f8a1317f: am f0a4508a: am f5aa2fd5: am 10af4b6e: Merge "Separate StringUtils.capitalizeFirstCharacter"
* commit 'f8a1317f4d517b1fb294a1a8b7c401df4196d62c':
|
2013-04-17 19:48:53 -07:00 |
|
Keisuke Kuroynagi
|
e399734095
|
am cde21724: am 5c7c36e3: am e81c1678: am 87fdde6e: Typing double letters via a \'circle\' on the key.
* commit 'cde2172412beeacd48650f004139b60eabd4d095':
|
2013-04-17 19:48:51 -07:00 |
|
Tadashi G. Takaoka
|
eea5453c45
|
am 86726e21: am 6f6edd76: am ae8a941e: am f606fd85: Hide Setup Wizard icon for stock keyboard
* commit '86726e2197f805078f2e5fb4270930ec8eb59f90':
|
2013-04-17 19:48:49 -07:00 |
|
Tadashi G. Takaoka
|
336bfb2f69
|
am a51ddebb: am 0d9164ec: am 0d7499bc: am 4fdfce6d: Merge "Refactor SpellCheckerProximityInfo as extending ProximityInfo"
* commit 'a51ddebb7c398e31b02d3e8663a82953ecfb0ab5':
|
2013-04-17 19:48:48 -07:00 |
|
Tom Ouyang
|
1711cee049
|
am 20d54cab: am 6a0f11cc: am ff981cc3: am 43779c04: Merge "Add method to get dictionary flags from DicTraverseSession"
* commit '20d54cab2a6971739d6f3c37f0afacced1d280f8':
|
2013-04-17 19:48:46 -07:00 |
|
Baligh Uddin
|
f96989dd63
|
am fe4c83c6: (-s ours) am 1646267f: am 8e7ca6be: am 224e969e: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit 'fe4c83c6bf88ee9c2659b57cee9e9ff7579b714c':
|
2013-04-17 19:48:44 -07:00 |
|
Baligh Uddin
|
0063ed45de
|
am 79dcc4f0: (-s ours) am 2eede9f4: am 13811400: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit '79dcc4f009de1f4caecc34798e8730c4f0949e62':
|
2013-04-17 19:48:43 -07:00 |
|
Satoshi Kataoka
|
ab3280f0e4
|
am f9d5d101: am 75b099f4: am 23408ee6: am e8f7d669: am 9414d75d: am db377ca6: am 64dd4754: am 63742fe5: am d2a04e1e: Merge "Move typing policy to AOSP"
* commit 'f9d5d10166d4e152e273196666e789f989112fdc':
|
2013-04-17 19:45:21 -07:00 |
|
Jean Chalard
|
17e964b18c
|
am ce2a5f93: am 44590a16: am 9d071843: (-s ours) am de19e161: am be9af787: am e405ec76: (-s ours) am 1bd8f332: am 6531bcdc: am ecb59eff: (-s ours) Revert "[DO NOT MERGE] Activate hardware keyboard handling"
* commit 'ce2a5f93aed2862f4397871d317d31baeac57f82':
|
2013-04-17 19:45:19 -07:00 |
|
Jean Chalard
|
bd531725f5
|
am 01a862fb: am fd59acce: am 5a6b0787: (-s ours) am cb7983e4: am ab6ef3b1: am e1f90dce: (-s ours) am 6b29ef46: am 558f41d4: am c741f1f8: (-s ours) [DO NOT MERGE] Activate hardware keyboard handling
* commit '01a862fba392db93985d7c644ba4728047b7ec2d':
|
2013-04-17 19:45:18 -07:00 |
|
Kurt Partridge
|
4376a55e04
|
am 0f8c86c8: am a3837fd1: am 4c74aaa0: am 5d337ad6: am 0c552106: am 6c9097fa: am 3547bd29: am 228d4533: am 5779bc91: Merge "Split LogUnits differently."
* commit '0f8c86c8ea9a81f0f4dd2fcf0c9abc9e1568125f':
|
2013-04-17 19:45:12 -07:00 |
|
Baligh Uddin
|
761c188aa4
|
am 08f0697b: am 6a7f4639: am 4a41a48f: (-s ours) am 27fede0b: am 5db8119d: am 7022bd23: (-s ours) am 2741e56d: am 0491706a: am 02fc1ed5: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '08f0697bc37d6ba06e3cc20c0e6e58f24a638f79':
|
2013-04-17 19:45:10 -07:00 |
|
Baligh Uddin
|
6f4025d64c
|
am fbc91459: am 6ff63273: am 166b3f98: (-s ours) am f4be7558: am c60d81f5: am a35cea39: (-s ours) am 536e7220: am 9bf7e74d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit 'fbc9145961fe3be8732ae7dc04de17b201c1029d':
|
2013-04-17 19:45:09 -07:00 |
|
Kurt Partridge
|
c0486a58ef
|
am 3a63e4e3: am 3fcaa3e8: am 1dc4a24f: am 538974d0: am 72c2b423: am ae0c5f79: am 3ec6a8bd: am 6c522b53: am 0c0ab2b4: Merge "Reorder ResearchLogger call"
* commit '3a63e4e3b8175faeca1f8135a6bdf6e7642b96cb':
|
2013-04-17 19:45:08 -07:00 |
|
Jean Chalard
|
dbb031c74a
|
am 56e931de: am feb16b6d: am b8a3454d: am a7da57de: am 3b8d54bf: am 08a5e43d: am 19fe4d4b: am bfd7dcd5: am 0745fe83: am b8869ec1: am 0fcc4960: Deactivate hardware keyboard handling.
* commit '56e931de8055a0cd181bc16b51a605a3da06ead6':
|
2013-04-17 19:45:06 -07:00 |
|
Tadashi G. Takaoka
|
59e17512cf
|
am 85fca857: am 300d3bde: am ab99e613: am 8a984e8c: am 2b3f1289: am 06c1baba: am b1533116: am b08506c2: am 9413e957: Merge "Interpolate gesture preview trails"
* commit '85fca857af9987993c82c76fb63aa07935c291cc':
|
2013-04-17 19:45:05 -07:00 |
|
Satoshi Kataoka
|
a08620f13f
|
am eeb38639: am 65690000: am 7d0d728c: am bc36fbfc: am cb4ae59c: am bb229fe1: am 91d468f5: am ac870326: am 54c091d2: Merge "Move policy and session to AOSP"
* commit 'eeb386390ac5282d2212128aa5bec4a5c1a98092':
|
2013-04-17 19:45:04 -07:00 |
|
Jean Chalard
|
484e914477
|
am e29ffdb6: am c14fdded: am 714b0044: am 2cd99981: am ed66b232: am cffac321: am 873c20ba: am e40d5633: am 43341ba0: Merge "Ask the client to make itself known when it\'s not"
* commit 'e29ffdb6c6344e7dd13936e22b8858c84b3802c4':
|
2013-04-17 19:45:03 -07:00 |
|
Jean Chalard
|
472f764f57
|
am 267e6179: am c26022cf: am d901066b: am f921a587: am 76dda675: am c821c723: am 3b9d7fd1: am 151e4e18: am 065f126f: Merge "Fix two nasty bugs with surrogate pairs."
* commit '267e61790a6d1f41ead37efd6a4045f48227ff8b':
|
2013-04-17 19:45:01 -07:00 |
|
Satoshi Kataoka
|
a59d936c44
|
am 371369d9: am d196cb64: am 8c485086: am 51805727: am 8348fe8a: am 6f7494e6: am fdf3c49c: am bde25a4a: am 38c26dd0: Move dicnode to AOSP
* commit '371369d9f12b2ad47e328b0ec3e9268c64d68dd0':
|
2013-04-17 19:45:00 -07:00 |
|
The Android Open Source Project
|
892fcbfb89
|
am e2cc803c: am a0b2dc74: am aeb96805: (-s ours) am cfe49191: am 38a9f856: am 228fcdae: (-s ours) am 70616b63: am 08f5b780: am c1dec87a: (-s ours) am b35915fb: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit 'e2cc803c4674b5efe49a19c82ca1f1fc9a131990':
|
2013-04-17 19:44:58 -07:00 |
|
Satoshi Kataoka
|
e1829730c8
|
am 14175662: am b949db38: am 51c0380f: am d7c3c523: am 7a3bc77b: am b980adab: am a9ef902c: am 70747ad6: am 97a3ce02: Merge "Refactor"
* commit '1417566219204f75eff13d3cd69ff3513f253971':
|
2013-04-17 19:44:57 -07:00 |
|
Jean Chalard
|
783b0862a1
|
am 34c0bef6: am 9a181179: am 62e0ee32: am c7163a4c: am 126336be: am 3effa520: am 4c535232: am a38d907b: am 740da0d8: Fix an NPE
* commit '34c0bef6759e22f0f9ac8aeadb9cd03c2b664c7f':
|
2013-04-17 19:44:56 -07:00 |
|
Tadashi G. Takaoka
|
a1b056088f
|
am c01de725: am 023ed8a6: am 05ed9c76: am 617362fd: am 1b7451af: am 57a7a5c3: am 76c00dec: am 7580e994: am 48d8d8d0: Fix potential NPE in MainKeyboardView.KeyTimerHandler
* commit 'c01de7259d83a48c4879f886c48b620d99f30fbd':
|
2013-04-17 19:44:54 -07:00 |
|
Jean Chalard
|
9477d7b37e
|
am a6ec1871: am 3f17ab41: am 724e100e: am 84b246f1: am db993a5f: am ae97a93a: am 86b8b7b4: am 9bf1dfeb: am 2188cbae: Merge "Fix an NPE"
* commit 'a6ec1871fe1af4982fd13aafe3f59d574a2b172c':
|
2013-04-17 19:44:53 -07:00 |
|
Jean Chalard
|
8f89b9b13d
|
am ccb3dc02: am 0eb58dfe: am 10373006: am 5c874a7b: am bb94c643: am 5b248590: am 1c63efc9: am a657afc3: am d555a0d7: Merge "Cleanup"
* commit 'ccb3dc022515a28172ef147d07a96b8ff444fe7e':
|
2013-04-17 19:44:51 -07:00 |
|
Baligh Uddin
|
42f36bb6ea
|
am 2456eb3a: 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 '2456eb3a25501b2a28d0a872b27952d5c903d887':
|
2013-04-17 19:44:50 -07:00 |
|
Baligh Uddin
|
5e79a34461
|
am f205c258: 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 'f205c258636da9cad5a7ac782598b9f7701bca4b':
|
2013-04-17 19:44:49 -07:00 |
|
The Android Automerger
|
abaea38f58
|
am 13ac43b3: 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 '13ac43b3e604e31ee3e3a3e0e57279637b1ccab7':
|
2013-04-17 19:44:48 -07:00 |
|