aboutsummaryrefslogtreecommitdiffstats
path: root/java/src (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge "Move UUID preference reading to ResearchSettings.java"Kurt Partridge2013-03-022-19/+45
|\ \ \ | |_|/ |/| |
| * | Move UUID preference reading to ResearchSettings.java•••Change-Id: I8157249259cf8c3218c5c82a5729f4cbc1fb4eeb Kurt Partridge2013-02-282-19/+45
* | | am 99b0dc6f: Merge "Add setup wizard launcher icon" into jb-mr2-dev•••* commit '99b0dc6f0d18f5fdd8634e8fa533bf1b3f81a538': Add setup wizard launcher icon Tadashi G. Takaoka2013-03-013-19/+197
|\ \ \ | | |/ | |/|
| * | Merge "Add setup wizard launcher icon" into jb-mr2-devTadashi G. Takaoka2013-03-013-19/+197
| |\ \
| | * | Add setup wizard launcher icon•••The setup wizard icon will be hidden if the Android Keyboard is in system image. Bug: 8239067 Change-Id: Ib0c0c9e3a0954512c3e03e42a661cdf86eff0dca Tadashi G. Takaoka2013-03-013-19/+197
* | | | Merge "[TestPrep22] Make variable package-private for testing"Kurt Partridge2013-03-011-1/+1
|\ \ \ \
| * | | | [TestPrep22] Make variable package-private for testing•••Change-Id: I902a6a40df1c672c611672f34d2f3237b0d1821b Kurt Partridge2013-02-281-1/+1
* | | | | am abaf5827: Separate suggestions from SuggestionView•••* commit 'abaf5827e7a7f5f6c5d8d98e03e6b9528b0c9351': Separate suggestions from SuggestionView Jean Chalard2013-03-012-20/+28
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Separate suggestions from SuggestionView•••This is a cleanup change, but it's also necessary for Bug: 8152758 Change-Id: Id6ba06243f573fdb856f87d1df03277c9f2e5e71 Jean Chalard2013-02-282-20/+28
* | | | | Merge "[TestPrep20] Clean up import statement"Kurt Partridge2013-03-011-1/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | [TestPrep20] Clean up import statement•••Change-Id: Ifcfec09b669d8b2012b1c960bd4b1471c7946870 Kurt Partridge2013-02-281-1/+0
| | |_|/ | |/| |
* | | | am 18e21d58: Remove closing method from KeyboardView•••* commit '18e21d58f7c0b5c5c001835c093221c573a841c4': Remove closing method from KeyboardView Tadashi G. Takaoka2013-02-283-9/+0
|\ \ \ \ | |/ / / |/| / / | |/ /
| * / 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
| |/
* | Merge "[TestPrep18] Make class public for testing"Kurt Partridge2013-02-281-1/+1
|\ \
| * | [TestPrep18] Make class public for testing•••Change-Id: I4b457f44dd6a5a595c61a62061ea02c251fa9ab1 Kurt Partridge2013-02-261-1/+1
* | | Merge "[TestPrep17] Allow fake dictionary for testing"Kurt Partridge2013-02-271-0/+13
|\| |
| * | [TestPrep17] Allow fake dictionary for testing•••Currently ResearchLog requires a full dictionary to perform privacy-related checks. This makes testing difficult. This change allows a fake dictionary to be used instead. Change-Id: Ifca5bd8647475a6b84e4324117e0faa0a35479ee Kurt Partridge2013-02-261-0/+13
* | | am 016046eb: Keep Keyboard object while closing KeyboardView•••* commit '016046eb4e3ea28745b9a29c41c126801f177f58': Keep Keyboard object while closing KeyboardView Tadashi G. Takaoka2013-02-271-1/+1
|\ \ \ | | |/ | |/|
| * | Keep Keyboard object while closing KeyboardView•••Bug: 8217626 Change-Id: Ie00ba827bc391aa152427965c57488b66308a75c Tadashi G. Takaoka2013-02-271-1/+1
* | | Merge "Ensure Preference listener is unregistered"Kurt Partridge2013-02-272-0/+9
|\ \ \ | |_|/ |/| |
| * | Ensure Preference listener is unregistered•••Change-Id: I1a4d1e7bc45fc30cb1b63ea6020f0eee6e804333 Kurt Partridge2013-02-262-0/+9
* | | Merge "[TestPrep11] Only use mHasWrittenData to control JsonWriter#endArray()...Kurt Partridge2013-02-271-9/+5
|\ \ \
| * | | [TestPrep11] Only use mHasWrittenData to control JsonWriter#endArray() call•••Change-Id: If2107e38575b009a4c372194ecd827e27bdbb2b4 Kurt Partridge2013-02-261-9/+5
* | | | Merge "[TestPrep10] Add some comments"Kurt Partridge2013-02-261-4/+28
|\| | | | |_|/ |/| |
| * | [TestPrep10] Add some comments•••Change-Id: Ia8e0bd72b0dc09bfc256ec5d1996637554376b5f Kurt Partridge2013-02-261-4/+28
| |/
* / 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 "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-236-32/+37
|\
| * 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-226-32/+37
* | [TestPrep8] Narrow try/catch scope•••Change-Id: If15f250feb81c2ad55ce1bc7dc3dafa57de87aef Kurt Partridge2013-02-211-10/+9
|/
* [TestPrep7] Encapsulate JsonWriter creation•••Change-Id: I4e97fa28dd0bb1101edc0db03f024432fee6f6fe Kurt Partridge2013-02-211-8/+19
* 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 "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-214-5/+474
|/ /