aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin (follow)
Commit message (Collapse)AuthorAgeFilesLines
* am e6560252: am 72cd8466: Merge "Fix NPE in user history bigram dictionary" ↵satok2012-05-311-0/+7
|\ | | | | | | | | | | | | into jb-dev * commit 'e656025282c0da28ed80b2604949092dbc5fb72e': Fix NPE in user history bigram dictionary
| * Fix NPE in user history bigram dictionarysatok2012-06-011-0/+7
| | | | | | | | | | Bug: 6584882 Change-Id: Id0162bffc4f0f36239cdc68383f8a47d7a957397
* | Merge "Include version number in log output."Kurt Partridge2012-05-311-4/+3
|\ \
| * | Include version number in log output.Kurt Partridge2012-05-311-4/+3
| | | | | | | | | | | | | | | Bug: 6188932 Change-Id: I1039a3ad317d207599f30fe578bdf814c80d6852
* | | am bb104678: am 6f0cd9ba: Fix a possible NPE.Jean Chalard2012-05-311-0/+1
|\ \ \ | |/ / |/| / | |/ | | * commit 'bb10467863ff531c5cbee8ffd72845a91e487e72': Fix a possible NPE.
| * Fix a possible NPE.Jean Chalard2012-05-311-0/+1
| | | | | | | | | | | | This NPE's at least in unit tests. Change-Id: I255ac5fec9502e4e5bd18cba1211cdf46c6cafc8
* | am 40bab488: am 4f78f8cb: Merge "Remove a vibration-related option when ↵Jean Chalard2012-05-291-0/+5
|\| | | | | | | | | | | | | there\'s no vibrator" into jb-dev * commit '40bab488cb70875f46e29f595d577cc6cc4a9264': Remove a vibration-related option when there's no vibrator
| * Remove a vibration-related option when there's no vibratorJean Chalard2012-05-301-0/+5
| | | | | | | | | | Bug: 6567160 Change-Id: I1b5d425ffb64b2d7390cd0b7be0825f6aca17f41
* | Merge "Fixes to json output"Kurt Partridge2012-05-291-96/+63
|\ \
| * | Fixes to json outputKurt Partridge2012-05-291-96/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - booleans and numbers in SharedPreferences not quoted as strings - removed redundant logging from KeyboardState - json output for KeyboardId - remove unnecessary logging of LatinImeLogger.onStartView() and PointerTracker checking keyboardlayoutchange - fix to day-of-month part of uuid Multi-project commit with Idb8f190214f852ab2b58df49f9e514dc7fcbecbb Bug: 6188932 Change-Id: I67b4a0b34aa26c2804e2b3ee2136614f0ec8181a
* | | am 126ed424: am 1ed017ef: Fix performance issue when there are no contacts ↵Tom Ouyang2012-05-292-12/+34
|\ \ \ | | |/ | |/| | | | | | | | | | | | | in the dictionary dictionary. * commit '126ed42415a4dc3841e8981a23cbe8a22a9e2213': Fix performance issue when there are no contacts in the dictionary dictionary.
| * | Fix performance issue when there are no contacts in the dictionary dictionary.Tom Ouyang2012-05-292-12/+34
| | | | | | | | | | | | | | | Bug: 6551480 Change-Id: I8681a1bd82423c612af2d012f9b872501d8c201d
* | | am 408fa1ac: am 961e676b: Merge "Set level 1 as the initial value of the ↵Satoshi Kataoka2012-05-298-21/+77
|\| | | | | | | | | | | | | | | | | | | | valid words" into jb-dev * commit '408fa1ac48a3eb6f378274d5dd0e490da0f453ae': Set level 1 as the initial value of the valid words
| * | Set level 1 as the initial value of the valid wordsSatoshi Kataoka2012-05-298-21/+77
| | | | | | | | | | | | | | | Bug: 4192129 Change-Id: I867e78ce79c78977d08e8b66881a25b6fe5bf41f
* | | am 40ab25ca: am 51705efc: Merge "Add a JNI to get the frequency" into jb-devSatoshi Kataoka2012-05-291-2/+3
|\| | | | | | | | | | | | | | * commit '40ab25cab0e723f34dc2f1442f414761149b2338': Add a JNI to get the frequency
| * | Add a JNI to get the frequencySatoshi Kataoka2012-05-291-2/+3
| | | | | | | | | | | | | | | Bug: 4192129 Change-Id: I3f220f5a10114d4eb23956148076cf76220bda0f
* | | am d882aead: am bd40b94f: Merge "Optimize the store of bigram list" into jb-devSatoshi Kataoka2012-05-283-106/+179
|\| | | | | | | | | | | | | | * commit 'd882aeadb07d16ed887c71895577faabbd635ff3': Optimize the store of bigram list
| * | Merge "Optimize the store of bigram list" into jb-devSatoshi Kataoka2012-05-283-106/+179
| |\ \
| | * | Optimize the store of bigram listSatoshi Kataoka2012-05-293-106/+179
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 4192129 Change-Id: Idcc62e4f9696b56b1d7013891b2da37b1784423e
* | | | am 7317a257: am 24c4d626: Merge "Fix NumberFormatException" into jb-devSatoshi Kataoka2012-05-281-2/+2
|\| | | | | | | | | | | | | | | | | | | * commit '7317a257e553c6ecc7adb4211a0370d502bfa0fe': Fix NumberFormatException
| * | | Fix NumberFormatExceptionSatoshi Kataoka2012-05-291-2/+2
| |/ / | | | | | | | | | | | | Bug: 6567496 Change-Id: Ib0d9fab8496c8c856b94cce5812a263efbcb724f
* | | am fff5cd6f: am aa064139: Merge "Forget user history" into jb-devsatok2012-05-278-100/+333
|\| | | | | | | | | | | | | | * commit 'fff5cd6f767e248ecb5b30ea39cb9a22a476b953': Forget user history
| * | Merge "Forget user history" into jb-devsatok2012-05-278-100/+333
| |\ \
| | * | Forget user historysatok2012-05-288-100/+333
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 4192129 Change-Id: Ic98398e5383093a1c24373849eadc48fc4d3626f
* | | | am fac23787: am bed613cf: Merge "Simulate hardware enter/delete events if ↵Jean Chalard2012-05-271-3/+37
|\| | | | |_|/ |/| | | | | | | | | | | | | | the app targets < 16" into jb-dev * commit 'fac23787bbd7723acba4e7e344aa6f799d9584f6': Simulate hardware enter/delete events if the app targets < 16
| * | Merge "Simulate hardware enter/delete events if the app targets < 16" into ↵Jean Chalard2012-05-271-3/+37
| |\ \ | | |/ | |/| | | | jb-dev
| | * Simulate hardware enter/delete events if the app targets < 16Jean Chalard2012-05-281-3/+37
| | | | | | | | | | | | | | | | | | | | | | | | This will make text input buggy on all apps until they target JB or superior. Bug: 6537051 Change-Id: I726347db8c84d1582ad1962d3a910e698389e08c
* | | am 250f6a44: am 123017cc: Merge "Wipe the application cache selectively" ↵Jean Chalard2012-05-252-1/+5
|\| | | | | | | | | | | | | | | | | | | | into jb-dev * commit '250f6a44a7585d61175ec983f9afd43081cd636f': Wipe the application cache selectively
| * | Merge "Wipe the application cache selectively" into jb-devJean Chalard2012-05-252-1/+5
| |\|
| | * Wipe the application cache selectivelyJean Chalard2012-05-252-1/+5
| | | | | | | | | | | | | | | Bug: 6537051 Change-Id: I839d0a98c729f3604582946d70c0140a5cff7dcf
* | | am d45e334f: am 7707e045: Merge "Cache application info." into jb-devJean Chalard2012-05-252-4/+17
|\| | | | | | | | | | | | | | * commit 'd45e334f5a73d2cc36800a81e1bbf881e633f026': Cache application info.
| * | Merge "Cache application info." into jb-devJean Chalard2012-05-252-4/+17
| |\|
| | * Cache application info.Jean Chalard2012-05-252-4/+17
| | | | | | | | | | | | | | | Bug: 6537051 Change-Id: Ieca891235df0d697bdeb0510651b703654fdef38
* | | am 6691bd67: am 9b93817b: Merge "Get information about the target ↵Jean Chalard2012-05-252-1/+68
|\| | | | | | | | | | | | | | | | | | | | application." into jb-dev * commit '6691bd675a555163aa59c2ac791c6138c1d8a32c': Get information about the target application.
| * | Merge "Get information about the target application." into jb-devJean Chalard2012-05-252-1/+68
| |\|
| | * Get information about the target application.Jean Chalard2012-05-252-1/+68
| | | | | | | | | | | | | | | Bug: 6537051 Change-Id: I9fe7a07b5ddf2a423d5764840753ea70544206f1
* | | am 41cf0ced: am b6c314e4: Merge "Clean up some compiler warnings" into jb-devTadashi G. Takaoka2012-05-259-15/+15
|\| | | | | | | | | | | | | | * commit '41cf0ced38912c5f4a6d11a88c0deb4ac4d01860': Clean up some compiler warnings
| * | Clean up some compiler warningsTadashi G. Takaoka2012-05-259-15/+15
| |/ | | | | | | Change-Id: I604da15e65fc3cf807ec4033df4e4cd5ef0196fc
* | 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.
| * Fix a bug with a concurrent modification of a map.Jean Chalard2012-05-242-18/+21
| | | | | | | | | | Bug: 6538848 Change-Id: I1a8422356d9909213e53cfdc8c5bcc12eb48f19d
* | am 9b98c4a8: am 69897af2: Merge "Add new locales for the spell checker." ↵Jean Chalard2012-05-241-0/+6
|\| | | | | | | | | | | | | into jb-dev * commit '9b98c4a8ce496fa45b8ad6e7da57063c79d1d9e4': Add new locales for the spell checker.
| * Merge "Add new locales for the spell checker." into jb-devJean Chalard2012-05-241-0/+6
| |\
| | * Add new locales for the spell checker.Jean Chalard2012-05-241-0/+6
| | | | | | | | | | | | | | | Bug: 6533167 Change-Id: I1581e8446b1af5dc3679e01be16d4fc34af725cc
* | | am 9c239184: am 49afe45d: Fix buildTadashi G. Takaoka2012-05-241-1/+1
|\| | | | | | | | | | | | | | * commit '9c239184530be37fa806cf37a4f19ae0bc824aec': 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
| * | 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
| * 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