The Android Automerger
18725ed10a
merge in klp-release history after reset to klp-dev
2013-10-13 06:02:49 -07:00
Ken Wakasa
c8383eda8b
Fix wrong commitText parameter in sendKeyCodePoint()
...
Small optimization on generating a String instance from a single code
point too.
bug: 11181913
Change-Id: I0f905e4dc6ec7841092bb4d3d940daf3b2303f5b
2013-10-13 10:56:10 +09:00
Baligh Uddin
8a866d6fc1
am f68ef910: (-s ours) am cdc4c1dc: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f68ef9102cd2a2a4d5de48a55e9858d94f47f5f7':
Import translations. DO NOT MERGE
2013-10-12 12:53:33 -07:00
Baligh Uddin
f68ef9102c
am cdc4c1dc: (-s ours) Import translations. DO NOT MERGE
...
* commit 'cdc4c1dca70afce35342675de02762959b27b590':
Import translations. DO NOT MERGE
2013-10-12 12:51:52 -07:00
Baligh Uddin
9e4210ba3a
Import translations. DO NOT MERGE
...
Change-Id: I6f722071496d4673ca2214cd5fe73dde1006f036
Auto-generated-cl: translation import
2013-10-12 09:50:42 -07:00
Baligh Uddin
cdc4c1dca7
Import translations. DO NOT MERGE
...
Change-Id: Icbe028a32311c167219f366e695cb7932f5a9a71
Auto-generated-cl: translation import
2013-10-12 09:43:32 -07:00
Baligh Uddin
1789d83949
am e35594f9: (-s ours) am 3c8bbd2f: (-s ours) am 40823338: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'e35594f91b08a619ff1208928cadebf0b43d23b5':
Import translations. DO NOT MERGE
2013-10-11 08:44:44 -07:00
Baligh Uddin
e35594f91b
am 3c8bbd2f: (-s ours) am 40823338: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '3c8bbd2fdc3381b70842cc165d57e7732cdc6e5c':
Import translations. DO NOT MERGE
2013-10-11 08:42:22 -07:00
Baligh Uddin
3c8bbd2fdc
am 40823338: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '40823338e21a0112f141f52278986d0e20df17b9':
Import translations. DO NOT MERGE
2013-10-11 08:38:45 -07:00
Baligh Uddin
8f99107bbb
Merge "Import translations. DO NOT MERGE"
2013-10-11 15:35:33 +00:00
Baligh Uddin
40823338e2
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-10-11 15:35:27 +00:00
Baligh Uddin
fc33cc6dba
Import translations. DO NOT MERGE
...
Change-Id: Iafd4f4b04b7c80e2d686d2a3953a5c6e41df2739
Auto-generated-cl: translation import
2013-10-11 06:35:24 -07:00
Baligh Uddin
02ecae3aa3
Import translations. DO NOT MERGE
...
Change-Id: I45a783763fce6254469a39374d03edb6a1867cc9
Auto-generated-cl: translation import
2013-10-11 06:31:03 -07:00
Ken Wakasa
fe97ff4083
am 60fb5865: am 06e1bdaa: am 3e35e072: Merge "Make emoji separators" into klp-dev
...
* commit '60fb58654e33448651fea191ba22cfdc87e37466':
Make emoji separators
2013-10-11 05:10:21 -07:00
Satoshi Kataoka
eb7fa4dc6d
am 40506273: am ac6d0c65: am 6d915037: Merge "Fix a bug where emojis would remove the suggestion strip." into klp-dev
...
* commit '405062733cfe066c4b9af719bfc36a9a516c9dd3':
Fix a bug where emojis would remove the suggestion strip.
2013-10-11 05:10:19 -07:00
Ken Wakasa
60fb58654e
am 06e1bdaa: am 3e35e072: Merge "Make emoji separators" into klp-dev
...
* commit '06e1bdaa2582293193df7c1b1dd0784b9c327b87':
Make emoji separators
2013-10-11 05:07:02 -07:00
Satoshi Kataoka
405062733c
am ac6d0c65: am 6d915037: Merge "Fix a bug where emojis would remove the suggestion strip." into klp-dev
...
* commit 'ac6d0c656e1788d796c3c78434ceb049b43abb42':
Fix a bug where emojis would remove the suggestion strip.
2013-10-11 05:07:00 -07:00
Ken Wakasa
06e1bdaa25
am 3e35e072: Merge "Make emoji separators" into klp-dev
...
* commit '3e35e0727ce02e29ae498fb09ebc70df7e103d14':
Make emoji separators
2013-10-11 05:05:11 -07:00
Satoshi Kataoka
ac6d0c656e
am 6d915037: Merge "Fix a bug where emojis would remove the suggestion strip." into klp-dev
...
* commit '6d91503727a6d5b4eb942c56ee3f640984ae31a4':
Fix a bug where emojis would remove the suggestion strip.
2013-10-11 05:05:09 -07:00
Ken Wakasa
3e35e0727c
Merge "Make emoji separators" into klp-dev
2013-10-11 11:57:07 +00:00
Satoshi Kataoka
6d91503727
Merge "Fix a bug where emojis would remove the suggestion strip." into klp-dev
2013-10-11 11:53:07 +00:00
Jean Chalard
6fc15b9fc4
Fix a bug where emojis would remove the suggestion strip.
...
Bug: 11163495
Change-Id: I23d12c430125cc2a66a6e00715a4c609bb9e2bb1
2013-10-11 20:51:13 +09:00
Jean Chalard
401fb908f0
Make emoji separators
...
Bug: 11163495
Change-Id: I3247b8d1bbd3406b29a30a25aebd932c63431943
2013-10-11 20:00:38 +09:00
Ken Wakasa
7abdab1c6f
Merge "Add a time stamp for unigrams."
2013-10-11 10:17:01 +00:00
Ken Wakasa
00e0248984
Merge "Fix unit test for If8c94ef91ed58bb5028f51be7c8d9beb677436a4"
2013-10-11 08:51:26 +00:00
Jean Chalard
3def959e4d
am 3f1c95db: am 331c84d7: am 5fe9ab1c: Merge "Fix the suggestion size." into klp-dev
...
* commit '3f1c95dbdc18453dc0cd6f847b33e01db1f1d75b':
Fix the suggestion size.
2013-10-11 01:49:51 -07:00
Jean Chalard
3f1c95dbdc
am 331c84d7: am 5fe9ab1c: Merge "Fix the suggestion size." into klp-dev
...
* commit '331c84d790cfc04040e7b4e4102519f7be3f5e48':
Fix the suggestion size.
2013-10-11 01:46:44 -07:00
Jean Chalard
331c84d790
am 5fe9ab1c: Merge "Fix the suggestion size." into klp-dev
...
* commit '5fe9ab1cc680bed75160980f69f0a7d33f18fb5a':
Fix the suggestion size.
2013-10-11 01:43:29 -07:00
Jean Chalard
5fe9ab1cc6
Merge "Fix the suggestion size." into klp-dev
2013-10-11 08:38:31 +00:00
Ken Wakasa
eacb2be8fe
Fix unit test for If8c94ef91ed58bb5028f51be7c8d9beb677436a4
...
Change-Id: I056013de3a5e09feed429dfd8097d3d85331a0ab
2013-10-11 16:52:12 +09:00
Ken Wakasa
be22a01df3
Merge "Add resolveBigramPositions."
2013-10-11 07:45:20 +00:00
Jean Chalard
c0bd0a244d
Fix the suggestion size.
...
The available space was not computed correctly. This makes the
decision to ellipsize/expand the middle suggestion correct.
Also, the scale was not applied correctly in some cases.
Finally, for some reason ellipsize does not work as we expect.
I'm not sure how to get it to work like we want it to, but
this works around the problem in a simple manner.
Bug: 11158757
Change-Id: I083e7ac56e157f100923733e67b92a6368a526c9
2013-10-11 16:42:46 +09:00
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
c32962b8f1
Add a time stamp for unigrams.
...
Bug: 10920255
Change-Id: I26d2cce3c322a4ff39a614f8615f43fb7bd3baed
2013-10-11 15:08:09 +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