21213 Commits

Author SHA1 Message Date
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
e497a1e326 am 268d298a: am 4bd7d179: am 4ffc9322: am 2097f0d4: am 4dd37bb7: am 4565c8b2: am db92fe62: am 3c93fdc8: am 9bb189f6: am 7d19ab5c: Using int instead of booleans to save keyboard shift state
* commit '268d298af082ca10499cd52faa7ec587019db297':
2013-10-03 16:52:10 -07:00
Tadashi G. Takaoka
edb14be9f6 am 72cdf3ea: am a390047b: am fef4c342: am 41466ebc: am aac0783f: am 13afe2ca: am 503ab45a: am 62dd1ee3: am 3c1a18c6: am 7f8dd50b: Save automatic shift state while orientation changing
* commit '72cdf3ea64e23eafaee85106756ad9bc76592da3':
2013-10-03 16:51:57 -07:00
Baligh Uddin
3497dd4241 am 9e98458a: am 158b3c2c: am 31b3a24f: (-s ours) am 6fa88d6e: (-s ours) am d1864bac: (-s ours) am deeaf9ae: (-s ours) am da33179c: (-s ours) am 0a0b9fe2: (-s ours) am 276ed0d6: (-s ours) am 9e0ffd35: (-s ours) am f9a4732e: (-s ours) am f7e4057f: Merge "Import translat
* commit '9e98458a0f2478ebf737d4d2ac35e5b5c34ead66':
2013-10-03 16:51:52 -07:00
Baligh Uddin
fbcaa181b4 am a0ba17eb: (-s ours) am d7903e25: (-s ours) am 0c64b713: (-s ours) am 6459733a: (-s ours) am 3d7c4cc1: (-s ours) am bdf7113c: (-s ours) am c7f37218: (-s ours) am bc6fd1a6: (-s ours) am 11d4d240: am 39b3bf8d: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit 'a0ba17eb101a5ecab8b72c5968ad666d0bd84cd1':
2013-10-03 16:51:50 -07:00
Baligh Uddin
abe3f2ffb3 am d72b5944: (-s ours) am 1110bd5d: (-s ours) am 5ee45793: (-s ours) am cf904030: (-s ours) am 5a8c2fac: (-s ours) am 62bf6fa5: (-s ours) am 0ffe46a1: (-s ours) am a8fb8b4b: (-s ours) am e351e10a: Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit 'd72b5944368fceb58792c0da54466e7348aa00df':
2013-10-03 16:51:46 -07:00
Baligh Uddin
a047d6c7d6 am e1fd5de3: (-s ours) am 4fe1f32a: (-s ours) am 95be27fd: (-s ours) am 70a09b36: (-s ours) am 5aab3bb3: (-s ours) am d72c805d: (-s ours) am a2942457: (-s ours) am 168d43d7: (-s ours) am dde8e9e3: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit 'e1fd5de3450d85139f207dbfbf68e213c69f01cf':
2013-10-03 16:51:44 -07:00
Tadashi G. Takaoka
5d0647e311 am efd0cfb8: am 7e9672cf: am 25cbda13: am d19e8451: am 801a8876: am 59b93354: am 2a06798e: am 6600b06c: am cd196fd5: am 307f49b8: Mark some unit tests as @MediumTest
* commit 'efd0cfb87004996f04f1e81c8455069dfa4edf62':
2013-10-03 16:51:39 -07:00
Satoshi Kataoka
25646cd308 am 290be747: (-s ours) am ee96815b: (-s ours) am c7f05e44: am acfbfcbe: (-s ours) am c6d49148: (-s ours) am 8fad5d83: (-s ours) am 6f9617ab: (-s ours) am 77c6d2bb: (-s ours) am 25a713d6: am 11b9f680: (-s ours) am e5daf660: (-s ours) am 6845427e: DO NOT MERGE: Return possible su
* commit '290be747f12fd0c9a5d16d024792bde25129b92f':
2013-10-03 16:51:35 -07:00
Jean Chalard
12fead2215 am 51ed7879: am 6b62c6e9: am 94018741: am b4d9d140: am 6bee71b3: am d0981b0f: am 771b60ba: am e229cd97: am d8e55277: am 83757d43: Merge "Pass blockOffensiveWords as a parameter"
* commit '51ed787966dc86574b4fe6112befbacf934ce173':
2013-10-03 16:51:32 -07:00
Ken Wakasa
36e5a5cedc am c31ce3a5: am 122e4514: am 18c95594: am 1fd7d6b9: am 5b04d8b5: am 43d34fb8: am af1196dd: am f415cc6b: am 56550ee5: am 1490b534: Cleanup -- follow up to Ief04a4abb6dc1f79660a2e419c9c5e271802b5a1
* commit 'c31ce3a5744a4ce9e6f943c943dc2268a7f86f02':
2013-10-03 16:51:28 -07:00
Satoshi Kataoka
ef59fb914a am e5f448bb: am 7438e6bc: am ef95a3d0: am 17c8d766: am ee180b02: am f00f84a7: am 679bff89: am 8781e3b6: am 483fc6f1: am c43417fb: Fix build
* commit 'e5f448bb05ce25c6312ab75f63b2e069dff145d3':
2013-10-03 16:51:22 -07:00
Jean Chalard
e8707d373c am 556601dc: am 143e6f2d: am dd199e6b: am 6adf817f: am fb238e46: am 0c179788: am 1b62da75: am 6b93b185: am 3eee5cd2: am 53b37dc0: Merge "Fix a layout problem for pre-MR2"
* commit '556601dc9ed620d4bbb61940ce23bb9a28f041cc':
2013-10-03 16:51:18 -07:00
Baligh Uddin
d990ab52f5 am aa13c1f0: am 909cbd1f: am e3923e65: am 28685e72: am 7ed4f366: am 6dcfbae4: am 4827a249: am c363302e: Merge commit \'3ac40c6a\' into jb-mr2-dev-plus-aosp
* commit 'aa13c1f0d5397204676bc819cdaec70d6706b284':
2013-10-03 16:51:15 -07:00
Tadashi G. Takaoka
fd46ed1dd5 am e11061e4: am 747372d5: am d89d9136: am ce5aedf7: am 18ece47e: am fe4cdd12: am 8923d767: am 1e08d3d2: am 6191026c: am 0caf3f6a: Merge "Introduce MoreSuggestionsListener class"
* commit 'e11061e432b0982e27769dfc960d8e4c85be1bb1':
2013-10-03 16:51:10 -07:00
Satoshi Kataoka
b87f034d28 am 5568ca2a: am c4c5d046: am 802d8334: am 50704547: am 4e90125e: am 07806b03: am 1749dba1: am d53fb22a: am fcfa2cb2: am 6314b845: Merge "Add permissions for personalization"
* commit '5568ca2ab21493757ad500464fee60988ee194a0':
2013-10-03 16:51:06 -07:00
Tadashi G. Takaoka
d64d8afb42 am 953a0bfd: am f2b2b69c: am cda685f6: am 7ffb4225: am 1b6271fc: am 95fed887: am 35952d7b: am 2f6851d9: am f405dc87: am 17a35383: Merge "Override View.drawableStateChanged to detect state_pressed"
* commit '953a0bfdcc418acee318ea1b341fd8e5429f4393':
2013-10-03 16:51:03 -07:00
Satoshi Kataoka
b75b70db05 am 62833cdf: am 175c3083: am ee7c9e88: am 0788e947: am 6ffd1e66: am 143e628c: am 7f63d12e: am 6cf492e4: am 941b288c: am df2eae6e: Fix exact match profanity
* commit '62833cdf8cab6663e42df58bf2a5a9133371e1b0':
2013-10-03 16:51:00 -07:00
Tadashi G. Takaoka
f2ea52e204 am 546d1339: am b16017d5: am 8b2a17e9: am 54b1c86d: am 3688ddd2: am 7a0c82b2: am f6cd82d7: am 03fe0cf4: am 3b892164: am 7b2114a4: Display still image when device can\'t play welcome video
* commit '546d13391d41400883b4374d2e87d7a5f8c6c6c6':
2013-10-03 16:50:57 -07:00
Jean Chalard
d5dca48ba9 am 3f717593: am 56f10d19: am b04d0337: am aac20e4b: am 31ddb205: am bfdb0fb1: am 457b6ae8: am a10c80fe: am 4aa48aed: am 019c3806: am ace3f3c5: am 25c90e6d: Merge "Don\'t do recorrection when suggestions are off." into jb-mr2-dev
* commit '3f717593749d9ec2aff375a7e479ecf92847c56e':
2013-10-03 16:50:54 -07:00
Baligh Uddin
aa4f95a555 am 5c518d61: am c8e34872: (-s ours) am f0136e37: (-s ours) am 5b1fe393: (-s ours) am 5ca69fe4: (-s ours) am 5d9f4081: (-s ours) am 00078f79: (-s ours) am 50925559: (-s ours) am d2ea99b7: am c9f49b88: (-s ours) am b4251873: (-s ours) am e5ae0bd3: Import translations. D
* commit '5c518d614bb0f091deaf3b5622375827a0b6d936':
2013-10-03 16:50:51 -07:00
Baligh Uddin
abf5ceac13 am caaf5673: (-s ours) am bfb9af84: (-s ours) am bb0a3ccb: (-s ours) am d33c8baf: (-s ours) am 949b2a42: (-s ours) am 7bde4523: (-s ours) am 39afe052: (-s ours) am 6242fca8: (-s ours) am 8daffca0: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit 'caaf56738f899f1a37357b7d79ca95c75bf2ee30':
2013-10-03 16:50:48 -07:00
Ken Wakasa
1771219827 am b6c34066: am 3acf77cc: am b084305f: am 0c4f934a: am bd326eda: am 8aed26b4: am 4c526225: am 45fe5c34: am 761b5586: am a0b62ece: Merge "Cleanup an unused return value"
* commit 'b6c340661b0e5b59a231107414a79db12fc4501b':
2013-10-03 16:50:44 -07:00
Tadashi G. Takaoka
67b3be7c3a am d1b73078: am 89e30b73: am edf8a28f: am fb7a2163: am 16a3fb0e: am 53d9ed64: am cfb0c03c: am 24fc5ab6: am f4a03ddc: am 1187ef9a: Merge "Catch error while playing welcome video"
* commit 'd1b73078c0e1d159bac0ba830f1748a45843c4bc':
2013-10-03 16:50:41 -07:00
Jean Chalard
fd948aa559 am 0872993f: am eca9d848: am cedc9003: am d3cbd2e4: am 15cb1a36: am 40736750: am 8e32cc2a: am 9db1f6d9: am d618419d: am 37bbaea8: Merge "[PB14] Cosmetic fixes to the progress bar"
* commit '0872993f80b4db4768fa49fd1d59bc50ac8e21e5':
2013-10-03 16:50:38 -07:00
Satoshi Kataoka
e83a3414c8 am fe7bfd66: am 4bc7b25e: am e3ab2081: am b1f3e3ac: am 6a2f0d10: am 91a1b953: am dc7cff7c: am fa47814c: am f4d7c99c: am 71c1e50f: Merge "Fix the title of the fragment of the personal dictionary"
* commit 'fe7bfd66fb5cea4748b5a5d6f4a1b4858dfc8c4a':
2013-10-03 16:50:34 -07:00
Jean Chalard
b68c30a06e am 7c6bfef1: am 75de987d: am 3461c14c: am 78c33f29: am 6ad83dbe: am c816430a: am 3b765c2b: am bc81ac83: am 69e1e45c: am 01170ffe: [PB13] Actually update the progress bar
* commit '7c6bfef13599cd190a77e7c064351e350f83b57d':
2013-10-03 16:50:31 -07:00
Tadashi G. Takaoka
cee6c924c8 am d7daab08: am e71f8e64: am 9118e605: am e6de3f89: am 0bb5b488: am f10231c4: am 0512fd40: am 58434ae6: am 3bcc7545: am 965329c1: Fix missing string reference of spellchecker.xml
* commit 'd7daab082a1e83d2f467226c17c9381e02eebdcc':
2013-10-03 16:50:27 -07:00
Jean Chalard
eeab52c832 am 20b2c385: am 80fb373c: am 61fb3429: am 90d7024f: am 7ee8e171: am 868a805d: am f022a0d8: am 861d7cea: am 27c91662: am 5f2efe0f: Merge "[PB12] Implement the progress bar update lifecycle"
* commit '20b2c38528c09948fc99f72fe1aa7bbcc0cf35ec':
2013-10-03 16:50:24 -07:00