Commit graph

12556 commits

Author SHA1 Message Date
Tadashi G. Takaoka
96d539237f 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 '104923e4716aef2bef6db14dceb8063cb1af2438':
2013-04-10 19:45:56 -07:00
Satoshi Kataoka
54f46879de 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 '1af04dc698e2352eb3fedd13369fd88e50936e2f':
2013-04-10 19:45:54 -07:00
Baligh Uddin
2060aa13e5 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 '97046d19844bc22414c510a1dac384eee27d924c':
2013-04-10 19:45:52 -07:00
Satoshi Kataoka
9e45f9e858 am 24cf39e7: am 894a8ffc: am 9f419592: am c3c1b4db: am 5d9459df: am 67d1bdd4: am ac2d54b5: am 0cc63149: am c1c3e03c: am 140b6705: Merge "Fix appname"
* commit '24cf39e787858900988ca9697d6212cd62ef85a1':
2013-04-10 19:45:51 -07:00
Tadashi G. Takaoka
7bc7bd7997 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 '59b23bcfae2993a394045f12f17f5a4cbebc9f8c':
2013-04-10 19:45:49 -07:00
The Android Open Source Project
7db5bfa0fa 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 '20995333067181fe68f5d325ca067d142d35a08e':
2013-04-10 19:45:47 -07:00
Alan Viverette
4b45830a21 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 '7c9b7f249e48bbe130afdbceb9a501c704e6c74b':
2013-04-10 19:45:46 -07:00
Jean Chalard
186cf922f0 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 '288deb7ab980dc37892b451206b653cbc24b2814':
2013-04-10 19:45:44 -07:00
Jean Chalard
2cef432317 am db3713a1: am 9f9050d1: am 2cb50a05: am 93465ea3: am a747d762: am 6e78878f: am 844e5014: Merge "Increase string limits"
* commit 'db3713a1b9e9b144ddb728bab0a1d4babd7b924a':
2013-04-10 19:45:43 -07:00
Baligh Uddin
e04cee4fe6 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 '492016265c8d4eeff78656d57fa8b8cf5a43709e':
2013-04-10 19:45:41 -07:00
Baligh Uddin
3df28d1495 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 '14d778b27c79cc027ccc451514db9e2bd6ef9ab7':
2013-04-10 19:45:40 -07:00
Baligh Uddin
719e57293d am e71516b2: (-s ours) am 5244d637: am 41db26ed: am 68889f1c: (-s ours) am 0b227bb9: am 57b68207: Import translations. DO NOT MERGE
* commit 'e71516b290fb137d6b926df23fcc383866bdf069':
2013-04-10 19:45:38 -07:00
Satoshi Kataoka
5db288268b am b3796ab2: am 82a67bc8: am e3c0cca4: am e8a3e964: am 395e500b: am bb9a8e08: am f463b45d: Merge "Fix Possible NPE"
* commit 'b3796ab2a7c66e8bcd6911bb1dc0fa8982f16d0a':
2013-04-10 19:45:37 -07:00
Satoshi Kataoka
71f828b12a am 9ff33b6d: am d430c1b6: am d6f56350: am 619d1f73: am 0c99a379: am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE"
* commit '9ff33b6dfa6641a5fe064624e07182db042df92f':
2013-04-10 19:45:35 -07:00
Kurt Partridge
a6092dc8a5 am 504bbe38: am 798820ab: am 3012c891: am 867b2380: am 35e02ccd: am bf62dc03: am ef103e1f: Merge "Close ResearchLogger upon onFinishInputView"
* commit '504bbe38f7ca172a88a10c83064d8dda81e5d1dd':
2013-04-10 19:45:34 -07:00
The Android Open Source Project
19289df5e4 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 'e279de0265b985d2980d1cf7973e9b81f068b933':
2013-04-10 19:45:32 -07:00
The Android Open Source Project
d9f9ba395f am 4b176a01: (-s ours) am 83346295: am 2c7b1b82: am d2582473: (-s ours) am 22953740: Reconcile with jb-mr2-release - do not merge
* commit '4b176a0104adb5f76809b847463cd665d5b75933':
2013-04-10 19:45:31 -07:00
Baligh Uddin
536ec3bf58 am b4fbb295: (-s ours) am d3ae58ef: am 3bc22c56: am e7d91194: (-s ours) am 370070ae: am 4cdb7ccb: Import translations. DO NOT MERGE
* commit 'b4fbb295511efd42d164454386f1b756df9854f5':
2013-04-10 19:45:29 -07:00
Baligh Uddin
f420e3bf9a am 792abb73: (-s ours) am 3c163ec1: am ac68b5ce: am 4b8494c4: (-s ours) Import translations. DO NOT MERGE
* commit '792abb730b813fda85500092d24634b7ab7008e3':
2013-04-10 19:45:27 -07:00
Baligh Uddin
82c49d746d am c1f3a801: (-s ours) am 8acb56b6: am 128ab7e5: Import translations. DO NOT MERGE
* commit 'c1f3a8012cb5b7a879c7485a5eac846571ad3c5e':
2013-04-10 19:45:25 -07:00
Satoshi Kataoka
62f52e4fce am a514e958: am a2b129e9: am 0b0d9827: am 95fe8267: Move suggest logic to AOSP
* commit 'a514e9580115c059bd509f7a0b58a0086c60ac91':
2013-04-10 19:45:23 -07:00
Jean-Baptiste Queru
626dd2a0ab am 784eda74: (-s ours) am d9f35e32: am a21bec13: am 30667266: (-s ours) am 5bcb3876: Merge 2caa1d81ce - do not merge
* commit '784eda74afcc48876972bb00cf504d4049b00f16':
2013-04-10 19:45:22 -07:00
Baligh Uddin
269f141bed am cfdc91b9: am 58df3cfa: Import translations. DO NOT MERGE
* commit 'cfdc91b99abbb985a7e9207020b95b1df807d567':
  Import translations. DO NOT MERGE
