aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | am bfd58885: Merge "Cleanup DicNodePriorityQueue."Keisuke Kuroyanagi2014-03-281-11/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'bfd58885bf53e4893e5c11576b79336699338b3c': Cleanup DicNodePriorityQueue.
| * | | | Merge "Cleanup DicNodePriorityQueue."Keisuke Kuroyanagi2014-03-281-11/+12
| |\ \ \ \
| | * | | | Cleanup DicNodePriorityQueue.Keisuke Kuroyanagi2014-03-281-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia44ca0e14f8aad090ae2b8007771dea6d9b41221
* | | | | | am 9261e4c0: Merge "Remove DicNode.managedDelete."Keisuke Kuroyanagi2014-03-286-36/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9261e4c08083fe5c60019e6a11ca3574abd8a886': Remove DicNode.managedDelete.
| * | | | | Merge "Remove DicNode.managedDelete."Keisuke Kuroyanagi2014-03-286-36/+8
| |\| | | |
| | * | | | Remove DicNode.managedDelete.Keisuke Kuroyanagi2014-03-286-36/+8
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8146975d72878ba34d1c5054a7cf5fdcc41a3332
* | | | | | am a4c5c54a: Merge "Remove unused method."Keisuke Kuroyanagi2014-03-284-21/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a4c5c54a19fd3143ee838d9f1a472a73799ef514': Remove unused method.
| * | | | | Merge "Remove unused method."Keisuke Kuroyanagi2014-03-284-21/+0
| |\ \ \ \ \
| | * | | | | Remove unused method.Keisuke Kuroyanagi2014-03-274-21/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iefb75136080e73c357511df045816f18cec767a6
* | | | | | | am 781e3df7: Merge "Dictionary migration in Java side."Keisuke Kuroyanagi2014-03-284-1/+150
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '781e3df73b7a3821ca54ba019c6a0f6597e24800': Dictionary migration in Java side.
| * | | | | | Merge "Dictionary migration in Java side."Keisuke Kuroyanagi2014-03-284-1/+150
| |\| | | | |
| | * | | | | Dictionary migration in Java side.Keisuke Kuroyanagi2014-03-274-1/+150
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13406708 Change-Id: If83938e4b4810d2e8353c70cdd8ef3ea97a29571
* | | | | | am 35645ac3: Merge "[CB14.5] Stop copying WordComposers."Jean Chalard2014-03-284-34/+48
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '35645ac39aee1864658a0c00ee82836a93822ebb': [CB14.5] Stop copying WordComposers.
| * | | | | Merge "[CB14.5] Stop copying WordComposers."Jean Chalard2014-03-284-34/+48
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | [CB14.5] Stop copying WordComposers.Jean Chalard2014-03-284-34/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an overdue refactoring that I have been wanted to do forever, and that we can at last do now that suggestions come only from instances of BinaryDictionary instances. With this, all unit tests and regression tests are passing again. Bug: 13667648 Bug: 13665487 Bug: 8636060 Change-Id: Ie23a19f9b7e692edf2ee0b107ddaff2d7db564b6
* | | | | | am 3c801be5: Merge "Fix unit tests by adding @UsedForTesting."Keisuke Kuroyanagi2014-03-282-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3c801be5e5856c8e77077efeb4487ed1c6507e45': Fix unit tests by adding @UsedForTesting.
| * | | | | Merge "Fix unit tests by adding @UsedForTesting."Keisuke Kuroyanagi2014-03-282-0/+3
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Fix unit tests by adding @UsedForTesting.Keisuke Kuroyanagi2014-03-282-0/+3
| | | |_|/ | | |/| | | | | | | | | | | | Change-Id: I8497d6cf446297bc8c15e9d9818078b1026a8c51
* | | | | am f173b12b: Merge "Stop displaying locale string on short space bar"Tadashi G. Takaoka2014-03-283-80/+34
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'f173b12b03a46cb086d61b6a39334c8c9c528281': Stop displaying locale string on short space bar
| * | | | Merge "Stop displaying locale string on short space bar"Tadashi G. Takaoka2014-03-283-80/+34
| |\ \ \ \
| | * | | | Stop displaying locale string on short space barTadashi G. Takaoka2014-03-283-80/+34
| | | |/ / | | |/| | | | | | | | | | | | | | | | | Bug: 12070355 Change-Id: I2d6fa20431bc56d5139caeac33e396b73906d075
* | | | | am a09b9cea: Merge "Fix: NPE after onDestroy()."Keisuke Kuroyanagi2014-03-282-0/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'a09b9cead82dd1f0af6cf97d7b27834b21dcd9ba': Fix: NPE after onDestroy().
| * | | | Merge "Fix: NPE after onDestroy()."Keisuke Kuroyanagi2014-03-282-0/+15
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix: NPE after onDestroy().Keisuke Kuroyanagi2014-03-282-0/+15
| | |/ / | | | | | | | | | | | | | | | | Bug: 13671513 Change-Id: I06aa14870ff5422ad514356ee406600b247858c5
* | | | am 2f781026: (-s ours) Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-03-270-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit '2f781026ccfadc2ad91e5c57ff59ecb27dd192e9': Import translations. DO NOT MERGE
| * | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-03-2757-57/+86
| |\ \ \ | | |/ / | |/| |
| | * | Import translations. DO NOT MERGEBaligh Uddin2014-03-2657-57/+86
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia5b2ec8549346f3b4b1c2ffd569abde6cdecae3e Auto-generated-cl: translation import
* | | | Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleBaligh Uddin2014-03-2757-57/+86
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBaligh Uddin2014-03-2657-57/+86
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3edab05b4043bb083b1b5286b3b08d4d23e272ad Auto-generated-cl: translation import
* | | | | am 618a949f: Merge "Use SuggestionResults to get suggestion."Keisuke Kuroyanagi2014-03-2713-169/+122
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit '618a949f9dd751236b4d74d293ca401002bad59d': Use SuggestionResults to get suggestion.
| * | | | Merge "Use SuggestionResults to get suggestion."Keisuke Kuroyanagi2014-03-2713-169/+122
| |\ \ \ \
| | * | | | Use SuggestionResults to get suggestion.Keisuke Kuroyanagi2014-03-2713-169/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8187060 Bug: 13333066 Change-Id: I435096ecf8422453f9b167adb0ca3b9c8a840018
* | | | | | am ff2456c8: Merge "Use Clang for dicttool"Ken Wakasa2014-03-273-11/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ff2456c8009cb4b5cdcc69a4e81d872981860a15': Use Clang for dicttool
| * | | | | Merge "Use Clang for dicttool"Ken Wakasa2014-03-273-11/+10
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Use Clang for dicttoolKen Wakasa2014-03-273-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the wrong shared lib name too. Change-Id: Ib98c55dfd1aee4a762dc96b12df3a463bef2ac80
* | | | | | am 2426bc29: Merge "Remove DicNodeUtils::appendTwoWords()."Keisuke Kuroyanagi2014-03-273-38/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2426bc2943af97ef8d6936842be7b2b6708522a3': Remove DicNodeUtils::appendTwoWords().
| * | | | | Merge "Remove DicNodeUtils::appendTwoWords()."Keisuke Kuroyanagi2014-03-273-38/+3
| |\ \ \ \ \
| | * | | | | Remove DicNodeUtils::appendTwoWords().Keisuke Kuroyanagi2014-03-273-38/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7402793b3f71ef5d786abea2f97bd4b624e4405f
* | | | | | | am 080e0253: Merge "Revert "[CB15] Remove a redundant variable.""Jean Chalard2014-03-273-17/+37
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '080e0253ae9d725a328b54c4771b9838699ffc7a': Revert "[CB15] Remove a redundant variable."
| * | | | | | Merge "Revert "[CB15] Remove a redundant variable.""Jean Chalard2014-03-273-17/+37
| |\ \ \ \ \ \
| | * | | | | | Revert "[CB15] Remove a redundant variable."Jean Chalard2014-03-273-17/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0de7a6d1a272d52a9544df1c693ae199ab5abc52. Change-Id: I327679b76a14cf9c3aec4b00b013b921408c32f9
* | | | | | | | am f459ccf4: Merge "Revert "[CB16] Remove unused stuff""Jean Chalard2014-03-272-5/+37
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f459ccf4f663d74ce43c57e9b9af9251ee0c48a1': Revert "[CB16] Remove unused stuff"
| * | | | | | | Merge "Revert "[CB16] Remove unused stuff""Jean Chalard2014-03-272-5/+37
| |\ \ \ \ \ \ \
| | * | | | | | | Revert "[CB16] Remove unused stuff"Jean Chalard2014-03-272-5/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 05c46f59fdc6065aad833d905fc9759ba907fc82. Change-Id: Ica0feea10fff1b2a9ef42bc55cb7c1892b3a3f58
* | | | | | | | | am 5154c47c: Merge "[CB16] Remove unused stuff"Jean Chalard2014-03-272-37/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5154c47cbe57b51e3dac97a98d932ce6d5110d26': [CB16] Remove unused stuff
| * | | | | | | | Merge "[CB16] Remove unused stuff"Jean Chalard2014-03-272-37/+5
| |\| | | | | | | | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | [CB16] Remove unused stuffJean Chalard2014-03-272-37/+5
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13406701 Change-Id: Ib863c5181e1f5d74cfa4458060afc49d1ee8109e
* | | | | | | am e04a9798: Merge "Call setLayerType(LAYER_TYPE_HARDWARE) for ↵Ken Wakasa2014-03-271-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EmojiPalettesView too." * commit 'e04a9798f6f1e2c4976c8c8bf07a204fa76a6da9': Call setLayerType(LAYER_TYPE_HARDWARE) for EmojiPalettesView too.
| * | | | | | Merge "Call setLayerType(LAYER_TYPE_HARDWARE) for EmojiPalettesView too."Ken Wakasa2014-03-271-1/+3
| |\ \ \ \ \ \
| | * | | | | | Call setLayerType(LAYER_TYPE_HARDWARE) for EmojiPalettesView too.Ken Wakasa2014-03-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL probably does not addresses the bug, but still this should be the right thing to do here. bug: 12667742 Change-Id: I587652942fd66094779fb7942c734e0ff5f9d0b6