aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of 8e9385cc to masterKen Wakasa2014-09-132-1/+13
|\ | | | | | | Change-Id: Ia6d192ee4a8496afa3f788894844ebef78fb7a8c
| * am 567c0dd4: am 7aa47cb3: Only do double-space-period on real text fields.Jean Chalard2014-09-122-1/+13
| |\ | | | | | | | | | | | | * commit '567c0dd471b16445a44af6c743290817a3c1d38b': Only do double-space-period on real text fields.
| | * am 7aa47cb3: Only do double-space-period on real text fields.Jean Chalard2014-09-122-1/+13
| | |\ | | | | | | | | | | | | | | | | * commit '7aa47cb3748d82b6f8bf3713c3c9e05b3fca8979': Only do double-space-period on real text fields.
| | | * Only do double-space-period on real text fields.Jean Chalard2014-09-122-1/+13
| | | | | | | | | | | | | | | | | | | | Bug: 15559216 Change-Id: Id6ecadc58c03889496967d67371457e4050d695b
* | | | am 468daeb7: (-s ours) am 8aa54301: (-s ours) am 64dd48e3: (-s ours) Merge ↵Baligh Uddin2014-09-120-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into lmp-dev * commit '468daeb79106a71226382c3a6d41232addba1f9f': Import translations. DO NOT MERGE
| * | | am 8aa54301: (-s ours) am 64dd48e3: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2014-09-110-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into lmp-dev * commit '8aa543017109daa52bd1b6ef4e3d185f7cbfa119': Import translations. DO NOT MERGE
| | * | am 64dd48e3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-devBaligh Uddin2014-09-110-0/+0
| | |\| | | | | | | | | | | | | | | | | * commit '64dd48e381266ac63a2b9d6145040191bacdae10': Import translations. DO NOT MERGE
| | | * Merge "Import translations. DO NOT MERGE" into lmp-devBaligh Uddin2014-09-1173-685/+7
| | | |\
| | | | * Import translations. DO NOT MERGEBaligh Uddin2014-09-0973-685/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I760fae2840e78c7dce10f6caf9cae4fffdef71c1 Auto-generated-cl: translation import
* | | | | am c24340f9: am 74d59cca: am dc1097ee: Merge "Update AOSP launcher icon" ↵Tadashi G. Takaoka2014-09-125-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit 'c24340f956c16d8594c44d45685f8a814538245b': Update AOSP launcher icon
| * | | | am 74d59cca: am dc1097ee: Merge "Update AOSP launcher icon" into lmp-devTadashi G. Takaoka2014-09-115-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '74d59ccae1974005f8b12940e4a109c70eecd765': Update AOSP launcher icon
| | * | | am dc1097ee: Merge "Update AOSP launcher icon" into lmp-devTadashi G. Takaoka2014-09-115-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit 'dc1097ee2e85daaed525ceff2154d4d7252c75ed': Update AOSP launcher icon
| | | * | Merge "Update AOSP launcher icon" into lmp-devTadashi G. Takaoka2014-09-115-0/+0
| | | |\ \
| | | | * | Update AOSP launcher iconTadashi G. Takaoka2014-09-125-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16635354 Bug: 16635354 Change-Id: I68f9c4ec21a01b9db0fc73c1785c972f5d7ac05b
* | | | | | am 1073ef97: am 1bb20aa0: am 31544dcb: Add xxxhdpi assetsTadashi G. Takaoka2014-09-1297-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1073ef9756617ecd2b4eeddca045039d9e6f3d14': Add xxxhdpi assets
| * | | | | am 1bb20aa0: am 31544dcb: Add xxxhdpi assetsTadashi G. Takaoka2014-09-1197-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1bb20aa0cf99c72aef702ebb0464c0c1e4476ccb': Add xxxhdpi assets
| | * | | | am 31544dcb: Add xxxhdpi assetsTadashi G. Takaoka2014-09-1197-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '31544dcb43bfb4f14339d1c2b3ffa92063487c0c': Add xxxhdpi assets
| | | * | | Add xxxhdpi assetsTadashi G. Takaoka2014-09-1197-0/+0
| | | |/ / | | | | | | | | | | | | | | | Bug: 17432407 Change-Id: I68e5f660425db567688d4e119c94fc34430f8ff3
* | | | | Merge "Use WordIdArrayView for prevWordIds."Keisuke Kuroyanagi2014-09-1220-138/+133
|\ \ \ \ \
| * | | | | Use WordIdArrayView for prevWordIds.Keisuke Kuroyanagi2014-09-1120-138/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14425059 Change-Id: Ia84fb997d89564e60111b46ca83bbfa3b187f316
* | | | | | am ead70974: am 27ccbeb4: am cd119050: Support CursorAnchorInfo in the ↵Yohei Yukawa2014-09-113-20/+291
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | full-screen mode * commit 'ead70974aecd78d5bad0fa87a759f6bf82dcb503': Support CursorAnchorInfo in the full-screen mode
| * | | | | am 27ccbeb4: am cd119050: Support CursorAnchorInfo in the full-screen modeYohei Yukawa2014-09-113-20/+291
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * commit '27ccbeb4e69e32641c20afa32d8e57c46fcc412e': Support CursorAnchorInfo in the full-screen mode
| | * | | | am cd119050: Support CursorAnchorInfo in the full-screen modeYohei Yukawa2014-09-113-20/+291
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | * commit 'cd11905022306c9b95f8781f0f8b23a3570f30e9': Support CursorAnchorInfo in the full-screen mode
| | | * | | Support CursorAnchorInfo in the full-screen modeYohei Yukawa2014-09-113-20/+291
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL allows to emulate the behavior of CursorAnchorInfo in the full-screen mode to work around the limitation of the framework. Basically this CL copies relevant code from the framework to LatinIME. This is actually a code duplicate which isn't great, but probably the only way that is available right now. Change-Id: I30bc8c3387c91c8e47252ba699cbd967d8927dad
* | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-09-1173-685/+7
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-09-0973-685/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id31c38a0c1c737071e3659fc374eaca40f441102 Auto-generated-cl: translation import
* | | | | | | [ML6] Have asyncReloadMainDictionary support multiple localesJean Chalard2014-09-111-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4c3dfaad38ec1cc91d1a9f81d5ff45ef12f70029
* | | | | | | [ML5] Rewrite resetDictionariesWithDictNamePrefixJean Chalard2014-09-112-50/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change rewrites resetDictionariesWithDictNamePrefix so that it would work if there were several locales, which is going to happen shortly. This change on its own is quite large and difficult already, so I didn't want to merge it into the change that actually makes several locales happen; another such change is following. Change-Id: Ibb80b05b73c0f0f0bea64b7e308cc4d38ca448f9
* | | | | | | Merge "Implement IntArrayView.copyToBuffer()."Keisuke Kuroyanagi2014-09-112-1/+30
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Implement IntArrayView.copyToBuffer().Keisuke Kuroyanagi2014-09-112-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14425059 Change-Id: Ic1b7de72701eae0c0b1bb28d12514099446a66a9
* | | | | | | Merge "add productionFlag for checking split keyboard status"Jatin Matani2014-09-111-0/+5
|\ \ \ \ \ \ \
| * | | | | | | add productionFlag for checking split keyboard statusJatin Matani2014-09-111-0/+5
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic999c9b0b2c116858801b8c38363c956de6d5faf
* | | | | | | Merge "Adds StatsUtil methods for LatinIME.on{Start,Create,Finish}inputView"Jatin Matani2014-09-112-0/+20
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Adds StatsUtil methods for LatinIME.on{Start,Create,Finish}inputViewJatin Matani2014-09-102-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4e7dc008b98e398c38aafea5cb31156dde7f42ea
* | | | | | | Merge "Remove unigram probability from dicNode."Keisuke Kuroyanagi2014-09-106-32/+11
|\ \ \ \ \ \ \
| * | | | | | | Remove unigram probability from dicNode.Keisuke Kuroyanagi2014-09-106-32/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14425059 Change-Id: Ie848e8568bb4dbb1d8358e823a881d9157a1aad3
* | | | | | | | Merge "Quit using dicNode.getUnigramProbability()."Keisuke Kuroyanagi2014-09-104-8/+16
|\| | | | | | |
| * | | | | | | Quit using dicNode.getUnigramProbability().Keisuke Kuroyanagi2014-09-104-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14425059 Change-Id: I192070cc11e5d46c8413ebc19982d6a8c93577fc
* | | | | | | | Merge "Use CodePointArrayView to create children DicNodes."Keisuke Kuroyanagi2014-09-106-13/+20
|\| | | | | | |
| * | | | | | | Use CodePointArrayView to create children DicNodes.Keisuke Kuroyanagi2014-09-106-13/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie940b6595f3f3f804fbb8dd03c710ea062b75af3
* | | | | | | | Merge "Use WordAttributes for checking flags."Keisuke Kuroyanagi2014-09-108-41/+22
|\| | | | | | |
| * | | | | | | Use WordAttributes for checking flags.Keisuke Kuroyanagi2014-09-108-41/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14425059 Change-Id: Idee84478a482a0e7b5cc53e5dbd4e2484584ba79
* | | | | | | | Merge "Introduce WordAttributes to get word probability and flags."Keisuke Kuroyanagi2014-09-1010-28/+116
|\| | | | | | |
| * | | | | | | Introduce WordAttributes to get word probability and flags.Keisuke Kuroyanagi2014-09-1010-28/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14425059 Change-Id: Iee11d038e0893d7ddd6c52447907f8c55fecb6a5
* | | | | | | | Merge "Use getProbabilityOfWordInContext for prediction."Keisuke Kuroyanagi2014-09-102-8/+12
|\| | | | | | |
| * | | | | | | Use getProbabilityOfWordInContext for prediction.Keisuke Kuroyanagi2014-09-102-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14425059 Change-Id: I9d5c905a0adda3503c593bfbf0bb9af8d1686f5d
* | | | | | | | Merge "Implement LanguageModelDictContent.getWordProbability()."Keisuke Kuroyanagi2014-09-108-40/+95
|\| | | | | | |
| * | | | | | | Implement LanguageModelDictContent.getWordProbability().Keisuke Kuroyanagi2014-09-108-40/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14425059 Change-Id: I290a05cee6f341caa25fb222892505529cef1eb7
* | | | | | | | Merge "Enable personalization for multilingual users."Keisuke Kuroyanagi2014-09-105-18/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | Enable personalization for multilingual users.Keisuke Kuroyanagi2014-09-105-18/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16547557 Change-Id: I03eda34edc902fc4732d16d234216344d8d84d88