aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | am 3dcba427: Merge "Extract the jni library name"satok2011-12-132-2/+28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3dcba4279a9e663d040330fe13b6ce3ecd0ca879': Extract the jni library name
| * | | | | Merge "Extract the jni library name"satok2011-12-132-2/+28
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Extract the jni library namesatok2011-12-132-2/+28
| | |/ / / | | | | | | | | | | | | | | | Change-Id: Icc58ccea1178d9f35f5be0dceebab67bbb965b7f
* | | | | am 77ecf52a: Merge "Remove KeyboardSwitcher.updateShiftLockState method"Tadashi G. Takaoka2011-12-131-15/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '77ecf52a082143ef65fa2de1ca4425ec32ad8cd0': Remove KeyboardSwitcher.updateShiftLockState method
| * | | | Merge "Remove KeyboardSwitcher.updateShiftLockState method"Tadashi G. Takaoka2011-12-131-15/+7
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Remove KeyboardSwitcher.updateShiftLockState methodTadashi G. Takaoka2011-12-131-15/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: I032fc50a62a573ba4258530e695c8c88467783c6
* | | | | am 0a2494fa: Merge "Remove a useless return"Jean Chalard2011-12-131-3/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '0a2494fa5881152a9ed316409ae650353d8969fb': Remove a useless return
| * | | | Merge "Remove a useless return"Jean Chalard2011-12-131-3/+0
| |\ \ \ \
| | * | | | Remove a useless returnJean Chalard2011-12-131-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iefe10e94e2d88171387351a5b6cab52e281d0f76
* | | | | | am b2632553: Merge "Use priority queue for native string buffer"satok2011-12-135-85/+178
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b2632553bfcae5beb92f7366a71f15de30f44a9c': Use priority queue for native string buffer
| * | | | | Merge "Use priority queue for native string buffer"satok2011-12-125-85/+178
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Use priority queue for native string buffersatok2011-12-135-85/+178
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | +1 2 -6 2 Performance before ==== test finished, terminate logcat ===== (0) 100.34 (0.26%) (1) 37149.26 (95.30%) (2) 8.43 (0.02%) (3) 11.18 (0.03%) (4) 9.92 (0.03%) (5) 1330.60 (3.41%) (6) 250.46 (0.64%) (20) 12.41 (0.03%) Total 38982.50 (sum of others 38872.59) after ==== test finished, terminate logcat ===== (0) 97.65 (0.26%) (1) 35427.43 (95.32%) (2) 10.30 (0.03%) (3) 8.95 (0.02%) (4) 11.01 (0.03%) (5) 1224.67 (3.30%) (6) 243.76 (0.66%) (20) 40.91 (0.11%) Total 37167.04 (sum of others 37064.68) Change-Id: Id4d3b88a9cdef765affc52973aeac951ecc6a8ca
* | | | | am 8e404536: Merge "Simplification"Jean Chalard2011-12-131-4/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '8e404536cd20a5624acf5cea0c3aae19324b0e3f': Simplification
| * | | | Merge "Simplification"Jean Chalard2011-12-121-4/+2
| |\ \ \ \
| | * | | | SimplificationJean Chalard2011-12-131-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both tests have the same meaning. They should be merged. Also, if "deleteLast()" deletes more than one char (which never happens in the current implementation, but it's not guaranteed), the new code is more correct. Change-Id: I216df7cd45f4a7d76d1d5d6aa7f8d7f9a6e35ea3
* | | | | | am cf5ceccc: Merge "Refactoring"Jean Chalard2011-12-131-21/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cf5cecccfe84b316169f01ec1bc2b92361330002': Refactoring
| * | | | | Merge "Refactoring"Jean Chalard2011-12-121-21/+18
| |\| | | |
| | * | | | RefactoringJean Chalard2011-12-131-21/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If mHasUncommittedTypedChars is true, then mWordSavedForAutoCorrectCancellation must always be null, and spaceState must always be SPACE_STATE_NONE. Hence, this change is supposed to be very no-op. Change-Id: I2716f7372d996cc4dec40a4b7ac1ee7f5f4afe91
* | | | | | am 024ee9ff: Merge changes I7888797c,I57b2232fJean Chalard2011-12-131-11/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '024ee9ff0286b760a2c5aa7c755dda7e6c37ae21': Refactor + small bugfix Refactoring
| * | | | | Merge changes I7888797c,I57b2232fJean Chalard2011-12-121-11/+8
| |\| | | | | | |/ / / | |/| | | | | | | | | | | | | | | | | | * changes: Refactor + small bugfix Refactoring
| | * | | Refactor + small bugfixJean Chalard2011-12-131-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | postUpdateShiftKeyState used to be called also when mEnteredText is not null => this is a bugfix. The rest does not change the logic, as posting a message can be done anywhere within the function with no impact. Change-Id: I7888797c0778702d64f96701e35b611a55a6a259
| | * | | RefactoringJean Chalard2011-12-131-7/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: I57b2232f7fde32df5f6e1925aad1df988def34f9
* | | | | am dc52e7c6: Remove current keyboard id variableTadashi G. Takaoka2011-12-131-5/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'dc52e7c646bafb00898c3f2ebec064a5920e58fc': Remove current keyboard id variable
| * | | | Remove current keyboard id variableTadashi G. Takaoka2011-12-131-5/+3
| |/ / / | | | | | | | | | | | | Change-Id: Iec19af98209e1ea8ecd176d3be04d628d4b38950
* | | | am 34081186: Merge "Fix a bug where revert auto-correct would revert too much"Jean Chalard2011-12-121-8/+24
|\| | | | | | | | | | | | | | | | | | | * commit '34081186f9bcfcb84fa991ccd940745dcff38cda': Fix a bug where revert auto-correct would revert too much
| * | | Merge "Fix a bug where revert auto-correct would revert too much"Jean Chalard2011-12-121-8/+24
| |\ \ \
| | * | | Fix a bug where revert auto-correct would revert too muchJean Chalard2011-12-121-8/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there are no uncommitted chars, we shouldn't enter any of the tests that follow. We didn't use to, but a change today made it possible - it should not happen. There is no point in doing the rest of the tests, they are sure to fail. Change-Id: I580dd104aff3585de72a93b38989bfd9713f615b
* | | | | am 4f41cbc5: Remove a useless function callJean Chalard2011-12-121-1/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '4f41cbc588916dce64eef644e9f7b69da1618d03': Remove a useless function call
| * | | | Remove a useless function callJean Chalard2011-12-121-1/+0
| |/ / / | | | | | | | | | | | | Change-Id: I1a775cbf90dca301e1e6b596ddac64fdbc023199
* | | | am dcf8a6b2: Merge "Move a settings var to the settings class"Jean Chalard2011-12-122-2/+3
|\| | | | | | | | | | | | | | | | | | | * commit 'dcf8a6b2c6bf746c2d633e5c7d3e9692c886df91': Move a settings var to the settings class
| * | | Merge "Move a settings var to the settings class"Jean Chalard2011-12-122-2/+3
| |\ \ \
| | * | | Move a settings var to the settings classJean Chalard2011-12-122-2/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I1331ad6dec3a9d64a77e314f8a1f4c29282df31b
* | | | | am 2a659b8a: Remove a useless variableJean Chalard2011-12-121-3/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '2a659b8aa642b0832fa0ac9a93e0640592fcc239': Remove a useless variable
| * | | | Remove a useless variableJean Chalard2011-12-121-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can be just read when it's needed. Change-Id: I00753fe55645c244db5d4a96e7fdb8f5325475d9
* | | | | am 7208af0e: Remove a messy and unused class.Jean Chalard2011-12-122-225/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '7208af0ecdea9eb7de02e62926f0c57c83496f1e': Remove a messy and unused class.
| * | | | Remove a messy and unused class.Jean Chalard2011-12-122-225/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | Today is a happy day Change-Id: I3ef484bd258d5a59815bfcb0bd35ea3606b32430
* | | | am f162ed7e: Merge "Remove side-effects from TextEntryState"Jean Chalard2011-12-123-12/+41
|\| | | | | | | | | | | | | | | | | | | * commit 'f162ed7ec86be695fedd98e872d313f161fcdecd': Remove side-effects from TextEntryState
| * | | Merge "Remove side-effects from TextEntryState"Jean Chalard2011-12-123-12/+41
| |\ \ \
| | * | | Remove side-effects from TextEntryStateJean Chalard2011-12-123-12/+41
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib98eea9e791e426435cfdfd0c9ab3ed9061664aa
* | | | | am 267cd015: Add special handling for "Phone number" layout.Tadashi G. Takaoka2011-12-121-0/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '267cd0151f038d4d1654b9cbea5066d1927dd032': Add special handling for "Phone number" layout.
| * | | | Add special handling for "Phone number" layout.Tadashi G. Takaoka2011-12-121-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5743584 Change-Id: I821b837a2078afb64b460191c98b28f7733cf2c1
* | | | | am aa59e24e: Merge "Add unit test of KeyboardState"Tadashi G. Takaoka2011-12-122-3/+263
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'aa59e24ebec5e09c62d564d97fe790c6763ffc54': Add unit test of KeyboardState
| * | | | Merge "Add unit test of KeyboardState"Tadashi G. Takaoka2011-12-122-3/+263
| |\ \ \ \
| | * | | | Add unit test of KeyboardStateTadashi G. Takaoka2011-12-122-3/+263
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5708602 Change-Id: I1a8a9f4320948bb500a96df8773b0bfa1a1d4167
* | | | | | am c2a76a15: Remove a useless variable.Jean Chalard2011-12-121-5/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c2a76a1529870b59bba133a7d76a800cbd20ecfa': Remove a useless variable.
| * | | | | Remove a useless variable.Jean Chalard2011-12-121-5/+1
| | |/ / / | |/| | | | | | | | | | | | | Change-Id: Iea5ce5cfc05bad8b1d9085438e90147bd54b7e9c
* | | | | am 205f9ca3: Merge "Straighten out logic for revert word paths"Jean Chalard2011-12-111-30/+67
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '205f9ca3101f36e5375beddd453b771c8a92c352': Straighten out logic for revert word paths
| * | | | Merge "Straighten out logic for revert word paths"Jean Chalard2011-12-111-30/+67
| |\ \ \ \
| | * | | | Straighten out logic for revert word pathsJean Chalard2011-12-121-30/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also includes a new memorized string with simpler logic that will allow to remove other members Change-Id: I0b97243084902e68fcb835b6163c86fef8190ebc
* | | | | | am 243e0347: Merge "Assign Key.mCode from the label only when outputText is ↵Tadashi G. Takaoka2011-12-111-1/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not specified" * commit '243e0347169c857e08662bdc4d245473b6ea8097': Assign Key.mCode from the label only when outputText is not specified