aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | Merge "Clean up some compiler warnings" into jb-devTadashi G. Takaoka2012-05-2510-21/+15
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Clean up some compiler warningsTadashi G. Takaoka2012-05-2510-21/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I604da15e65fc3cf807ec4033df4e4cd5ef0196fc
* | | | | | | am eceedfb8: am 383f4d6a: Fix the name of the resource to lower caseJean Chalard2012-05-241-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eceedfb887d3cb9d1300aaa1cdc5dc3510d05549': Fix the name of the resource to lower case
| * | | | | | am 383f4d6a: Fix the name of the resource to lower caseJean Chalard2012-05-241-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '383f4d6a698b1eb208b55c59aea72d6c1cecc778': Fix the name of the resource to lower case
| | * | | | | Fix the name of the resource to lower caseJean Chalard2012-05-251-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icbacf10702de20ef1a60d2648ee6440812d13f1d
* | | | | | | am 8e50fe88: am 1b3db401: Add the dictionary for Portuguese to the apkJean Chalard2012-05-241-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8e50fe886279b0c4d812928226ffea22326f930a': Add the dictionary for Portuguese to the apk
| * | | | | | am 1b3db401: Add the dictionary for Portuguese to the apkJean Chalard2012-05-241-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1b3db401bc4eb40d9ba3938d30e4c0af4178361c': Add the dictionary for Portuguese to the apk
| | * | | | | Add the dictionary for Portuguese to the apkJean Chalard2012-05-251-0/+0
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds about 1MB to the system image, but Ibae3cd55 has been committed to make up for it. Both those considered, we are still adding 23kB to the build. Bug: 6558327 Change-Id: Iae066d39a193a0a380d2872a35661920dd5cea54
* | | | | | am 4fbdaacb: Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '4fbdaacb208c350a7a01aa3f2062e09e71f83daa':
| | \ \ \ \
| | \ \ \ \
| *-. \ \ \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-240-0/+0
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | / | | | | |_|/ | | | |/| | Change-Id: Idc407af8f1c35eec3901797e62283f15b5ca147a
| | | * | | merge in nakasi-factoryrom-release history after reset to jb-devThe Android Automerger2012-05-220-0/+0
| | | |\ \ \
| | * | \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-240-0/+0
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | / | | | | |_|/ | | | |/| |
| | | * | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-230-0/+0
| | | |\ \ \
* | | | | | | am d8b3e5c6: am 0c207144: Merge "Fix a bug with a concurrent modification of ↵Jean Chalard2012-05-242-18/+21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a map." into jb-dev * commit 'd8b3e5c69f4de663c748c82155fc3b8854119826': Fix a bug with a concurrent modification of a map.
| * | | | | | am 0c207144: Merge "Fix a bug with a concurrent modification of a map." into ↵Jean Chalard2012-05-242-18/+21
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-dev * commit '0c20714403d3548d1500cf8ac30041bedeae23d5': Fix a bug with a concurrent modification of a map.
| | * | | | | Merge "Fix a bug with a concurrent modification of a map." into jb-devJean Chalard2012-05-242-18/+21
| | |\ \ \ \ \
| | | * | | | | Fix a bug with a concurrent modification of a map.Jean Chalard2012-05-242-18/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6538848 Change-Id: I1a8422356d9909213e53cfdc8c5bcc12eb48f19d
* | | | | | | | am f726d09b: am f11c8cd1: Merge "Get rid of heavy IPC call from key drawing ↵Tadashi G. Takaoka2012-05-242-11/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | code" into jb-dev * commit 'f726d09b53e16a9602090da062393bdf9f34282f': Get rid of heavy IPC call from key drawing code
| * | | | | | | am f11c8cd1: Merge "Get rid of heavy IPC call from key drawing code" into jb-devTadashi G. Takaoka2012-05-242-11/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f11c8cd15a0b24231dba886c2135833a94923793': Get rid of heavy IPC call from key drawing code
| | * | | | | | Merge "Get rid of heavy IPC call from key drawing code" into jb-devTadashi G. Takaoka2012-05-242-11/+9
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Get rid of heavy IPC call from key drawing codeTadashi G. Takaoka2012-05-242-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6541544 Change-Id: I5c7df486ff72714ae09e1dbc21a8adbe3106ce95
* | | | | | | | am 21d5a015: am 28d82a3a: Merge "Remove non-words from the French ↵Jean Chalard2012-05-242-91/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dictionary." into jb-dev * commit '21d5a0157e18325e982b763ce253cfe3266f231a': Remove non-words from the French dictionary.
| * | | | | | | am 28d82a3a: Merge "Remove non-words from the French dictionary." into jb-devJean Chalard2012-05-242-91/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '28d82a3ad349127b8b829970716431c34e4e09fc': Remove non-words from the French dictionary.
| | * | | | | | Merge "Remove non-words from the French dictionary." into jb-devJean Chalard2012-05-242-91/+2
| | |\ \ \ \ \ \
| | | * | | | | | Remove non-words from the French dictionary.Jean Chalard2012-05-242-91/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I98c546818aa456a534e833495deb670e79df4104
* | | | | | | | | am 9b98c4a8: am 69897af2: Merge "Add new locales for the spell checker." ↵Jean Chalard2012-05-242-0/+22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit '9b98c4a8ce496fa45b8ad6e7da57063c79d1d9e4': Add new locales for the spell checker.
| * | | | | | | | am 69897af2: Merge "Add new locales for the spell checker." into jb-devJean Chalard2012-05-242-0/+22
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '69897af20db8fc0cb7cbf3d218cc1760ee200c43': Add new locales for the spell checker.
| | * | | | | | | Merge "Add new locales for the spell checker." into jb-devJean Chalard2012-05-242-0/+22
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | | * | | | | | Add new locales for the spell checker.Jean Chalard2012-05-242-0/+22
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6533167 Change-Id: I1581e8446b1af5dc3679e01be16d4fc34af725cc
* | | | | | | | am 9c239184: am 49afe45d: Fix buildTadashi G. Takaoka2012-05-241-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9c239184530be37fa806cf37a4f19ae0bc824aec': Fix build
| * | | | | | | am 49afe45d: Fix buildTadashi G. Takaoka2012-05-241-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '49afe45d8ea09dd51bbe27f10b0210adf37cdb3f': Fix build
| | * | | | | | Fix buildTadashi G. Takaoka2012-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up of I7822adf407 Change-Id: Iac75c0f2ff2482bce1305c54cb25b708037db6c6
* | | | | | | | am bc48a8f7: am c60a846e: Fix NPE in Settings.updateCustomInputStylesSummaryTadashi G. Takaoka2012-05-241-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bc48a8f7ab0d9003a9c97ceb7d85bcf0502785a6': Fix NPE in Settings.updateCustomInputStylesSummary
| * | | | | | | am c60a846e: Fix NPE in Settings.updateCustomInputStylesSummaryTadashi G. Takaoka2012-05-241-1/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c60a846e219ead1a40307d1a562013c38ea81b9d': Fix NPE in Settings.updateCustomInputStylesSummary
| | * | | | | | Fix NPE in Settings.updateCustomInputStylesSummaryTadashi G. Takaoka2012-05-241-1/+2
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I7822adf407046098f97bf60da9382910c0a40209
* | | | | | | am 60b2d84d: am 1e1235fe: Merge "Support bigram suggestions in Android spell ↵satok2012-05-231-1/+28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | checker" into jb-dev * commit '60b2d84d82ce8fd4a7bf4592d5229ee2436a675c': Support bigram suggestions in Android spell checker
| * | | | | | am 1e1235fe: Merge "Support bigram suggestions in Android spell checker" ↵satok2012-05-231-1/+28
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit '1e1235feeb5454dc8dd76d68dbf634b35d2d20f2': Support bigram suggestions in Android spell checker
| | * | | | | Merge "Support bigram suggestions in Android spell checker" into jb-devsatok2012-05-231-1/+28
| | |\ \ \ \ \
| | | * | | | | Support bigram suggestions in Android spell checkersatok2012-05-241-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6136291 Change-Id: Ic278153f95b23e9aa180d1d6b5960785766d96e5
* | | | | | | | am 7d81f318: am 7b1570e6: Merge "Cleanup Makefiles of LatinIME" into jb-devKen Wakasa2012-05-233-31/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7d81f3187198b1589edab3c7883c3ee94855ed7e': Cleanup Makefiles of LatinIME
| * | | | | | | am 7b1570e6: Merge "Cleanup Makefiles of LatinIME" into jb-devKen Wakasa2012-05-233-31/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7b1570e60c2e04fe7d132df758476b34685eb709': Cleanup Makefiles of LatinIME
| | * | | | | | Merge "Cleanup Makefiles of LatinIME" into jb-devKen Wakasa2012-05-233-31/+0
| | |\ \ \ \ \ \
| | | * | | | | | Cleanup Makefiles of LatinIMEKen Wakasa2012-05-243-31/+0
| | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | Change-Id: Id4c6700bc045825eb64fb2b7ae57f23a6211441d
* | | | | | | | am 925212ff: am c54d558e: Cancel adding user history bigram when ↵satok2012-05-235-180/+219
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | autocorrection is cancelled * commit '925212ff4b3d6ff4182a94a133c0e4a4f23dd6aa': Cancel adding user history bigram when autocorrection is cancelled
| * | | | | | | am c54d558e: Cancel adding user history bigram when autocorrection is cancelledsatok2012-05-235-180/+219
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c54d558e2e70bdfb2c1078cae7b88440d421dc67': Cancel adding user history bigram when autocorrection is cancelled
| | * | | | | | Cancel adding user history bigram when autocorrection is cancelledsatok2012-05-245-180/+219
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6465474 Change-Id: Ifbfe0ddc2ce5fab070939ede3db7bf03a8535a45
* | | | | | | am 074e8c92: am a0ac31fc: Fix the issue on multiple words suggestionsatok2012-05-233-3/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '074e8c920683d77fae191b34185193c896e3aa00': Fix the issue on multiple words suggestion
| * | | | | | am a0ac31fc: Fix the issue on multiple words suggestionsatok2012-05-233-3/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a0ac31fcaa01c21592a6e7af243c14dada65cf3e': Fix the issue on multiple words suggestion
| | * | | | | Fix the issue on multiple words suggestionsatok2012-05-233-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6509844 Change-Id: I823074a2b29befc3e60c63699ab4dc7719105c63
* | | | | | | am a6f86554: am 0b6b6ee5: Merge "Notify the dictionary pack about copy ↵Jean Chalard2012-05-231-5/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | failures" into jb-dev * commit 'a6f865541bb1f0db7d179d77d6c4fe10a22dc109': Notify the dictionary pack about copy failures