aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 93c2fa8d: am cd7422f4: Merge "Fix a pernicious bug with caps."Jean Chalard2013-10-092-0/+3
|\ | | | | | | | | * commit '93c2fa8d3e65ab91898760e64636d5d10942ea17': Fix a pernicious bug with caps.
| * am cd7422f4: Merge "Fix a pernicious bug with caps."Jean Chalard2013-10-022-0/+3
| |\ | | | | | | | | | | | | * commit 'cd7422f4dfe2bd5708acc6305a4f6dc83767685a': Fix a pernicious bug with caps.
| | * Merge "Fix a pernicious bug with caps."Jean Chalard2013-10-022-0/+3
| | |\
| | | * Fix a pernicious bug with caps.Jean Chalard2013-10-022-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | What's happening here is, setAlphabetKeyboard sets the keyboard to AUTOMATIC_SHIFTED and updates the keyboard, then restoring the keyboard old state sets it back to UNSHIFTED without updating it. When we finally know what the correct value is, we try to set it to UNSHIFTED, but since that's already the currently recorded state, it skips updating the keyboard forever. The solution is to avoid setting the shift state without updating the keyboard. Bug: 10948582 Change-Id: Ic8670401e378f8284e851281f91a9ad93eac8e90
* | | | am 0fbad0fa: am 52c20927: Merge "Change name of DecayingUtils."Keisuke Kuroyanagi2013-10-097-46/+49
|\| | | | | | | | | | | | | | | | | | | * commit '0fbad0fac461c8d2472fd9918f59c056c0a7c347': Change name of DecayingUtils.
| * | | am 52c20927: Merge "Change name of DecayingUtils."Keisuke Kuroyanagi2013-10-027-46/+49
| |\| | | | | | | | | | | | | | | | | | * commit '52c20927a9516a50c8f210b61d18f5744c41923c': Change name of DecayingUtils.
| | * | Merge "Change name of DecayingUtils."Keisuke Kuroyanagi2013-10-027-46/+49
| | |\ \
| | | * | Change name of DecayingUtils.Keisuke Kuroyanagi2013-10-027-46/+49
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6669677 Change-Id: I97839b2184b95ae1659c55a9b31d22e2d601cba1
* | | | | am 85eba056: am c5182c9a: Correspond to the security related API change for ↵Satoshi Kataoka2013-10-094-2/+30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PreferenceActivity * commit '85eba056f2326f5e3015e4153123d40b6f7cd98f': Correspond to the security related API change for PreferenceActivity
| * | | | am c5182c9a: Correspond to the security related API change for ↵Satoshi Kataoka2013-10-024-2/+30
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PreferenceActivity * commit 'c5182c9a4ae66e75df8c959bf625d08ef99f81d2': Correspond to the security related API change for PreferenceActivity
| | * | | Correspond to the security related API change for PreferenceActivitySatoshi Kataoka2013-10-024-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10118761 Change-Id: Ia7d1c6c526dae849f447c26387e96a4fb4d6042f
* | | | | am 0874939e: am a8b838b4: Merge "Fix a test and crash with a better error ↵Jean Chalard2013-10-093-3/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | message when reading" * commit '0874939e1086baceba9c1f94ca98a7a5837e7813': Fix a test and crash with a better error message when reading
| * | | | am a8b838b4: Merge "Fix a test and crash with a better error message when ↵Jean Chalard2013-10-013-3/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reading" * commit 'a8b838b473d4927e6f0483912c45fba929dfb402': Fix a test and crash with a better error message when reading
| | * | | 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
* | | | | am 319eb1c3: am 77144a64: Merge "Retain Emoji Keyboard after rotation"Satoshi Kataoka2013-10-092-4/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '319eb1c363a0d443cace14ee41c575a67ecfc93a': Retain Emoji Keyboard after rotation
| * | | | am 77144a64: Merge "Retain Emoji Keyboard after rotation"Satoshi Kataoka2013-10-012-4/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '77144a645f693fd0d73fd2cbe378997c7a339006': Retain Emoji Keyboard after rotation
| | * | | 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 358e152b: am e95262a8: (-s ours) am 847fdcf7: (-s ours) am 2f14418c: am ↵Keisuke Kuroyanagi2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e628cd3c: (-s ours) Use reentrant lock for main dictionaries. DO NOT MERGE * commit '358e152b1081f0e74693651e9b5137bd6c2dbad6':
| * | | | | am e95262a8: (-s ours) am 847fdcf7: (-s ours) am 2f14418c: am e628cd3c: (-s ↵Keisuke Kuroyanagi2013-10-010-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours) Use reentrant lock for main dictionaries. DO NOT MERGE * commit 'e95262a8754f9799dd014a19389109b4195bd9a6':
| | * | | | 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 a1ff53fb: am 4b540703: am 2913ce41: am a0c9846f: am ceb364c0: Fix ↵Yuichiro Hanada2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PrioritizedSerialExecutor. * commit 'a1ff53fb5b6f08d15c619a90241dc1064a381443':
| * | | | | | | am 4b540703: am 2913ce41: am a0c9846f: am ceb364c0: Fix ↵Yuichiro Hanada2013-10-010-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PrioritizedSerialExecutor. * commit '4b540703fe6430a1250145a2ac79b6832d610e83':
| | * | | | | | 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 ab5affde: am b924b2bb: (-s ours) am 83d1648b: (-s ours) am cecb793f: am ↵Keisuke Kuroyanagi2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ef63947f: (-s ours) Add boundary checking for PtNode Array reading. DO NOT MERGE * commit 'ab5affded4bf2dc328aa438a556029c488af2f10':
| * | | | | | | | am b924b2bb: (-s ours) am 83d1648b: (-s ours) am cecb793f: am ef63947f: (-s ↵Keisuke Kuroyanagi2013-10-010-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours) Add boundary checking for PtNode Array reading. DO NOT MERGE * commit 'b924b2bb1d3528f8d117d76af221d8bbe6338c7e':
| | * | | | | | | 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 3c623101: am 5e375d42: (-s ours) am 1e113c13: (-s ours) am e628cd3c: Use ↵Keisuke Kuroyanagi2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reentrant lock for main dictionaries. DO NOT MERGE * commit '3c6231011743b4323a4530dd3f07f914e08dda04':
| * | | | | | | | | am 5e375d42: (-s ours) am 1e113c13: (-s ours) am e628cd3c: Use reentrant ↵Keisuke Kuroyanagi2013-10-010-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lock for main dictionaries. DO NOT MERGE * commit '5e375d428c535e94dd451f79ac4b8e5cc822c155':
| | * | | | | | | | 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 a317bf58: am 6bbaf2f8: am 1ef00b28: am ceb364c0: Fix ↵Yuichiro Hanada2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PrioritizedSerialExecutor. * commit 'a317bf58e1da3d42b395a739a4c4549747229c1e':
| * | | | | | | | | | am 6bbaf2f8: am 1ef00b28: am ceb364c0: Fix PrioritizedSerialExecutor.Yuichiro Hanada2013-10-010-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6bbaf2f812251b9360d87e8b2d9c2f4769a11d89':
| | * | | | | | | | | 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 30ca32de: am 6ed55278: (-s ours) am 3b3cb4fe: (-s ours) am ef63947f: Add ↵Keisuke Kuroyanagi2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | boundary checking for PtNode Array reading. DO NOT MERGE * commit '30ca32defc7f4b4fc124d9d39bfffaf298d09a81':
| * | | | | | | | | | | am 6ed55278: (-s ours) am 3b3cb4fe: (-s ours) am ef63947f: Add boundary ↵Keisuke Kuroyanagi2013-10-010-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | checking for PtNode Array reading. DO NOT MERGE * commit '6ed552780427cd7fb184a648c25e143e507741a7':
| | * | | | | | | | | | 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 9de5ec25: am 49410adb: (-s ours) am dd8ea0a3: (-s ours) am 10fa6a2e: Stop ↵Keisuke Kuroyanagi2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reading dictionary while regenerating. (DO NOT MERGE) * commit '9de5ec255f2fe9ccad8558e3d090f41a05660a54':
| * | | | | | | | | | | | am 49410adb: (-s ours) am dd8ea0a3: (-s ours) am 10fa6a2e: Stop reading ↵Keisuke Kuroyanagi2013-10-010-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dictionary while regenerating. (DO NOT MERGE) * commit '49410adb1be1071f3797616c43b9fb5ccb923005':
| | * | | | | | | | | | | 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 eff90276: am 9b9d17f9: (-s ours) am e628cd3c: (-s ours) Use reentrant ↵Keisuke Kuroyanagi2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lock for main dictionaries. DO NOT MERGE * commit 'eff90276f13fabe46bc59828e4db83fea85413a9':
| * | | | | | | | | | | | am 9b9d17f9: (-s ours) am e628cd3c: (-s ours) Use reentrant lock for main ↵Keisuke Kuroyanagi2013-10-010-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dictionaries. DO NOT MERGE * commit '9b9d17f99c2f1be7fbdf55a3b5403b865942beb7': Use reentrant lock for main dictionaries. 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