Commit graph

20649 commits

Author SHA1 Message Date
Jean Chalard
4afd8ff474 am 0874939e: am a8b838b4: Merge "Fix a test and crash with a better error message when reading"
* commit '0874939e1086baceba9c1f94ca98a7a5837e7813':
  Fix a test and crash with a better error message when reading
2013-10-09 17:54:40 -07:00
Satoshi Kataoka
3cc9602c57 am 319eb1c3: am 77144a64: Merge "Retain Emoji Keyboard after rotation"
* commit '319eb1c363a0d443cace14ee41c575a67ecfc93a':
  Retain Emoji Keyboard after rotation
2013-10-09 17:54:37 -07:00
Keisuke Kuroyanagi
193fea55d9 am 358e152b: am e95262a8: (-s ours) am 847fdcf7: (-s ours) am 2f14418c: am e628cd3c: (-s ours) Use reentrant lock for main dictionaries. DO NOT MERGE
* commit '358e152b1081f0e74693651e9b5137bd6c2dbad6':
2013-10-09 17:54:35 -07:00
Yuichiro Hanada
1a33d3eb6e am a1ff53fb: am 4b540703: am 2913ce41: am a0c9846f: am ceb364c0: Fix PrioritizedSerialExecutor.
* commit 'a1ff53fb5b6f08d15c619a90241dc1064a381443':
2013-10-09 17:54:32 -07:00
Keisuke Kuroyanagi
a0efc4d1e1 am ab5affde: am b924b2bb: (-s ours) am 83d1648b: (-s ours) am cecb793f: am ef63947f: (-s ours) Add boundary checking for PtNode Array reading. DO NOT MERGE
* commit 'ab5affded4bf2dc328aa438a556029c488af2f10':
2013-10-09 17:54:28 -07:00
Keisuke Kuroyanagi
c53202b441 am 3c623101: am 5e375d42: (-s ours) am 1e113c13: (-s ours) am e628cd3c: Use reentrant lock for main dictionaries. DO NOT MERGE
* commit '3c6231011743b4323a4530dd3f07f914e08dda04':
2013-10-09 17:54:26 -07:00
Yuichiro Hanada
89b44b43f4 am a317bf58: am 6bbaf2f8: am 1ef00b28: am ceb364c0: Fix PrioritizedSerialExecutor.
* commit 'a317bf58e1da3d42b395a739a4c4549747229c1e':
2013-10-09 17:54:21 -07:00
Keisuke Kuroyanagi
806a622b23 am 30ca32de: am 6ed55278: (-s ours) am 3b3cb4fe: (-s ours) am ef63947f: Add boundary checking for PtNode Array reading. DO NOT MERGE
* commit '30ca32defc7f4b4fc124d9d39bfffaf298d09a81':
2013-10-09 17:54:18 -07:00
Keisuke Kuroyanagi
99ea6cbb58 am 9de5ec25: am 49410adb: (-s ours) am dd8ea0a3: (-s ours) am 10fa6a2e: Stop reading dictionary while regenerating. (DO NOT MERGE)
* commit '9de5ec255f2fe9ccad8558e3d090f41a05660a54':
2013-10-09 17:54:15 -07:00
Keisuke Kuroyanagi
750fc3cb22 am eff90276: am 9b9d17f9: (-s ours) am e628cd3c: (-s ours) Use reentrant lock for main dictionaries. DO NOT MERGE
* commit 'eff90276f13fabe46bc59828e4db83fea85413a9':
2013-10-09 17:54:11 -07:00
Yuichiro Hanada
183718f276 am d2265036: am f9ba073d: am ceb364c0: Fix PrioritizedSerialExecutor.
* commit 'd22650363c0eca3f232beaa6df4d164002bae3d4':
2013-10-09 17:54:08 -07:00
Keisuke Kuroyanagi
2e082f46aa am e0547020: am a6095365: (-s ours) am ef63947f: (-s ours) Add boundary checking for PtNode Array reading. DO NOT MERGE
* commit 'e0547020f13c3cde2bfca5665e8b289729c15de0':
2013-10-09 17:54:04 -07:00
Satoshi Kataoka
2e7f74f00c am 615509cf: am 9d763910: Merge "Unfortunately, hide some broken "emoji"s"
* commit '615509cf27839e946280787cf27d8c091079b91b':
  Unfortunately, hide some broken "emoji"s
2013-10-09 17:54:01 -07:00
Jean Chalard
e398d09a50 am af75e48e: am 74577bed: Merge "Implement the heuristic for auto-commit."
* commit 'af75e48efdc5be7d0b1c3d411017757454ed1799':
  Implement the heuristic for auto-commit.
