Satoshi Kataoka
ed7d262eeb
am 16b2dd43
: (-s ours) am ee1ff0da
: am 7611af75
: Merge "Do not merge. Save / restore the last used emoji category" into klp-dev
...
* commit '16b2dd439634e469edcfbd9b876be6288014df58':
Do not merge. Save / restore the last used emoji category
2013-10-11 00:26:25 -07:00
Satoshi Kataoka
16b2dd4396
am ee1ff0da
: am 7611af75
: Merge "Do not merge. Save / restore the last used emoji category" into klp-dev
...
* commit 'ee1ff0da30f7895d38a1d93d1810425dcd04390a':
Do not merge. Save / restore the last used emoji category
2013-10-11 00:24:52 -07:00
Satoshi Kataoka
ee1ff0da30
am 7611af75
: Merge "Do not merge. Save / restore the last used emoji category" into klp-dev
...
* commit '7611af753af5ba112bcfc8c434caf88dc8f46325':
Do not merge. Save / restore the last used emoji category
2013-10-11 00:23:38 -07:00
Satoshi Kataoka
7611af753a
Merge "Do not merge. Save / restore the last used emoji category" into klp-dev
2013-10-11 07:21:35 +00:00
Satoshi Kataoka
7d3f53a1cb
Do not merge. Save / restore the last used emoji category
...
Bug: 11029983
Change-Id: I5547910c7b5dd7974292fc075af33568940f4e81
2013-10-11 16:05:38 +09:00
Satoshi Kataoka
6026a95816
Merge "Save / restore the last used emoji category"
2013-10-11 07:04:42 +00:00
Satoshi Kataoka
6dc99dc200
Save / restore the last used emoji category
...
Bug: 11029983
Change-Id: I1bec2c3c6b547de68562a818a8d6c9fef83787b7
2013-10-11 16:00:33 +09:00
Yuichiro Hanada
9514ed5c2a
Add the new format of bigram entries.
...
In new format, each bigram entry has flags (1 byte), a terminal id (3 byte),
a time-stamp (4 byte), a counter (1 byte) and a level (1 byte).
Bug: 10920255
Bug: 10920165
Change-Id: I0f7fc125a6178e6d25a07e8462afc41a7f57e3e1
2013-10-11 14:50:41 +09: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
Baligh Uddin
ae408df19c
am 273ca4c3
: am 2783fcec
: am 2d74136e
: keep history after reset to jb-ub-latinimegoogle-bayo
...
* commit '273ca4c32024c384412fa47480d08b3256831e99':
2013-10-10 08:23:58 -07:00
Baligh Uddin
c48143b922
am 6d0d4b85
: am e75cd64a
: am 8105ea2f
: keep history after reset to jb-ub-latinimegoogle-bayo
...
* commit '6d0d4b850a5d0f51f2c911318928fcd30d7d2602':
2013-10-10 08:23:56 -07:00
Satoshi Kataoka
4d7b11020a
am ddb0f5a2
: am 8e9ce07b
: am a6a6abc8
: Fix the security related API change for PreferenceActivity
...
* commit 'ddb0f5a22605ac8b7c8159c39539763ff1c23a2d':
Fix the security related API change for PreferenceActivity
2013-10-10 08:23:53 -07:00
Satoshi Kataoka
44df13949a
am 22888291
: am 6beb03df
: am 6862b819
: Fix crash in AdditionalSubtypeUtils
...
* commit '22888291df6d86b412bfbe8a9bfbf74a3a625b4f':
Fix crash in AdditionalSubtypeUtils
2013-10-10 08:23:50 -07:00
The Android Automerger
51764e8347
am b7922678
: am 3815e4d2
: am 965eac66
: merge in jb-ub-latinimegoogle-bayo history after reset to jb-ub-latinimegoogle
...
* commit 'b79226788e5d18971099fc36076c873196b8d1f8':
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
2013-10-10 08:23:47 -07:00
Satoshi Kataoka
ab581457ae
am 1a5e6a74
: am 6deea22c
: am 31e152e3
: am de65b7c0
: Merge "Fix the position of emoji palette"
...
* commit '1a5e6a7446fdaa8f8913b151ed6d1f70f74c939b':
2013-10-10 08:23:44 -07:00
Ken Wakasa
6b1fbd50e7
am 5e70e91e
: am ef2add6f
: am 1d24f19b
: am c040d59d
: Merge "Add more_keys_for_* declarations for the Swedish keyboard."
...
* commit '5e70e91e2c565cce2628143a0dc630e080d0f576':
2013-10-10 08:23:41 -07:00
Jean Chalard
f68d6e424d
am d0d728eb
: am 71895285
: am e9631bcd
: am 0152ff53
: Merge "Update dictionaries"
...
* commit 'd0d728ebdaabe5f66ef0601cfeb44e72022533c6':
2013-10-10 08:23:37 -07:00
Satoshi Kataoka
cffaaa56a4
am 2163a48d
: am 302102ee
: am db7513bb
: am a701501c
: Merge "Reduce memory of emoji palette"
...
* commit '2163a48d860dffb0dd97473a086586ea1781f48c':
2013-10-10 08:23:34 -07:00
Jean Chalard
ca237747fb
am 5ff266e0
: am 2b33fc74
: am 17bec5cb
: am 92190d9a
: Merge "Show the keyboard earlier when rotating."
...
* commit '5ff266e0b1d6fa1cc2b196c98ee0ed5d79e72a34':
2013-10-10 08:23:31 -07:00
Satoshi Kataoka
9b22a2f0e7
am 5908917c
: am 2715465b
: am 67aa1a93
: am 2d3e1210
: Fix memory leak in EmojiPaletteView
...
* commit '5908917cff73544e463ebc684753648987f0edff':
2013-10-10 08:23:28 -07:00
Ken Wakasa
3d8b0cbba9
am 86c6aff4
: am 8d454af4
: am 87f06033
: am d900b90d
: Merge "Prep for RAM footprint optimization for Emoji palettes"
...
* commit '86c6aff4aa61d28044cb3385ba865ffd0df182f1':
2013-10-10 08:23:25 -07:00
Jean Chalard
4c2b785ec3
am 4f1424f9
: am 156ea961
: am 6d4cdadb
: am a2422c0b
: Merge "Show more messages when reading a compressed combined format file."
...
* commit '4f1424f9e61e3fff6c7e173c631992b76cf690ee':
2013-10-10 08:23:22 -07:00
Keisuke Kuroyanagi
66684a74dc
am 96f54480
: am ba13ae79
: am d168bd54
: am 6d91e4ce
: Fix offdevice test build.
...
* commit '96f54480cb5b3db6aaaafedaa9098712a01a9fbe':
2013-10-10 08:23:19 -07:00
Jean Chalard
a2ba881991
am 86e0e06c
: am 9af39314
: am 62001702
: am 36c56cae
: Merge "Make the sentence separator a resource."
...
* commit '86e0e06c36777e84fe52cc8df26bdd329a1112d4':
2013-10-10 08:23:16 -07:00
Keisuke Kuroyanagi
e5aeb6a025
am 616eabae
: am 394363c2
: am 551cc99e
: am 61aae2b4
: Merge "Add Ime language switching test."
...
* commit '616eabaebbe6a53d005b2ced1bdfea4dc4294372':
2013-10-10 08:23:13 -07:00
Keisuke Kuroyanagi
a6012802f1
am 5b61f1d2
: am 584e0fd6
: am a798a16a
: am 6d3d5395
: Merge "Fix a bug: wrong parent position is written when moving."
...
* commit '5b61f1d2490bc73913dd02d17f2a771b4e5a7d51':
2013-10-10 08:23:11 -07:00
Keisuke Kuroyanagi
80bea4a849
am 3c01d789
: am 8ddac9ae
: am bf4c72c4
: am a81d37ee
: Merge "Add a large test adding bigrams for decaying dictionary."
...
* commit '3c01d78932dd834f8a3837d80fbdf84e13600e2d':
2013-10-10 08:23:08 -07:00
Satoshi Kataoka
f38651f9f8
am 16dfdf75
: am 6d998b36
: am da9408c8
: am 984aa60e
: Merge "Extend hitbox of emoji keys"
...
* commit '16dfdf755ebd0317dbb82f90fd795e4d008b73c2':
2013-10-10 08:23:05 -07:00
Jean Chalard
35359a5cce
am 83305e53
: am a3efde54
: am 6e979246
: am 7712baa5
: Merge "Fix a possible IOOB"
...
* commit '83305e5338d29087bec81cceed25c6f3b4fb6883':
2013-10-10 08:23:02 -07:00
Jean Chalard
b7cf8ae7b0
am cc3bdb59
: am 322366d0
: am 9493affc
: am 3c4e8cb6
: Call loadKeyboard later if it can\'t be called right away
...
* commit 'cc3bdb59015d54285d9aef1169b2fce3c8ae477f':
2013-10-10 08:22:59 -07:00
Satoshi Kataoka
c7c9475784
am d24cb579
: am e167265f
: am 4a0af2cb
: am 291ef1c9
: Merge "Clear the cache of subtypes in onStartInputViewInternal"
...
* commit 'd24cb579f8051f474e80510490e5fe668abbbe01':
2013-10-10 08:22:56 -07:00
Jean Chalard
3f5dce6280
am e1e95fd2
: am ea3a2f28
: am 0675d374
: am 86f77114
: Merge "Don\'t auto-correct to non-whitelist shortcuts"
...
* commit 'e1e95fd2e48ad639d9df38be565abd9c71007c19':
2013-10-10 08:22:54 -07:00
Jean Chalard
da00744a3d
am 05aaedd0
: am e6b018aa
: am d44b2490
: am a6047aae
: Merge "Set the shortcut frequency correctly."
...
* commit '05aaedd0240e5982c15f40a18c76b4fd0f8a68eb':
2013-10-10 08:22:51 -07:00
Keisuke Kuroyanagi
7c50d6d70c
am 34f6b9e8
: am 2b1e1696
: am eafff65b
: am be4d85fe
: Merge "Fix bug and Add large test for decaying dictionary."
...
* commit '34f6b9e8becbdd62a916a4843139eb3bd88c9686':
2013-10-10 08:22:49 -07:00
Jean Chalard
5a6810cd2a
am bf5889a3
: am 11ab8f2e
: am 93622c4f
: am 69d10385
: Merge "Update en_GB dictionary"
...
* commit 'bf5889a32fb5bdbd251385550708f67f3baf5802':
2013-10-10 08:22:46 -07:00
Jean Chalard
b5c7461df8
am fe8d76b1
: am adc7bacf
: am dff82299
: am 7da62bbe
: Merge "Remove suggestions when string contains a period"
...
* commit 'fe8d76b15ea1dcf6cde4527476a85007c56166bb':
2013-10-10 08:22:42 -07:00
Satoshi Kataoka
703645aacb
am 746d53d8
: am 9eb2acc7
: am 6a83a875
: am 47462172
: Enter -> Alpha keyboard switcher in Emoji palette view
...
* commit '746d53d815684cbe3c0e5a81d2842fd0a9539970':
2013-10-10 08:22:39 -07:00
Satoshi Kataoka
0de2fd865f
am 38e3fac3
: am dd53038e
: am 192414a4
: am 32cf6f85
: Show Emoji key by longpressing the enter key
...
* commit '38e3fac3c2be0949a7e7825ef6e2dbe15cc8b6e8':
2013-10-10 08:22:36 -07:00
Satoshi Kataoka
30c8db4fd5
am 17dd222a
: am 72facc17
: am b3ac25f1
: am 4deb824f
: Add navigateEmoji
...
* commit '17dd222ab5f27015126dc1229925df177cb2ae51':
2013-10-10 08:22:33 -07:00
Satoshi Kataoka
13946f911b
am 13485642
: am bc5198b8
: am 8822a52c
: am 287c739d
: Merge "Fix build"
...
* commit '1348564283733323977fd0f5049101637136432c':
2013-10-10 08:22:30 -07:00
Keisuke Kuroyanagi
e20cd6f9c8
am 489a6aa4
: am 178ec9d9
: am 8b6b9e33
: am 785eed9b
: Merge "Parameter optimization."
...
* commit '489a6aa4a822fe8f7d2da4c621164e9e39a7f07d':
2013-10-10 08:22:27 -07:00
Satoshi Kataoka
4a60d2f789
am 1dcb5bdc
: am 53e60a5e
: am 6f726f6f
: am d76b5529
: Rename EmojiKeyboardView -> EmojiPalettesView
...
* commit '1dcb5bdc9486ea6d938bf3870454634ae56ef0ee':
2013-10-10 08:22:24 -07:00
Baligh Uddin
4cd9c5f651
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 'ca77d5cb8efa86ecf71ad9479d086eb84614bb11':
2013-10-10 08:22:21 -07:00
Baligh Uddin
806d81d97c
am 00e43d31
: (-s ours) am eb2cf344
: (-s ours) am e9557d4b
: (-s ours) am f645402a
: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '00e43d313bf2bbfa8daefe4851fd8de5569cc805':
2013-10-10 08:22:19 -07:00
Baligh Uddin
379d958a9c
am 73b5fe5d
: (-s ours) am 0cb0827f
: (-s ours) am d7e90dad
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
...
* commit '73b5fe5d6710488699fd1590d87fcf46e55add6a':
Import translations. DO NOT MERGE
2013-10-10 08:22:16 -07:00
Qiwen Zhao
8ee5d38a90
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 'fd1a7a324256093374bc7b348506924c73b058c4':
2013-10-10 08:22:13 -07:00
Jean Chalard
7e6ac9d727
Allow double-space-to-period after percent
...
Bug: 11158604
Change-Id: If8c94ef91ed58bb5028f51be7c8d9beb677436a4
2013-10-10 21:26:08 +09:00
Satoshi Kataoka
d733aadb8e
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 '35c2a7408bc6857c9b1ac5fd25c047a388442d0d':
2013-10-09 23:54:24 -07:00