aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* am 62abc40d: Merge "[TestPrep10] Add some comments"Kurt Partridge2013-02-261-4/+28
|\ | | | | | | | | * commit '62abc40d7da0cfec3f3fa0409ae273a394167f4c': [TestPrep10] Add some comments
| * Merge "[TestPrep10] Add some comments"Kurt Partridge2013-02-261-4/+28
| |\
| | * [TestPrep10] Add some commentsKurt Partridge2013-02-261-4/+28
| | | | | | | | | | | | Change-Id: Ia8e0bd72b0dc09bfc256ec5d1996637554376b5f
* | | am c6ee9e69: am 183fe800: Small cleanup of RunInLocaleTadashi G. Takaoka2013-02-261-2/+3
|\| | | | | | | | | | | | | | * commit 'c6ee9e692c02b49b2feabda494985f59eff33d68': Small cleanup of RunInLocale
| * | am 183fe800: Small cleanup of RunInLocaleTadashi G. Takaoka2013-02-261-2/+3
| |\ \ | | |/ | |/| | | | | | | * commit '183fe8003163702a0ba9487d6fde2a7c025ab91a': Small cleanup of RunInLocale
| | * Small cleanup of RunInLocaleTadashi G. Takaoka2013-02-261-2/+3
| | | | | | | | | | | | Change-Id: Ib588e67da2c88345fc4eb51587b07ebfa434e0bb
| * | Import translations. DO NOT MERGEBaligh Uddin2013-02-2518-410/+206
| |/ | | | | | | | | Change-Id: I6592c412b60b21baaae7716dc897a65060463161 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBaligh Uddin2013-02-2518-410/+206
| | | | | | | | | | Change-Id: Iec690c5a0e2a945319ae9805a593b21ad50808fe Auto-generated-cl: translation import
* | am 0f3c05cd: Merge "Send the dictionaries descriptions to the dict pack"Jean Chalard2013-02-232-3/+16
|\| | | | | | | | | * commit '0f3c05cd6bee664e5ccaf632c35c34017eb1c5e9': Send the dictionaries descriptions to the dict pack
| * Merge "Send the dictionaries descriptions to the dict pack"Jean Chalard2013-02-232-3/+16
| |\
| | * Send the dictionaries descriptions to the dict packJean Chalard2013-02-232-3/+16
| | | | | | | | | | | | | | | Bug: 8255795 Change-Id: I12a5922f50c2d2e3aa639457abcc1483e6a48721
* | | am 76ead0ea: Fix a possible crashJean Chalard2013-02-231-3/+7
|\| | | | | | | | | | | | | | * commit '76ead0ead06ab1c09c698247c19d1d2f4bd35d23': Fix a possible crash
| * | Fix a possible crashJean Chalard2013-02-231-3/+7
| |/ | | | | | | | | | | | | | | | | | | 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
* | am aefaec3c: Remove a cluttering logJean Chalard2013-02-231-4/+5
|\| | | | | | | | | * commit 'aefaec3c5fc4b9aa3126ae0a7f32133c0423e7e2': Remove a cluttering log
| * Remove a cluttering logJean Chalard2013-02-231-4/+5
| | | | | | | | | | Bug: 8175067 Change-Id: I9a104a32ba2b3b52a5dfa250f8c642abd6169cc0
* | am 1b05ecb7: Merge "Pass the client ID to the dictionary pack in settings"Jean Chalard2013-02-231-1/+5
|\| | | | | | | | | * commit '1b05ecb7ba3124e7d4d6f8c75335c5b5138be86e': Pass the client ID to the dictionary pack in settings
| * 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 settingsJean Chalard2013-02-221-1/+5
| | | | | | | | | | | | | | | | | | Bug: 6789534 Bug: 8256209 Change-Id: Ib63c18e7f18117ba888324febea13da47332b6c6
* | | am 8b4023c4: Merge "Tiny cleanup"Jean Chalard2013-02-231-1/+0
|\| | | | | | | | | | | | | | * commit '8b4023c4d631d7ac240d8a30702c212b33595e0b': Tiny cleanup
| * | Merge "Tiny cleanup"Jean Chalard2013-02-231-1/+0
| |\ \
| | * | Tiny cleanupJean Chalard2013-02-221-1/+0
| | |/ | | | | | | | | | Change-Id: I5d7150a4abb3a498e790f41af569093217cb8b43
* | | am 2521edec: Fix a bug with the passed dictionary idJean Chalard2013-02-222-6/+11
|\| | | | | | | | | | | | | | * commit '2521edec09373b2810093462c89221a2aca9e369': Fix a bug with the passed dictionary id
| * | Fix a bug with the passed dictionary idJean Chalard2013-02-222-6/+11
| |/ | | | | | | | | | | | | | | | | | | 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
* | am 8f794c72: Merge "Fix how the Enter action is decided"Jean Chalard2013-02-227-33/+38
|\| | | | | | | | | * commit '8f794c72db07786c866e357c7853c339882b45ef': Fix how the Enter action is decided
| * Merge "Fix how the Enter action is decided"Jean Chalard2013-02-237-33/+38
| |\
| | * Fix how the Enter action is decidedJean Chalard2013-02-227-33/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | This unifies the software and hardware keyboard code under a single decision process that works. Bug: 8129303 Bug: 8152758 Change-Id: I7574c563d5f957d57bfe62fe5e3eec59a519d335
| * | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-02-2253-1170/+1178
| |\ \
| | * | Import translations. DO NOT MERGEBaligh Uddin2013-02-2253-1170/+1178
| | |/ | | | | | | | | | | | | Change-Id: I75753bfe196bf52c7ec5534ce1996e035ea0f956 Auto-generated-cl: translation import
* | | Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleBaligh Uddin2013-02-2253-1170/+1178
|\ \ \
| * | | Import translations. DO NOT MERGEBaligh Uddin2013-02-2253-1170/+1178
| | | | | | | | | | | | | | | | | | | | Change-Id: I86cb41c3f86a29bac9a3f93b6692e3f787156fdd Auto-generated-cl: translation import
* | | | am b5c2033a: Merge "[TestPrep8] Narrow try/catch scope"Kurt Partridge2013-02-221-10/+9
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * commit 'b5c2033aa526b91b9ef3b71691a3ae11f657e135': [TestPrep8] Narrow try/catch scope
| * / [TestPrep8] Narrow try/catch scopeKurt Partridge2013-02-211-10/+9
| |/ | | | | | | Change-Id: If15f250feb81c2ad55ce1bc7dc3dafa57de87aef
* | am c3252cfa: Merge "[TestPrep7] Encapsulate JsonWriter creation"Kurt Partridge2013-02-221-8/+19
|\| | | | | | | | | * commit 'c3252cfaf750d706f7280d32d1259e4367670bd9': [TestPrep7] Encapsulate JsonWriter creation
| * [TestPrep7] Encapsulate JsonWriter creationKurt Partridge2013-02-211-8/+19
| | | | | | | | Change-Id: I4e97fa28dd0bb1101edc0db03f024432fee6f6fe
* | am 07050549: Merge "[TestPrep5] Parameterize MainLogBuffer"Kurt Partridge2013-02-212-19/+19
|\| | | | | | | | | * commit '07050549b1f91a787fadb553cc834f9833617041': [TestPrep5] Parameterize MainLogBuffer
| * Merge "[TestPrep5] Parameterize MainLogBuffer"Kurt Partridge2013-02-212-19/+19
| |\
| | * [TestPrep5] Parameterize MainLogBufferKurt Partridge2013-02-202-19/+19
| | | | | | | | | | | | Change-Id: I6d84f490922cd1f40e44ca4f95c9d950fba38290
* | | am bf0d6af3: Merge "[TestPrep4] Add some finals"Kurt Partridge2013-02-211-3/+3
|\| | | | | | | | | | | | | | * commit 'bf0d6af3d38c1637b40ed9e844fc05471274a2d7': [TestPrep4] Add some finals
| * | Merge "[TestPrep4] Add some finals"Kurt Partridge2013-02-211-3/+3
| |\|
| | * [TestPrep4] Add some finalsKurt Partridge2013-02-201-3/+3
| | | | | | | | | | | | Change-Id: Ib437a6ad7fd6a897e2bbc65afe881ae8a3b1cbb0
* | | am 7c996475: Merge "[TestPrep3] Add helper method to retrive dictionary"Kurt Partridge2013-02-211-7/+9
|\| | | | | | | | | | | | | | * commit '7c996475d8531af413c09d4ece51423b96edd172': [TestPrep3] Add helper method to retrive dictionary
| * | Merge "[TestPrep3] Add helper method to retrive dictionary"Kurt Partridge2013-02-211-7/+9
| |\|
| | * [TestPrep3] Add helper method to retrive dictionaryKurt Partridge2013-02-201-7/+9
| | | | | | | | | | | | Change-Id: Id6e03c6f8a3e96979d589f0605ac056fcad7e1ff
* | | am c8a1ec6e: Merge "[TestPrep2] Rename a method"Kurt Partridge2013-02-212-4/+4
|\| | | | | | | | | | | | | | * commit 'c8a1ec6e4128240a8f666120dbc3fb066a717f00': [TestPrep2] Rename a method
| * | Merge "[TestPrep2] Rename a method"Kurt Partridge2013-02-212-4/+4
| |\|
| | * [TestPrep2] Rename a methodKurt Partridge2013-02-202-4/+4
| | | | | | | | | | | | Change-Id: Id9a72045afa3558b20b9d63c8720fb7443d34fd9
* | | am 4e5a4ddb: Merge "[TestPrep1] Move MotionEvent.Action strings to LoggingUtils"Kurt Partridge2013-02-212-11/+39
|\| | | | | | | | | | | | | | * commit '4e5a4ddbd06c3e98e931a789c13a9920fb3b4e16': [TestPrep1] Move MotionEvent.Action strings to LoggingUtils
| * | Merge "[TestPrep1] Move MotionEvent.Action strings to LoggingUtils"Kurt Partridge2013-02-212-11/+39
| |\|
| | * [TestPrep1] Move MotionEvent.Action strings to LoggingUtilsKurt Partridge2013-02-202-11/+39
| | | | | | | | | | | | Change-Id: I7b9ed800552f2fd546ed21e9dc06ea1ff5798337
* | | am 07296cf7: Merge "Use WordComposer.addKeyInfo for testing"Tadashi G. Takaoka2013-02-211-1/+3
|\| | | | | | | | | | | | | | * commit '07296cf7fffad7282aee24d9313636cf64ffb178': Use WordComposer.addKeyInfo for testing