aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | Merge "Add American typography boolean to SpacingAndPunctuations"Tadashi G. Takaoka2014-01-094-10/+19
| |\| | | | | | | | |
| | * | | | | | | | | Add American typography boolean to SpacingAndPunctuationsTadashi G. Takaoka2014-01-094-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic2663eaef38fbe7c5bd1fb3a81771e94c2d4de52
* | | | | | | | | | | am 85040b7c: Merge "Fix a unit test in InputLogicTests."Keisuke Kuroyanagi2014-01-081-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '85040b7cde2a8d7165bcfff7101ac09caea2af52': Fix a unit test in InputLogicTests.
| * | | | | | | | | | Merge "Fix a unit test in InputLogicTests."Keisuke Kuroyanagi2014-01-091-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix a unit test in InputLogicTests.Keisuke Kuroyanagi2014-01-091-1/+1
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I63a20bb2e4b3c39495fade6cae3a14fdd11ca48c
* | | | | | | | | | | am 6c326caa: A style fixYohei Yukawa2014-01-081-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6c326caa4f37eb29774aeb82a39c56df62c7f568': A style fix
| * | | | | | | | | | A style fixYohei Yukawa2014-01-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just a style fix to follow up the previous commit. BUG: 11439600 Change-Id: Ib7a4654627a6fc22d86f2097f86f001bd76426e9
* | | | | | | | | | | am b30f7e4b: Merge "Check whether the word is OOV or not for amanatto update."Keisuke Kuroyanagi2014-01-084-1/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b30f7e4bceefc4f30c7b942675cc6af5f6d8d852': Check whether the word is OOV or not for amanatto update.
| * | | | | | | | | | Merge "Check whether the word is OOV or not for amanatto update."Keisuke Kuroyanagi2014-01-094-1/+5
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Check whether the word is OOV or not for amanatto update.Keisuke Kuroyanagi2014-01-084-1/+5
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11736529 Change-Id: I27973212da7e922b2185dbb4febfb5bb4dfbdcbb
* | | | | | | | | | am eab4d252: Merge "Remove some warnings"Jean Chalard2014-01-0812-81/+61
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eab4d252103741eb9487b4e70534d2ec3f1c64a4': Remove some warnings
| * | | | | | | | | Merge "Remove some warnings"Jean Chalard2014-01-0912-81/+61
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Remove some warningsJean Chalard2014-01-0912-81/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5cfa0d2fccc139bd6c45c5590a68c3e0c90534b8
* | | | | | | | | | | am c1f2986a: Merge "Trigger haptic feedback at touch down on the ↵Yohei Yukawa2014-01-082-29/+51
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EmojiPalettesView" * commit 'c1f2986a72dfaa18ed5438bf03ce9c40cae973c0': Trigger haptic feedback at touch down on the EmojiPalettesView
| * | | | | | | | | | Merge "Trigger haptic feedback at touch down on the EmojiPalettesView"Yohei Yukawa2014-01-092-29/+51
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Trigger haptic feedback at touch down on the EmojiPalettesViewYohei Yukawa2014-01-092-29/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EmojiPalettesView triggers the haptic feedback at the timing of touch-up rather than touch-down. This patch set changes the timing to touch-up so that the UX on the EmojiPalettesView can be consistent with normal keyboard layouts. This patch set also fixes the missing haptic feedback from facemarks such as ":-)". Bug: 11439600 Change-Id: I22245946712bd1c36226786d6ff81e3b563f7ef7
* | | | | | | | | | | | am d3e78fc5: Merge "Fix a bug where changing auto-shift would cancel ↵Jean Chalard2014-01-082-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | autorepeat." * commit 'd3e78fc5ce8be694bd97e6580d761f3e4ec6e519': Fix a bug where changing auto-shift would cancel autorepeat.
| * | | | | | | | | | | Merge "Fix a bug where changing auto-shift would cancel autorepeat."Jean Chalard2014-01-092-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Fix a bug where changing auto-shift would cancel autorepeat.Jean Chalard2014-01-092-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12453966 Change-Id: Idd65f732e2de0a7309e08315893c28cca63732c5
* | | | | | | | | | | | am 941a4540: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-01-080-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '941a4540bc648f329d3dd8e357d33ccd80694679': Import translations. DO NOT MERGE
| * | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-01-0831-62/+31
| | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia2d0f4528529df463307e1706cd4d7265b3958c1 Auto-generated-cl: translation import
* | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-01-0831-62/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5a8ed486c75c319212cfa5d831ccbca3f10acd26 Auto-generated-cl: translation import
* | | | | | | | | | | am 5742a415: Merge "Make reloadMainDict() private."Keisuke Kuroyanagi2014-01-083-37/+84
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5742a415f37a3f3d4ddba4c7cc0b47385db7ecc7': Make reloadMainDict() private.
| * | | | | | | | | | Merge "Make reloadMainDict() private."Keisuke Kuroyanagi2014-01-083-37/+84
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Make reloadMainDict() private.Keisuke Kuroyanagi2014-01-083-37/+84
| | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8187060 Change-Id: I852a751d748f39512e62c9cd69748dfbe87b2151
* | | | | | | | | | | am b90fa0fb: Revert "Revert "Separate spacing and punctuation related ↵Jean Chalard2014-01-086-85/+153
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | settings values"" * commit 'b90fa0fb2ce195cfaec878dea9702261290176c2': Revert "Revert "Separate spacing and punctuation related settings values""
| * | | | | | | | | | Revert "Revert "Separate spacing and punctuation related settings values""Jean Chalard2014-01-086-85/+153
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8bc427799a9b7a53103d1edba4a447033fbd8cfa. Change-Id: I34f509998afdb1a7c120fbfdb9f0a1b188224a4d
* | | | | | | | | | am e5cdcaff: Fix a race condition, take 2.Jean Chalard2014-01-082-5/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e5cdcaff658f5366621115a728cb683eab5fda0a': Fix a race condition, take 2.
| * | | | | | | | | Fix a race condition, take 2.Jean Chalard2014-01-082-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use absolute cursor positions when making edits, this leads to race conditions. This is a bit ugly and will need to be fixed soon. Plans are underway to clean this up. Bug: 12390573 Change-Id: I69c09fc41b979880d0800c55a710e39373287cff
* | | | | | | | | | am 1e7f2809: Merge "Revert "Separate spacing and punctuation related ↵Jean Chalard2014-01-086-153/+85
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | settings values"" * commit '1e7f2809d2ec544b07956bdbe89c905c981b75fc': Revert "Separate spacing and punctuation related settings values"
| * | | | | | | | | Merge "Revert "Separate spacing and punctuation related settings values""Jean Chalard2014-01-086-153/+85
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Revert "Separate spacing and punctuation related settings values"Jean Chalard2014-01-086-153/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is conflicting with later changes. Temporary revert for cherry-pick. This reverts commit 0b593ce858d4b406e949f0e809cb77f41da691f9. Change-Id: Id53eadb023a950cfcca496c0cfbfe583c7ec7b8c
* | | | | | | | | | | am d4843c25: Merge "Revert "Fix a race condition, take 2.""Jean Chalard2014-01-082-18/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd4843c25e2b9f7e7c7c972af0cb22aac89e15d7d': Revert "Fix a race condition, take 2."
| * | | | | | | | | | Merge "Revert "Fix a race condition, take 2.""Jean Chalard2014-01-082-18/+5
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Revert "Fix a race condition, take 2."Jean Chalard2014-01-082-18/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts prevent this to be cherry-picked. This reverts commit dd3d697a6e6713d82020dd63cbf78e4f87664484. Change-Id: Ib97fae2234633b4bb27d611f48a79060db9ab16f
* | | | | | | | | | | | am ff7103d3: Merge "Fix a race condition, take 2."Jean Chalard2014-01-082-5/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ff7103d356819952bf040ab851f96a30ed0d3abc': Fix a race condition, take 2.
| * | | | | | | | | | | Merge "Fix a race condition, take 2."Jean Chalard2014-01-082-5/+18
| |\| | | | | | | | | |
| | * | | | | | | | | | Fix a race condition, take 2.Jean Chalard2014-01-082-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use absolute cursor positions when making edits, this leads to race conditions. This is a bit ugly and will need to be fixed soon. Plans are underway to clean this up. Bug: 12390573 Change-Id: Ib42d4149343c642b1b5c1937b424e8afdbd4cc1f
* | | | | | | | | | | | am 0a0a3cda: Merge "Revert "Revert "Fix a race condition."""Jean Chalard2014-01-081-2/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0a0a3cdad83ae0923c503c394ebdefafff2a217b': Revert "Revert "Fix a race condition.""
| * | | | | | | | | | | Merge "Revert "Revert "Fix a race condition."""Jean Chalard2014-01-081-2/+5
| |\| | | | | | | | | |
| | * | | | | | | | | | Revert "Revert "Fix a race condition.""Jean Chalard2014-01-081-2/+5
| | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 38401272446dbaec785e656b921cfbd31162ba09. Change-Id: I7f0d975ec9e18d94fe3505250360c2b79ccbe96d
* | | | | | | | | | | am ad78058a: Rename InputPointers.addPointer and ResizableIntArray.addTadashi G. Takaoka2014-01-076-21/+19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ad78058a93492d4f114c6a6eb56177be9231a9eb': Rename InputPointers.addPointer and ResizableIntArray.add
| * | | | | | | | | | Rename InputPointers.addPointer and ResizableIntArray.addTadashi G. Takaoka2014-01-086-21/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5580250c91b29f93ed886b080ce33845b3b67ace
* | | | | | | | | | | am e13cc9d7: Fix ResizableIntArrayTests readabilityTadashi G. Takaoka2014-01-072-69/+90
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e13cc9d7e596c8c9db1b36a772b51e4960137671': Fix ResizableIntArrayTests readability
| * | | | | | | | | | Fix ResizableIntArrayTests readabilityTadashi G. Takaoka2014-01-082-69/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I68862b98f228210f1d76fef4fd7454edbfd8e01d
* | | | | | | | | | | am 9b351f75: Merge "Fix InputPointersTests"Tadashi G. Takaoka2014-01-072-95/+163
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9b351f75943b50df9ebf2452dfe9c3a797547f1a': Fix InputPointersTests
| * | | | | | | | | | Merge "Fix InputPointersTests"Tadashi G. Takaoka2014-01-082-95/+163
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Fix InputPointersTestsTadashi G. Takaoka2014-01-082-95/+163
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | InputPointers.getTime(int) has a validity check of time values. And the check is enabled when LatinImeLogger.sDBG is on. Such situation may occur while unit testing. This change ensure that time values are monotonic while unit testing. Change-Id: I9ff2cff2bcd253de0e8206dd3be964fe565170fa
* | | | | | | | | | | am b3c51630: Fix: NPE in LatinIME.loadSettnigs().Keisuke Kuroyanagi2014-01-071-2/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b3c51630a6b8dc09c161c7720db7bae21b0cf27e': Fix: NPE in LatinIME.loadSettnigs().
| * | | | | | | | | | Fix: NPE in LatinIME.loadSettnigs().Keisuke Kuroyanagi2014-01-081-2/+4
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icae6c74401a7a8f4da6015737f09f557640c0cca