aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Prepare for changing text color for functional keysSatoshi Kataoka2013-10-035-8/+77
| | | | | | Bug: 10786040 Change-Id: I0de7d4923ea13b44adcf1f4ea456796cd02ef27b
* Correspond to the security related API change for PreferenceActivitySatoshi Kataoka2013-10-024-2/+30
| | | | | Bug: 10118761 Change-Id: Ia7d1c6c526dae849f447c26387e96a4fb4d6042f
* Merge "Fix a test and crash with a better error message when reading"Jean Chalard2013-10-023-3/+7
|\
| * Fix a test and crash with a better error message when readingJean Chalard2013-10-023-3/+7
| | | | | | | | | | | | | | | | | | When there are too many bigrams, we stop reading the file, so the file pointer is in an inconsistent place. This means we have no idea what's going to happen next. It's better to crash right away. Change-Id: Id3b7b78cbe4fda3493b3c9c46758763e1ab5f6a3
* | Merge "Retain Emoji Keyboard after rotation"Satoshi Kataoka2013-10-022-4/+2
|\ \
| * | Retain Emoji Keyboard after rotationSatoshi Kataoka2013-10-012-4/+2
| | | | | | | | | | | | | | | Bug: 10612450 Change-Id: Ie0ae953958d2b0a0a4da651584f1e28b0ba38ae3
* | | am 847fdcf7: (-s ours) am 2f14418c: am e628cd3c: (-s ours) Use reentrant ↵Keisuke Kuroyanagi2013-10-010-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | lock for main dictionaries. DO NOT MERGE * commit '847fdcf7089941c6ded7635c6e3a508d092a0557':
| * \ \ am 2f14418c: am e628cd3c: (-s ours) Use reentrant lock for main ↵Keisuke Kuroyanagi2013-10-012-135/+16
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | dictionaries. DO NOT MERGE * commit '2f14418c3176caa09d646d95e5556c11e3b86549':
| | * \ \ am e628cd3c: (-s ours) Use reentrant lock for main dictionaries. DO NOT MERGEKeisuke Kuroyanagi2013-09-300-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e628cd3c325d97243d4ef1c991f07c084d0cbaac': Use reentrant lock for main dictionaries. DO NOT MERGE
* | | | | | am 2913ce41: am a0c9846f: am ceb364c0: Fix PrioritizedSerialExecutor.Yuichiro Hanada2013-10-010-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '2913ce4141be93962ed488495ff3cbcdb74f7cb7':
| * | | | | am a0c9846f: am ceb364c0: Fix PrioritizedSerialExecutor.Yuichiro Hanada2013-10-010-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | * commit 'a0c9846fb99b65a6a4a578eba38f3d4b66056fed':
| | * | | | am ceb364c0: Fix PrioritizedSerialExecutor.Yuichiro Hanada2013-09-304-47/+46
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ceb364c0411dbcb38f2bd94f1d2b54eef3b985c1': Fix PrioritizedSerialExecutor.
* | | | | | | am 83d1648b: (-s ours) am cecb793f: am ef63947f: (-s ours) Add boundary ↵Keisuke Kuroyanagi2013-10-010-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | checking for PtNode Array reading. DO NOT MERGE * commit '83d1648b2c0132715f4fbc623cc922afe4719bcd':
| * | | | | | am cecb793f: am ef63947f: (-s ours) Add boundary checking for PtNode Array ↵Keisuke Kuroyanagi2013-10-013-21/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reading. DO NOT MERGE * commit 'cecb793ff36539f5938db764cad73d88fa399192':
| | * | | | | am ef63947f: (-s ours) Add boundary checking for PtNode Array reading. DO ↵Keisuke Kuroyanagi2013-09-300-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE * commit 'ef63947f7d10bcbb3237661ad480b430d4208833': Add boundary checking for PtNode Array reading. DO NOT MERGE
* | | | | | | | am 1e113c13: (-s ours) am e628cd3c: Use reentrant lock for main ↵Keisuke Kuroyanagi2013-10-010-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dictionaries. DO NOT MERGE * commit '1e113c1325de5cc5e1f0956e60652eefd88b2813':
| * | | | | | | am e628cd3c: Use reentrant lock for main dictionaries. DO NOT MERGEKeisuke Kuroyanagi2013-10-012-16/+135
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit 'e628cd3c325d97243d4ef1c991f07c084d0cbaac': Use reentrant lock for main dictionaries. DO NOT MERGE
* | | | | | | | am 1ef00b28: am ceb364c0: Fix PrioritizedSerialExecutor.Yuichiro Hanada2013-10-010-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1ef00b28a58fe175c721f4b4c04aa903d6e45280':
| * | | | | | | am ceb364c0: Fix PrioritizedSerialExecutor.Yuichiro Hanada2013-10-014-47/+46
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit 'ceb364c0411dbcb38f2bd94f1d2b54eef3b985c1': Fix PrioritizedSerialExecutor.
* | | | | | | | am 3b3cb4fe: (-s ours) am ef63947f: Add boundary checking for PtNode Array ↵Keisuke Kuroyanagi2013-10-010-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reading. DO NOT MERGE * commit '3b3cb4fe56e3d9feb9d21952658ec898843e1e47':
| * | | | | | | am ef63947f: Add boundary checking for PtNode Array reading. DO NOT MERGEKeisuke Kuroyanagi2013-10-013-1/+21
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit 'ef63947f7d10bcbb3237661ad480b430d4208833': Add boundary checking for PtNode Array reading. DO NOT MERGE
* | | | | | | | am dd8ea0a3: (-s ours) am 10fa6a2e: Stop reading dictionary while ↵Keisuke Kuroyanagi2013-10-010-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | regenerating. (DO NOT MERGE) * commit 'dd8ea0a33a768f579d90489f67dbba31e75167c5':
| * | | | | | | am 10fa6a2e: Stop reading dictionary while regenerating. (DO NOT MERGE)Keisuke Kuroyanagi2013-09-301-62/+88
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '10fa6a2e51ff29b81ffaf33d6bc4e3d78bae83e6': Stop reading dictionary while regenerating. (DO NOT MERGE)
* | | | | | | | am e628cd3c: (-s ours) Use reentrant lock for main dictionaries. DO NOT MERGEKeisuke Kuroyanagi2013-10-010-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | * commit 'e628cd3c325d97243d4ef1c991f07c084d0cbaac': Use reentrant lock for main dictionaries. DO NOT MERGE
| * | | | | | | Use reentrant lock for main dictionaries. DO NOT MERGEKeisuke Kuroyanagi2013-10-012-16/+135
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cherrypick of Iaa9b79fc770d8ae2ec9d7c362c90c28bc9f65ea8 Bug: 10964805 Change-Id: Id5e67b00bf9594be0591c87407a78146297e0e78
* | | | | | | am ceb364c0: Fix PrioritizedSerialExecutor.Yuichiro Hanada2013-10-010-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ceb364c0411dbcb38f2bd94f1d2b54eef3b985c1': Fix PrioritizedSerialExecutor.
| * | | | | | Fix PrioritizedSerialExecutor.Yuichiro Hanada2013-09-294-47/+46
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was possible that fetchNextTasks() would be called by multiple threads concurrently. If it happens, some tasks in the task queues might be ignored. cherrypick of Idc81c43c45e382da3850cc55b9a42c281548d2a8 bug: 10957075 Change-Id: I41bf90dda15306ee879350f96a791d940ea31da1
* | | | | | am ef63947f: (-s ours) Add boundary checking for PtNode Array reading. DO ↵Keisuke Kuroyanagi2013-10-010-0/+0
|\| | | | | | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE * commit 'ef63947f7d10bcbb3237661ad480b430d4208833': Add boundary checking for PtNode Array reading. DO NOT MERGE
| * | | | Add boundary checking for PtNode Array reading. DO NOT MERGEKeisuke Kuroyanagi2013-09-293-1/+21
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | cheery-pick of Iea5e19d98d2fc26f137046dd5f8e339239672351 Bug: 10957075 Change-Id: I3f1806c32fe480f2e7422d3a945932b9cc0cd98b
* | | | Merge "Unfortunately, hide some broken "emoji"s"Satoshi Kataoka2013-10-013-26/+56
|\ \ \ \ | |_|_|/ |/| | |
| * | | Unfortunately, hide some broken "emoji"sSatoshi Kataoka2013-10-013-26/+56
| | | | | | | | | | | | | | | | | | | | Bug: 10923117 Change-Id: I27ba38e5f388cc15ae331fd05d63db4e4a41cbbf
* | | | Merge "Implement the heuristic for auto-commit."Jean Chalard2013-10-016-21/+90
|\ \ \ \
| * | | | Implement the heuristic for auto-commit.Jean Chalard2013-10-016-21/+90
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9059617 Change-Id: I066abf018df5aaeabf415425dd822ebe233e6008
* | | | | Merge "Fix typos"Jean Chalard2013-10-016-19/+19
|\ \ \ \ \
| * | | | | Fix typosJean Chalard2013-10-016-19/+19
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | I think I may pass out from the sheer ugliness Change-Id: I1e709f03ef47ec713552d41fd9e37e01b810ae88
* | | | | Merge "Fix a bug where gesture would delay update."Jean Chalard2013-10-011-2/+4
|\ \ \ \ \
| * | | | | Fix a bug where gesture would delay update.Jean Chalard2013-10-011-2/+4
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I94c394f45f2717bc1a4b95692a5757c1e7179152
* | | | | Merge "Cleanup and remove redundant more keys on phones"Ken Wakasa2013-10-018-28/+115
|\ \ \ \ \
| * | | | | Cleanup and remove redundant more keys on phonesKen Wakasa2013-10-018-28/+115
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I419c3c119eb1e4d2e877c8c00564e46f40b6abc2
* | | | | | Merge "Swap keys: exclamation, question, period, comma."Ken Wakasa2013-10-013-20/+20
|\| | | | |
| * | | | | Swap keys: exclamation, question, period, comma.Ken Wakasa2013-10-013-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 11003945 Change-Id: If9ff0487ebbb1c25c8b13eaa55615255921c61c6
* | | | | | Merge "Separate "GC" and "GC with decay"."Keisuke Kuroyanagi2013-10-0113-32/+77
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Separate "GC" and "GC with decay".Keisuke Kuroyanagi2013-10-0113-32/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6669677 Change-Id: I9d6aba76cef2616f0549e612db9701e1d6a19467
* | | | | | Merge "Add skipPtNode to DictDecoders."Ken Wakasa2013-10-014-0/+50
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Add skipPtNode to DictDecoders.Yuichiro Hanada2013-10-014-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I042ff041b68572182c87dc87db6a6aa2bbbefc6c
* | | | | | Tentatively revert inconsistent assetsSatoshi Kataoka2013-10-015-0/+1
| |_|/ / / |/| | | | | | | | | | | | | | Change-Id: I90f0ffed57f0efa9f01adb969fd499e2dcd2a0dc
* | | | | Hide indication bar if only one pageSatoshi Kataoka2013-10-011-2/+3
| |/ / / |/| | | | | | | | | | | | | | | Bug: 10923117 Change-Id: If81bf07ba2e7c4fff44a8832f98b4a393c15edc7
* | | | Merge "Quit blocking getSuggestion during GC."Keisuke Kuroyanagi2013-10-012-12/+21
|\ \ \ \ | |/ / / |/| | |
| * | | Quit blocking getSuggestion during GC.Keisuke Kuroyanagi2013-10-012-12/+21
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 10831272 Change-Id: I995c619dc18a9120a47f547d31045cb73a9353ec
* | | | Merge "Create the wiring for auto-commit confidence computation."Jean Chalard2013-10-018-13/+38
|\ \ \ \