Commit graph

12614 commits

Author SHA1 Message Date
Jean Chalard
1bd8f332a9 am 6531bcdc: am ecb59eff: (-s ours) Revert "[DO NOT MERGE] Activate hardware keyboard handling"
* commit '6531bcdc82958463a94482acc37d0f23578bb662':
  Revert "[DO NOT MERGE] Activate hardware keyboard handling"
2013-04-03 19:33:02 -07:00
Jean Chalard
6b29ef4624 am 558f41d4: am c741f1f8: (-s ours) [DO NOT MERGE] Activate hardware keyboard handling
* commit '558f41d4020a6714146dfd6f9508742c29ce9edd':
  [DO NOT MERGE] Activate hardware keyboard handling
2013-04-03 19:33:01 -07:00
Kurt Partridge
3547bd2932 am 228d4533: am 5779bc91: Merge "Split LogUnits differently."
* commit '228d45337bdf3bd2bcd0170ddf73ab05b4f7e53f':
  Split LogUnits differently.
2013-04-03 19:33:00 -07:00
Baligh Uddin
2741e56d56 am 0491706a: am 02fc1ed5: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '0491706a533cde9b3f7e8e9fe3e81e0ac4ed4799':
  Import translations. DO NOT MERGE
2013-04-03 19:32:59 -07:00
Baligh Uddin
536e722033 am 9bf7e74d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit '9bf7e74dc4b29978a92d96de5b404c20677a249c':
  Import translations. DO NOT MERGE
