aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | am 987aa153: am 62cd919d: Remove a compiler warning.Jean Chalard2012-05-291-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '987aa1536b762070138ba40485a10e4caac01c48': Remove a compiler warning.
| * | | | | am 62cd919d: Remove a compiler warning.Jean Chalard2012-05-291-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '62cd919dca9ef85cdd045b539b3ef85e921c6e4c': Remove a compiler warning.
| | * | | | Remove a compiler warning.Jean Chalard2012-05-301-1/+1
| | |/ / / | | | | | | | | | | | | | | | Change-Id: Id2c949d03a2e38787cbf3c8f99313bcfe8610a1f
* | | | | am 719badd1: (-s ours) am 902275cb: Import translations. DO NOT MERGEEric Fischer2012-05-290-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '719badd135bad4ea52d8c4336ba2bc4541693e5b': Import translations. DO NOT MERGE
| * | | | am 902275cb: Import translations. DO NOT MERGEEric Fischer2012-05-298-9/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '902275cb5d30afa6e31931b990666bf1fab79225': Import translations. DO NOT MERGE
| | * | | Import translations. DO NOT MERGEEric Fischer2012-05-298-9/+9
| | | |/ | | |/| | | | | | | | | Change-Id: I50bf9fee5d80982699b696871987df047c569d18
* | | | Merge "Fixes to json output"Kurt Partridge2012-05-293-115/+63
|\ \ \ \
| * | | | Fixes to json outputKurt Partridge2012-05-293-115/+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.
| * | | | am 1ed017ef: Fix performance issue when there are no contacts in the ↵Tom Ouyang2012-05-292-12/+34
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | dictionary dictionary. * commit '1ed017ef0e271ed3f3c212def6cc6ba95b14e780': 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 c0749033: Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-290-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit 'c074903330415ce304177e9d6e062b43d337e232':
| | \ \ \
| | \ \ \
| *-. \ \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-290-0/+0
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | Change-Id: Ie760d80e44abe7a9de08f417ff107aa86b398e96
| | | * | | merge in nakasi-factoryrom-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-290-0/+0
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
* | | | | | | 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
| * | | | | | am 961e676b: Merge "Set level 1 as the initial value of the valid words" ↵Satoshi Kataoka2012-05-298-21/+77
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit '961e676b9a6b8282b1049715523aa520d3b6a6e5': Set level 1 as the initial value of the valid words
| | * | | | | Merge "Set level 1 as the initial value of the valid words" into jb-devSatoshi Kataoka2012-05-298-21/+77
| | |\ \ \ \ \
| | | * | | | | Set level 1 as the initial value of the valid wordsSatoshi Kataoka2012-05-298-21/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4192129 Change-Id: I867e78ce79c78977d08e8b66881a25b6fe5bf41f
* | | | | | | | am 08c295c5: am 9a321180: Add unit tests for double tap shift keyTadashi G. Takaoka2012-05-292-1/+42
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '08c295c5bb8d48b26a4486ed42a32a955b39ddd3': Add unit tests for double tap shift key
| * | | | | | | am 9a321180: Add unit tests for double tap shift keyTadashi G. Takaoka2012-05-292-1/+42
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9a3211802baf11e5749a080e4f451ef7b795220b': Add unit tests for double tap shift key
| | * | | | | | Add unit tests for double tap shift keyTadashi G. Takaoka2012-05-292-1/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6568746 Change-Id: I84db31ce86e3e043ac9f9bb971663a629fa3d3c7
* | | | | | | | am c79a7104: am 2959fc0f: Delay shift lock transient until long pressed ↵Tadashi G. Takaoka2012-05-293-76/+74
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shift key is released * commit 'c79a710445cca2a69dca9600a2c06eadcb253b62': Delay shift lock transient until long pressed shift key is released
| * | | | | | | am 2959fc0f: Delay shift lock transient until long pressed shift key is releasedTadashi G. Takaoka2012-05-293-76/+74
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2959fc0f13ec29e05eda2c4a1e9a728350a80557': Delay shift lock transient until long pressed shift key is released
| | * | | | | | Delay shift lock transient until long pressed shift key is releasedTadashi G. Takaoka2012-05-293-76/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5424586 Change-Id: Ib602af1b38b1b109bdac9cb0c53132169556db2f
* | | | | | | | am 57da84da: am fb0a4ba8: Add unit tests for long press shift keyTadashi G. Takaoka2012-05-292-2/+49
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '57da84dac4618c0848af02509b42cf913376f382': Add unit tests for long press shift key
| * | | | | | | am fb0a4ba8: Add unit tests for long press shift keyTadashi G. Takaoka2012-05-292-2/+49
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fb0a4ba8fd7291e1bed0ec61bb7d2b5c8f93c1ad': Add unit tests for long press shift key
| | * | | | | | Add unit tests for long press shift keyTadashi G. Takaoka2012-05-292-2/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5424586 Change-Id: I8465b7e2cebb07a135e24ea33eb7b7fb6752f7a2
* | | | | | | | am 7291fbce: am 16531ad5: Merge "More precise KeyboardState unit test" into ↵Tadashi G. Takaoka2012-05-293-39/+68
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-dev * commit '7291fbce4776519f764a4a175951a9ae2a1c2a30': More precise KeyboardState unit test
| * | | | | | | am 16531ad5: Merge "More precise KeyboardState unit test" into jb-devTadashi G. Takaoka2012-05-293-39/+68
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '16531ad52f08cffab05fb653c5bf31c48fffbc3e': More precise KeyboardState unit test
| | * | | | | | Merge "More precise KeyboardState unit test" into jb-devTadashi G. Takaoka2012-05-293-39/+68
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | More precise KeyboardState unit testTadashi G. Takaoka2012-05-293-39/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5424586 Change-Id: I838c82e3fe4629929cbd6e21111d139e7becab55
* | | | | | | | am 40ab25ca: am 51705efc: Merge "Add a JNI to get the frequency" into jb-devSatoshi Kataoka2012-05-296-11/+25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '40ab25cab0e723f34dc2f1442f414761149b2338': Add a JNI to get the frequency
| * | | | | | | am 51705efc: Merge "Add a JNI to get the frequency" into jb-devSatoshi Kataoka2012-05-296-11/+25
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '51705efc96c1c555cf9e0f557ea8cdc1c1c97781': Add a JNI to get the frequency
| | * | | | | | Merge "Add a JNI to get the frequency" into jb-devSatoshi Kataoka2012-05-296-11/+25
| | |\ \ \ \ \ \
| | | * | | | | | Add a JNI to get the frequencySatoshi Kataoka2012-05-296-11/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4192129 Change-Id: I3f220f5a10114d4eb23956148076cf76220bda0f
* | | | | | | | | am e3864d42: am b074dfea: Merge "Add a comment on a caveat for future ↵Jean Chalard2012-05-291-0/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reference." into jb-dev * commit 'e3864d429e699469644fa7ae867fd48e8206bd04': Add a comment on a caveat for future reference.
| * | | | | | | | am b074dfea: Merge "Add a comment on a caveat for future reference." into jb-devJean Chalard2012-05-291-0/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b074dfead504fba4039e4eaaded07c10244ff292': Add a comment on a caveat for future reference.
| | * | | | | | | Merge "Add a comment on a caveat for future reference." into jb-devJean Chalard2012-05-291-0/+5
| | |\ \ \ \ \ \ \
| | | * | | | | | | Add a comment on a caveat for future reference.Jean Chalard2012-05-291-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I328a0cd4346275aac960e1369bf370688a004e11
* | | | | | | | | | am 18f65017: am bfba64bc: Merge "Compute the correct frequency for bigram ↵Jean Chalard2012-05-292-4/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prediction" into jb-dev * commit '18f650172d29800edb772d3798391b2d430426df': Compute the correct frequency for bigram prediction
| * | | | | | | | | am bfba64bc: Merge "Compute the correct frequency for bigram prediction" ↵Jean Chalard2012-05-292-4/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit 'bfba64bcfd70ce8e3932d52c4b9f3182d33e1f55': Compute the correct frequency for bigram prediction
| | * | | | | | | | Merge "Compute the correct frequency for bigram prediction" into jb-devJean Chalard2012-05-292-4/+9
| | |\| | | | | | |
| | | * | | | | | | Compute the correct frequency for bigram predictionJean Chalard2012-05-292-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3196f48a0ca2ed5e94f430254d58e65d341398c8
* | | | | | | | | | am e382bcc3: am 8f9f55dd: Merge "Fix a bug where the bigram freq would be ↵Jean Chalard2012-05-291-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | underevaluated" into jb-dev * commit 'e382bcc39aa6aa64504a0fcd2ca59ad09dda0d25': Fix a bug where the bigram freq would be underevaluated
| * | | | | | | | | am 8f9f55dd: Merge "Fix a bug where the bigram freq would be underevaluated" ↵Jean Chalard2012-05-291-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit '8f9f55dd9d27f6c759c12416c872138b9b4661dc': Fix a bug where the bigram freq would be underevaluated
| | * | | | | | | | Merge "Fix a bug where the bigram freq would be underevaluated" into jb-devJean Chalard2012-05-291-1/+1
| | |\| | | | | | |
| | | * | | | | | | Fix a bug where the bigram freq would be underevaluatedJean Chalard2012-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The difference in score is not large, but it's still a bug Change-Id: Ie22c2b6e1206e829c1c8af096469df05af14d47b
* | | | | | | | | | am c941bc9b: am 22cf6958: Merge "Split a method to reconstruct freq from ↵Jean Chalard2012-05-291-7/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uni/bi freq" into jb-dev * commit 'c941bc9bd3eb5b564f8b5f63ff07a44097262671': Split a method to reconstruct freq from uni/bi freq
| * | | | | | | | | am 22cf6958: Merge "Split a method to reconstruct freq from uni/bi freq" ↵Jean Chalard2012-05-291-7/+12
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit '22cf695834009929a6c0fbcd75a9ff56efa04d83': Split a method to reconstruct freq from uni/bi freq