2013-04-10 19:41:45 -07:00
Tadashi G. Takaoka
ac018da68c am 9620943c: am d9a22235: Hide Setup Wizard icon for stock keyboard
* commit '9620943cc80e8f709e1cd53af7bf77a0e717d3db':
  Hide Setup Wizard icon for stock keyboard
2013-04-10 19:41:44 -07:00
Jean Chalard
defd295068 am 1aaaa64d: am 75618c33: am 19dcd154: Merge "Offer to add any OOV typed word to the dictionary."
* commit '1aaaa64da8d818dd7a91c024eb4fa2d9e1459f93':
2013-04-10 19:41:43 -07:00
Satoshi Kataoka
d355283f56 am fd89cd20: am daef4e8f: am f31553bc: Merge "Fix touch coordinate calibration"
* commit 'fd89cd20c956ce9618353dcd5d7648a2bab3b7ab':
2013-04-10 19:41:41 -07:00
Jean Chalard
e040aa197e am 0d72a230: am 04bb419c: am ddafcf82: Merge "Fix bugs and add tests"
* commit '0d72a23054341a8e216a33c0191cace1edc0cff9':
2013-04-10 19:41:40 -07:00
Kurt Partridge
e2bdf6861a am bea42fc5: am 5bd24642: am 1f70a4d6: Merge "Allow logging while replaying"
* commit 'bea42fc5bd1e4053e7cf7a3a51021d771d939f97':
2013-04-10 19:41:39 -07:00
Kurt Partridge
1944521bed am 41a049a4: am ae144fe9: am d117c1a1: Merge "Do not record log split time when handling separator"
* commit '41a049a410a921abdb896450abe3c6010a71d9e6':
2013-04-10 19:41:38 -07:00
The Android Open Source Project
c89354b9af am fb899d85: am 3019a5e1: am a8d29082: (-s ours) am d5c8247f: Reconcile with jb-mr2-release - do not merge
* commit 'fb899d85ee3497dbb9443fbbee0241aaf94f2e52':
2013-04-10 19:41:37 -07:00
Ken Wakasa
d01118aeba am 4c896a2f: am f71b9640: am d17c8bd9: Update comments
* commit '4c896a2fe81748990786288eff28b00233423da9':
2013-04-10 19:41:35 -07:00
Ken Wakasa
3f55a951e9 am b3cf23de: am a271f165: am 31f42ba0: Tiny clean up in Makefile
* commit 'b3cf23de7f30eb4c9c8c757d8b02a12fdad026aa':
2013-04-10 19:41:34 -07:00
Ken Wakasa
e4d60a2db0 am ff730a66: am bc2fd24f: am b68e7344: Cleanup the include paths
* commit 'ff730a665cc90aec1c795c8555e8563ff1bfbc37':
2013-04-10 19:41:33 -07:00
Satoshi Kataoka
c7d4f50233 am c7e1caac: am cd0984a4: am e320789a: Suppress bigram native log
* commit 'c7e1caac44238d53f635ee1660cb767d122b7416':
2013-04-10 19:41:32 -07:00
Satoshi Kataoka
23b62c9387 am 40d8b652: am dfb680c4: am f5e18e99: Merge "Cleanup suggest interface"
* commit '40d8b652b2fce9246ad34b7f78719b83348136a7':
2013-04-10 19:41:30 -07:00
Ken Wakasa
1c9da7af48 am 34cff46a: am ed8fd94e: am 370461ef: Clean up a few option strings under the Advanced settings
* commit '34cff46a9ca4fc8bdd1d074b94597859bde08a4a':
2013-04-10 19:41:29 -07:00
Jean Chalard
8178241912 am 024d0e4a: am f10e7cbe: am e9f69e16: Merge "Move a generic string utility to StringUtils"
* commit '024d0e4abf9d3bfacfb5495fa27a512c266df114':
2013-04-10 19:41:28 -07:00
Tom Ouyang
3c15067b0e am 8ab65b8b: am 4096fd08: am 08fd3d95: Merge "Add DigraphUtils class"
* commit '8ab65b8b4eb5815398db8abb0a0dfc02f613445e':
2013-04-10 19:41:26 -07:00
Ben Cheng
7629394953 am f82a5a24: am 96cb244d: am 65534ffc: am d0c383e1: am 5a4949c2: Merge "Force inlining Correction::isSingleQuote" into jb-mr2-dev
* commit 'f82a5a24ccc6d9e8a77f49ebb1a58f64d174c59f':
2013-04-10 19:41:25 -07:00
Satoshi Kataoka
b3d7d07e58 am e90df243: am 481412bb: am f3633e9b: Merge "Add flag to turn on new suggest implementation for typing"
* commit 'e90df24386ca22689abccaacf70a087912c00343':
2013-04-10 19:41:24 -07:00
Baligh Uddin
1270880eaa am da90ffe0: am 898ec2bf: am 5a5db35d: am 04915a76: am c33a0ab3: keep history after reset to jb-ub-latinimegoogle-azuki
* commit 'da90ffe048850df35a1a8d159d6b50eb2c14bda6':
2013-04-10 19:41:23 -07:00
Baligh Uddin
83c5ec6b3b am 005df808: am 12db86a6: am c48fe5d1: (-s ours) am 51a47422: am a631cede: Import translations. DO NOT MERGE
* commit '005df80888657650ce6c39ecc4c61cb8974f6234':
2013-04-10 19:41:22 -07:00
The Android Automerger
ed19c0053f am ddb50fff: am d4b63931: am df35f7dd: am 02dc06a8: am 21484175: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
* commit 'ddb50ffff8227750a160dd26de4ae63a56f4ed1a':
2013-04-10 19:41:21 -07:00
Jean Chalard
4d21e347df am edf26bee: am d1491741: am 1e1d61d2: am d2a0c614: am b4e2a3bb: am 868805ae: Merge "Change which backdoor the tests goes through"
* commit 'edf26bee83603fdd6035f438c16096e4f00f820d':
2013-04-10 19:41:19 -07:00
Jean Chalard
f6de7890ca am 3090e8c8: am b154f10c: am 310f0dbc: am c840ec9e: am 7cd0ffdd: am 248dcdf0: Merge "Fix a test."
* commit '3090e8c861687d123ac8c5a4073b03f671597ec0':
2013-04-10 19:41:18 -07:00
Satoshi Kataoka
23408ee603 am e8f7d669: am 9414d75d: am db377ca6: am 64dd4754: am 63742fe5: am d2a04e1e: Merge "Move typing policy to AOSP"
* commit 'e8f7d669c53a5d8d5aa215b2a9e793ef2b5d88e6':
2013-04-10 19:41:16 -07:00
Jean Chalard
9d071843a4 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 'de19e1615400e8d55d84da185c38e91f22f27be0':
2013-04-10 19:41:15 -07:00
Jean Chalard
5a6b0787be am cb7983e4: am ab6ef3b1: am e1f90dce: (-s ours) am 6b29ef46: am 558f41d4: am c741f1f8: (-s ours) [DO NOT MERGE] Activate hardware keyboard handling
* commit 'cb7983e4e29dab246998a2d2d382dafaefa40570':
2013-04-10 19:41:14 -07:00
Kurt Partridge
4c74aaa09a am 5d337ad6: am 0c552106: am 6c9097fa: am 3547bd29: am 228d4533: am 5779bc91: Merge "Split LogUnits differently."
* commit '5d337ad68adf380df593e3f38c39f9b7851b0660':
2013-04-10 19:41:13 -07:00
Baligh Uddin
4a41a48fdb am 27fede0b: am 5db8119d: am 7022bd23: (-s ours) am 2741e56d: am 0491706a: am 02fc1ed5: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '27fede0b06d05dbc94585087c7f97453ac98593e':
2013-04-10 19:41:11 -07:00