2013-04-03 19:32:59 -07:00
Kurt Partridge
ae0c5f7965 am 3ec6a8bd: am 6c522b53: am 0c0ab2b4: Merge "Reorder ResearchLogger call"
* commit '3ec6a8bdf92b1b60be0dc0a44c84b79b13ba8671':
2013-04-03 19:31:37 -07:00
Jean Chalard
08a5e43d61 am 19fe4d4b: am bfd7dcd5: am 0745fe83: am b8869ec1: am 0fcc4960: Deactivate hardware keyboard handling.
* commit '19fe4d4b6b6a39d1c66d696b63aa272cb707187e':
2013-04-03 19:31:36 -07:00
Tadashi G. Takaoka
06c1baba54 am b1533116: am b08506c2: am 9413e957: Merge "Interpolate gesture preview trails"
* commit 'b1533116f5c88a452cbf4d0573955f2d7e7ed060':
2013-04-03 19:31:35 -07:00
Satoshi Kataoka
bb229fe173 am 91d468f5: am ac870326: am 54c091d2: Merge "Move policy and session to AOSP"
* commit '91d468f5a09df4c651fb9eeed597e634b5607983':
2013-04-03 19:31:34 -07:00
Jean Chalard
cffac3218f am 873c20ba: am e40d5633: am 43341ba0: Merge "Ask the client to make itself known when it\'s not"
* commit '873c20ba06f8d1067be8cde3b698e0ece9cfd98f':
2013-04-03 19:31:32 -07:00
Jean Chalard
c821c723b8 am 3b9d7fd1: am 151e4e18: am 065f126f: Merge "Fix two nasty bugs with surrogate pairs."
* commit '3b9d7fd1792da09c1d436eceb49ee4ea6bc47f07':
2013-04-03 19:31:31 -07:00
Satoshi Kataoka
6f7494e615 am fdf3c49c: am bde25a4a: am 38c26dd0: Move dicnode to AOSP
* commit 'fdf3c49c8bd4d4b444d018e5ec8a94a5e1d3ba32':
2013-04-03 19:31:30 -07:00
The Android Open Source Project
228fcdae71 am 70616b63: am 08f5b780: am c1dec87a: (-s ours) am b35915fb: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '70616b635a411f7ad3ba8ade350406d30b5145bb':
2013-04-03 19:31:29 -07:00
Satoshi Kataoka
b980adabe2 am a9ef902c: am 70747ad6: am 97a3ce02: Merge "Refactor"
* commit 'a9ef902cd8105169cca5bbdf8fb1e3abab7a2eab':
2013-04-03 19:31:28 -07:00
Jean Chalard
3effa52016 am 4c535232: am a38d907b: am 740da0d8: Fix an NPE
* commit '4c535232bccca17eca3b45480d94d5e68108497f':
2013-04-03 19:31:27 -07:00
Tadashi G. Takaoka
57a7a5c33e am 76c00dec: am 7580e994: am 48d8d8d0: Fix potential NPE in MainKeyboardView.KeyTimerHandler
* commit '76c00decc9232f069fef4d6fea89183bfa8974b9':
2013-04-03 19:31:26 -07:00
Jean Chalard
ae97a93ab3 am 86b8b7b4: am 9bf1dfeb: am 2188cbae: Merge "Fix an NPE"
* commit '86b8b7b407c8b8d642388c5026931d41eff66aa6':
2013-04-03 19:31:25 -07:00
Jean Chalard
5b2485901b am 1c63efc9: am a657afc3: am d555a0d7: Merge "Cleanup"
* commit '1c63efc9759190e29b9c7120e6b2a66162c5410d':
2013-04-03 19:31:23 -07:00
Baligh Uddin
a3ed3254a7 am 05b7988a: am 53698f8d: am fd0e40ef: am 78b07d8b: am 0cd02c2b: keep history after reset to jb-ub-latinimegoogle-azuki
* commit '05b7988a74333ecdcd88090efa224190aeabecd9':
2013-04-03 19:31:22 -07:00
Baligh Uddin
c66608308d am 68a0afc3: am 0c777365: am fbb6500d: (-s ours) am 5bcbc21a: (-s ours) am c08b8245: (-s ours) Import translations. DO NOT MERGE
* commit '68a0afc3b99cf8281cf09f3697ff3368ac0d4cf7':
2013-04-03 19:31:20 -07:00
The Android Automerger
228e26f7c7 am ea46fdcb: am 65dfe94d: am 1237c872: am a02de1f7: am 5c3d51e2: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
* commit 'ea46fdcb7b086a3a9c0ce05dec3d041df943784b':
2013-04-03 19:31:19 -07:00
Tadashi G. Takaoka
62b07bf948 am 561a04f3: am 1911c513: am abd22393: am 8b120b98: am 50cc14b5: am ef86bbce: Add const_cast to live with host\'s jni.h
* commit '561a04f3140ef701c6477d890d8a841c97cb19bf':
2013-04-03 19:31:18 -07:00
Tadashi G. Takaoka
fc0fc52122 am e01d1960: am c17e0bba: am 830a8cbb: am 33fa6a0b: am cc75c950: am 73d00e68: Merge "Use XmlPullParser.getEventType()"
* commit 'e01d1960a2793c083eded84182ba402cf272bdf9':
2013-04-03 19:31:17 -07:00
Satoshi Kataoka
8138c8d21f am f4f4d6c9: am b3438173: am d3c823c1: am dd8ca1f8: am bc586fb1: am 0b327101: Merge "Fix possible NPE"
* commit 'f4f4d6c939a42c110f1acb32f43134cdc31127c1':
2013-04-03 19:31:16 -07:00
Tadashi G. Takaoka
60083e3e90 am 49d59d4a: am a469cdfe: am d0495a35: am 56b1bd86: am f892f775: am d17b69ec: Clean up XmlParserUtils
* commit '49d59d4a9a792cfd606da9fbd8c5d635010e6277':
2013-04-03 19:31:14 -07:00
Baligh Uddin
51c7dbea68 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 '4379dbea4a0eba2dd2c69fb26a77899e74848dae':
2013-04-03 19:31:13 -07:00
Baligh Uddin
d72347f919 am 67f7bb2e: am 284d4285: am f0346d70: (-s ours) am fc135df5: (-s ours) am 24daa2a1: am 6616188e: (-s ours) Import translations. DO NOT MERGE
* commit '67f7bb2e58d206dd4de048c6d32fd072c7dffa67':
2013-04-03 19:31:12 -07:00
Baligh Uddin
210d473d53 am a62edb47: am 3d082f1b: am 14ef11a8: (-s ours) am 93c5c7a4: (-s ours) am 2898aac8: Import translations. DO NOT MERGE
* commit 'a62edb475dd75724939085271e6bebad0173b259':
2013-04-03 19:31:11 -07:00
Tadashi G. Takaoka
1047bf17a7 am 32d89afa: am e2ccd61b: am 2b04e787: am 71fb8af7: am ec183b50: am fb658d6c: Fix possible ArrayIndexOutOfBoundsException
* commit '32d89afaf6554e6b50cf6ee9468483d20f08be0e':
2013-04-03 19:31:09 -07:00
Baligh Uddin
0ad31c8dc8 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 'a5bc58acccbe881f1fc07151a774b24ece88dd4f':
2013-04-03 19:31:08 -07:00
Baligh Uddin
273a21ca53 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 '772dfa51deaa3632015196b9f95513f8ef6d33c9':
2013-04-03 19:31:07 -07:00
Baligh Uddin
2f8e381be0 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 '92adcda67601cba0f9b634db5f8bb1ab82c3520b':
2013-04-03 19:31:05 -07:00
Alan Viverette
80a2e25162 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 '14f65cffc5cef6ed9ba6e30fc505794a44f5dd13':
2013-04-03 19:28:27 -07:00
Satoshi Kataoka
745725e144 am 103b1118: am 33c91be3: am 40be0244: am 54b85827: am 189c1b0e: am 97ddbf22: am 19a70087: Merge "Fix appname"
* commit '103b111866f3f9bc06b444f4ad67825db22a83f1':
2013-04-03 19:28:25 -07:00
Tadashi G. Takaoka
5f81bb8cd8 am 3ef47fd3: am e0aa9383: am a7353dda: am 5a4700a0: am 0992fd24: am 1e3c73de: am 3a8a63c3: Remove unused import
* commit '3ef47fd3dee01aafc715555285ce2c61aa64f5c3':
2013-04-03 19:28:24 -07:00
Tadashi G. Takaoka
02a59e551a am 1f722ca9: am 4e627c21: am 56796cd7: am 4841df87: am bb679a22: am 3d0fee4e: am c6452f25: Merge "Remove reference to string.english_ime_name"
* commit '1f722ca9be13b889572dcabd62eac19d9ff7b59a':
2013-04-03 19:28:22 -07:00
Satoshi Kataoka
793763268e am f555b255: am 5d33d2c2: am 9b969b26: am 13498620: am 4bb504ce: am 45728330: am f4352c2c: Merge "Use correct appname resource"
* commit 'f555b25503c4628c90f19ae3bd8684aaede3b335':
2013-04-03 19:28:21 -07:00
Baligh Uddin
307d2aa218 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 '8e48a61891f274aa791469b0ae92ae5eb2a430c7':
2013-04-03 19:28:20 -07:00
Satoshi Kataoka
9f419592ff am c3c1b4db: am 5d9459df: am 67d1bdd4: am ac2d54b5: am 0cc63149: am c1c3e03c: am 140b6705: Merge "Fix appname"
* commit 'c3c1b4db786a379345209ac0046ec1b5cab55d0c':
2013-04-03 19:28:18 -07:00
Tadashi G. Takaoka
c61393c8ef am 56642281: am d7bcc52d: am f510d154: am bb0c999b: am dbb90d08: am bd7b4fcc: am ee91bde1: Clean up InflateException reference from KeyboardBuilder
* commit '56642281573a89d96f13f1861ffbd7461f870079':
2013-04-03 19:28:17 -07:00
The Android Open Source Project
5517262476 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 'b2c2ce310cdb3218b5198f4135a8dfac0d9c14cb':
2013-04-03 19:28:15 -07:00
Alan Viverette
046a311a13 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 'd19c71d98432f57b2c84d5741b8f2f27cb1b1f28':
2013-04-03 19:28:14 -07:00
Jean Chalard
dee08de2c5 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 '724ff2980d429e62557df73d588be2d678175716':
2013-04-03 19:28:13 -07:00
Jean Chalard
2cb50a05cd am 93465ea3: am a747d762: am 6e78878f: am 844e5014: Merge "Increase string limits"
* commit '93465ea3bbf1a24df861f0fd599e02df1775dfb7':
2013-04-03 19:28:12 -07:00
Baligh Uddin
e7edb56174 am 1368eeee: (-s ours) am 108ee452: am f980ec6c: am fc801fe8: (-s ours) am c57cf2b7: (-s ours) am 841e6016: Import translations. DO NOT MERGE
* commit '1368eeee15a7d1378139baec9e085b25fe32039c':
2013-04-03 19:28:10 -07:00
Baligh Uddin
781195f438 am 119eaf7a: (-s ours) am c1283003: am 6e0e8dd6: am 8ca085db: (-s ours) Import translations. DO NOT MERGE
* commit '119eaf7a2742504fbaac65665e5c3a64fcfe5339':
2013-04-03 19:28:09 -07:00
Baligh Uddin
41db26ed18 am 68889f1c: (-s ours) am 0b227bb9: am 57b68207: Import translations. DO NOT MERGE
* commit '68889f1c3485b2eb2404e34f2da9df350700363e':
2013-04-03 19:28:08 -07:00
Satoshi Kataoka
e3c0cca463 am e8a3e964: am 395e500b: am bb9a8e08: am f463b45d: Merge "Fix Possible NPE"
* commit 'e8a3e96447e367714d0ea8c91907573e0694c168':
2013-04-03 19:28:07 -07:00
Satoshi Kataoka
d6f56350fc am 619d1f73: am 0c99a379: am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE"
* commit '619d1f73d4eda2c235fe45ac9fa1441719545f3e':
2013-04-03 19:28:05 -07:00
Kurt Partridge
3012c891ba am 867b2380: am 35e02ccd: am bf62dc03: am ef103e1f: Merge "Close ResearchLogger upon onFinishInputView"
* commit '867b2380b97e379c34db3e76a7eaf0521ebbe12c':
2013-04-03 19:28:04 -07:00