aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "add a default vaule for getMatchedProximityType" into jb-mr2-devSatoshi Kataoka2013-03-011-0/+2
|\
| * add a default vaule for getMatchedProximityType•••Change-Id: Id940f1226ca493d0a1b82e2810b1882184ef8987 Satoshi Kataoka2013-03-011-0/+2
* | Merge "Revert "Fix description of setup wizard 1st step"" into jb-mr2-devTadashi G. Takaoka2013-02-281-1/+1
|\ \
| * | Revert "Fix description of setup wizard 1st step"•••This reverts commit b5f4cac53266e6c3783b6a0ff62f40f2e293c24f Change-Id: Ic5787fcf63663885285c20403534572d5e7d7696 Tadashi G. Takaoka2013-02-281-1/+1
* | | Merge "Fix description of setup wizard 1st step" into jb-mr2-devTadashi G. Takaoka2013-02-281-1/+1
|\| |
| * | Fix description of setup wizard 1st step•••Bug: 8265778 Change-Id: Ie25be9d43089b2e9cb7b690df374bad1f8966b16 Tadashi G. Takaoka2013-02-281-1/+1
* | | Remove closing method from KeyboardView•••This is a follow up of Ie00ba827. After the change, the KeyboardView.closing() method does nothing important. Change-Id: I9659ea56ce82a95f8798a4136bf93f164b67fae7 Tadashi G. Takaoka2013-02-273-9/+0
|/ /
* / Keep Keyboard object while closing KeyboardView•••Bug: 8217626 Change-Id: Ie00ba827bc391aa152427965c57488b66308a75c Tadashi G. Takaoka2013-02-271-1/+1
|/
* Merge "Fix failed unit test due to resource string change" into jb-mr2-devTadashi G. Takaoka2013-02-271-3/+3
|\
| * Fix failed unit test due to resource string change•••Change-Id: Ie7acdf6895a9769eb43ea8a1c70c0d13b32ed349 Tadashi G. Takaoka2013-02-261-3/+3
* | Small cleanup of RunInLocale•••Change-Id: Ib588e67da2c88345fc4eb51587b07ebfa434e0bb Tadashi G. Takaoka2013-02-261-2/+3
|/
* Merge "Send the dictionaries descriptions to the dict pack"Jean Chalard2013-02-232-3/+16
|\
| * Send the dictionaries descriptions to the dict pack•••Bug: 8255795 Change-Id: I12a5922f50c2d2e3aa639457abcc1483e6a48721 Jean Chalard2013-02-232-3/+16
* | Fix a possible crash•••If the dictionary ID, as indicated in the metadata, is less than three chars long, it crashes LatinIME. Of course we don't have such dictionary IDs in the current metadata, but it's still better to be able to handle the case gracefully ^^; Change-Id: I60cdf6f8ecce9f4d44b42ddd5d157aebff9a4163 Jean Chalard2013-02-231-3/+7
|/
* Remove a cluttering log•••Bug: 8175067 Change-Id: I9a104a32ba2b3b52a5dfa250f8c642abd6169cc0 Jean Chalard2013-02-231-4/+5
* Merge "Pass the client ID to the dictionary pack in settings"Jean Chalard2013-02-231-1/+5
|\
| * Pass the client ID to the dictionary pack in settings•••Bug: 6789534 Bug: 8256209 Change-Id: Ib63c18e7f18117ba888324febea13da47332b6c6 Jean Chalard2013-02-221-1/+5
* | Merge "Tiny cleanup"Jean Chalard2013-02-231-1/+0
|\ \
| * | Tiny cleanup•••Change-Id: I5d7150a4abb3a498e790f41af569093217cb8b43 Jean Chalard2013-02-221-1/+0
| |/
* / Fix a bug with the passed dictionary id•••We used to make the dictionary that we passed to the dictionary pack as an initial value based on the locale. This is wrong - it should be read from the dictionary. This change fixes that. Bug: 7005813 Change-Id: Ib08ed31dd9c216f6f7b9c6c3174ca514bf96e06f Jean Chalard2013-02-222-6/+11
|/
* Merge "Fix how the Enter action is decided"Jean Chalard2013-02-237-33/+38
|\
| * Fix how the Enter action is decided•••This unifies the software and hardware keyboard code under a single decision process that works. Bug: 8129303 Bug: 8152758 Change-Id: I7574c563d5f957d57bfe62fe5e3eec59a519d335 Jean Chalard2013-02-227-33/+38
* | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-02-2253-1170/+1178
|\ \
| * | Import translations. DO NOT MERGE•••Change-Id: I75753bfe196bf52c7ec5534ce1996e035ea0f956 Auto-generated-cl: translation import Baligh Uddin2013-02-2253-1170/+1178
| |/
* | Merge "[TestPrep8] Narrow try/catch scope"Kurt Partridge2013-02-221-10/+9
|\ \ | |/ |/|
| * [TestPrep8] Narrow try/catch scope•••Change-Id: If15f250feb81c2ad55ce1bc7dc3dafa57de87aef Kurt Partridge2013-02-211-10/+9
* | Merge "[TestPrep7] Encapsulate JsonWriter creation"Kurt Partridge2013-02-221-8/+19
|\|
| * [TestPrep7] Encapsulate JsonWriter creation•••Change-Id: I4e97fa28dd0bb1101edc0db03f024432fee6f6fe Kurt Partridge2013-02-211-8/+19
* | Merge "Use common incremental decoder output scale."Tom Ouyang2013-02-221-0/+1
|\ \ | |/ |/|
| * Use common incremental decoder output scale.•••Change-Id: Ib6bd7be45be9229a075b6a8feb46c67ec75a9b06 Tom Ouyang2013-02-211-0/+1
* | Merge "[TestPrep5] Parameterize MainLogBuffer"Kurt Partridge2013-02-212-19/+19
|\ \
| * | [TestPrep5] Parameterize MainLogBuffer•••Change-Id: I6d84f490922cd1f40e44ca4f95c9d950fba38290 Kurt Partridge2013-02-202-19/+19
* | | Merge "[TestPrep4] Add some finals"Kurt Partridge2013-02-211-3/+3
|\| |
| * | [TestPrep4] Add some finals•••Change-Id: Ib437a6ad7fd6a897e2bbc65afe881ae8a3b1cbb0 Kurt Partridge2013-02-201-3/+3
* | | Merge "[TestPrep3] Add helper method to retrive dictionary"Kurt Partridge2013-02-211-7/+9
|\| |
| * | [TestPrep3] Add helper method to retrive dictionary•••Change-Id: Id6e03c6f8a3e96979d589f0605ac056fcad7e1ff Kurt Partridge2013-02-201-7/+9
* | | Merge "[TestPrep2] Rename a method"Kurt Partridge2013-02-212-4/+4
|\| |
| * | [TestPrep2] Rename a method•••Change-Id: Id9a72045afa3558b20b9d63c8720fb7443d34fd9 Kurt Partridge2013-02-202-4/+4
* | | Merge "[TestPrep1] Move MotionEvent.Action strings to LoggingUtils"Kurt Partridge2013-02-212-11/+39
|\| |
| * | [TestPrep1] Move MotionEvent.Action strings to LoggingUtils•••Change-Id: I7b9ed800552f2fd546ed21e9dc06ea1ff5798337 Kurt Partridge2013-02-202-11/+39
* | | Merge "add defines"Satoshi Kataoka2013-02-211-0/+4
|\ \ \
| * | | add defines•••Change-Id: I8bc009bf258cbdf01e15dc63a7a8afad47db5d96 Satoshi Kataoka2013-02-211-0/+4
* | | | Merge "Use WordComposer.addKeyInfo for testing"Tadashi G. Takaoka2013-02-211-1/+3
|\ \ \ \
| * | | | Use WordComposer.addKeyInfo for testing•••Change-Id: I500654e7a26717aa5547942357e56060afb72969 Tadashi G. Takaoka2013-02-201-1/+3
| |/ / /
* | | / Add preliminary setup wizard•••Bug: 8159728 Change-Id: I30d9cd637fb1d2e64588550e0aa4387bc1f7e6e5 Tadashi G. Takaoka2013-02-2115-5/+745
| |_|/ |/| |
* | | Merge remote-tracking branch 'goog/jb-mr2-release'Ed Heyl2013-02-200-0/+0
|\ \ \
| * | | merge in jb-mr2-release history after reset to masterThe Android Automerger2013-02-200-0/+0
|/| | |
| * | | merge in jb-mr2-release history after reset to masterThe Android Automerger2013-02-190-0/+0
| |\ \ \ | | |/ / | |/| |
| | * | merge in jb-mr2-release history after reset to masterThe Android Automerger2013-02-140-0/+0
| | |\ \
| | | * \ merge in jb-mr2-release history after reset to masterThe Android Automerger2013-02-130-0/+0
| | | |\ \