Commit graph

12745 commits

Author SHA1 Message Date
Jean Chalard
445d1115a0 am 7aa9277f: am f6de7890: am 3090e8c8: am b154f10c: am 310f0dbc: am c840ec9e: am 7cd0ffdd: am 248dcdf0: Merge "Fix a test."
* commit '7aa9277fd1d1919c5107f4c2856024a5a0da7c48':
2013-04-17 19:40:28 -07:00
Satoshi Kataoka
f9d5d10166 am 75b099f4: am 23408ee6: am e8f7d669: am 9414d75d: am db377ca6: am 64dd4754: am 63742fe5: am d2a04e1e: Merge "Move typing policy to AOSP"
* commit '75b099f46d674f92328a39df3208728f9c391e09':
2013-04-17 19:40:26 -07:00
Jean Chalard
ce2a5f93ae 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 '44590a161fd15dcd8879c8f9eada15eee2234b50':
2013-04-17 19:40:25 -07:00
Jean Chalard
01a862fba3 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 'fd59acceff4deec5000dde5af431486e487d8a7c':
2013-04-17 19:40:24 -07:00
Kurt Partridge
0f8c86c8ea am a3837fd1: am 4c74aaa0: am 5d337ad6: am 0c552106: am 6c9097fa: am 3547bd29: am 228d4533: am 5779bc91: Merge "Split LogUnits differently."
* commit 'a3837fd1a0a01d34a7e6ef73e51c79d91e143c7a':
2013-04-17 19:40:22 -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
Baligh Uddin
08f0697bc3 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 '6a7f4639759864689a155fcc567a5b21b6993cb2':
2013-04-17 19:40:19 -07:00
Baligh Uddin
fbc9145961 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 '6ff63273e748484684ecae9c757615b68c8c6f49':
2013-04-17 19:40:18 -07:00
Kurt Partridge
3a63e4e3b8 am 3fcaa3e8: am 1dc4a24f: am 538974d0: am 72c2b423: am ae0c5f79: am 3ec6a8bd: am 6c522b53: am 0c0ab2b4: Merge "Reorder ResearchLogger call"
* commit '3fcaa3e8b4920dca0560e122a8a309087d02b26c':
2013-04-17 19:40:16 -07:00
Jean Chalard
56e931de80 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 'feb16b6d4f37156d7a42589c210a2c6759349935':
2013-04-17 19:40:15 -07:00
Tadashi G. Takaoka
85fca857af am 300d3bde: am ab99e613: am 8a984e8c: am 2b3f1289: am 06c1baba: am b1533116: am b08506c2: am 9413e957: Merge "Interpolate gesture preview trails"
* commit '300d3bdee5ab6c3804e0c47ba0665a2d2140c56f':
2013-04-17 19:40:14 -07:00
Satoshi Kataoka
eeb386390a am 65690000: am 7d0d728c: am bc36fbfc: am cb4ae59c: am bb229fe1: am 91d468f5: am ac870326: am 54c091d2: Merge "Move policy and session to AOSP"
* commit '656900003c92a370e3ac2e32b84631c1906d7d31':
2013-04-17 19:40:12 -07:00
Jean Chalard
e29ffdb6c6 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 'c14fdded82fb293bd6d5a7b5487e4c6b0c8625dd':
2013-04-17 19:40:11 -07:00
Jean Chalard
267e61790a 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 'c26022cf59801de74e19fda38a7aff76f3039ad4':
2013-04-17 19:40:10 -07:00
Satoshi Kataoka
371369d9f1 am d196cb64: am 8c485086: am 51805727: am 8348fe8a: am 6f7494e6: am fdf3c49c: am bde25a4a: am 38c26dd0: Move dicnode to AOSP
* commit 'd196cb6400c074c7c03416b62c2428986c3a74e2':
2013-04-17 19:40:09 -07:00
The Android Open Source Project
e2cc803c46 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 'a0b2dc74fa521cf584536b72e390f2aadb48d42b':
2013-04-17 19:40:07 -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
Tadashi G. Takaoka
c0d71c3b49 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 '3a2e78f9b5b585b85a12283ed89bcec3376fdc32':
2013-04-17 19:39:35 -07:00
Tadashi G. Takaoka
18be37b079 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 '96d539237f22dd9d29a41bbdefd16978a148b442':
2013-04-17 19:39:33 -07:00
Satoshi Kataoka
9e78d2ba2c 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 '54f46879de606cb913888ddc419742c7a61d2108':
2013-04-17 19:39:32 -07:00
Baligh Uddin
15a357a30d 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\' into jb-mr2-dev
* commit '2060aa13e5f946950f788c383e5655c36167d062':
2013-04-17 19:39:30 -07:00
Satoshi Kataoka
e83747891d 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 '9e45f9e85807591b6484b4d96d5c6607d67bd755':
2013-04-17 19:39:28 -07:00
Tadashi G. Takaoka
fd06763b6a 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 '7bc7bd79974bfccb437abc6cd4bab85d1aeb931b':
2013-04-17 19:39:27 -07:00
The Android Open Source Project
eb2fee1da6 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 with jb-mr2-release - do not merge
* commit '7db5bfa0faf93f63dfc7e77c343799d07d886031':
2013-04-17 19:39:25 -07:00
Alan Viverette
79ef0a1708 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 '4b45830a210b2eb61ebb3207234c9d848cb5b38b':
2013-04-17 19:39:24 -07:00
Jean Chalard
c5424013cf 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" into jb-mr2-dev
* commit '186cf922f0176078d49c8855256bc6b10be0a383':
2013-04-17 19:39:22 -07:00
Jean Chalard
5a59a9868a am 2cef4323: am db3713a1: am 9f9050d1: am 2cb50a05: am 93465ea3: am a747d762: am 6e78878f: am 844e5014: Merge "Increase string limits"
* commit '2cef432317c17c9382cd6f90812affb6283c8827':
2013-04-17 19:39:21 -07:00
Baligh Uddin
2d607977f4 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 'e04cee4fe60626f2f0942c3e8892159629f3a845':
2013-04-17 19:39:19 -07:00
Baligh Uddin
ffb269b130 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 '3df28d1495fdd3eaa90ac5a41624e112b5bd8a1a':
2013-04-17 19:39:18 -07:00
Baligh Uddin
bc1bc4d0cd am 719e5729: am e71516b2: (-s ours) am 5244d637: am 41db26ed: am 68889f1c: (-s ours) am 0b227bb9: am 57b68207: Import translations. DO NOT MERGE
* commit '719e57293d00cbe407c8953b40b2a17fe26e6a3a':
2013-04-17 19:39:16 -07:00