Commit graph

13771 commits

Author SHA1 Message Date
Kurt Partridge
c9b193c1b4 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 'fdf1a05a57d70be081161bdacaced29866f2ce1b':
2013-05-15 10:39:20 -07:00
Jean Chalard
2d03ab456f 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 'c633b61ee00b0298f6f0cc1445317891d5760b89':
2013-05-15 10:39:13 -07:00
Tadashi G. Takaoka
254cb1ffcc 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 'd13a605cd91f15dc126d57401ebae967ac1ddeb5':
2013-05-15 10:39:09 -07:00
Satoshi Kataoka
e406c31654 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 '85cb23c4627987129f7a40db6b1b08fa9a4ade8b':
2013-05-15 10:39:07 -07:00
Jean Chalard
114e9c5621 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 '0eb45d7f370a8fe07dc7c407c5977e7501b1b0cc':
2013-05-15 10:39:05 -07:00
Jean Chalard
00f46f031b 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 '174ddfd47934cd6497c0bcf9dc65c3fb41744a06':
2013-05-15 10:39:03 -07:00
Satoshi Kataoka
94eeba653c 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 '78ed62326a8326dac53aa40df1f7b6353f4f9f63':
2013-05-15 10:39:01 -07:00
The Android Open Source Project
6e804061bc 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 '7c4dff90a216190762e6e1a05b884b737533ad94':
2013-05-15 10:38:59 -07:00
Satoshi Kataoka
a7885e529d 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 '3d12edabf5059345b57e60c4de66e8de0dbddaaf':
2013-05-15 10:38:58 -07:00
Jean Chalard
840a0695d4 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 '55afe17c3c5510a0354f7e5e0480247a940bec7a':
2013-05-15 10:38:56 -07:00
Tadashi G. Takaoka
2bc1809de5 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 'e878a2770c7286eafe01ada3a90092514ac5ecdb':
2013-05-15 10:38:54 -07:00
Jean Chalard
60368456ec 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 '720ce530470d5b139389b0806d95e42cfa7cf5ac':
2013-05-15 10:38:52 -07:00
Jean Chalard
6e2e946d37 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 'a1187bd071d9a45e35efa97a8452b96f41457ea6':
2013-05-15 10:38:50 -07:00
Baligh Uddin
61076e10a7 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 '04ef41417b9062d73a45670a7102619dcbe733d9':
2013-05-15 10:38:47 -07:00
Baligh Uddin
4fd9ca75d5 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 NOT MERGE
* commit '26e105b609ca0d06d364febd84e32730057f7bcc':
2013-05-15 10:38:45 -07:00
The Android Automerger
f4ed91f54d 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 '8435a9b8ac5a1272d844ebc5bd445f76212fd0fd':
2013-05-15 10:38:43 -07:00
Tadashi G. Takaoka
35c4a83411 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 '52a89e5adf201cd559b02ce1708065ecaafcf41c':
2013-05-15 10:38:41 -07:00
Tadashi G. Takaoka
593432e167 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 'e5561f52418d4d26e3b0bad0552b48062e7d9010':
2013-05-15 10:38:38 -07:00
Satoshi Kataoka
4b2cd41350 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 'ef6e62dd751b50c5c46fd5222600b99ab64a1ffc':
2013-05-15 10:38:36 -07:00
Tadashi G. Takaoka
1e02d2ccef 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 '398c686243107ce5eb56b2ecb94ddb14b753eb00':
2013-05-15 10:38:35 -07:00
Baligh Uddin
608d77a1d9 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) am fba54597:
* commit '352e94b016db3ecf3e9b6c16708ccb45f04e8ad9':
2013-05-15 10:38:33 -07:00
Baligh Uddin
32e5224a3c 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 translations. DO NO
* commit '33a9c2b26adb479ade42f25eb38f2750767df624':
2013-05-15 10:38:31 -07:00
Baligh Uddin
db9dbeee8e 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 '8f89ca1d2586d338888b55d99d607c6a7e7976f4':
2013-05-15 10:38:29 -07:00
Tadashi G. Takaoka
2a4ab01198 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 'b53d753dcf0c28a0d82a2377eedf88612240d423':
2013-05-15 10:38:27 -07:00
Baligh Uddin
a13080d655 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) am 21160c4e:
* commit 'aa52681bfc215c9d3829980fac5c07841217a4db':
2013-05-15 10:38:24 -07:00
Baligh Uddin
0b6762a1eb 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 translations
* commit '719f8865fd146b0a4b592a78d197ec80650db370':
2013-05-15 10:38:23 -07:00
Baligh Uddin
768c3c659a 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 translations. D
* commit 'dff9a64655f8eedd6ee8ac5dc8e94e0856c2d7bf':
2013-05-15 10:38:21 -07:00
Alan Viverette
28a831de82 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 'c795a288b375af72709b0d07d74338c5502c6c7c':
2013-05-15 10:38:19 -07:00
Satoshi Kataoka
04708a3216 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 'd1935d05483e71610146eedb54074406178ea916':
2013-05-15 10:38:17 -07:00
Tadashi G. Takaoka
bfb1855908 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 '37232a10d27fe87fac16271c3ce6e91df5d77e6a':
2013-05-15 10:38:15 -07:00
Tadashi G. Takaoka
9faf1961bf 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 'c1e417dd2b2ca0046f9c0202ab5d06445bbe6b90':
2013-05-15 10:38:13 -07:00
Satoshi Kataoka
eecbcea7a9 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 '4bb35fea2db5b34dd95f58c756a8dd6331ced17d':
2013-05-15 10:38:11 -07:00
Baligh Uddin
af1ca4138a 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 \'525bbec9eccbf5bd4581c2b9908e46f61c4431ad\' in
* commit 'daad9c687ed5857588bade9b71c8e2b74e1b605e':
2013-05-15 10:38:09 -07:00
Satoshi Kataoka
29370f4150 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 '204243c3e11d1c1933ee146a7bb511230ce226c9':
2013-05-15 10:38:07 -07:00
Tadashi G. Takaoka
217fe8773b 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 'eeb0459e68d6c9a8654d3fd76561814c4dbb2399':
2013-05-15 10:38:05 -07:00
The Android Open Source Project
be7561c240 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) Reconcile wit
* commit '41b61150d0a395bc466361099a841ab187b80859':
2013-05-15 10:38:03 -07:00
Alan Viverette
77deeefe8e 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 view.
* commit '3694cc826a239e9860a7e57adaf76b494f4df9bd':
2013-05-15 10:38:01 -07:00
Jean Chalard
efd853284b 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 string limits" int
* commit 'c825c55779455e17ca85e526b9c5ed8ad95dd60b':
2013-05-15 10:37:59 -07:00
Jean Chalard
dd0e671af3 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 '30439651658d0c676f650b38ae92ea8553712f21':
2013-05-15 10:37:57 -07:00
Baligh Uddin
6da2f050df 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 '79971a1f25f258a1fa5f0e8dd89dc7a73e74a4b7':
2013-05-15 10:37:55 -07:00
Baligh Uddin
6686f6eeb0 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 'ea1510321df75995233477469f5021e8cd09d359':
2013-05-15 10:37:52 -07:00
Baligh Uddin
4c2b9e46d7 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 'e0789c736becc6be61c3edcb995bcb19240ff248':
2013-05-15 10:37:49 -07:00
Satoshi Kataoka
9da909d187 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 'dcfff5c0d28345891f3324f29d0edaa92c03fb2d':
2013-05-15 10:37:46 -07:00
Satoshi Kataoka
f368fdb6d5 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 '3d82dbcaaef28d3ac201d8c5d312110aa4898280':
2013-05-15 10:37:44 -07:00
Kurt Partridge
c68eb70ae2 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 '023bee608b5695715394f1ff2f433612f16efc85':
2013-05-15 10:37:42 -07:00
The Android Open Source Project
37f22676b0 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 'b241b243c893810461dd6da004e323dcea386d38':
2013-05-15 10:37:40 -07:00
The Android Open Source Project
3f0311128a 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 '3675b5bb967ec9683f5fc7cdbb61a9e87c3cd3c8':
2013-05-15 10:37:38 -07:00
Baligh Uddin
d28727d92b 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 '480ebe7969ac6d9c19d1c6489128ddc7a93802b6':
2013-05-15 10:37:36 -07:00
Baligh Uddin
d31b88ab17 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 '7c9a29d578fe2651620733fe9036485c2c292430':
2013-05-15 10:37:34 -07:00
Baligh Uddin
097dee9d42 am dd3aa373: am 9f2573e4: (-s ours) am ea0d7ecd: am 82c49d74: am c1f3a801: (-s ours) am 8acb56b6: am 128ab7e5: Import translations. DO NOT MERGE
* commit 'dd3aa3732131a17defff7b27220bd11b294d283b':
2013-05-15 10:37:32 -07:00