The Android Automerger
|
687d15b8e4
|
am 51764e83: am b7922678: am 3815e4d2: am 965eac66: merge in jb-ub-latinimegoogle-bayo history after reset to jb-ub-latinimegoogle
* commit '51764e8347fcee99e4c23073e16252d01484239f':
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
|
2013-10-10 08:39:14 -07:00 |
|
Satoshi Kataoka
|
acc4a607ee
|
am ab581457: am 1a5e6a74: am 6deea22c: am 31e152e3: am de65b7c0: Merge "Fix the position of emoji palette"
* commit 'ab581457ae46e43bbfcc4927cd48b2fc1262c983':
|
2013-10-10 08:39:10 -07:00 |
|
Ken Wakasa
|
8149aa3c77
|
am 6b1fbd50: am 5e70e91e: am ef2add6f: am 1d24f19b: am c040d59d: Merge "Add more_keys_for_* declarations for the Swedish keyboard."
* commit '6b1fbd50e790893689f244a986a547d38bdc7a11':
|
2013-10-10 08:39:04 -07:00 |
|
Jean Chalard
|
56b6f4f269
|
am f68d6e42: am d0d728eb: am 71895285: am e9631bcd: am 0152ff53: Merge "Update dictionaries"
* commit 'f68d6e424ddbf788a170d34f05d9cb8804ff51a2':
|
2013-10-10 08:39:00 -07:00 |
|
Satoshi Kataoka
|
25c7690fab
|
am cffaaa56: am 2163a48d: am 302102ee: am db7513bb: am a701501c: Merge "Reduce memory of emoji palette"
* commit 'cffaaa56a4df0e70963c61e66bc4362b1a7050c1':
|
2013-10-10 08:38:48 -07:00 |
|
Jean Chalard
|
561b74acc3
|
am ca237747: am 5ff266e0: am 2b33fc74: am 17bec5cb: am 92190d9a: Merge "Show the keyboard earlier when rotating."
* commit 'ca237747fba58dd3b90517eaf1165995e102deef':
|
2013-10-10 08:38:44 -07:00 |
|
Satoshi Kataoka
|
f546a67b77
|
am 9b22a2f0: am 5908917c: am 2715465b: am 67aa1a93: am 2d3e1210: Fix memory leak in EmojiPaletteView
* commit '9b22a2f0e799733bda55f6905d689848385bce57':
|
2013-10-10 08:38:40 -07:00 |
|
Ken Wakasa
|
3aca6fd506
|
am 3d8b0cbb: am 86c6aff4: am 8d454af4: am 87f06033: am d900b90d: Merge "Prep for RAM footprint optimization for Emoji palettes"
* commit '3d8b0cbba90712e9993f08e30a118f4af21b3e6f':
|
2013-10-10 08:38:35 -07:00 |
|
Jean Chalard
|
974ab43787
|
am 4c2b785e: am 4f1424f9: am 156ea961: am 6d4cdadb: am a2422c0b: Merge "Show more messages when reading a compressed combined format file."
* commit '4c2b785ec3f235e48ae482a02dc070d33bdc796b':
|
2013-10-10 08:38:31 -07:00 |
|
Keisuke Kuroyanagi
|
f74de6bf67
|
am 66684a74: am 96f54480: am ba13ae79: am d168bd54: am 6d91e4ce: Fix offdevice test build.
* commit '66684a74dc0dd49e1deb855426e07987b12a8827':
|
2013-10-10 08:38:20 -07:00 |
|
Jean Chalard
|
26fbb9aee2
|
am a2ba8819: am 86e0e06c: am 9af39314: am 62001702: am 36c56cae: Merge "Make the sentence separator a resource."
* commit 'a2ba881991165190af55589a074a73b933c497f0':
|
2013-10-10 08:38:16 -07:00 |
|
Keisuke Kuroyanagi
|
a047e618d2
|
am e5aeb6a0: am 616eabae: am 394363c2: am 551cc99e: am 61aae2b4: Merge "Add Ime language switching test."
* commit 'e5aeb6a0253177618b64d54cbe34ab78a70cc73a':
|
2013-10-10 08:38:07 -07:00 |
|
Keisuke Kuroyanagi
|
5c08b16982
|
am a6012802: am 5b61f1d2: am 584e0fd6: am a798a16a: am 6d3d5395: Merge "Fix a bug: wrong parent position is written when moving."
* commit 'a6012802f1e556b058dfa86f233b9bbd213fd42b':
|
2013-10-10 08:37:58 -07:00 |
|
Keisuke Kuroyanagi
|
7428fa1fc6
|
am 80bea4a8: am 3c01d789: am 8ddac9ae: am bf4c72c4: am a81d37ee: Merge "Add a large test adding bigrams for decaying dictionary."
* commit '80bea4a849cf9de3b77f8101e4f837d21c101287':
|
2013-10-10 08:37:49 -07:00 |
|
Satoshi Kataoka
|
fbdaf65214
|
am f38651f9: am 16dfdf75: am 6d998b36: am da9408c8: am 984aa60e: Merge "Extend hitbox of emoji keys"
* commit 'f38651f9f880256c278ba1704d03b62df6d308eb':
|
2013-10-10 08:37:44 -07:00 |
|
Jean Chalard
|
59a28ff16b
|
am 35359a5c: am 83305e53: am a3efde54: am 6e979246: am 7712baa5: Merge "Fix a possible IOOB"
* commit '35359a5cced64048afef94e8d7c09ab686a66c7b':
|
2013-10-10 08:37:40 -07:00 |
|
Jean Chalard
|
5e131a1247
|
am b7cf8ae7: am cc3bdb59: am 322366d0: am 9493affc: am 3c4e8cb6: Call loadKeyboard later if it can\'t be called right away
* commit 'b7cf8ae7b04309033c2507b32b03e3ef607e1e1b':
|
2013-10-10 08:37:36 -07:00 |
|
Satoshi Kataoka
|
c80eac8c6c
|
am c7c94757: am d24cb579: am e167265f: am 4a0af2cb: am 291ef1c9: Merge "Clear the cache of subtypes in onStartInputViewInternal"
* commit 'c7c9475784eea69da9a51675e885c6aa6b96e4e2':
|
2013-10-10 08:37:32 -07:00 |
|
Jean Chalard
|
11f00f1ece
|
am 3f5dce62: am e1e95fd2: am ea3a2f28: am 0675d374: am 86f77114: Merge "Don\'t auto-correct to non-whitelist shortcuts"
* commit '3f5dce628080808422c519672d1c22ea08f9b188':
|
2013-10-10 08:37:28 -07:00 |
|
Jean Chalard
|
c69cebaaeb
|
am da00744a: am 05aaedd0: am e6b018aa: am d44b2490: am a6047aae: Merge "Set the shortcut frequency correctly."
* commit 'da00744a3d1b13b8d5c47641f4f81eeafe143c58':
|
2013-10-10 08:37:25 -07:00 |
|
Keisuke Kuroyanagi
|
086c36b88d
|
am 7c50d6d7: am 34f6b9e8: am 2b1e1696: am eafff65b: am be4d85fe: Merge "Fix bug and Add large test for decaying dictionary."
* commit '7c50d6d70c96264ecba8f5450003ce7c83ebee94':
|
2013-10-10 08:37:21 -07:00 |
|
Jean Chalard
|
d4d7fb0d5d
|
am 5a6810cd: am bf5889a3: am 11ab8f2e: am 93622c4f: am 69d10385: Merge "Update en_GB dictionary"
* commit '5a6810cd2ae694ea726a6b07e74b9f1796af36eb':
|
2013-10-10 08:36:52 -07:00 |
|
Jean Chalard
|
eea72cc1af
|
am b5c7461d: am fe8d76b1: am adc7bacf: am dff82299: am 7da62bbe: Merge "Remove suggestions when string contains a period"
* commit 'b5c7461df8e2cc71659ad1e52c2acdea3ac1336c':
|
2013-10-10 08:36:48 -07:00 |
|
Satoshi Kataoka
|
6206631f56
|
am 703645aa: am 746d53d8: am 9eb2acc7: am 6a83a875: am 47462172: Enter -> Alpha keyboard switcher in Emoji palette view
* commit '703645aacb0e8a5821056c312ac2db6cbcd6adb5':
|
2013-10-10 08:36:44 -07:00 |
|
Satoshi Kataoka
|
24901b629d
|
am 0de2fd86: am 38e3fac3: am dd53038e: am 192414a4: am 32cf6f85: Show Emoji key by longpressing the enter key
* commit '0de2fd865fa63a61738c48b1b0e2374fb72649f7':
|
2013-10-10 08:36:40 -07:00 |
|
Satoshi Kataoka
|
18eb830fa2
|
am 30c8db4f: am 17dd222a: am 72facc17: am b3ac25f1: am 4deb824f: Add navigateEmoji
* commit '30c8db4fd595bf917832d99914ced2bc561c2bb5':
|
2013-10-10 08:36:34 -07:00 |
|
Satoshi Kataoka
|
b36b1d2340
|
am 13946f91: am 13485642: am bc5198b8: am 8822a52c: am 287c739d: Merge "Fix build"
* commit '13946f911b42bc641c3a05c883c4c2d730088253':
|
2013-10-10 08:36:25 -07:00 |
|
Keisuke Kuroyanagi
|
7db325c07e
|
am e20cd6f9: am 489a6aa4: am 178ec9d9: am 8b6b9e33: am 785eed9b: Merge "Parameter optimization."
* commit 'e20cd6f9c8848ead7287a8aeeaa930a34e59e7e1':
|
2013-10-10 08:36:22 -07:00 |
|
Satoshi Kataoka
|
f1de4cdfba
|
am 4a60d2f7: am 1dcb5bdc: am 53e60a5e: am 6f726f6f: am d76b5529: Rename EmojiKeyboardView -> EmojiPalettesView
* commit '4a60d2f789c67c80a6f18dcc70c2047decc24a4b':
|
2013-10-10 08:36:17 -07:00 |
|
Baligh Uddin
|
93bb7e3aed
|
am 4cd9c5f6: (-s ours) am ca77d5cb: (-s ours) am 6fb8d3a6: (-s ours) am 7b8c9dd0: (-s ours) am a8f4efd0: (-s ours) am 069b185d: (-s ours) am 0de11871: (-s ours) am b2ffcd64: (-s ours) Import translations. DO NOT MERGE
* commit '4cd9c5f65193a30ee0bb014fd1bbef5061d4a447':
|
2013-10-10 08:36:14 -07:00 |
|
Baligh Uddin
|
5bf6460dc4
|
am 806d81d9: (-s ours) am 00e43d31: (-s ours) am eb2cf344: (-s ours) am e9557d4b: (-s ours) am f645402a: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '806d81d97ca5f19286950ba30f65d5b915b2b2f3':
|
2013-10-10 08:36:10 -07:00 |
|
Baligh Uddin
|
7f5898e014
|
am 379d958a: (-s ours) am 73b5fe5d: (-s ours) am 0cb0827f: (-s ours) am d7e90dad: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit '379d958a9c0f705f69c2910a07a78fdcd0a82382':
|
2013-10-10 08:36:06 -07:00 |
|
Qiwen Zhao
|
b2cd850234
|
am 8ee5d38a: am fd1a7a32: (-s ours) am 2008b38a: am e30c8885: (-s ours) am 791a5a6a: am 06ba3ef1: (-s ours) am 551a1c24: reset to klp-dev branch to fix merging problem.
* commit '8ee5d38a90dc79dda137653d6d2c7df05c901898':
|
2013-10-10 08:36:03 -07:00 |
|
Ken Wakasa
|
849942950e
|
am 56e21a02: (-s ours) am 85dec741: am 6dac27ee: Merge "Tweak vertical gap of Emoji palette. DO NOT MERGE" into klp-dev
* commit '56e21a02f071306704ec1ab9ac099fd3c2811461':
Tweak vertical gap of Emoji palette. DO NOT MERGE
|
2013-10-10 08:33:14 -07:00 |
|
Ken Wakasa
|
604f523ef2
|
am e38ed07c: (-s ours) am 07baf17c: am f9d7d17f: Merge "Retry to tweak punctuations. DO NOT MERGE" into klp-dev
* commit 'e38ed07cad8e5df8ef34e169bb689d559fd5f44b':
Retry to tweak punctuations. DO NOT MERGE
|
2013-10-10 08:33:10 -07:00 |
|
Satoshi Kataoka
|
295fda09ec
|
am 3bd1f24f: (-s ours) am 49d8b8ca: am c8e4ad07: Support sw540 (ultra Z). DO NOT MERGE
* commit '3bd1f24f28a32fb5a641cda67abe90a3452a3a2a':
Support sw540 (ultra Z). DO NOT MERGE
|
2013-10-10 08:33:08 -07:00 |
|
Jean Chalard
|
6e9a2c2b1c
|
am 7e6ac9d7: Allow double-space-to-period after percent
* commit '7e6ac9d7270592944f04318ea1ae00e4bee28b19':
Allow double-space-to-period after percent
|
2013-10-10 08:31:39 -07:00 |
|
Satoshi Kataoka
|
ac434c3962
|
am d733aadb: (-s ours) am 35c2a740: (-s ours) am 9b2d4bde: am 39ccc44b: am 6594318e: (-s ours) am 5ce96037: (-s ours) am d03f1793: am f4aa9a7b: Do not merge. Revert emoji key position to JB-mr2
* commit 'd733aadb8eb466577606d55a92d68bbc1c89d14f':
|
2013-10-10 08:31:35 -07:00 |
|
Baligh Uddin
|
d7e85fd547
|
am 8435025f: (-s ours) am 7ae28409: (-s ours) am 23f9540e: (-s ours) am a9a54bb4: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit '8435025f593606b46ee91325f78d07baceb61458':
|
2013-10-10 08:31:31 -07:00 |
|
Jean Chalard
|
416ea62eae
|
am c54fb482: am 0126566c: am 0ded4114: am 73ca0f2c: am 423921ca: Merge "Fallback on empty locales."
* commit 'c54fb482720562afc5974dd12b7a540d86e8a35d':
|
2013-10-10 08:31:26 -07:00 |
|
Jean Chalard
|
741a600531
|
am a7340558: am 470f13fc: am 3ab42a00: am c5f7d74b: am 5db7eaba: Merge "Accept double-space-period after emoji."
* commit 'a7340558d5fbfcf889bc3802241761f1f8c1f230':
|
2013-10-10 08:31:21 -07:00 |
|
Satoshi Kataoka
|
82d7886f51
|
am f647ea44: am 605bca9b: am f12df9e4: am 3bf2c598: am 1d188a28: Merge "Fix emoji"
* commit 'f647ea44039440fdc6556faaf047f1ab210b6afb':
|
2013-10-10 08:31:17 -07:00 |
|
Satoshi Kataoka
|
9c0a3ef25f
|
am fa9c15ae: am b7c0e1a0: am 383da922: am 664f11f2: am 0b288985: Merge "Fix emoji recent key behavior"
* commit 'fa9c15aefde1f54da1b124dff3b83c4c791c98e8':
|
2013-10-10 08:31:05 -07:00 |
|
Ken Wakasa
|
ddf0a0adc4
|
am 576d5bca: am 2226498c: am d439ee37: am f330de95: am c01707db: Merge "Suppress exceptions that have always been happening."
* commit '576d5bcaa702d58a70aebffad59709e06abf2ac9':
|
2013-10-10 08:31:02 -07:00 |
|
Ken Wakasa
|
b47476d593
|
am 1483647c: am b2f59966: am bcb095e7: am e6a64022: am 676bb517: Merge "Add Ver4DictUpdater."
* commit '1483647cd3754956bc088f173982302aff049a83':
|
2013-10-10 08:30:57 -07:00 |
|
Ken Wakasa
|
25470d5c02
|
am c619d676: am 3418b4df: am f9de7ca5: am d5c90d9d: am 618158e6: Merge "Refactor BinaryDictIOUtilsTests."
* commit 'c619d676ae8dc89d0e49131c334dd744af20c292':
|
2013-10-10 08:30:52 -07:00 |
|
Satoshi Kataoka
|
133d4e6e22
|
am 2cf4cee7: am 3accabfc: am 0f0cd69a: am 3944a67c: am 6ec0cf12: Merge "Tentatively revert assets"
* commit '2cf4cee7edd1c00e0ba067bcda41c66d56c27883':
|
2013-10-10 08:30:48 -07:00 |
|
Keisuke Kuroyanagi
|
731c628f1d
|
am 21202171: am 115b7cf6: am 7f876997: am 799263c3: am 966af8b5: Merge "Make BinaryDictionaryTests use current time as a seed."
* commit '21202171020d6fe6c5b8608950d16063ba888042':
|
2013-10-10 08:30:41 -07:00 |
|
Keisuke Kuroyanagi
|
eed952d7a1
|
am f4efc70d: am fa65c8bb: am 449245c8: am 5544b966: am 3e5f4b53: Merge "Check the elapsed time for decaying."
* commit 'f4efc70df09beb40b8b8a8377fc2942a473c00a7':
|
2013-10-10 08:30:37 -07:00 |
|
Yuichiro Hanada
|
ba12911814
|
am 1d5fd266: am 07dcb6ac: am 1f6b9d7f: am 10100b2c: am 14d31d46: Add AbstractDictDecoder.
* commit '1d5fd266ba61e180321215b0c126c93682c6fa1a':
|
2013-10-10 08:30:33 -07:00 |
|