2013-10-09 17:53:58 -07:00
Jean Chalard
1f8eab7d79 am a6e7c3ff: am ff9476f1: Merge "Fix typos"
* commit 'a6e7c3ff29c2b9eaf406f96dd3ee44cafa293452':
  Fix typos
2013-10-09 17:53:55 -07:00
Jean Chalard
805bae9575 am 6f2830dc: am 2afa0e62: Merge "Fix a bug where gesture would delay update."
* commit '6f2830dcb91fd2d00088c7522c91a45e90a1f3e6':
  Fix a bug where gesture would delay update.
2013-10-09 17:53:52 -07:00
Ken Wakasa
3dd8185656 am a9f5c55c: am 382094a7: Merge "Cleanup and remove redundant more keys on phones"
* commit 'a9f5c55ca2f075ed6923e0040fa66c07a5a37176':
  Cleanup and remove redundant more keys on phones
2013-10-09 17:53:49 -07:00
Ken Wakasa
272a8b79d8 am 88c946af: am 194c6360: Merge "Swap keys: exclamation, question, period, comma."
* commit '88c946af0c8a8e07092be71a7b98957d021e499b':
  Swap keys: exclamation, question, period, comma.
2013-10-09 17:53:47 -07:00
Keisuke Kuroyanagi
d5ff552c9e am a231c2ab: am e89a179b: Merge "Separate "GC" and "GC with decay"."
* commit 'a231c2ab72e92a3f849c347bc46d3f8599547510':
  Separate "GC" and "GC with decay".
2013-10-09 17:53:44 -07:00
Ken Wakasa
b04568b460 am 1522e7be: am cc81a93b: Merge "Add skipPtNode to DictDecoders."
* commit '1522e7be20ac53c3870d493e3a9fb7946edbbea4':
  Add skipPtNode to DictDecoders.
2013-10-09 17:53:41 -07:00
Satoshi Kataoka
acdd67bb42 am 98da7cfc: am c2dda795: Tentatively revert inconsistent assets
* commit '98da7cfc0b9afc75db240d10c20f3360fe693320':
  Tentatively revert inconsistent assets
2013-10-09 17:53:39 -07:00
Satoshi Kataoka
8498002afb am db083a2b: am a4913994: Hide indication bar if only one page
* commit 'db083a2b25d057f21a22333251ea0a78668e6326':
  Hide indication bar if only one page
2013-10-09 17:53:37 -07:00
Keisuke Kuroyanagi
07fe099765 am d00e4865: am 126d758c: Merge "Quit blocking getSuggestion during GC."
* commit 'd00e48656b02ff49fc834ed6762dc194d00b42ad':
  Quit blocking getSuggestion during GC.
2013-10-09 17:53:34 -07:00
Jean Chalard
645d992786 am bff2d14d: am 74730a46: Merge "Create the wiring for auto-commit confidence computation."
* commit 'bff2d14d1caf4d70f8c1fdcbbf8e9b41209a3e94':
  Create the wiring for auto-commit confidence computation.
2013-10-09 17:53:32 -07:00
Ed Heyl
d8d2a9fca7 am 02092936: merge in KQS81M
* commit '02092936b982f8ca64ccb1a02d7aefd44e0e4a94':
  Import translations. DO NOT MERGE
2013-10-08 15:47:52 -07:00
Ed Heyl
02092936b9 merge in KQS81M 2013-10-08 15:43:27 -07:00
Baligh Uddin
0de11871c5 am b2ffcd64: (-s ours) Import translations. DO NOT MERGE
* commit 'b2ffcd6424eaed951302889079773f6a51c9d380':
  Import translations. DO NOT MERGE
2013-10-06 18:11:59 -07:00
Baligh Uddin
b2ffcd6424 Import translations. DO NOT MERGE
Change-Id: I6f88694633aa9f39c6b1731ea7634b80d3e3bf69
Auto-generated-cl: translation import
2013-10-04 22:55:10 -07:00
Qiwen Zhao
551a1c246f reset to klp-dev branch to fix merging problem. 2013-10-04 11:04:56 -07:00
Satoshi Kataoka
d03f17936b am f4aa9a7b: Do not merge. Revert emoji key position to JB-mr2
* commit 'f4aa9a7bd71b646cee8dd7dd19af27bc56238d1e':
  Do not merge. Revert emoji key position to JB-mr2
2013-10-04 00:47:41 -07:00
Satoshi Kataoka
f4aa9a7bd7 Do not merge. Revert emoji key position to JB-mr2
Cherry pick of Ie2033b2f5253b2e2

