aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am ea3db813: Merge "Do not merge. Remove Azerbaijani subtype" into klp-devSatoshi Kataoka2013-10-161-4/+6
|\ | | | | | | | | * commit 'ea3db813ccb0744129358b9db0b21b9d27b16dde': Do not merge. Remove Azerbaijani subtype
| * Merge "Do not merge. Remove Azerbaijani subtype" into klp-devSatoshi Kataoka2013-10-161-4/+6
| |\
| | * Do not merge. Remove Azerbaijani subtypeSatoshi Kataoka2013-10-161-4/+6
| | | | | | | | | | | | | | | | | | | | | The corresponding change is I0d2a98dffe03ebd Bug: 11244796 Change-Id: I0d2a98dffe03ebddf26fc3c2760061c39de4c57e
* | | 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
* | | 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 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
* | | 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
* | | | 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 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
* | | | 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
* | | | am 7611af75: Merge "Do not merge. Save / restore the last used emoji ↵Satoshi Kataoka2013-10-112-11/+25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | category" into klp-dev * commit '7611af753af5ba112bcfc8c434caf88dc8f46325': Do not merge. Save / restore the last used emoji category
| * | | Merge "Do not merge. Save / restore the last used emoji category" into klp-devSatoshi Kataoka2013-10-112-11/+25
| |\ \ \ | | |/ / | |/| |
| | * | Do not merge. Save / restore the last used emoji categorySatoshi Kataoka2013-10-112-11/+25
| | |/ | | | | | | | | | | | | Bug: 11029983 Change-Id: I5547910c7b5dd7974292fc075af33568940f4e81
* | | am 6dac27ee: Merge "Tweak vertical gap of Emoji palette. DO NOT MERGE" into ↵Ken Wakasa2013-10-091-2/+2
|\| | | | | | | | | | | | | | | | | | | | klp-dev * commit '6dac27eeb4cfc969a07e646f013a25a27760c773': Tweak vertical gap of Emoji palette. DO NOT MERGE
| * | Merge "Tweak vertical gap of Emoji palette. DO NOT MERGE" into klp-devKen Wakasa2013-10-101-2/+2
| |\ \
| | * | Tweak vertical gap of Emoji palette. DO NOT MERGESatoshi Kataoka2013-10-101-2/+2
| | |/ | | | | | | | | | | | | | | | | | | cherrypick of I8163568a9d7f9d321148001e161c672f78796c96 Bug: 11140087 Change-Id: Ifd28f3017a8cf568a8c4a1045811564a129d85b7
* | | am f9d7d17f: Merge "Retry to tweak punctuations. DO NOT MERGE" into klp-devKen Wakasa2013-10-092-2/+2
|\| | | | | | | | | | | | | | * commit 'f9d7d17f8fe9aa30346a1e3c8d01163aac58098b': Retry to tweak punctuations. DO NOT MERGE
| * | Merge "Retry to tweak punctuations. DO NOT MERGE" into klp-devKen Wakasa2013-10-102-2/+2
| |\ \
| | * | Retry to tweak punctuations. DO NOT MERGESatoshi Kataoka2013-10-102-2/+2
| | |/ | | | | | | | | | | | | | | | | | | cherrypick of I9ffc457ca44bccfa3eb3bdb0c26535d795215b26 Bug: 11130808 Change-Id: I1a65fd8acc4efe9b4e4786a3dc959498ae63c2f8
* | | am c8e4ad07: Support sw540 (ultra Z). DO NOT MERGESatoshi Kataoka2013-10-095-0/+0
|\| | | | | | | | | | | | | | * commit 'c8e4ad0748d38fa589fc2ffa4bcf13f08c67d74b': Support sw540 (ultra Z). DO NOT MERGE
| * | Support sw540 (ultra Z). DO NOT MERGESatoshi Kataoka2013-10-105-0/+0
| |/ | | | | | | | | | | | | cherrypick of Ib930ba810b25e28bcc36ea1647d46731816d9def Bug: 11125351 Change-Id: Ifc4ab2a0495e886259c34f78bbe8cbf8fb75203b
* | am 2d74136e: keep history after reset to jb-ub-latinimegoogle-bayoBaligh Uddin2013-10-090-0/+0
|\| | | | | | | * commit '2d74136e5793af65d231e07a0cb058a80491cd57':
| * keep history after reset to jb-ub-latinimegoogle-bayoBaligh Uddin2013-10-090-0/+0
| |\
* | \ am 8105ea2f: keep history after reset to jb-ub-latinimegoogle-bayoBaligh Uddin2013-10-090-0/+0
|\ \ \ | | |/ | |/| | | | * commit '8105ea2f1d38dc86f3652a8a67abc868d77909d0':
| * | keep history after reset to jb-ub-latinimegoogle-bayoBaligh Uddin2013-10-090-0/+0
| |\ \ | | |/ | |/|
* | | am a6a6abc8: Fix the security related API change for PreferenceActivitySatoshi Kataoka2013-10-096-4/+91
|\| | | | | | | | | | | | | | * commit 'a6a6abc81611023a0159fa678b731367d80d0aa6': Fix the security related API change for PreferenceActivity
| * | Fix the security related API change for PreferenceActivitySatoshi Kataoka2013-10-096-4/+91
| | | | | | | | | | | | | | | Bug: 10118761 Change-Id: I63501d6c2b5f561d7ab8b7362498665d805d5e1e
* | | am 6862b819: Fix crash in AdditionalSubtypeUtilsSatoshi Kataoka2013-10-092-6/+68
|\| | | | | | | | | | | | | | * commit '6862b8192df0c979ebf3a1fd566ede1b0dbd8a82': Fix crash in AdditionalSubtypeUtils
| * | Fix crash in AdditionalSubtypeUtilsSatoshi Kataoka2013-10-092-6/+68
| | | | | | | | | | | | | | | | | | Bug: 11136982 Change-Id: I9d022a178c47bad3566be4c0bd8ffbce0b14896d
* | | am 965eac66: merge in jb-ub-latinimegoogle-bayo history after reset to ↵The Android Automerger2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | jb-ub-latinimegoogle * commit '965eac663b26b1030074000b66e6980d6b310f5f': Import translations. DO NOT MERGE Import translations. DO NOT MERGE
| * | merge in jb-ub-latinimegoogle-bayo history after reset to jb-ub-latinimegoogleThe Android Automerger2013-10-080-0/+0
| |\ \
| | * | Import translations. DO NOT MERGEBaligh Uddin2013-10-0420-24/+1643
| | | | | | | | | | | | | | | | | | | | Change-Id: Icb238009beb72e5f4f70ad6e7e2333e26a7b24d5 Auto-generated-cl: translation import
| | * | Import translations. DO NOT MERGEBaligh Uddin2013-10-0249-196/+98
| | | | | | | | | | | | | | | | | | | | Change-Id: If2f9b9384231a0d19a39bad13db8c5ce97411f33 Auto-generated-cl: translation import
* | | | am 31e152e3: am de65b7c0: Merge "Fix the position of emoji palette"Satoshi Kataoka2013-10-091-1/+5
|\| | | | | | | | | | | | | | | | | | | * commit '31e152e38012ddba520fc7efc527a2713e8166c1': Fix the position of emoji palette
| * | | am de65b7c0: Merge "Fix the position of emoji palette"Satoshi Kataoka2013-10-081-1/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'de65b7c0b36963de0f5c4f5cede543b247a8ccd7': Fix the position of emoji palette
| | * \ \ Merge "Fix the position of emoji palette"Satoshi Kataoka2013-10-081-1/+5
| | |\ \ \
| | | * | | Fix the position of emoji paletteSatoshi Kataoka2013-10-081-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I07a3912cb9fef8e28f3605de4e73a201a900e95c
* | | | | | am 1d24f19b: am c040d59d: Merge "Add more_keys_for_* declarations for the ↵Ken Wakasa2013-10-092-29/+104
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Swedish keyboard." * commit '1d24f19b00f93fa5ee14b68d7c862c73485b90b1': Add more_keys_for_* declarations for the Swedish keyboard.
| * | | | | am c040d59d: Merge "Add more_keys_for_* declarations for the Swedish keyboard."Ken Wakasa2013-10-082-29/+104
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c040d59defe38ce4b55e54dc8859db2e48307f1f': Add more_keys_for_* declarations for the Swedish keyboard.