aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 0e39e820: Merge "Fix referring wrong TypedArray (DO NOT MERGE)" into ics-mr1•••* commit '0e39e820ce49b5fc2f8a309c3f64e5b0fefbea48': Fix referring wrong TypedArray (DO NOT MERGE) Tadashi G. Takaoka2011-11-081-1/+1
|\
| * Merge "Fix referring wrong TypedArray (DO NOT MERGE)" into ics-mr1Tadashi G. Takaoka2011-11-071-1/+1
| |\
| | * Fix referring wrong TypedArray (DO NOT MERGE)•••This is the cherry-pick of Change I2a8f00ed from Master. Change-Id: I2a8f00edb579e24e612e839498ece097e9d3d7f6 Tadashi G. Takaoka2011-11-071-1/+1
* | | am 0a75373f: Merge "Fix a bug where the UserDictionary may not be released" i...•••* commit '0a75373f4187d2db036757c2c2bcaba42301fd22': Fix a bug where the UserDictionary may not be released Ken Wakasa2011-11-071-1/+5
|\| |
| * | Merge "Fix a bug where the UserDictionary may not be released" into ics-mr1Ken Wakasa2011-11-071-1/+5
| |\ \
| | * | Fix a bug where the UserDictionary may not be released•••Bug: 5547357 Change-Id: I521afeaa349c86fb0087cedb70127de6acebec78 Jean Chalard2011-11-071-1/+5
| | |/
* | | am f47e014e: Import revised translations. DO NOT MERGE•••* commit 'f47e014eb251ed83c9672b928b45d7340b83c464': Import revised translations. DO NOT MERGE Eric Fischer2011-11-072-2/+2
|\| |
| * | Import revised translations. DO NOT MERGE•••Change-Id: I3650b8f5925e9f71927312acf310f7a165bd4ce3 Eric Fischer2011-11-072-2/+2
| |/
* | am f8b9e7eb: am 01c335df: (-s ours) Import revised translations. DO NOT MERGE•••* commit 'f8b9e7ebeba8e6f42f4af4addf3cea7e962beb1c': Import revised translations. DO NOT MERGE Eric Fischer2011-11-030-0/+0
|\|
| * am 01c335df: (-s ours) Import revised translations. DO NOT MERGE•••* commit '01c335df7178e8126617e4e29d5ed6602ff25c4a': Import revised translations. DO NOT MERGE Eric Fischer2011-11-030-0/+0
| |\
| | * Import revised translations. DO NOT MERGE•••Change-Id: Ib73d7c6594aef7eb5d2c97fb675dbe5574dd5d12 Eric Fischer2011-11-021-1/+1
* | | am db1fc8f5: Import revised translations. DO NOT MERGE•••* commit 'db1fc8f59c520990dd1925aa8f2c4042e84c9dcc': Import revised translations. DO NOT MERGE Eric Fischer2011-11-015-4/+310
|\| |
| * | Import revised translations. DO NOT MERGE•••Change-Id: I63a6dd39a4af314afdb782ea090171c7bc959749 Eric Fischer2011-11-015-4/+310
* | | Merge remote branch 'goog/ics-mr1' into ics-aahEd Heyl2011-10-314-47/+25
|\| |
| * | Merge "Use reflection to get field values of SuggestionSpan" into ics-mr1satok2011-10-281-7/+23
| |\ \
| | * | Use reflection to get field values of SuggestionSpan•••Bug: 5440299 Change-Id: I5e40edf6f790c078c4a05d0d347a89d63f7c042a satok2011-10-281-7/+23
| * | | Merge "Removed lift-to-type from LatinIME accessibility." into ics-mr1Svetoslav Ganov2011-10-282-40/+0
| |\ \ \ | | |/ / | |/| |
| | * | Removed lift-to-type from LatinIME accessibility.•••Bug: 5522854 Change-Id: I32df86450fa0d5dd9606609ea693d0e331b64b19 Alan Viverette2011-10-262-40/+0
| * | | Merge "Cancel pending rotation when another rotation start" into ics-mr1Tadashi G. Takaoka2011-10-271-0/+2
| |\ \ \
| | * | | Cancel pending rotation when another rotation start•••Bug: 5516802 Change-Id: Iccb0abeb94e6dc1322a98a0c744188bb74034c7f Tadashi G. Takaoka2011-10-271-0/+2
| | |/ /
| * | | am f4c1cd77: (-s ours) Import revised translations. DO NOT MERGE•••* commit 'f4c1cd7729eea7a48e084eaea0cb28013d9131ae': Import revised translations. DO NOT MERGE Eric Fischer2011-10-270-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | Import revised translations. DO NOT MERGE•••Change-Id: I10bc743f4d9c8c53beab37a5135e634ddf8bb99e Eric Fischer2011-10-271-1/+1
* | | | keep previous history after reset to mr1 plus aah changes (ics-aah-wip)Ed Heyl2011-10-280-0/+0
|\ \ \ \ | |/ / / |/| | |
| * | | undo reset to ics-mr1 until we have a better methodEd Heyl2011-10-260-0/+0
| |\ \ \
| | * \ \ reset to ics-mr1, but keep historyEd Heyl2011-10-260-0/+0
| | |\ \ \ | | |/ / / | |/| | |
| * | | | am ef543c72: Merge "Use onCustomRequest to request haptick and audio feedback"•••* commit 'ef543c725e0d5bc322adc40e364fbaedd1861e4b': Use onCustomRequest to request haptick and audio feedback Tadashi G. Takaoka2011-10-263-11/+16
| |\ \ \ \
| | * \ \ \ Merge "Use onCustomRequest to request haptick and audio feedback"Tadashi G. Takaoka2011-10-263-11/+16
| | |\ \ \ \
| | | * | | | Use onCustomRequest to request haptick and audio feedback•••Change-Id: I958f274d8cfebb1551cdf08f1bada50c20fb9ca0 Tadashi G. Takaoka2011-10-263-11/+16
| * | | | | | am e648e839: Merge "Remove eventTime argument from PointerTracker.onShowMoreK...•••* commit 'e648e839395de48166c961e603f08423de93fe5e': Remove eventTime argument from PointerTracker.onShowMoreKeysPanel Tadashi G. Takaoka2011-10-263-8/+5
| |\| | | | |
| | * | | | | Merge "Remove eventTime argument from PointerTracker.onShowMoreKeysPanel"Tadashi G. Takaoka2011-10-263-8/+5
| | |\ \ \ \ \
| | | * | | | | Remove eventTime argument from PointerTracker.onShowMoreKeysPanel•••Change-Id: Idbcd6e3047c6c0c407e3b347cf9f65951d43a312 Tadashi G. Takaoka2011-10-263-8/+5
| | | |/ / / /
| * | | | | | am 0f99bb08: am 720baf0c: Merge remote branch \'goog/ics-mr0\' into ics-mr1•••* commit '0f99bb088856576b963d89242b2a66995ecce9d4': Ed Heyl2011-10-260-0/+0
| |\| | | | |
| | * | | | | am 720baf0c: Merge remote branch \'goog/ics-mr0\' into ics-mr1•••* commit '720baf0cb3d6dcdf0b0024083824edaf905499ed': Ed Heyl2011-10-260-0/+0
| | |\ \ \ \ \
| * | | | | | | am 44f4d77b: am cb8cb95d: Fix NPE•••* commit '44f4d77b75a2a34077a558e6edf107cd31775cc8': Fix NPE Ken Wakasa2011-10-261-0/+1
| |\| | | | | |
| | * | | | | | am cb8cb95d: Fix NPE•••* commit 'cb8cb95d0afd340de9f1a0e15948f0068d2450bc': Fix NPE Ken Wakasa2011-10-261-0/+1
| | |\ \ \ \ \ \
| * | | | | | | | am 5a0b4881: Merge "Group special spaces and double/swapped spaces in undo mode"•••* commit '5a0b4881f892bf9dd714d1741817095daffae695': Group special spaces and double/swapped spaces in undo mode Jean Chalard2011-10-261-87/+129
| |\| | | | | | |
| | * | | | | | | Merge "Group special spaces and double/swapped spaces in undo mode"Jean Chalard2011-10-261-87/+129
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | | * | | | | | Group special spaces and double/swapped spaces in undo mode•••This introduces an elementary undo facility that accounts for magic space, strong space, double space and its cancelling, and swapped punctuation and its cancelling. The former three were existing behavior ; this change adds the swapped punctuation cancelling behavior. Bug: 5454442 Change-Id: I87af633f30caa2788e9af725e556a7f0746d9a14 Jean Chalard2011-10-261-87/+129
| * | | | | | | | am d726d093: Merge "Import revised translations."•••* commit 'd726d093892e33e242726bcb3f349e78647f8fab': Import revised translations. Eric Fischer2011-10-2518-80/+72
| |\| | | | | | |
| | * | | | | | | Merge "Import revised translations."Eric Fischer2011-10-2518-80/+72
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Import revised translations.•••Change-Id: I45b2224d22ea73a50b7bfcc1a05b3ece25f402c5 Eric Fischer2011-10-2518-80/+72
| * | | | | | | | am d0c5f939: Cleanup.•••* commit 'd0c5f9395a1b94e8425982e353d090f972dc44f0': Cleanup. Jean Chalard2011-10-252-25/+8
| |\| | | | | | |
| | * | | | | | | Cleanup.•••Remove a state that can never be reached, and ajust all the callers that would always have received false. Change-Id: Iac025568be11743428419e0772da306a4f0a0bf1 Jean Chalard2011-10-252-25/+8
| * | | | | | | | am ce668e7a: Small clean up.•••* commit 'ce668e7a0b6ae7046e1f22a162ad174d58dfe145': Small clean up. Jean Chalard2011-10-251-28/+5
| |\| | | | | | |
| | * | | | | | | Small clean up.•••Remove unused methods and constants. Change-Id: If72e04394a2943b416915217d22cb6e58a0508b3 Jean Chalard2011-10-251-28/+5
| * | | | | | | | am 126698fd: Add a strong space behavior.•••* commit '126698fdd256a2e3734634d3b923cabd800064ba': Add a strong space behavior. Jean Chalard2011-10-251-15/+42
| |\| | | | | | |
| | * | | | | | | Add a strong space behavior.•••Bug: 5454442 Change-Id: Ic095cb65dd7b4427617cd74fc7c53a9666b218c4 Jean Chalard2011-10-251-15/+42
| * | | | | | | | am c47c2dc6: Merge "Fix a cosmetic bug where text would blink on space swap"•••* commit 'c47c2dc65a8d4c46817023bebc7bb3ef19c132f0': Fix a cosmetic bug where text would blink on space swap Jean Chalard2011-10-251-16/+19
| |\| | | | | | |
| | * | | | | | | Merge "Fix a cosmetic bug where text would blink on space swap"Jean Chalard2011-10-251-16/+19
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix a cosmetic bug where text would blink on space swap•••On space swap or space removal in some occasions there would be a small blink on the screen. This change fixes that. Change-Id: I486cbcc5dfcafd531b3fa92c4f9a3255832f22cc Jean Chalard2011-10-251-16/+19