aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 46b762c4: am d69892fc: am 12bf5a05: am e99daea0: Update dictionariesJean Chalard2013-04-170-0/+0
|\ | | | | | | * commit '46b762c49f9cec57c02e264e98708db22b8d69ca':
| * am d69892fc: am 12bf5a05: am e99daea0: Update dictionariesJean Chalard2013-04-170-0/+0
| |\ | | | | | | | | | * commit 'd69892fc82bcc269b3a2765263b2e352c485d7c3':
| | * am 12bf5a05: am e99daea0: Update dictionariesJean Chalard2013-04-174-0/+0
| | |\ | | | | | | | | | | | | | | | | * commit '12bf5a0546e64e4265e1271b6c78b51e67a990f5': Update dictionaries
* | | | am 2bf09135: am 2532265d: am 34676d92: am a022c538: Merge "If there are no ↵Jean Chalard2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | suggestion span, recompute suggestions." * commit '2bf091358150a36df18feaf260f97beea6916a74':
| * | | am 2532265d: am 34676d92: am a022c538: Merge "If there are no suggestion ↵Jean Chalard2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | span, recompute suggestions." * commit '2532265d6a1b85cc318c06d010632584a9bc7a63':
| | * | am 34676d92: am a022c538: Merge "If there are no suggestion span, recompute ↵Jean Chalard2013-04-174-16/+148
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | suggestions." * commit '34676d92cc08c5575995a36cef1df9c50c1facca': If there are no suggestion span, recompute suggestions.
* | | | | am 4f4a7fe8: am da9c04cd: am d55ccbf7: am 837f46dc: Enable touch coordinate ↵Satoshi Kataoka2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | correction for new algorithm * commit '4f4a7fe8ada812fa7da880db401e8875ea27316c':
| * | | | am da9c04cd: am d55ccbf7: am 837f46dc: Enable touch coordinate correction ↵Satoshi Kataoka2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | for new algorithm * commit 'da9c04cd45ded0fe8b9860f7386c1a695d6a6026':
| | * | | am d55ccbf7: am 837f46dc: Enable touch coordinate correction for new algorithmSatoshi Kataoka2013-04-178-48/+94
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd55ccbf7f95bb1af2d0b4a60994fb05af502e325': Enable touch coordinate correction for new algorithm
* | | | | | am afbeba59: am ae731331: am be0e013b: am 059e084e: Merge "Reject a ↵Jean Chalard2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | previously user-refused suggestion." * commit 'afbeba59c5d93f5db250d238511ce7536de01c11':
| * | | | | am ae731331: am be0e013b: am 059e084e: Merge "Reject a previously ↵Jean Chalard2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user-refused suggestion." * commit 'ae731331880f81534d1a0bf0bd6e2235b4204d63':
| | * | | | am be0e013b: am 059e084e: Merge "Reject a previously user-refused suggestion."Jean Chalard2013-04-173-0/+27
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'be0e013be879aec19197a9e1b0a1d2631a8d4c79': Reject a previously user-refused suggestion.
* | | | | | | am bf22c2fa: am 577dc189: am 1a42236a: am 4b6756db: Merge "Remove ↵Tadashi G. Takaoka2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unnecessary harmful finish() from SettingsActivity" * commit 'bf22c2fac7db2587740f675bfd45f99aae869e69':
| * | | | | | am 577dc189: am 1a42236a: am 4b6756db: Merge "Remove unnecessary harmful ↵Tadashi G. Takaoka2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | finish() from SettingsActivity" * commit '577dc1890626862f581a14badee5a0b85cbc4aa2':
| | * | | | | am 1a42236a: am 4b6756db: Merge "Remove unnecessary harmful finish() from ↵Tadashi G. Takaoka2013-04-171-7/+2
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SettingsActivity" * commit '1a42236a8b22e0d3ca6f26704f052b8f83c991c5': Remove unnecessary harmful finish() from SettingsActivity
* | | | | | | | am 85315351: am 18c362d7: am 5f6492c5: am 673ebb4e: Merge "Update dictionaries"Jean Chalard2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '853153510721da4e66be4e613cca7f915155af50':
| * | | | | | | am 18c362d7: am 5f6492c5: am 673ebb4e: Merge "Update dictionaries"Jean Chalard2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '18c362d7007feafa01fbce780816bfa737cc0a7c':
| | * | | | | | am 5f6492c5: am 673ebb4e: Merge "Update dictionaries"Jean Chalard2013-04-1710-0/+0
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5f6492c584699fea5c5793f11b71df4b394c31c9': Update dictionaries
* | | | | | | | | am 511f0149: am 9797dd2e: am 2fd4a00b: am 1ec4c07a: Merge "Ignore modifier ↵Tadashi G. Takaoka2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | key while sliding key input" * commit '511f01496d9863f0b3336881e7b572226faeb640':
| * | | | | | | | am 9797dd2e: am 2fd4a00b: am 1ec4c07a: Merge "Ignore modifier key while ↵Tadashi G. Takaoka2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sliding key input" * commit '9797dd2edc65e1b0bd2a428ea01ab712163e78d7':
| | * | | | | | | am 2fd4a00b: am 1ec4c07a: Merge "Ignore modifier key while sliding key input"Tadashi G. Takaoka2013-04-171-3/+3
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2fd4a00bea92a6b54cc21999c8f147e1baed1393': Ignore modifier key while sliding key input
* | | | | | | | | | am 7067e8e3: am 333bb7db: am eabb710b: am f224941c: Merge "Suppress calling ↵Tadashi G. Takaoka2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | onPressKey and onReleaseKey while detecting gesture" * commit '7067e8e347a5720f38a45fa344370541a9cb7cd5':
| * | | | | | | | | am 333bb7db: am eabb710b: am f224941c: Merge "Suppress calling onPressKey ↵Tadashi G. Takaoka2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and onReleaseKey while detecting gesture" * commit '333bb7dbbddaca55372322ff3c044222d385a08f':
| | * | | | | | | | am eabb710b: am f224941c: Merge "Suppress calling onPressKey and ↵Tadashi G. Takaoka2013-04-171-2/+2
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | onReleaseKey while detecting gesture" * commit 'eabb710b60c50b58a105bf9cbb6c7987ccdae6ee': Suppress calling onPressKey and onReleaseKey while detecting gesture
* | | | | | | | | | | am 2b1e1c60: am ed497d24: am 089f1ce9: am bfb07ed7: Merge "Add preference ↵Tadashi G. Takaoka2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dependency to gesture input related options" * commit '2b1e1c6003952a267e7ed9d4407d4ff57845e97c':
| * | | | | | | | | | am ed497d24: am 089f1ce9: am bfb07ed7: Merge "Add preference dependency to ↵Tadashi G. Takaoka2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gesture input related options" * commit 'ed497d24236544e1cf02a385f1f6aa44015eba60':
| | * | | | | | | | | am 089f1ce9: am bfb07ed7: Merge "Add preference dependency to gesture input ↵Tadashi G. Takaoka2013-04-172-4/+2
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | related options" * commit '089f1ce95467e279c1d0b9f53de603af6a685bc4': Add preference dependency to gesture input related options
* | | | | | | | | | | | am e1f7c7dd: am d244574b: am fd959fd1: am 1903b41f: Merge "Clean up tests ↵Jean Chalard2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and increase speed" * commit 'e1f7c7dd19474f72154b0447a2be9146b1692a02':
| * | | | | | | | | | | am d244574b: am fd959fd1: am 1903b41f: Merge "Clean up tests and increase speed"Jean Chalard2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd244574be84119505d3712559b743c67a783103c':
| | * | | | | | | | | | am fd959fd1: am 1903b41f: Merge "Clean up tests and increase speed"Jean Chalard2013-04-171-5/+6
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fd959fd15991717ca0f67851d38bf36052746596': Clean up tests and increase speed
* | | | | | | | | | | | | am df848bcc: am b8540f8e: am 18414333: am e2af9b7e: Merge "Reset vertical ↵Tadashi G. Takaoka2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | correction when more suggestions are in modal mode" * commit 'df848bcc40f2dfbcd8d133b3d5c1899cbcd32023':
| * | | | | | | | | | | | am b8540f8e: am 18414333: am e2af9b7e: Merge "Reset vertical correction when ↵Tadashi G. Takaoka2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | more suggestions are in modal mode" * commit 'b8540f8ee523753c6bbc04a70ff9f850220a7dea':
| | * | | | | | | | | | | am 18414333: am e2af9b7e: Merge "Reset vertical correction when more ↵Tadashi G. Takaoka2013-04-173-3/+9
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | suggestions are in modal mode" * commit '18414333d41ce877fb4a7aba76804cea2a8c89e3': Reset vertical correction when more suggestions are in modal mode
* | | | | | | | | | | | | | am 3ea03315: am 9b7fefea: am 6223d823: am c2653d0b: Fix a typoJean Chalard2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3ea0331525b07f4baaac2c2ffc413d36deb9932a':
| * | | | | | | | | | | | | am 9b7fefea: am 6223d823: am c2653d0b: Fix a typoJean Chalard2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9b7fefea1c4abe05c947a036f1939250fe2d3045':
| | * | | | | | | | | | | | am 6223d823: am c2653d0b: Fix a typoJean Chalard2013-04-171-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6223d82312d19afc5c0cbb10b3ece57f026cb723': Fix a typo
* | | | | | | | | | | | | | | am 2dc1f0bf: am ba5e450e: am 69ffa8b0: am 03d1dff3: Merge "Fix Binary dict ↵Jean Chalard2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests" * commit '2dc1f0bfdeeb80b8c2835d8249d6f0592c8696d9':
| * | | | | | | | | | | | | | am ba5e450e: am 69ffa8b0: am 03d1dff3: Merge "Fix Binary dict tests"Jean Chalard2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ba5e450e401564d0528ec4ad4884244e91fa01cf':
| | * | | | | | | | | | | | | am 69ffa8b0: am 03d1dff3: Merge "Fix Binary dict tests"Jean Chalard2013-04-172-5/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '69ffa8b0ff646591edcc1eb3a6dc28572cf8e033': Fix Binary dict tests
* | | | | | | | | | | | | | | | am 87a3830a: am e157fa50: am 6246b7c3: am a94bb198: fix assertionSatoshi Kataoka2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '87a3830ab74d6e2348bda1e6a2537aadd9ce32ce':
| * | | | | | | | | | | | | | | am e157fa50: am 6246b7c3: am a94bb198: fix assertionSatoshi Kataoka2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e157fa502f2329b94fd9ac5844eb33a21c37019e':
| | * | | | | | | | | | | | | | am 6246b7c3: am a94bb198: fix assertionSatoshi Kataoka2013-04-171-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6246b7c324eedae03b873b7b3fa054f6f3416455': fix assertion
* | | | | | | | | | | | | | | | | am 8af80b3f: am b0d3d86c: am be1232b3: am b12c2af3: Tighten unit test ↵Tadashi G. Takaoka2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | condition of MoreKeysKeyboardBuilder * commit '8af80b3fb400ad07b30124e27de73c54d487e275':
| * | | | | | | | | | | | | | | | am b0d3d86c: am be1232b3: am b12c2af3: Tighten unit test condition of ↵Tadashi G. Takaoka2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MoreKeysKeyboardBuilder * commit 'b0d3d86c3f85c20a321e1be06f5794c64e97bd08':
| | * | | | | | | | | | | | | | | am be1232b3: am b12c2af3: Tighten unit test condition of MoreKeysKeyboardBuilderTadashi G. Takaoka2013-04-172-8/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'be1232b36f6fb54dfbccf051d709f34b290a5320': Tighten unit test condition of MoreKeysKeyboardBuilder
* | | | | | | | | | | | | | | | | | am 670d8852: (-s ours) am 4793943e: am a270f90a: am dc64866c: (-s ours) am ↵Baligh Uddin2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0dbc8c35: am f2ab0adc: Import translations. DO NOT MERGE * commit '670d88527a2d1182870775190e5a8203659f7706':
| * | | | | | | | | | | | | | | | | am 4793943e: am a270f90a: am dc64866c: (-s ours) am 0dbc8c35: am f2ab0adc: ↵Baligh Uddin2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE * commit '4793943ee5d5ce5167ae5a58628bff1a9eca58f3':
| | * | | | | | | | | | | | | | | | am a270f90a: am dc64866c: (-s ours) am 0dbc8c35: am f2ab0adc: Import ↵Baligh Uddin2013-04-170-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit 'a270f90a325ae1b6e4477302be0bd7b7e303008c':
* | | | | | | | | | | | | | | | | | | am c2e36a8f: (-s ours) am 97aa9c40: am a5506b53: am bfedad23: (-s ours) ↵Baligh Uddin2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" * commit 'c2e36a8fc227d751eedf1396ba138573eea883d6':
| * | | | | | | | | | | | | | | | | | am 97aa9c40: am a5506b53: am bfedad23: (-s ours) Merge "Import translations. ↵Baligh Uddin2013-04-1753-1590/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE" * commit '97aa9c4059c41395b6ad550a3e8dfb4a7b66a83b':