aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | Merge "Use WordComposer.addKeyInfo for testing"Tadashi G. Takaoka2013-02-211-1/+3
| |\ \
| | * | Use WordComposer.addKeyInfo for testingTadashi G. Takaoka2013-02-201-1/+3
| | | | | | | | | | | | | | | | Change-Id: I500654e7a26717aa5547942357e56060afb72969
* | | | am 46878544: Add preliminary setup wizardTadashi G. Takaoka2013-02-2115-5/+745
|\| | | | | | | | | | | | | | | | | | | * commit '46878544ec894fd3db368e183404a01c3e3ecc92': Add preliminary setup wizard
| * | | Add preliminary setup wizardTadashi G. Takaoka2013-02-2115-5/+745
| |/ / | | | | | | | | | | | | Bug: 8159728 Change-Id: I30d9cd637fb1d2e64588550e0aa4387bc1f7e6e5
* | | am da348e11: Fix layout direction of Keyboard and Suggestions viewTadashi G. Takaoka2013-02-181-0/+6
|\| | | | | | | | | | | | | | * commit 'da348e11ad43b5eaf70a6bad8551a86cd43a6512': Fix layout direction of Keyboard and Suggestions view
| * | Fix layout direction of Keyboard and Suggestions viewTadashi G. Takaoka2013-02-181-0/+6
| | | | | | | | | | | | | | | Bug: 8167348 Change-Id: I5e0432707fff1dd3032686b733ba28bef305173a
* | | am d4cbc4fd: Implement getting data files with protocol v2Jean Chalard2013-02-151-26/+55
|\| | | | | | | | | | | | | | * commit 'd4cbc4fd078cbb23be4eafe1cb82a8a470fca3a0': Implement getting data files with protocol v2
| * | Implement getting data files with protocol v2Jean Chalard2013-02-151-26/+55
| |/ | | | | | | | | | | | | This also does it for deleting them Bug: 8167342 Bug: 6789534 Change-Id: I1823f98508881f109a667146d3608003f87aa4cb
* | am 4beaab2a: Merge "Determine the protocol version of the dictionary pack"Jean Chalard2013-02-141-14/+44
|\| | | | | | | | | | | # Via Android (Google) Code Review (1) and Jean Chalard (1) * commit '4beaab2a88ce616bdc8ca35248d65c1b649943a9': Determine the protocol version of the dictionary pack
| * Merge "Determine the protocol version of the dictionary pack"Jean Chalard2013-02-141-14/+44
| |\
| | * Determine the protocol version of the dictionary packJean Chalard2013-02-131-14/+44
| | | | | | | | | | | | | | | | | | | | | ...for query. Bug: 8167342 Change-Id: Ieb8e5b31c4b62bf507593c4631e31799aad5f267
* | | am 4c53e144: Merge "Add placeholder of keyboard setup wizard"Tadashi G. Takaoka2013-02-142-5/+52
|\| | | | | | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Tadashi G. Takaoka (1) * commit '4c53e144c184a7b084e9deecf5d1f1fe01ec1af9': Add placeholder of keyboard setup wizard
| * | Add placeholder of keyboard setup wizardTadashi G. Takaoka2013-02-142-5/+52
| |/ | | | | | | | | Bug: 8159728 Change-Id: I5552e9d0ffa8f94d183e76378d55bba6f718adfe
* | am de3e5fbf: Merge "Cleanup in preparation for tests"Kurt Partridge2013-02-133-9/+16
|\| | | | | | | | | | | # Via Android (Google) Code Review (1) and Kurt Partridge (1) * commit 'de3e5fbf9dfb2e4e34095e0c34e8aec8d8de02f5': Cleanup in preparation for tests
| * Merge "Cleanup in preparation for tests"Kurt Partridge2013-02-133-9/+16
| |\
| | * Cleanup in preparation for testsKurt Partridge2013-02-123-9/+16
| | | | | | | | | | | | | | | | | | multi-project commit with I1212da392ecda0ad78962da68941870b5a651eee Change-Id: Ie74af59d4e45bf954723fee9dcf350a36468c381
* | | am d1f80f72: Merge "Clean up dictionary pack presence test."Jean Chalard2013-02-131-39/+21
|\| | | | | | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Jean Chalard (1) * commit 'd1f80f72e33f79ae8ed94a279a9969cc238a83a7': Clean up dictionary pack presence test.
| * | Merge "Clean up dictionary pack presence test."Jean Chalard2013-02-131-39/+21
| |\ \