aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | am 3ccb97a7: am 3516a1f6: Merge "Fix description of setup wizard 1st step" ↵Tadashi G. Takaoka2013-02-281-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr2-dev * commit '3ccb97a7cdb2536962d9081da03b473d5df37d16': Fix description of setup wizard 1st step
| * | | | | am 3516a1f6: Merge "Fix description of setup wizard 1st step" into jb-mr2-devTadashi G. Takaoka2013-02-281-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3516a1f6ddcb9cc608b2e783143f5f4eded31a1f': Fix description of setup wizard 1st step
| | * | | | Merge "Fix description of setup wizard 1st step" into jb-mr2-devTadashi G. Takaoka2013-02-281-1/+1
| | |\| | |
| | | * | | Fix description of setup wizard 1st stepTadashi G. Takaoka2013-02-281-1/+1
| | | | |/ | | | |/| | | | | | | | | | | | | | | | Bug: 8265778 Change-Id: Ie25be9d43089b2e9cb7b690df374bad1f8966b16
* | | | | am 040b442f: am 18e21d58: Remove closing method from KeyboardViewTadashi G. Takaoka2013-02-283-9/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '040b442f3cd4c0a212ef7e2ec0c55541b67ec7ce': Remove closing method from KeyboardView
| * | | | am 18e21d58: Remove closing method from KeyboardViewTadashi G. Takaoka2013-02-283-9/+0
| |\| | | | | |_|/ | |/| | | | | | | | | | * commit '18e21d58f7c0b5c5c001835c093221c573a841c4': Remove closing method from KeyboardView
| | * | Remove closing method from KeyboardViewTadashi G. Takaoka2013-02-273-9/+0
| | |/ | | | | | | | | | | | | | | | | | | This is a follow up of Ie00ba827. After the change, the KeyboardView.closing() method does nothing important. Change-Id: I9659ea56ce82a95f8798a4136bf93f164b67fae7
* | | am abaa88fd: Merge "[TestPrep18] Make class public for testing"Kurt Partridge2013-02-271-1/+1
|\| | | | | | | | | | | | | | * commit 'abaa88fd4e33de54f3efd980ac0fef4935e439db': [TestPrep18] Make class public for testing
| * | Merge "[TestPrep18] Make class public for testing"Kurt Partridge2013-02-281-1/+1
| |\ \
| | * | [TestPrep18] Make class public for testingKurt Partridge2013-02-261-1/+1
| | | | | | | | | | | | | | | | Change-Id: I4b457f44dd6a5a595c61a62061ea02c251fa9ab1
* | | | am a04fbce4: Merge "[TestPrep17] Allow fake dictionary for testing"Kurt Partridge2013-02-271-0/+13
|\| | | | | | | | | | | | | | | | | | | * commit 'a04fbce41273b0b7d464e4d823de5f0d54549673': [TestPrep17] Allow fake dictionary for testing
| * | | Merge "[TestPrep17] Allow fake dictionary for testing"Kurt Partridge2013-02-271-0/+13
| |\| |
| | * | [TestPrep17] Allow fake dictionary for testingKurt Partridge2013-02-261-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am 2ed1ec41: am 016046eb: Keep Keyboard object while closing KeyboardViewTadashi G. Takaoka2013-02-271-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit '2ed1ec411d8b539890359f8ced8e1fe8d90344cd': Keep Keyboard object while closing KeyboardView
| * | | am 016046eb: Keep Keyboard object while closing KeyboardViewTadashi G. Takaoka2013-02-271-1/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit '016046eb4e3ea28745b9a29c41c126801f177f58': Keep Keyboard object while closing KeyboardView
| | * | Keep Keyboard object while closing KeyboardViewTadashi G. Takaoka2013-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 8217626 Change-Id: Ie00ba827bc391aa152427965c57488b66308a75c
| * | | Import translations. DO NOT MERGEBaligh Uddin2013-02-2728-606/+306
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib43ed30fcf7d9be1d29af9da9dfe148371a3aec7 Auto-generated-cl: translation import
* | | | Import translations. DO NOT MERGEBaligh Uddin2013-02-2728-606/+306
| | | | | | | | | | | | | | | | | | | | Change-Id: I14643d519433db75403b8a7f5b9a409e316c1f1e Auto-generated-cl: translation import
* | | | am 424a976e: Merge "Ensure Preference listener is unregistered"Kurt Partridge2013-02-262-0/+9
|\| | | | | | | | | | | | | | | | | | | * commit '424a976e58ea40e44f28ac4b6aacc4656a4c1377': Ensure Preference listener is unregistered
| * | | Merge "Ensure Preference listener is unregistered"Kurt Partridge2013-02-272-0/+9
| |\ \ \ | | |_|/ | |/| |
| | * | Ensure Preference listener is unregisteredKurt Partridge2013-02-262-0/+9
| | | | | | | | | | | | | | | | Change-Id: I1a4d1e7bc45fc30cb1b63ea6020f0eee6e804333
* | | | am 64c34122: Merge "[TestPrep11] Only use mHasWrittenData to control ↵Kurt Partridge2013-02-261-9/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | JsonWriter#endArray() call" * commit '64c34122f26f58a621ca9e2f9258ab47d99a1178': [TestPrep11] Only use mHasWrittenData to control JsonWriter#endArray() call
| * | | Merge "[TestPrep11] Only use mHasWrittenData to control ↵Kurt Partridge2013-02-271-9/+5
| |\ \ \ | | | | | | | | | | | | | | | JsonWriter#endArray() call"
| | * | | [TestPrep11] Only use mHasWrittenData to control JsonWriter#endArray() callKurt Partridge2013-02-261-9/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: If2107e38575b009a4c372194ecd827e27bdbb2b4
* | | | | 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