aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | am ab34a4a7: Merge "Fix a bug where last candidate would not be reset"Jean Chalard2012-01-111-0/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ab34a4a7f53e1426a5cc4cd7a7fefde38a82e499': Fix a bug where last candidate would not be reset
| * | | | | | Merge "Fix a bug where last candidate would not be reset"Jean Chalard2012-01-111-0/+6
| |\ \ \ \ \ \
| | * | | | | | Fix a bug where last candidate would not be resetJean Chalard2012-01-121-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5851148 Change-Id: Ic270318842d8e16bc62d78d5fe0d6be0ca1fb532
* | | | | | | | am cda8a42c: Merge "Add a sanity check"Jean Chalard2012-01-111-0/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cda8a42cbe114b6f9e3b98d868ab19fe673d3d09': Add a sanity check
| * | | | | | | Merge "Add a sanity check"Jean Chalard2012-01-111-0/+8
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Add a sanity checkJean Chalard2012-01-121-0/+8
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check if any character is both a magic space swapper and a magic space stripper for the current language, and throw an exception if found. Since this is expensive, it's done only in debug mode. Change-Id: Ibd166db87c91495b76878ea0e4f420a62c7bb276
* | | | | | | am 53f56dde: Merge "Change the application name of aosp latin ime"satok2012-01-112-2/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '53f56ddef9f5e9e5eee86b95a9d8e1f2878d5e24': Change the application name of aosp latin ime
| * | | | | | Merge "Change the application name of aosp latin ime"satok2012-01-112-2/+4
| |\ \ \ \ \ \
| | * | | | | | Change the application name of aosp latin imesatok2012-01-122-2/+4
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I96281709736bc20d70e63af170bfb48b5df3f18d
* | | | | | | am a8c8ab1c: Remove an excessive parensJean Chalard2012-01-111-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a8c8ab1cb4f148693ebf8443c62b029db0840d26': Remove an excessive parens
| * | | | | | Remove an excessive parensJean Chalard2012-01-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If8aa4253ab0f664e628ed7f4d7a3adc02a898cc7
* | | | | | | am 9de5cfc6: Fix a crash where revertSwap would be wrongly calledJean Chalard2012-01-111-2/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9de5cfc67a4e349c547e40678add27cdd6ca8490': Fix a crash where revertSwap would be wrongly called
| * | | | | | Fix a crash where revertSwap would be wrongly calledJean Chalard2012-01-121-2/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This would crash the program when inputting a punctuation symbol that should not swap with a weak space through the suggestion strip, then press backspace. Those include all two-part punctuation symbols in French for example, as well as magic space strippers like the dash in English. For English all suggestion strips symbols happen to be magic space swappers so this would not happen in English by default. Also fix a typo. Change-Id: Ia40678c264e978509b5786290a75a3c57181648e
* | | | | | am 8c111043: am ed043c61: (-s ours) am 4b23789e: Merge "DO NOT MERGE. Fix ↵Ken Wakasa2012-01-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | more keys for fr_CA and fr_CH. Also tidy up more keys for de_ZZ as well." into ics-mr1 * commit '8c111043b8e08d3b058f7508d23b5e6c078c7534': DO NOT MERGE. Fix more keys for fr_CA and fr_CH. Also tidy up more keys for de_ZZ as well.
| * | | | | am ed043c61: (-s ours) am 4b23789e: Merge "DO NOT MERGE. Fix more keys for ↵Ken Wakasa2012-01-110-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fr_CA and fr_CH. Also tidy up more keys for de_ZZ as well." into ics-mr1 * commit 'ed043c61eae95a9476a233d88f058ea0c163cfcb': DO NOT MERGE. Fix more keys for fr_CA and fr_CH. Also tidy up more keys for de_ZZ as well.
| | * | | | am 4b23789e: Merge "DO NOT MERGE. Fix more keys for fr_CA and fr_CH. Also ↵Ken Wakasa2012-01-113-6/+51
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tidy up more keys for de_ZZ as well." into ics-mr1 * commit '4b23789ecbc3108808c26fee35936d719df2bf73': DO NOT MERGE. Fix more keys for fr_CA and fr_CH. Also tidy up more keys for de_ZZ as well.
| | | * | | Merge "DO NOT MERGE. Fix more keys for fr_CA and fr_CH. Also tidy up more ↵Ken Wakasa2012-01-113-6/+51
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | keys for de_ZZ as well." into ics-mr1
| | | | * | | DO NOT MERGE. Fix more keys for fr_CA and fr_CH. Also tidy up more keys ↵Ken Wakasa2011-12-263-6/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for de_ZZ as well. This is a cherry pick of http://android-git.corp.google.com/g/156427 from master. bug: 5800592 Change-Id: Ifb249e8b6d432bbd1a5faf1a8731deea02962d39
* | | | | | | am e895db8f: am e7fecbc5: (-s ours) am 3e405f3a: DO NOT MERGE. Save keyboard ↵Tadashi G. Takaoka2012-01-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | layout only when it is shown * commit 'e895db8ff636c6c32671f07d04b81b0663ed2cf1': DO NOT MERGE. Save keyboard layout only when it is shown
| * | | | | | am e7fecbc5: (-s ours) am 3e405f3a: DO NOT MERGE. Save keyboard layout only ↵Tadashi G. Takaoka2012-01-110-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when it is shown * commit 'e7fecbc5631490e5ae05897cfc29dfecf4bc73b3': DO NOT MERGE. Save keyboard layout only when it is shown
| | * | | | | am 3e405f3a: DO NOT MERGE. Save keyboard layout only when it is shownTadashi G. Takaoka2012-01-111-1/+3
| | |\| | | | | | | |_|_|/ | | |/| | | | | | | | | | | | | | | * commit '3e405f3afd9bf5c5978d05c07dc186e862885f78': DO NOT MERGE. Save keyboard layout only when it is shown
| | | * | | DO NOT MERGE. Save keyboard layout only when it is shownTadashi G. Takaoka2012-01-051-1/+3
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a cherrypick of I150b4a05 from master to ics-mr1. Bug: 5130446 Bug: 5787394 Change-Id: Ie0d58283042166537ff161344564c3c51b0d1296
* | | | | am 0f925efb: Merge "Add EnabledWhenDefaultIsNotAsciiCapable to English ↵satok2012-01-111-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | keyboard subtype" * commit '0f925efb5caf5a8bdb9aa5c030c0d6ee66ac753b': Add EnabledWhenDefaultIsNotAsciiCapable to English keyboard subtype
| * | | | Merge "Add EnabledWhenDefaultIsNotAsciiCapable to English keyboard subtype"satok2012-01-111-1/+1
| |\ \ \ \
| | * | | | Add EnabledWhenDefaultIsNotAsciiCapable to English keyboard subtypesatok2012-01-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5806103 Change-Id: Iffdc68565f4a8b5af98247a4dff9dc4e76b4056a
* | | | | | am 903e5888: Add internal structure support for isShortcutOnly (B8)Jean Chalard2012-01-112-14/+39
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '903e58886e480d79b37c0f9347771042324e71a9': Add internal structure support for isShortcutOnly (B8)
| * | | | | Add internal structure support for isShortcutOnly (B8)Jean Chalard2012-01-112-14/+39
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iaac80937540a45849c347f80400762032b27c82c
* | | | | | am b751dbb6: Add shortcuts to XML output of makedict (B7)Jean Chalard2012-01-101-0/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b751dbb6c8505e717db9b0db223bed24dc06d2f7': Add shortcuts to XML output of makedict (B7)
| * | | | | Add shortcuts to XML output of makedict (B7)Jean Chalard2012-01-111-0/+10
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I579e43cd147c4323c390cf1c9bf5e94ae79f9d86
* | | | | am 2611d3d7: Merge "Get rid of Keyboard.CODE_DUMMY"Tadashi G. Takaoka2012-01-1012-72/+70
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '2611d3d75188ca61be314337612d185ae65be7d3': Get rid of Keyboard.CODE_DUMMY
| * | | | Merge "Get rid of Keyboard.CODE_DUMMY"Tadashi G. Takaoka2012-01-1012-72/+70
| |\ \ \ \
| | * | | | Get rid of Keyboard.CODE_DUMMYTadashi G. Takaoka2012-01-1012-72/+70
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id2320f4d9b5f22f0ac844ab20ce42b0c4e7c6880
* | | | | | am 82b3727c: Fix proguard.flags to keep method for testingTadashi G. Takaoka2012-01-101-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '82b3727c8327c18cf8584b4afcd3e16164be4f3a': Fix proguard.flags to keep method for testing
| * | | | | Fix proguard.flags to keep method for testingTadashi G. Takaoka2012-01-101-1/+1
| |/ / / / | | | | | | | | | | | | | | | Change-Id: Iab6c9a4104e8eec3eeb55fdb063d4368338ac74d
* | | | | am 33e2813d: Merge "Call KeyboardState.onUpdateShiftState from onCodeInput ↵Tadashi G. Takaoka2012-01-105-16/+33
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if code is a normal letter" * commit '33e2813d0964a0c7accfbef1bbca957d083cba1b': Call KeyboardState.onUpdateShiftState from onCodeInput if code is a normal letter
| * | | | Merge "Call KeyboardState.onUpdateShiftState from onCodeInput if code is a ↵Tadashi G. Takaoka2012-01-095-16/+33
| |\ \ \ \ | | | | | | | | | | | | | | | | | | normal letter"
| | * | | | Call KeyboardState.onUpdateShiftState from onCodeInput if code is a normal ↵Tadashi G. Takaoka2012-01-105-16/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | letter This will be helpful to write unit test code. Change-Id: Ib61cc46ac547084e0dc9ecd3a50814fecf08ace2
* | | | | | am cc39125e: Merge "Fix Slavic layout on phone device"Tadashi G. Takaoka2012-01-101-2/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cc39125e8e79a374cd626399120eb4f5f75e22b3': Fix Slavic layout on phone device
| * | | | | Merge "Fix Slavic layout on phone device"Tadashi G. Takaoka2012-01-091-2/+1
| |\ \ \ \ \
| | * | | | | Fix Slavic layout on phone deviceTadashi G. Takaoka2012-01-101-2/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | Change-Id: I7da35502072e336ba2c32fc78827f5dff1bedddc
* | | | | | am 342d5d5d: Wire the Xml-read shortcuts into the dict creation code (B6)Jean Chalard2012-01-102-12/+31
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '342d5d5dd095a5f73413a630b5de9db334ca45e4': Wire the Xml-read shortcuts into the dict creation code (B6)
| * | | | | Wire the Xml-read shortcuts into the dict creation code (B6)Jean Chalard2012-01-102-12/+31
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I352064835abb62c294b48e080d9709ff013c7bb0
* | | | | am 8edd3067: Add methods to read and write shortcut to binary files (B5)Jean Chalard2012-01-062-18/+98
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '8edd3067181a425ce1383bb950184f9742af7557': Add methods to read and write shortcut to binary files (B5)
| * | | | Add methods to read and write shortcut to binary files (B5)Jean Chalard2012-01-062-18/+98
| | | | | | | | | | | | | | | | | | | | Change-Id: I8e6a4242a73b2ec95ce9e8b4739e16dfeb9f1204
* | | | | am b0c49b76: Actually add shortcut targets to the suggestions (A4)Jean Chalard2012-01-051-2/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'b0c49b768485a92f6208630b8cef830b63c90513': Actually add shortcut targets to the suggestions (A4)
| * | | | Actually add shortcut targets to the suggestions (A4)Jean Chalard2012-01-061-2/+9
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia6f551d36b2897863e7faf5143bc319522b0668e
* | | | | am 69f94e19: Merge "Make the dictionary iterator shortcut-aware (B4)"Jean Chalard2012-01-053-5/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '69f94e1983f5b0d7b982d806afd9b937c8222b3d': Make the dictionary iterator shortcut-aware (B4)
| * | | | Merge "Make the dictionary iterator shortcut-aware (B4)"Jean Chalard2012-01-053-5/+8
| |\ \ \ \
| | * | | | Make the dictionary iterator shortcut-aware (B4)Jean Chalard2012-01-053-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I529dff4a50276d1a4f4896c66d1aa35296b21000
* | | | | | am 3a1a94c3: Merge "Add shortcut support to the in-memory format of makedict ↵Jean Chalard2012-01-054-27/+56
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (B3)" * commit '3a1a94c3cb4801dfe3985ab2b171e9a54b2d2ad2': Add shortcut support to the in-memory format of makedict (B3)