6032dcf950
am a79431b4: am d8ba6abf: Merge "[DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji" into klp-dev
...
* commit 'a79431b42b9ef67fc1e68507b5c09f3597fa2121':
[DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji
2013-10-17 09:30:34 -07:00
a79431b42b
am d8ba6abf: Merge "[DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji" into klp-dev
...
* commit 'd8ba6abfeef1bce43af3e0ac517e20172c9e8cc5':
[DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji
2013-10-17 09:28:49 -07:00
d8ba6abfee
Merge "[DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji" into klp-dev
2013-10-17 16:26:42 +00:00
1e779e0515
am 62bea4d6: (-s ours) am 8d757c20: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '62bea4d6e0a0c2cc91ef621c583ab2bf3db6c6c8':
Import translations. DO NOT MERGE
2013-10-17 08:50:47 -07:00
62bea4d6e0
am 8d757c20: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '8d757c205293bb2670d6f29a00bd5c369e538da3':
Import translations. DO NOT MERGE
2013-10-17 08:48:11 -07:00
8d757c2052
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-10-17 15:45:30 +00:00
9fa7efb0c5
Import translations. DO NOT MERGE
...
Change-Id: Ia2590927c02e8e64506e746650d318c1d84ae7c2
Auto-generated-cl: translation import
2013-10-17 08:40:51 -07:00
a3c285e876
[DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji
...
Bug: 11123691
Change-Id: I36474e12e34af95051129840865015f85595411b
2013-10-17 23:15:09 +09:00
46742367fb
am 09ecfc06: am cf0a94fa: merge in klp-release (no-op)
...
* commit '09ecfc062b756e4a452e04f55df49023b5f0eae9':
Do not merge. Revert emoji key position to JB-mr2
Fix: Native crash when an empty attribute is written. DO NOT MERGE
Use reentrant lock for main dictionaries. DO NOT MERGE
Stop reading dictionary while regenerating. (DO NOT MERGE)
2013-10-16 17:56:27 -07:00
09ecfc062b
am cf0a94fa: merge in klp-release (no-op)
...
* commit 'cf0a94fa9a7c8a5b259507cab616239f79349444':
Do not merge. Revert emoji key position to JB-mr2
Fix: Native crash when an empty attribute is written. DO NOT MERGE
Use reentrant lock for main dictionaries. DO NOT MERGE
Stop reading dictionary while regenerating. (DO NOT MERGE)
2013-10-16 17:51:49 -07:00
cf0a94fa9a
merge in klp-release (no-op)
2013-10-16 17:46:48 -07:00
fb8346cbd9
am bfef552e: am ea3db813: Merge "Do not merge. Remove Azerbaijani subtype" into klp-dev
...
* commit 'bfef552e623b2005afa0c53041183c787cd44bb2':
Do not merge. Remove Azerbaijani subtype
2013-10-16 14:26:01 -07:00
bfef552e62
am ea3db813: Merge "Do not merge. Remove Azerbaijani subtype" into klp-dev
...
* commit 'ea3db813ccb0744129358b9db0b21b9d27b16dde':
Do not merge. Remove Azerbaijani subtype
2013-10-16 14:22:41 -07:00
ea3db813cc
Merge "Do not merge. Remove Azerbaijani subtype" into klp-dev
2013-10-16 21:19:59 +00:00
3dd33652e4
Do not merge. Remove Azerbaijani subtype
...
The corresponding change is I0d2a98dffe03ebd
Bug: 11244796
Change-Id: I0d2a98dffe03ebddf26fc3c2760061c39de4c57e
2013-10-16 18:39:59 +09:00
62cda376db
merge in klp-release history after reset to klp-dev
2013-10-15 06:01:21 -07: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
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
cdc4c1dca7
Import translations. DO NOT MERGE
...
Change-Id: Icbe028a32311c167219f366e695cb7932f5a9a71
Auto-generated-cl: translation import
2013-10-12 09:43:32 -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
40823338e2
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-10-11 15:35:27 +00:00
02ecae3aa3
Import translations. DO NOT MERGE
...
Change-Id: I45a783763fce6254469a39374d03edb6a1867cc9
Auto-generated-cl: translation import
2013-10-11 06:31:03 -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
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
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
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
ae0871ef15
merge in klp-release history after reset to klp-dev
2013-10-10 06:01:47 -07:00
56e21a02f0
am 85dec741: am 6dac27ee: Merge "Tweak vertical gap of Emoji palette. DO NOT MERGE" into klp-dev
...
* commit '85dec741a70bf455d9aae583982580dc79df0209':
Tweak vertical gap of Emoji palette. DO NOT MERGE
2013-10-09 23:04:02 -07:00
e38ed07cad
am 07baf17c: am f9d7d17f: Merge "Retry to tweak punctuations. DO NOT MERGE" into klp-dev
...
* commit '07baf17c6f6fff0725c75f4ba778d5a26a6eea67':
Retry to tweak punctuations. DO NOT MERGE
2013-10-09 23:04:00 -07:00
Ken Wakasa
Baligh Uddin
Jean Chalard
Ed Heyl
Satoshi Kataoka
The Android Automerger