b067be0e5f
Merge "Revert "Revert "Add Swiss French and German keyboard layouts."""
2013-10-15 14:12:29 +00:00
62cda376db
merge in klp-release history after reset to klp-dev
2013-10-15 06:01:21 -07:00
d617c2d976
am eb870b14: am 34ad4e08: am b9ce8421: mExpectingUpdateSelection was out of sync when nothing to delete.
...
* commit 'eb870b14ecc7b26de37a939d6a661b54078ad08b':
mExpectingUpdateSelection was out of sync when nothing to delete.
2013-10-15 05:05:29 -07:00
b044047227
mExpectingUpdateSelection was out of sync when nothing to delete.
...
cherripick of I9c6a948331726a821bd3ccec9c1d02dec2c4703a
(forward cherrypicking this because the automerger is stuck now.)
This bug was leading to corrupted rendering of surrogate pairs in the following
scenario.
1. Type some emojis
2. Move the cursor at the beginning of the text field
3. Hit backspace even though there's nothing to delete
4. Move the cursor after some emoji
5. Hit backspace
The root cause of this issue was the out-of-sync mExpectingUpdateSelection if
handleBackspace() gets called when the cursor reaches at the beginning of the
TextView. In such case, mExpectingUpdateSelection shouldn't be set true because
there's nothing to delete, so there will be no onUpdateSelection() calls associated
with it. Due to this bug, the cache in RichInputConnection could get stale at step 4
described above. Then the following handleBackspace() that should delete a surrogate
pair was not working correctly because of the stale cache.
bug: 11181913
Change-Id: I1cbf444d8d105416e7de75c16d80b3797f470495
2013-10-15 14:05:34 +09:00
eb870b14ec
am 34ad4e08: am b9ce8421: mExpectingUpdateSelection was out of sync when nothing to delete.
...
* commit '34ad4e0879bbaa23a8ac493d174f804f1d81e25b':
mExpectingUpdateSelection was out of sync when nothing to delete.
2013-10-14 19:50:50 -07:00
34ad4e0879
am b9ce8421: mExpectingUpdateSelection was out of sync when nothing to delete.
...
* commit 'b9ce84214212f5b5072cd9fda458526887c3c739':
mExpectingUpdateSelection was out of sync when nothing to delete.
2013-10-14 19:49:12 -07:00
cf5dfd2464
am 3a3bbf4a: am eed74b81: am c8383eda: Fix wrong commitText parameter in sendKeyCodePoint()
...
* commit '3a3bbf4a38870ecc42b7f6fbd3a7cae20fe020a7':
Fix wrong commitText parameter in sendKeyCodePoint()
2013-10-14 10:52:40 -07:00
1ab9edee2f
am 8a866d6f: (-s ours) am f68ef910: (-s ours) am cdc4c1dc: (-s ours) Import translations. DO NOT MERGE
...
* commit '8a866d6fc13e518dfe054a007e585a740536e6e5':
Import translations. DO NOT MERGE
2013-10-14 10:50:33 -07:00
b9ce842142
mExpectingUpdateSelection was out of sync when nothing to delete.
...
This bug was leading to corrupted rendering of surrogate pairs in the following
scenario.
1. Type some emojis
2. Move the cursor at the beginning of the text field
3. Hit backspace even though there's nothing to delete
4. Move the cursor after some emoji
5. Hit backspace
The root cause of this issue was the out-of-sync mExpectingUpdateSelection if
handleBackspace() gets called when the cursor reaches at the beginning of the
TextView. In such case, mExpectingUpdateSelection shouldn't be set true because
there's nothing to delete, so there will be no onUpdateSelection() calls associated
with it. Due to this bug, the cache in RichInputConnection could get stale at step 4
described above. Then the following handleBackspace() that should delete a surrogate
pair was not working correctly because of the stale cache.
bug: 11181913
Change-Id: I9c6a948331726a821bd3ccec9c1d02dec2c4703a
2013-10-14 17:57:48 +09:00
d43b1dbc6b
merge in klp-release history after reset to klp-dev
2013-10-13 19:20:47 -07:00
3a3bbf4a38
am eed74b81: am c8383eda: Fix wrong commitText parameter in sendKeyCodePoint()
...
* commit 'eed74b81a6a8d7de11ae2411817546bdd886ae0a':
Fix wrong commitText parameter in sendKeyCodePoint()
2013-10-13 16:27:08 -07:00
eed74b81a6
am c8383eda: Fix wrong commitText parameter in sendKeyCodePoint()
...
* commit 'c8383eda8bb05e25b22fe6d66100248f7d0e33fa':
Fix wrong commitText parameter in sendKeyCodePoint()
2013-10-13 16:24:47 -07:00
18725ed10a
merge in klp-release history after reset to klp-dev
2013-10-13 06:02:49 -07:00
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
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
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
9e4210ba3a
Import translations. DO NOT MERGE
...
Change-Id: I6f722071496d4673ca2214cd5fe73dde1006f036
Auto-generated-cl: translation import
2013-10-12 09:50:42 -07:00
cdc4c1dca7
Import translations. DO NOT MERGE
...
Change-Id: Icbe028a32311c167219f366e695cb7932f5a9a71
Auto-generated-cl: translation import
2013-10-12 09:43:32 -07:00
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
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
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
8f99107bbb
Merge "Import translations. DO NOT MERGE"
2013-10-11 15:35:33 +00:00
40823338e2
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-10-11 15:35:27 +00:00
fc33cc6dba
Import translations. DO NOT MERGE
...
Change-Id: Iafd4f4b04b7c80e2d686d2a3953a5c6e41df2739
Auto-generated-cl: translation import
2013-10-11 06:35:24 -07:00
02ecae3aa3
Import translations. DO NOT MERGE
...
Change-Id: I45a783763fce6254469a39374d03edb6a1867cc9
Auto-generated-cl: translation import
2013-10-11 06:31:03 -07:00
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
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
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
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
06e1bdaa25
am 3e35e072: Merge "Make emoji separators" into klp-dev
...
* commit '3e35e0727ce02e29ae498fb09ebc70df7e103d14':
Make emoji separators
2013-10-11 05:05:11 -07:00
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
3e35e0727c
Merge "Make emoji separators" into klp-dev
2013-10-11 11:57:07 +00:00
6d91503727
Merge "Fix a bug where emojis would remove the suggestion strip." into klp-dev
2013-10-11 11:53:07 +00:00
6fc15b9fc4
Fix a bug where emojis would remove the suggestion strip.
...
Bug: 11163495
Change-Id: I23d12c430125cc2a66a6e00715a4c609bb9e2bb1
2013-10-11 20:51:13 +09:00
401fb908f0
Make emoji separators
...
Bug: 11163495
Change-Id: I3247b8d1bbd3406b29a30a25aebd932c63431943
2013-10-11 20:00:38 +09:00
7abdab1c6f
Merge "Add a time stamp for unigrams."
2013-10-11 10:17:01 +00:00
00e0248984
Merge "Fix unit test for If8c94ef91ed58bb5028f51be7c8d9beb677436a4"
2013-10-11 08:51:26 +00:00
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
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
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
5fe9ab1cc6
Merge "Fix the suggestion size." into klp-dev
2013-10-11 08:38:31 +00:00
eacb2be8fe
Fix unit test for If8c94ef91ed58bb5028f51be7c8d9beb677436a4
...
Change-Id: I056013de3a5e09feed429dfd8097d3d85331a0ab
2013-10-11 16:52:12 +09:00
be22a01df3
Merge "Add resolveBigramPositions."
2013-10-11 07:45:20 +00:00
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
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
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
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
7611af753a
Merge "Do not merge. Save / restore the last used emoji category" into klp-dev
2013-10-11 07:21:35 +00:00
7d3f53a1cb
Do not merge. Save / restore the last used emoji category
...
Bug: 11029983
Change-Id: I5547910c7b5dd7974292fc075af33568940f4e81
2013-10-11 16:05:38 +09:00
6026a95816
Merge "Save / restore the last used emoji category"
2013-10-11 07:04:42 +00:00
Ken Wakasa
The Android Automerger
Baligh Uddin
Satoshi Kataoka
Jean Chalard