Bug: 10954182
Change-Id: I9cc61e27a207055d5a43fe3da6fd1ec63bae49fd
2013-10-04 16:38:54 +09:00
Tadashi G. Takaoka
6f6ceacf44 am e27e0d70: am 9ab61646: am 0a12d887: am ed2c19d1: am 1da82714: am 2c159dfe: am ff1cf587: am 3dd3287f: am 67356b76: am bf22c2fa: am 577dc189: am 1a42236a: am 4b6756db: Merge "Remove unnecessary harmful finish() from SettingsActivity"
* commit 'e27e0d707c4c30d7bac0d10d333fadea6a5e64ea':
2013-10-03 16:42:01 -07:00
Jean Chalard
5439ef325b am b962b352: am 87d1cfef: am 8073a68a: am 39b72ee0: am 3ec1e9c6: am 7217e1c4: am 372354a9: am bcbbf8bd: am 4cae47f2: am 85315351: am 18c362d7: am 5f6492c5: am 673ebb4e: Merge "Update dictionaries"
* commit 'b962b35281f81b8675732353e510585f12f26649':
2013-10-03 16:41:58 -07:00
Tadashi G. Takaoka
8d02ed09be am ae1fb800: am 27c14af5: am 06296c65: am 0c5eeb75: am e50c246e: am eb58bdb5: am 6e617f91: am 1f3764ed: am 85a3525f: am 511f0149: am 9797dd2e: am 2fd4a00b: am 1ec4c07a: Merge "Ignore modifier key while sliding key input"
* commit 'ae1fb800c9aa3d59b94cda31034cb870a576ecd1':
2013-10-03 16:41:54 -07:00
Tadashi G. Takaoka
a2e6af452a am ef034c99: am 4b5619d2: am 9f3ef7bb: am e5a12463: am 8cf00f3c: am de25dae1: am e8b83088: am a48f5079: am 61c5c6b2: am 7067e8e3: am 333bb7db: am eabb710b: am f224941c: Merge "Suppress calling onPressKey and onReleaseKey while detecting gesture"
* commit 'ef034c9915420e2ead430f0fb710669558408862':
2013-10-03 16:41:51 -07:00
Tadashi G. Takaoka
6fe2339116 am 1ac7957b: am 968af281: am 359c0475: am 57f7d3cc: am 18aea75a: am 7a67b401: am b9f335f8: am 9628d204: am d2cc5570: am 2b1e1c60: am ed497d24: am 089f1ce9: am bfb07ed7: Merge "Add preference dependency to gesture input related options"
* commit '1ac7957b6b04a4cc0df03c1d20c3202e7e095486':
2013-10-03 16:41:37 -07:00
Jean Chalard
5d222593c3 am bdbd3dea: am 2b08fd2c: am fb627ae0: am 687a3bfa: am 052750ee: am 57fe5281: am 8f49a814: am 1b116879: am 3a1396aa: am e1f7c7dd: am d244574b: am fd959fd1: am 1903b41f: Merge "Clean up tests and increase speed"
* commit 'bdbd3dea83cdfa260c2527e6d9c40e12a377261d':
2013-10-03 16:41:34 -07:00
Tadashi G. Takaoka
2fc37f850c am 89a155f3: am 1fec7d6a: am 340bb7ca: am bcaf86b0: am 137f6c56: am 4e9aa771: am b52166a4: am f630dcc0: am 9e67e3b8: am df848bcc: am b8540f8e: am 18414333: am e2af9b7e: Merge "Reset vertical correction when more suggestions are in modal mode"
* commit '89a155f30e1d2f393a11cb80b61d42eda4e39628':
2013-10-03 16:41:29 -07:00
Jean Chalard
de9442e6b0 am e0301c75: am c3c1e552: am e8953fde: am 8cfb11b4: am 90e41da5: am eebfe359: am 9df8f3a1: am d0eee16e: am 77f92f70: am 3ea03315: am 9b7fefea: am 6223d823: am c2653d0b: Fix a typo
* commit 'e0301c75f455aa577b42d17ba78dc0587bb9875e':
2013-10-03 16:41:26 -07:00
Jean Chalard
a01eafb883 am d66e57c5: am 58b53dd3: am 2c312038: am 0d9aad3d: am e0f0ed22: am 1ed7d94f: am f0e59729: am 5717f5b4: am 0af32078: am 2dc1f0bf: am ba5e450e: am 69ffa8b0: am 03d1dff3: Merge "Fix Binary dict tests"
* commit 'd66e57c57f85a33762d2bf1307e5cb557279e049':
2013-10-03 16:41:23 -07:00
Satoshi Kataoka
a94ac3817e am 03eb22ed: am 36341d7d: am 18d5cd27: am 524ff4b2: am 4f80a117: am 224a1db9: am 3fb9c290: am f3cdb27d: am 7cb491a8: am 87a3830a: am e157fa50: am 6246b7c3: am a94bb198: fix assertion
* commit '03eb22ed899974e7579c43563dcf37a56edea161':
2013-10-03 16:41:18 -07:00
Tadashi G. Takaoka
843706cc0b am 6a5339c0: am 6815f105: am 674630f9: am 73b66655: am 8a703835: am 93e96ad3: am 137591e0: am a7e6a2b0: am 2a279011: am 8af80b3f: am b0d3d86c: am be1232b3: am b12c2af3: Tighten unit test condition of MoreKeysKeyboardBuilder
* commit '6a5339c00890d49224118691fa7d6b96660dc818':
2013-10-03 16:41:14 -07:00
Baligh Uddin
8c718189ab am 78108f78: am c8351c24: am 038aac1c: am 8527cc56: (-s ours) am b541f4a9: (-s ours) am e22f8da1: (-s ours) am 39b1a7dc: (-s ours) am d0b80ed4: (-s ours) am 9fa8fbc8: am 670d8852: (-s ours) am 4793943e: am a270f90a: am dc64866c: (-s ours) am 0dbc8c35: am f2ab0adc: Imp
* commit '78108f78cbba33c66049ed0bd8ac8183461aa44f':
2013-10-03 16:41:04 -07:00
Baligh Uddin
cb92fc2a98 am 6fae85d2: am b5a35b6f: am ea696e85: (-s ours) am 3107d241: (-s ours) am b3cb14f7: (-s ours) am 2bac6309: (-s ours) am 96abd37b: (-s ours) am 15047a85: (-s ours) am ce4d1cd5: am c2e36a8f: (-s ours) am 97aa9c40: am a5506b53: am bfedad23: (-s ours) Merge "Import trans
* commit '6fae85d2a7b10c0bb2b5dd06f7d38b58fd16b54d':
2013-10-03 16:40:58 -07:00
Baligh Uddin
392c2860db am 0010e81c: am 055d0ae7: (-s ours) am c1658257: (-s ours) am b6beb973: (-s ours) am 9f016b5d: (-s ours) am 5b34a371: (-s ours) am f166bdaf: (-s ours) am af0d283b: (-s ours) am 4e12347e: am 931e2530: (-s ours) am 37ac3b3a: am a559e767: (-s ours) Merge "Import translat
* commit '0010e81ce596287fd2a8a09d2b7ba54c8a0eee9b':
2013-10-03 16:40:55 -07:00
Tom Ouyang
4fb29c25fc am dc78da6c: am 1dae8195: am 8ca4d50f: am 69892512: am 09688051: am 829b4db7: am 6e361e44: am bc62c67b: am 0638a632: am 3386a6d7: Merge "Remove duplicate new-word bigram cost (part 1)"
* commit 'dc78da6c2aa07a171c267e38a3d320e4a1edf0e7':
2013-10-03 16:40:44 -07:00
Kurt Partridge
0981b577f2 am 8b38866c: am 5696cc3d: am a8f05288: am 5130ebb9: am 7281fb14: am 5c2eb205: am e7386e15: am f61ff3af: am 13b32ee1: am 368427e2: am de51abf1: am bfe5c07f: am ededdc6a: Merge "Avoid NPE"
* commit '8b38866c16971725a384b5ed98c0dac8dd32de9e':
2013-10-03 16:40:40 -07:00
Jean Chalard
195e77a58a am 5c9b731e: am c7cb5124: am ec9b2ea3: am 1771df34: am b86d0a25: am 96f8f9c2: am 548ff78b: am 6d908ce9: am e4e1964f: am d902228e: am f080123d: am 8895e5fb: am 128961ad: Fix failing tests
* commit '5c9b731e7ab4d8587b1871ba64ad56713cbe0713':
2013-10-03 16:40:37 -07:00
Jean Chalard
2092247a77 am 5c26685c: am a3824a7c: am af9c9351: am 2f26d174: am 94c91022: am 8b715de6: am c2b51cf8: am c1aec8ee: am fd4c38c8: am 5e225afa: am 38011d29: am 41e59b62: am 2cd1136b: Merge "Remove the dialog to insert words to the dictionary."
* commit '5c26685c1fa7c04c608eff95ead8f91a80990947':
2013-10-03 16:40:34 -07:00
Jean Chalard
def1591f1d am 464148a8: am 3af4a660: am e232ec46: am 1f75c94c: am 46aa843c: am 09f4b598: am 3076b0cd: am 433396e1: am 4d45fbe0: am 5e783427: am 7b81296f: am cb633e37: am 91bcf5eb: Merge "Restart suggestions when the cursor moves."
* commit '464148a88a7f99161a871e8059b589e1b84d7625':
2013-10-03 16:40:30 -07:00