Commit graph

13903 commits

Author SHA1 Message Date
Kurt Partridge
164e681fae am c9b193c1: am fdf1a05a: am c0486a58: am 3a63e4e3: am 3fcaa3e8: am 1dc4a24f: am 538974d0: am 72c2b423: am ae0c5f79: am 3ec6a8bd: am 6c522b53: am 0c0ab2b4: Merge "Reorder ResearchLogger call"
* commit 'c9b193c1b4af93d1b9e9db3f20ed6229663312e3':
2013-05-15 10:50:15 -07:00
Jean Chalard
a05f6c1c4f am 2d03ab45: am c633b61e: am dbb031c7: 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 '2d03ab456f8c5b5de9e83acaf45032888550a540':
2013-05-15 10:50:13 -07:00
Tadashi G. Takaoka
ea6db9ac9a am 254cb1ff: am d13a605c: am 59e17512: am 85fca857: am 300d3bde: am ab99e613: am 8a984e8c: am 2b3f1289: am 06c1baba: am b1533116: am b08506c2: am 9413e957: Merge "Interpolate gesture preview trails"
* commit '254cb1ffccfa90107744dfc258fdde9acfde4166':
2013-05-15 10:50:12 -07:00
Satoshi Kataoka
053e4ac91f am e406c316: am 85cb23c4: am a08620f1: 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 'e406c316545e3bfb424ad55345635ad7c33b6110':
2013-05-15 10:50:10 -07:00
Jean Chalard
42b7bad5b6 am 114e9c56: am 0eb45d7f: am 484e9144: 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 '114e9c562137b5902a9cbe3c2be1d1be3d6a0a60':
2013-05-15 10:50:08 -07:00
Jean Chalard
ef9ab1c6f5 am 00f46f03: am 174ddfd4: am 472f764f: 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 '00f46f031bcb775341b33d30230e3c1a1b262be8':
2013-05-15 10:50:07 -07:00
Satoshi Kataoka
817a43a904 am 94eeba65: am 78ed6232: am a59d936c: am 371369d9: am d196cb64: am 8c485086: am 51805727: am 8348fe8a: am 6f7494e6: am fdf3c49c: am bde25a4a: am 38c26dd0: Move dicnode to AOSP
* commit '94eeba653c377ea64559a6f3772ad5f31ff6ce86':
2013-05-15 10:50:05 -07:00
The Android Open Source Project
7a43a60df3 am 6e804061: (-s ours) am 7c4dff90: am 892fcbfb: (-s ours) 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 '6e804061bc5009118b45ff6fbfb88afe610ae351':
2013-05-15 10:50:04 -07:00
Satoshi Kataoka
175d4e55c2 am a7885e52: am 3d12edab: am e1829730: am 14175662: am b949db38: am 51c0380f: am d7c3c523: am 7a3bc77b: am b980adab: am a9ef902c: am 70747ad6: am 97a3ce02: Merge "Refactor"
* commit 'a7885e529d417d8275a696ec125d8509368942d3':
2013-05-15 10:50:02 -07:00
Jean Chalard
a1ff71f0c8 am 840a0695: am 55afe17c: am 783b0862: am 34c0bef6: am 9a181179: am 62e0ee32: am c7163a4c: am 126336be: am 3effa520: am 4c535232: am a38d907b: am 740da0d8: Fix an NPE
* commit '840a0695d4fa30e6910ea03550b80748e7f30fe5':
2013-05-15 10:50:00 -07:00
Tadashi G. Takaoka
0889868402 am 2bc1809d: am e878a277: am a1b05608: 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 '2bc1809de56c5983be69fc5ad54f52a2556c7718':
2013-05-15 10:49:59 -07:00
Jean Chalard
615c8b6690 am 60368456: am 720ce530: am 9477d7b3: am a6ec1871: am 3f17ab41: am 724e100e: am 84b246f1: am db993a5f: am ae97a93a: am 86b8b7b4: am 9bf1dfeb: am 2188cbae: Merge "Fix an NPE"
* commit '60368456ecbe5d006b06e00cc821a1603d1a453b':
2013-05-15 10:49:57 -07:00
Jean Chalard
6571290c9b am 6e2e946d: am a1187bd0: am 8f89b9b1: am ccb3dc02: am 0eb58dfe: am 10373006: am 5c874a7b: am bb94c643: am 5b248590: am 1c63efc9: am a657afc3: am d555a0d7: Merge "Cleanup"
* commit '6e2e946d37a814977244f8ab0210bfc0cb133f3f':
2013-05-15 10:49:55 -07:00
Baligh Uddin
0151b94760 am 61076e10: am 04ef4141: am 42f36bb6: 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 '61076e10a7fcec9ed7817d42fb02f6a1ee9b6fdb':
2013-05-15 10:49:54 -07:00
Baligh Uddin
f61619af18 am 4fd9ca75: am 26e105b6: am 5e79a344: (-s ours) 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 NO
* commit '4fd9ca75d5b58b41ac28cc5c810a8b95a3e1a335':
2013-05-15 10:49:52 -07:00
The Android Automerger
1e944609ac am f4ed91f5: am 8435a9b8: am abaea38f: 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 'f4ed91f54d749229e4a6ace3276e6c47c90f8239':
2013-05-15 10:49:51 -07:00
Tadashi G. Takaoka
4784610996 am 35c4a834: am 52a89e5a: am c7420082: am f6f20ab2: 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 '35c4a8341111c17f3edcab2ff3538a235c841657':
2013-05-15 10:49:49 -07:00
Tadashi G. Takaoka
751cce8d93 am 593432e1: am e5561f52: am 707d7d03: am 9a2c21ba: 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 '593432e1675b6e892437ff659f96752bae79fc79':
2013-05-15 10:49:48 -07:00
Satoshi Kataoka
bbc4491527 am 4b2cd413: am ef6e62dd: am 1ca78739: am 6a8da44f: 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 '4b2cd4135069edc63a509fdbfb9cefd67320e474':
2013-05-15 10:49:46 -07:00
Tadashi G. Takaoka
719e23e18c am 1e02d2cc: am 398c6862: am 8c897819: am b97fe385: 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 '1e02d2ccef8919e65e124bf4ec054340c718a37b':
2013-05-15 10:49:45 -07:00
Baligh Uddin
38a9550b97 am 608d77a1: am 352e94b0: am 13f39210: am ce453840: 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)
* commit '608d77a1d955028818dbc21077e9169866d368db':
2013-05-15 10:49:43 -07:00
Baligh Uddin
a7e31631c0 am 32e5224a: am 33a9c2b2: am c346b2dc: (-s ours) am de5560e2: 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 transl
* commit '32e5224a3c3abf65c908228bfe39f45c027eb2bf':
2013-05-15 10:49:41 -07:00
Baligh Uddin
e83fc873c7 am db9dbeee: (-s ours) am 8f89ca1d: am b233e047: (-s ours) am 062a6c02: 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 'db9dbeee8e0ad003496d0d9b2e17ae13ad989d95':
2013-05-15 10:49:39 -07:00
Tadashi G. Takaoka
19c16d9d4e am 2a4ab011: am b53d753d: am d88350e2: am 2721db44: 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 '2a4ab0119886dfc9f87a38c67ed6992cd662ab5c':
2013-05-15 10:49:33 -07:00
Baligh Uddin
bbe52bc641 am a13080d6: am aa52681b: am 627db009: am ac58dcf1: 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)
* commit 'a13080d65584211c0a5ddba06628421a9564ff02':
2013-05-15 10:49:31 -07:00
Baligh Uddin
80c444c93d am 0b6762a1: am 719f8865: am 2b19100a: (-s ours) am 58a4a153: 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
* commit '0b6762a1ebbeda4483055554c2a6b932098a099c':
2013-05-15 10:49:29 -07:00
Baligh Uddin
c33a6f27b2 am 768c3c65: am dff9a646: am 87ad4a8c: (-s ours) am b74cc3f9: 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 tr
* commit '768c3c659a5dac58a8ff558203ad3bacf43f7e60':
2013-05-15 10:49:28 -07:00
Alan Viverette
3dc70862a2 am 28a831de: am c795a288: am 69ef660f: am 3de1ae1a: 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 '28a831de82f4a918e58e4b73e63ec0498dea7467':
2013-05-15 10:49:26 -07:00
Satoshi Kataoka
363394c9b3 am 04708a32: am d1935d05: am d0642a34: am 775ef9bc: 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 '04708a3216945e6e695b7421f56f5fd6b30cf5b0':
2013-05-15 10:49:24 -07:00
Tadashi G. Takaoka
4a12a2b6b6 am bfb18559: am 37232a10: am 58db8c60: am c0d71c3b: am 3a2e78f9: am 30d9817b: am 7dcc22b6: am 5f81bb8c: am 3ef47fd3: am e0aa9383: am a7353dda: am 5a4700a0: am 0992fd24: am 1e3c73de: am 3a8a63c3: Remove unused import
* commit 'bfb1855908d99e4ddb07a652bda3a9ccc76c4902':
2013-05-15 10:49:22 -07:00
Tadashi G. Takaoka
05e54e59b3 am 9faf1961: am c1e417dd: am e010bb8a: am 18be37b0: am 96d53923: am 104923e4: am 863d83ea: am 02a59e55: am 1f722ca9: am 4e627c21: am 56796cd7: am 4841df87: am bb679a22: am 3d0fee4e: am c6452f25: Merge "Remove reference to string.english_ime_name"
* commit '9faf1961bfd5b30fd73c66e7fa873262c7baee13':
2013-05-15 10:49:21 -07:00
Satoshi Kataoka
e0e7b78f83 am eecbcea7: am 4bb35fea: am 8e8ea448: am 9e78d2ba: am 54f46879: am 1af04dc6: am 249ad4d5: am 79376326: am f555b255: am 5d33d2c2: am 9b969b26: am 13498620: am 4bb504ce: am 45728330: am f4352c2c: Merge "Use correct appname resource"
* commit 'eecbcea7a9357696a68eaa0f0b7b859c4516f247':
2013-05-15 10:49:19 -07:00
Baligh Uddin
dbff15a95e am af1ca413: am daad9c68: am 5bc76be0: am 15a357a3: am 2060aa13: am 97046d19: am 1d024eca: am 307d2aa2: am 8e48a618: am 18e45a93: am f1c2946c: am 4021464c: am 4b66d0c4: am a01fb001: am a3e47f87: am 74089a09: am ba0e497a: Merge commit \'525bbec9eccbf5bd4581c2b9908e46f6
* commit 'af1ca4138a1b21ecb4344b4cb1a4bf965a417f8d':
2013-05-15 10:49:17 -07:00
Satoshi Kataoka
32d5b4e39b am 29370f41: am 204243c3: am 071c3c6d: am e8374789: am 9e45f9e8: am 24cf39e7: am 894a8ffc: am 9f419592: am c3c1b4db: am 5d9459df: am 67d1bdd4: am ac2d54b5: am 0cc63149: am c1c3e03c: am 140b6705: Merge "Fix appname"
* commit '29370f41502f8c4b278314c43a0659201f9a4121':
2013-05-15 10:49:15 -07:00
Tadashi G. Takaoka
e971601657 am 217fe877: am eeb0459e: am a446f8f7: am fd06763b: am 7bc7bd79: am 59b23bcf: am 680d689d: am c61393c8: am 56642281: am d7bcc52d: am f510d154: am bb0c999b: am dbb90d08: am bd7b4fcc: am ee91bde1: Clean up InflateException reference from KeyboardBuilder
* commit '217fe8773b7cf473c900aec016500d7b3509e828':
2013-05-15 10:49:13 -07:00
The Android Open Source Project
461a0480c4 am be7561c2: am 41b61150: am adef73a7: am eb2fee1d: am 7db5bfa0: am 20995333: (-s ours) am 5d674b16: 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)
* commit 'be7561c240071d559a0189b471d47f09948af358':
2013-05-15 10:49:07 -07:00
Alan Viverette
74f9974337 am 77deeefe: am 3694cc82: am e4f98a02: am 79ef0a17: am 4b45830a: am 7c9b7f24: am e592be58: 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
* commit '77deeefe8e39c054585490c6ef499fa8e458aebd':
2013-05-15 10:49:05 -07:00
Jean Chalard
97b579d5c5 am efd85328: (-s ours) am c825c557: am b2af86cf: (-s ours) am c5424013: am 186cf922: am 288deb7a: (-s ours) 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 strin
* commit 'efd853284bee2f8d15df578862c2a2df4d61fb31':
2013-05-15 10:49:02 -07:00
Jean Chalard
66833def37 am dd0e671a: am 30439651: am a4156a8e: am 5a59a986: am 2cef4323: am db3713a1: am 9f9050d1: am 2cb50a05: am 93465ea3: am a747d762: am 6e78878f: am 844e5014: Merge "Increase string limits"
* commit 'dd0e671af3d3675b2e8e7f2fa70c533c35fc7710':
2013-05-15 10:49:00 -07:00
Baligh Uddin
7916a5d27d am 6da2f050: (-s ours) am 79971a1f: am 8a0205e2: (-s ours) am 2d607977: am e04cee4f: am 49201626: (-s ours) 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 '6da2f050df7895f1e78575087c455595546f53a1':
2013-05-15 10:48:59 -07:00
Baligh Uddin
7a68cf1e2f am 6686f6ee: (-s ours) am ea151032: am 4d085cfa: (-s ours) am ffb269b1: am 3df28d14: am 14d778b2: (-s ours) am 3847aa30: am 781195f4: am 119eaf7a: (-s ours) am c1283003: am 6e0e8dd6: am 8ca085db: (-s ours) Import translations. DO NOT MERGE
* commit '6686f6eeb0e757a6cf016d80675f6bc0148762b8':
2013-05-15 10:48:57 -07:00
Baligh Uddin
39177323d0 am 4c2b9e46: (-s ours) am e0789c73: am 9ef4b7dd: (-s ours) am bc1bc4d0: am 719e5729: am e71516b2: (-s ours) am 5244d637: am 41db26ed: am 68889f1c: (-s ours) am 0b227bb9: am 57b68207: Import translations. DO NOT MERGE
* commit '4c2b9e46d769b829a74f02484697d3bede2f15f4':
2013-05-15 10:48:56 -07:00
Satoshi Kataoka
8af0cc2e01 am 9da909d1: am dcfff5c0: am 4109952b: am 7a4430ac: am 5db28826: am b3796ab2: am 82a67bc8: am e3c0cca4: am e8a3e964: am 395e500b: am bb9a8e08: am f463b45d: Merge "Fix Possible NPE"
* commit '9da909d187cfc505bef7cea80215fd3b8ce2df86':
2013-05-15 10:48:54 -07:00
Satoshi Kataoka
795895e157 am f368fdb6: am 3d82dbca: am d3022faf: am 01eb9b25: am 71f828b1: am 9ff33b6d: am d430c1b6: am d6f56350: am 619d1f73: am 0c99a379: am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE"
* commit 'f368fdb6d55b0155a4df00a5b625f186ccf23ca0':
2013-05-15 10:48:52 -07:00
Kurt Partridge
4d4cb0195b am c68eb70a: am 023bee60: 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 'c68eb70ae2fe54e495c70c7e8603025e5a690b43':
2013-05-15 10:48:51 -07:00
The Android Open Source Project
258784dabb am 37f22676: (-s ours) am b241b243: 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 '37f22676b0017df1c54ed26987acbb26a9ac6648':
2013-05-15 10:48:49 -07:00
The Android Open Source Project
10f50a1b97 am 3f031112: (-s ours) am 3675b5bb: 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 '3f0311128af8af7fc4c8f77b979146385b78d25a':
2013-05-15 10:48:48 -07:00
Baligh Uddin
08f53d3c57 am d28727d9: (-s ours) am 480ebe79: 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 'd28727d92b006010471ba5b3a87cf6bb71f42168':
2013-05-15 10:48:46 -07:00
Baligh Uddin
7c692a8375 am d31b88ab: (-s ours) am 7c9a29d5: 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 'd31b88ab1771f2ab3163560758d8fecfa141d402':
2013-05-15 10:48:45 -07:00
Baligh Uddin
01f2d0d309 am 097dee9d: (-s ours) am dd3aa373: am 9f2573e4: (-s ours) am ea0d7ecd: am 82c49d74: am c1f3a801: (-s ours) am 8acb56b6: am 128ab7e5: Import translations. DO NOT MERGE
* commit '097dee9d422b08d02c75bbe623f17b8e53c13d12':
2013-05-15 10:48:43 -07:00