Satoshi Kataoka
85eba056f2
am c5182c9a: Correspond to the security related API change for PreferenceActivity
...
* commit 'c5182c9a4ae66e75df8c959bf625d08ef99f81d2':
Correspond to the security related API change for PreferenceActivity
2013-10-02 00:38:31 -07:00
Satoshi Kataoka
c5182c9a4a
Correspond to the security related API change for PreferenceActivity
...
Bug: 10118761
Change-Id: Ia7d1c6c526dae849f447c26387e96a4fb4d6042f
2013-10-02 16:25:07 +09:00
Jean Chalard
0874939e10
am a8b838b4: Merge "Fix a test and crash with a better error message when reading"
...
* commit 'a8b838b473d4927e6f0483912c45fba929dfb402':
Fix a test and crash with a better error message when reading
2013-10-01 23:29:35 -07:00
Jean Chalard
a8b838b473
Merge "Fix a test and crash with a better error message when reading"
2013-10-02 06:28:06 +00:00
Satoshi Kataoka
319eb1c363
am 77144a64: Merge "Retain Emoji Keyboard after rotation"
...
* commit '77144a645f693fd0d73fd2cbe378997c7a339006':
Retain Emoji Keyboard after rotation
2013-10-01 23:16:44 -07:00
Satoshi Kataoka
77144a645f
Merge "Retain Emoji Keyboard after rotation"
2013-10-02 06:14:14 +00:00
Keisuke Kuroyanagi
358e152b10
am e95262a8: (-s ours) am 847fdcf7: (-s ours) am 2f14418c: am e628cd3c: (-s ours) Use reentrant lock for main dictionaries. DO NOT MERGE
...
* commit 'e95262a8754f9799dd014a19389109b4195bd9a6':
2013-10-01 23:13:30 -07:00
Yuichiro Hanada
a1ff53fb5b
am 4b540703: am 2913ce41: am a0c9846f: am ceb364c0: Fix PrioritizedSerialExecutor.
...
* commit '4b540703fe6430a1250145a2ac79b6832d610e83':
2013-10-01 23:13:29 -07:00
Keisuke Kuroyanagi
ab5affded4
am b924b2bb: (-s ours) am 83d1648b: (-s ours) am cecb793f: am ef63947f: (-s ours) Add boundary checking for PtNode Array reading. DO NOT MERGE
...
* commit 'b924b2bb1d3528f8d117d76af221d8bbe6338c7e':
2013-10-01 23:13:18 -07:00
Keisuke Kuroyanagi
e95262a875
am 847fdcf7: (-s ours) am 2f14418c: am e628cd3c: (-s ours) Use reentrant lock for main dictionaries. DO NOT MERGE
...
* commit '847fdcf7089941c6ded7635c6e3a508d092a0557':
2013-10-01 23:10:25 -07:00
Yuichiro Hanada
4b540703fe
am 2913ce41: am a0c9846f: am ceb364c0: Fix PrioritizedSerialExecutor.
...
* commit '2913ce4141be93962ed488495ff3cbcdb74f7cb7':
2013-10-01 23:10:24 -07:00
Keisuke Kuroyanagi
b924b2bb1d
am 83d1648b: (-s ours) am cecb793f: am ef63947f: (-s ours) Add boundary checking for PtNode Array reading. DO NOT MERGE
...
* commit '83d1648b2c0132715f4fbc623cc922afe4719bcd':
2013-10-01 23:10:23 -07:00
Keisuke Kuroyanagi
847fdcf708
am 2f14418c: am e628cd3c: (-s ours) Use reentrant lock for main dictionaries. DO NOT MERGE
...
* commit '2f14418c3176caa09d646d95e5556c11e3b86549':
2013-10-01 22:22:04 -07:00
Yuichiro Hanada
2913ce4141
am a0c9846f: am ceb364c0: Fix PrioritizedSerialExecutor.
...
* commit 'a0c9846fb99b65a6a4a578eba38f3d4b66056fed':
2013-10-01 22:22:03 -07:00
Keisuke Kuroyanagi
83d1648b2c
am cecb793f: am ef63947f: (-s ours) Add boundary checking for PtNode Array reading. DO NOT MERGE
...
* commit 'cecb793ff36539f5938db764cad73d88fa399192':
2013-10-01 22:22:02 -07:00
Keisuke Kuroyanagi
3c62310117
am 5e375d42: (-s ours) am 1e113c13: (-s ours) am e628cd3c: Use reentrant lock for main dictionaries. DO NOT MERGE
...
* commit '5e375d428c535e94dd451f79ac4b8e5cc822c155':
2013-10-01 21:04:49 -07:00
Yuichiro Hanada
a317bf58e1
am 6bbaf2f8: am 1ef00b28: am ceb364c0: Fix PrioritizedSerialExecutor.
...
* commit '6bbaf2f812251b9360d87e8b2d9c2f4769a11d89':
2013-10-01 21:04:47 -07:00
Keisuke Kuroyanagi
30ca32defc
am 6ed55278: (-s ours) am 3b3cb4fe: (-s ours) am ef63947f: Add boundary checking for PtNode Array reading. DO NOT MERGE
...
* commit '6ed552780427cd7fb184a648c25e143e507741a7':
2013-10-01 21:04:46 -07:00
Keisuke Kuroyanagi
9de5ec255f
am 49410adb: (-s ours) am dd8ea0a3: (-s ours) am 10fa6a2e: Stop reading dictionary while regenerating. (DO NOT MERGE)
...
* commit '49410adb1be1071f3797616c43b9fb5ccb923005':
2013-10-01 21:04:44 -07:00
Keisuke Kuroyanagi
5e375d428c
am 1e113c13: (-s ours) am e628cd3c: Use reentrant lock for main dictionaries. DO NOT MERGE
...
* commit '1e113c1325de5cc5e1f0956e60652eefd88b2813':
2013-10-01 20:59:24 -07:00
Yuichiro Hanada
6bbaf2f812
am 1ef00b28: am ceb364c0: Fix PrioritizedSerialExecutor.
...
* commit '1ef00b28a58fe175c721f4b4c04aa903d6e45280':
2013-10-01 20:59:23 -07:00
Keisuke Kuroyanagi
6ed5527804
am 3b3cb4fe: (-s ours) am ef63947f: Add boundary checking for PtNode Array reading. DO NOT MERGE
...
* commit '3b3cb4fe56e3d9feb9d21952658ec898843e1e47':
2013-10-01 20:59:22 -07:00
Keisuke Kuroyanagi
49410adb1b
am dd8ea0a3: (-s ours) am 10fa6a2e: Stop reading dictionary while regenerating. (DO NOT MERGE)
...
* commit 'dd8ea0a33a768f579d90489f67dbba31e75167c5':
2013-10-01 20:59:21 -07:00
Jean Chalard
fa946d4a0f
Fix a test and crash with a better error message when reading
...
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
2013-10-02 11:48:47 +09:00
Keisuke Kuroyanagi
eff90276f1
am 9b9d17f9: (-s ours) am e628cd3c: (-s ours) Use reentrant lock for main dictionaries. DO NOT MERGE
...
* commit '9b9d17f99c2f1be7fbdf55a3b5403b865942beb7':
Use reentrant lock for main dictionaries. DO NOT MERGE
2013-10-01 18:53:32 -07:00
Yuichiro Hanada
d22650363c
am f9ba073d: am ceb364c0: Fix PrioritizedSerialExecutor.
...
* commit 'f9ba073d3b33344594578822edb7885fcc660fcf':
Fix PrioritizedSerialExecutor.
2013-10-01 18:53:30 -07:00
Keisuke Kuroyanagi
e0547020f1
am a6095365: (-s ours) am ef63947f: (-s ours) Add boundary checking for PtNode Array reading. DO NOT MERGE
...
* commit 'a6095365127546ab66574afe5e195972ad61b58b':
Add boundary checking for PtNode Array reading. DO NOT MERGE
2013-10-01 18:53:28 -07:00
Keisuke Kuroyanagi
9b9d17f99c
am e628cd3c: (-s ours) Use reentrant lock for main dictionaries. DO NOT MERGE
...
* commit 'e628cd3c325d97243d4ef1c991f07c084d0cbaac':
Use reentrant lock for main dictionaries. DO NOT MERGE
2013-10-01 18:45:36 -07:00
Yuichiro Hanada
f9ba073d3b
am ceb364c0: Fix PrioritizedSerialExecutor.
...
* commit 'ceb364c0411dbcb38f2bd94f1d2b54eef3b985c1':
Fix PrioritizedSerialExecutor.
2013-10-01 18:44:42 -07:00
Keisuke Kuroyanagi
a609536512
am ef63947f: (-s ours) Add boundary checking for PtNode Array reading. DO NOT MERGE
...
* commit 'ef63947f7d10bcbb3237661ad480b430d4208833':
Add boundary checking for PtNode Array reading. DO NOT MERGE
2013-10-01 18:44:41 -07:00
Satoshi Kataoka
615509cf27
am 9d763910: Merge "Unfortunately, hide some broken "emoji"s"
...
* commit '9d763910580379d3e68b4559f91e655cf05f02a3':
Unfortunately, hide some broken "emoji"s
2013-10-01 09:52:17 -07:00
Jean Chalard
af75e48efd
am 74577bed: Merge "Implement the heuristic for auto-commit."
...
* commit '74577bedb3bb0dabd0e661270f9da0c11c4b0f46':
Implement the heuristic for auto-commit.
2013-10-01 09:52:15 -07:00
Jean Chalard
a6e7c3ff29
am ff9476f1: Merge "Fix typos"
...
* commit 'ff9476f10ae271aa6df87aadb8b2b9edfeeb8a1d':
Fix typos
2013-10-01 09:52:13 -07:00
Jean Chalard
6f2830dcb9
am 2afa0e62: Merge "Fix a bug where gesture would delay update."
...
* commit '2afa0e621eab2ebd7e2bde344dd209308a75dcfc':
Fix a bug where gesture would delay update.
2013-10-01 09:52:11 -07:00
Ken Wakasa
a9f5c55ca2
am 382094a7: Merge "Cleanup and remove redundant more keys on phones"
...
* commit '382094a784efb32ef9308542ef2f8d2c88ac96b2':
Cleanup and remove redundant more keys on phones
2013-10-01 09:52:04 -07:00
Ken Wakasa
88c946af0c
am 194c6360: Merge "Swap keys: exclamation, question, period, comma."
...
* commit '194c6360554f54d3dfa165427eadda2c7046a65e':
Swap keys: exclamation, question, period, comma.
2013-10-01 09:51:57 -07:00
Keisuke Kuroyanagi
a231c2ab72
am e89a179b: Merge "Separate "GC" and "GC with decay"."
...
* commit 'e89a179b1048eb7d9a2edba5c140d6219a85b056':
Separate "GC" and "GC with decay".
2013-10-01 09:51:55 -07:00
Ken Wakasa
1522e7be20
am cc81a93b: Merge "Add skipPtNode to DictDecoders."
...
* commit 'cc81a93b01cbcada13c3791fa5ba73a09ba7e092':
Add skipPtNode to DictDecoders.
2013-10-01 09:51:53 -07:00
Satoshi Kataoka
98da7cfc0b
am c2dda795: Tentatively revert inconsistent assets
...
* commit 'c2dda795af14f94db7b6cfc80cbc609c20406522':
Tentatively revert inconsistent assets
2013-10-01 09:51:51 -07:00
Satoshi Kataoka
db083a2b25
am a4913994: Hide indication bar if only one page
...
* commit 'a4913994c2904eefa861782966a288959b216713':
Hide indication bar if only one page
2013-10-01 09:51:50 -07:00
Keisuke Kuroyanagi
d00e48656b
am 126d758c: Merge "Quit blocking getSuggestion during GC."
...
* commit '126d758c1e8db969ad1c9e5d801f3075e2061cc1':
Quit blocking getSuggestion during GC.
2013-10-01 09:51:43 -07:00
Jean Chalard
bff2d14d1c
am 74730a46: Merge "Create the wiring for auto-commit confidence computation."
...
* commit '74730a4600620b5ccfcf3d16666ad0239aec18b6':
Create the wiring for auto-commit confidence computation.
2013-10-01 09:51:41 -07:00
Satoshi Kataoka
5ceae026e0
Retain Emoji Keyboard after rotation
...
Bug: 10612450
Change-Id: Ie0ae953958d2b0a0a4da651584f1e28b0ba38ae3
2013-10-01 22:59:02 +09:00
Keisuke Kuroyanagi
1e113c1325
am e628cd3c: Use reentrant lock for main dictionaries. DO NOT MERGE
...
* commit 'e628cd3c325d97243d4ef1c991f07c084d0cbaac':
Use reentrant lock for main dictionaries. DO NOT MERGE
2013-10-01 05:23:17 -07:00
Yuichiro Hanada
1ef00b28a5
am ceb364c0: Fix PrioritizedSerialExecutor.
...
* commit 'ceb364c0411dbcb38f2bd94f1d2b54eef3b985c1':
Fix PrioritizedSerialExecutor.
2013-10-01 05:23:13 -07:00
Keisuke Kuroyanagi
3b3cb4fe56
am ef63947f: Add boundary checking for PtNode Array reading. DO NOT MERGE
...
* commit 'ef63947f7d10bcbb3237661ad480b430d4208833':
Add boundary checking for PtNode Array reading. DO NOT MERGE
2013-10-01 05:23:12 -07:00
Satoshi Kataoka
9d76391058
Merge "Unfortunately, hide some broken "emoji"s"
2013-10-01 12:18:13 +00:00
Jean Chalard
74577bedb3
Merge "Implement the heuristic for auto-commit."
2013-10-01 12:10:57 +00:00
Jean Chalard
ff9476f10a
Merge "Fix typos"
2013-10-01 12:10:37 +00:00
Jean Chalard
3e954347e3
Fix typos
...
I think I may pass out from the sheer ugliness
Change-Id: I1e709f03ef47ec713552d41fd9e37e01b810ae88
2013-10-01 21:08:14 +09:00