aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Add ShortcutContentReader.Yuichiro Hanada2013-10-171-59/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7c2d0d86d85775065a9bcb2b4a8463bb4969579e
* | | | | | | | am 46742367: am 09ecfc06: am cf0a94fa: merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '46742367fbc484de6e0433eb9f5b5862c3f7d9cc': 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)
| * | | | | | | am 09ecfc06: am cf0a94fa: merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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)
| | * | | | | | am cf0a94fa: merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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)
| | | * | | | | merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
| | | |\ \ \ \ \
| | | | * \ \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-10-150-0/+0
| | | | |\ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | |
| | | | | * | | | merge in klp-release history after reset to klp-devThe Android Automerger2013-10-130-0/+0
| | | | | |\ \ \ \
| | | | | | * \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-10-130-0/+0
| | | | | | |\ \ \ \
| | | | | | | * \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-10-100-0/+0
| | | | | | | |\ \ \ \
| | | | | | | | * \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-10-060-0/+0
| | | | | | | | |\ \ \ \
| | | | | | | | | * | | | Do not merge. Revert emoji key position to JB-mr2Satoshi Kataoka2013-10-044-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry pick of Ie2033b2f5253b2e2 Bug: 10954182 Change-Id: I9cc61e27a207055d5a43fe3da6fd1ec63bae49fd
| | | | | | | | | * | | | Fix: Native crash when an empty attribute is written. DO NOT MERGEKeisuke Kuroyanagi2013-10-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10964805 Change-Id: I862a6b920a7a09eac4e012bfe75f087b2d7b4fe6
| | | | | | | | | * | | | merge in klp-release history after reset to klp-devThe Android Automerger2013-10-030-0/+0
| | | | | | | | | |\ \ \ \
| | | | | | | | | | * | | | Use reentrant lock for main dictionaries. DO NOT MERGEKeisuke Kuroyanagi2013-09-302-16/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cherrypick of Iaa9b79fc770d8ae2ec9d7c362c90c28bc9f65ea8 Bug: 10964805 Change-Id: Id5e67b00bf9594be0591c87407a78146297e0e78
| | | | | | | | | | * | | | merge in klp-release history after reset to klp-devThe Android Automerger2013-09-290-0/+0
| | | | | | | | | | |\ \ \ \
| | | | | | | | | | | * | | | Stop reading dictionary while regenerating. (DO NOT MERGE)Keisuke Kuroyanagi2013-09-271-62/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherrypick of Iead7268a9371b48d729a5f65074ccbc05f3185db Bug: 10831272 Change-Id: Ib6f314ac68696616532ff9c05c7f35813137bf9f
| | | | | | | | | | | * | | | merge in klp-release history after reset to klp-devThe Android Automerger2013-09-260-0/+0
| | | | | | | | | | | |\ \ \ \
* | | | | | | | | | | | | | | | am fb8346cb: (-s ours) am bfef552e: am ea3db813: Merge "Do not merge. Remove ↵Satoshi Kataoka2013-10-160-0/+0
|\| | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Azerbaijani subtype" into klp-dev * commit 'fb8346cbd99a27b119f669d857ee6f996df8d1aa': Do not merge. Remove Azerbaijani subtype
| * | | | | | | | | | | | | | am bfef552e: am ea3db813: Merge "Do not merge. Remove Azerbaijani subtype" ↵Satoshi Kataoka2013-10-161-4/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit 'bfef552e623b2005afa0c53041183c787cd44bb2': Do not merge. Remove Azerbaijani subtype
| | * | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | Merge "Fix typo"Satoshi Kataoka2013-10-161-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix typoSatoshi Kataoka2013-10-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4748935c3cf00e4a3c02aabe2ea659e1c8c2d7c6
* | | | | | | | | | | | | | | | Merge "Remove unneeded code."Jean Chalard2013-10-162-63/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Remove unneeded code.Jean Chalard2013-10-162-63/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't support LOG_FULL_TEXTVIEW_CONTENTS any more, nor do we have any plans to support it again in the future. This also is a prelude to removing mIsExpectingUpdateSelection. Bug: 11226045 Change-Id: Ib68c6daf52993b87225a7ea9e71a414caaecfdb7
* | | | | | | | | | | | | | | | Add SparseContentTableReader.Yuichiro Hanada2013-10-162-39/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I976afc5d320bc65835d659bae1d10d2cdc68262b
* | | | | | | | | | | | | | | | Fix Ver4DictDecoder.readAndFollowForwardLink().Yuichiro Hanada2013-10-161-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib527a376b693be21aebd4920ac804ee9b161eb96
* | | | | | | | | | | | | | | | Merge "Fix readAndFollowForwardLink."Ken Wakasa2013-10-161-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix readAndFollowForwardLink.Yuichiro Hanada2013-10-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifda44e6139a4a1bd065468a7f74cd9483b343644
* | | | | | | | | | | | | | | | | Merge "Extract SparseTableContentWriter."Ken Wakasa2013-10-162-56/+93
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Extract SparseTableContentWriter.Yuichiro Hanada2013-10-162-56/+93
| |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9a58e53317654f8a09fbe79044214de3e9c59eb7
* | | | | | | | | | | | | | | | | Merge "Consolidate CharEncoding.writeString and BinaryDictIOUtils.writeString."Satoshi Kataoka2013-10-162-32/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Consolidate CharEncoding.writeString and BinaryDictIOUtils.writeString.Yuichiro Hanada2013-10-162-32/+9
| |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6f990fd84e7f08fd1149198c33d8bbf1cac8e078
* | | | | | | | | | | | | | | | Merge "Cleanup unintentionally used resources"Satoshi Kataoka2013-10-1621-2505/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Cleanup unintentionally used resourcesSatoshi Kataoka2013-10-1621-2505/+0
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 11244796 Change-Id: I99be3d54d38f4cd70fc38f5e0b88b4027f62d579
* / | | | | | | | | | | | | | 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