aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix typoSatoshi Kataoka2013-10-161-2/+2
| | | | Change-Id: I4748935c3cf00e4a3c02aabe2ea659e1c8c2d7c6
* Remove Azerbaijani subtypeSatoshi Kataoka2013-10-161-3/+5
| | | | | Bug: 11244796 Change-Id: I0d2a98dffe03ebddf26fc3c2760061c39de4c57e
* Merge "Initial step to support version 4 format in native code."Keisuke Kuroyanagi2013-10-165-0/+12
|\
| * Initial step to support version 4 format in native code.Keisuke Kuroyanagi2013-10-095-0/+12
| | | | | | | | | | Bug: 11073222 Change-Id: I633229381b28cef23edef2b37e5b0bf6e15af468
* | Merge "Revert "Revert "Add Swiss French and German keyboard layouts."""Ken Wakasa2013-10-1513-573/+970
|\ \
| * | Revert "Revert "Add Swiss French and German keyboard layouts.""Ken Wakasa2013-10-1013-573/+970
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 56402cf10a3a26ca7add62678d7e1ab3064feab7. I'll submit this on 10/16 after the final cut for Bayo. Change-Id: I0fe4ab64fd8dfa1e63e29adf00388743fca6a1ed bug: 11144401
* | | am eb870b14: am 34ad4e08: am b9ce8421: mExpectingUpdateSelection was out of ↵Ken Wakasa2013-10-150-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | sync when nothing to delete. * commit 'eb870b14ecc7b26de37a939d6a661b54078ad08b': mExpectingUpdateSelection was out of sync when nothing to delete.
| * \ \ am 34ad4e08: am b9ce8421: mExpectingUpdateSelection was out of sync when ↵Ken Wakasa2013-10-141-10/+24
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nothing to delete. * commit '34ad4e0879bbaa23a8ac493d174f804f1d81e25b': mExpectingUpdateSelection was out of sync when nothing to delete.
| | * \ \ am b9ce8421: mExpectingUpdateSelection was out of sync when nothing to delete.Ken Wakasa2013-10-141-10/+24
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b9ce84214212f5b5072cd9fda458526887c3c739': mExpectingUpdateSelection was out of sync when nothing to delete.
| | | * | | mExpectingUpdateSelection was out of sync when nothing to delete.Ken Wakasa2013-10-141-10/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | mExpectingUpdateSelection was out of sync when nothing to delete.Ken Wakasa2013-10-151-10/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | am 3a3bbf4a: am eed74b81: am c8383eda: Fix wrong commitText parameter in ↵Ken Wakasa2013-10-142-4/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sendKeyCodePoint() * commit '3a3bbf4a38870ecc42b7f6fbd3a7cae20fe020a7': Fix wrong commitText parameter in sendKeyCodePoint()
| * | | | | am eed74b81: am c8383eda: Fix wrong commitText parameter in sendKeyCodePoint()Ken Wakasa2013-10-132-4/+14
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eed74b81a6a8d7de11ae2411817546bdd886ae0a': Fix wrong commitText parameter in sendKeyCodePoint()
| | * | | | am c8383eda: Fix wrong commitText parameter in sendKeyCodePoint()Ken Wakasa2013-10-132-4/+14
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c8383eda8bb05e25b22fe6d66100248f7d0e33fa': Fix wrong commitText parameter in sendKeyCodePoint()
| | | * | | Fix wrong commitText parameter in sendKeyCodePoint()Ken Wakasa2013-10-132-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Small optimization on generating a String instance from a single code point too. bug: 11181913 Change-Id: I0f905e4dc6ec7841092bb4d3d940daf3b2303f5b
* | | | | | am 8a866d6f: (-s ours) am f68ef910: (-s ours) am cdc4c1dc: (-s ours) Import ↵Baligh Uddin2013-10-140-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '8a866d6fc13e518dfe054a007e585a740536e6e5': Import translations. DO NOT MERGE
| * | | | | am f68ef910: (-s ours) am cdc4c1dc: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-10-120-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f68ef9102cd2a2a4d5de48a55e9858d94f47f5f7': Import translations. DO NOT MERGE
| | * | | | am cdc4c1dc: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-10-120-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cdc4c1dca70afce35342675de02762959b27b590': Import translations. DO NOT MERGE
| | | * | | Import translations. DO NOT MERGEBaligh Uddin2013-10-122-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icbe028a32311c167219f366e695cb7932f5a9a71 Auto-generated-cl: translation import
* | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-10-122-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6f722071496d4673ca2214cd5fe73dde1006f036 Auto-generated-cl: translation import
* | | | | | am e35594f9: (-s ours) am 3c8bbd2f: (-s ours) am 40823338: (-s ours) Merge ↵Baligh Uddin2013-10-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into klp-dev * commit 'e35594f91b08a619ff1208928cadebf0b43d23b5': Import translations. DO NOT MERGE
| * | | | | am 3c8bbd2f: (-s ours) am 40823338: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2013-10-110-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into klp-dev * commit '3c8bbd2fdc3381b70842cc165d57e7732cdc6e5c': Import translations. DO NOT MERGE
| | * | | | am 40823338: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-10-110-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '40823338e21a0112f141f52278986d0e20df17b9': Import translations. DO NOT MERGE
| | | * | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-10-1133-120/+62
| | | |\ \ \
| | | | * | | Import translations. DO NOT MERGEBaligh Uddin2013-10-1133-120/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I45a783763fce6254469a39374d03edb6a1867cc9 Auto-generated-cl: translation import
* | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-10-114-5/+5
|\ \ \ \ \ \ \
| * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-10-114-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iafd4f4b04b7c80e2d686d2a3953a5c6e41df2739 Auto-generated-cl: translation import
* | | | | | | | am 60fb5865: am 06e1bdaa: am 3e35e072: Merge "Make emoji separators" into ↵Ken Wakasa2013-10-112-9/+4
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit '60fb58654e33448651fea191ba22cfdc87e37466': Make emoji separators
| * | | | | | | am 06e1bdaa: am 3e35e072: Merge "Make emoji separators" into klp-devKen Wakasa2013-10-112-9/+4
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '06e1bdaa2582293193df7c1b1dd0784b9c327b87': Make emoji separators
| | * | | | | | am 3e35e072: Merge "Make emoji separators" into klp-devKen Wakasa2013-10-112-9/+4
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | * commit '3e35e0727ce02e29ae498fb09ebc70df7e103d14': Make emoji separators
| | | * | | | | Merge "Make emoji separators" into klp-devKen Wakasa2013-10-112-9/+4
| | | |\ \ \ \ \
| | | | * | | | | Make emoji separatorsJean Chalard2013-10-112-9/+4
| | | | | |/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11163495 Change-Id: I3247b8d1bbd3406b29a30a25aebd932c63431943
* | | | | | | | am 40506273: am ac6d0c65: am 6d915037: Merge "Fix a bug where emojis would ↵Satoshi Kataoka2013-10-112-9/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove the suggestion strip." into klp-dev * commit '405062733cfe066c4b9af719bfc36a9a516c9dd3': Fix a bug where emojis would remove the suggestion strip.
| * | | | | | | am ac6d0c65: am 6d915037: Merge "Fix a bug where emojis would remove the ↵Satoshi Kataoka2013-10-112-9/+15
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | suggestion strip." into klp-dev * commit 'ac6d0c656e1788d796c3c78434ceb049b43abb42': Fix a bug where emojis would remove the suggestion strip.
| | * | | | | | am 6d915037: Merge "Fix a bug where emojis would remove the suggestion ↵Satoshi Kataoka2013-10-112-9/+15
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | strip." into klp-dev * commit '6d91503727a6d5b4eb942c56ee3f640984ae31a4': Fix a bug where emojis would remove the suggestion strip.
| | | * | | | | Merge "Fix a bug where emojis would remove the suggestion strip." into klp-devSatoshi Kataoka2013-10-112-9/+15
| | | |\ \ \ \ \
| | | | * | | | | Fix a bug where emojis would remove the suggestion strip.Jean Chalard2013-10-112-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11163495 Change-Id: I23d12c430125cc2a66a6e00715a4c609bb9e2bb1
* | | | | | | | | Merge "Add a time stamp for unigrams."Ken Wakasa2013-10-112-4/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add a time stamp for unigrams.Yuichiro Hanada2013-10-112-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10920255 Change-Id: I26d2cce3c322a4ff39a614f8615f43fb7bd3baed
* | | | | | | | | | Merge "Fix unit test for If8c94ef91ed58bb5028f51be7c8d9beb677436a4"Ken Wakasa2013-10-111-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix unit test for If8c94ef91ed58bb5028f51be7c8d9beb677436a4Ken Wakasa2013-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I056013de3a5e09feed429dfd8097d3d85331a0ab
* | | | | | | | | | | am 3f1c95db: am 331c84d7: am 5fe9ab1c: Merge "Fix the suggestion size." into ↵Jean Chalard2013-10-111-9/+26
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit '3f1c95dbdc18453dc0cd6f847b33e01db1f1d75b': Fix the suggestion size.
| * | | | | | | | | | am 331c84d7: am 5fe9ab1c: Merge "Fix the suggestion size." into klp-devJean Chalard2013-10-111-9/+26
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '331c84d790cfc04040e7b4e4102519f7be3f5e48': Fix the suggestion size.
| | * | | | | | | | | am 5fe9ab1c: Merge "Fix the suggestion size." into klp-devJean Chalard2013-10-111-9/+26
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5fe9ab1cc680bed75160980f69f0a7d33f18fb5a': Fix the suggestion size.
| | | * | | | | | | | Merge "Fix the suggestion size." into klp-devJean Chalard2013-10-111-9/+26
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Fix the suggestion size.Jean Chalard2013-10-111-9/+26
| | | | | |_|_|/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | Merge "Add resolveBigramPositions."Ken Wakasa2013-10-111-11/+22
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add resolveBigramPositions.Yuichiro Hanada2013-10-091-11/+22
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11073222 Change-Id: I680e4304c6ab701e9aa132e1e140d789097a53ae
* | | | | | | | | | am 16b2dd43: (-s ours) am ee1ff0da: am 7611af75: Merge "Do not merge. Save / ↵Satoshi Kataoka2013-10-110-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | restore the last used emoji category" into klp-dev * commit '16b2dd439634e469edcfbd9b876be6288014df58': Do not merge. Save / restore the last used emoji category
| * | | | | | | | | am ee1ff0da: am 7611af75: Merge "Do not merge. Save / restore the last used ↵Satoshi Kataoka2013-10-112-11/+25
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | emoji category" into klp-dev * commit 'ee1ff0da30f7895d38a1d93d1810425dcd04390a': Do not merge. Save / restore the last used emoji category