Satoshi Kataoka
bc218dda8b
Merge "add a default vaule for getMatchedProximityType" into jb-mr2-dev
2013-03-01 03:42:08 +00:00
Satoshi Kataoka
a406f803bc
add a default vaule for getMatchedProximityType
...
Change-Id: Id940f1226ca493d0a1b82e2810b1882184ef8987
2013-03-01 12:36:35 +09:00
Tadashi G. Takaoka
8ef4774a86
Merge "Revert "Fix description of setup wizard 1st step"" into jb-mr2-dev
2013-02-28 10:28:50 +00:00
Tadashi G. Takaoka
e359789593
Revert "Fix description of setup wizard 1st step"
...
This reverts commit b5f4cac532
Change-Id: Ic5787fcf63663885285c20403534572d5e7d7696
2013-02-28 10:25:42 +00:00
Tadashi G. Takaoka
3516a1f6dd
Merge "Fix description of setup wizard 1st step" into jb-mr2-dev
2013-02-28 07:55:53 +00:00
Tadashi G. Takaoka
b5f4cac532
Fix description of setup wizard 1st step
...
Bug: 8265778
Change-Id: Ie25be9d43089b2e9cb7b690df374bad1f8966b16
2013-02-28 16:55:11 +09:00
Tadashi G. Takaoka
18e21d58f7
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
2013-02-27 17:35:20 +09:00
Tadashi G. Takaoka
016046eb4e
Keep Keyboard object while closing KeyboardView
...
Bug: 8217626
Change-Id: Ie00ba827bc391aa152427965c57488b66308a75c
2013-02-27 17:30:16 +09:00
Tadashi G. Takaoka
e621ea5fdc
Merge "Fix failed unit test due to resource string change" into jb-mr2-dev
2013-02-27 00:03:54 +00:00
Tadashi G. Takaoka
183fe80031
Small cleanup of RunInLocale
...
Change-Id: Ib588e67da2c88345fc4eb51587b07ebfa434e0bb
2013-02-26 19:11:49 +09:00
Tadashi G. Takaoka
67a54c4bbe
Fix failed unit test due to resource string change
...
Change-Id: Ie7acdf6895a9769eb43ea8a1c70c0d13b32ed349
2013-02-26 16:58:23 +09:00
Jean Chalard
0f3c05cd6b
Merge "Send the dictionaries descriptions to the dict pack"
2013-02-23 10:18:03 +00:00
Jean Chalard
c6799ffeab
Send the dictionaries descriptions to the dict pack
...
Bug: 8255795
Change-Id: I12a5922f50c2d2e3aa639457abcc1483e6a48721
2013-02-23 01:46:39 -08:00
Jean Chalard
76ead0ead0
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
2013-02-23 01:41:44 -08:00
Jean Chalard
aefaec3c5f
Remove a cluttering log
...
Bug: 8175067
Change-Id: I9a104a32ba2b3b52a5dfa250f8c642abd6169cc0
2013-02-23 00:48:10 -08:00
Jean Chalard
1b05ecb7ba
Merge "Pass the client ID to the dictionary pack in settings"
2013-02-23 08:08:34 +00:00
Jean Chalard
8b4023c4d6
Merge "Tiny cleanup"
2013-02-23 08:07:27 +00:00
Jean Chalard
3c3b3c8690
Pass the client ID to the dictionary pack in settings
...
Bug: 6789534
Bug: 8256209
Change-Id: Ib63c18e7f18117ba888324febea13da47332b6c6
2013-02-22 21:24:15 -08:00
Jean Chalard
2521edec09
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
2013-02-22 20:49:48 -08:00
Jean Chalard
da0d771fe9
Tiny cleanup
...
Change-Id: I5d7150a4abb3a498e790f41af569093217cb8b43
2013-02-22 19:42:45 -08:00
Jean Chalard
8f794c72db
Merge "Fix how the Enter action is decided"
2013-02-23 00:13:27 +00:00
Jean Chalard
4e4f88127b
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
2013-02-22 16:01:37 -08:00
Baligh Uddin
97a5246f76
Merge "Import translations. DO NOT MERGE"
2013-02-22 23:49:17 +00:00
Kurt Partridge
b5c2033aa5
Merge "[TestPrep8] Narrow try/catch scope"
2013-02-22 19:36:32 +00:00
Baligh Uddin
beae302efe
Import translations. DO NOT MERGE
...
Change-Id: I75753bfe196bf52c7ec5534ce1996e035ea0f956
Auto-generated-cl: translation import
2013-02-22 10:51:10 -08:00
Kurt Partridge
c3252cfaf7
Merge "[TestPrep7] Encapsulate JsonWriter creation"
2013-02-22 14:12:49 +00:00
Tom Ouyang
c95d005c8a
Merge "Use common incremental decoder output scale."
2013-02-22 04:19:34 +00:00
Kurt Partridge
744b363ae8
[TestPrep8] Narrow try/catch scope
...
Change-Id: If15f250feb81c2ad55ce1bc7dc3dafa57de87aef
2013-02-21 17:01:08 -08:00
Kurt Partridge
78c1ad32e6
[TestPrep7] Encapsulate JsonWriter creation
...
Change-Id: I4e97fa28dd0bb1101edc0db03f024432fee6f6fe
2013-02-21 17:01:08 -08:00
Kurt Partridge
07050549b1
Merge "[TestPrep5] Parameterize MainLogBuffer"
2013-02-21 23:52:05 +00:00
Tom Ouyang
31f7ece470
Use common incremental decoder output scale.
...
Change-Id: Ib6bd7be45be9229a075b6a8feb46c67ec75a9b06
2013-02-21 15:42:44 -08:00
Kurt Partridge
bf0d6af3d3
Merge "[TestPrep4] Add some finals"
2013-02-21 22:13:05 +00:00
Kurt Partridge
7c996475d8
Merge "[TestPrep3] Add helper method to retrive dictionary"
2013-02-21 21:18:32 +00:00
Kurt Partridge
c8a1ec6e41
Merge "[TestPrep2] Rename a method"
2013-02-21 15:57:34 +00:00
Kurt Partridge
4e5a4ddbd0
Merge "[TestPrep1] Move MotionEvent.Action strings to LoggingUtils"
2013-02-21 14:54:46 +00:00
Satoshi Kataoka
2b47513de1
Merge "add defines"
2013-02-21 13:30:08 +00:00
Satoshi Kataoka
bc25b80525
add defines
...
Change-Id: I8bc009bf258cbdf01e15dc63a7a8afad47db5d96
2013-02-21 21:59:28 +09:00
Tadashi G. Takaoka
07296cf7ff
Merge "Use WordComposer.addKeyInfo for testing"
2013-02-21 06:20:01 +00:00
Kurt Partridge
ab0bda1499
[TestPrep5] Parameterize MainLogBuffer
...
Change-Id: I6d84f490922cd1f40e44ca4f95c9d950fba38290
2013-02-20 19:37:12 -08:00
Kurt Partridge
22acdb540c
[TestPrep4] Add some finals
...
Change-Id: Ib437a6ad7fd6a897e2bbc65afe881ae8a3b1cbb0
2013-02-20 19:37:12 -08:00
Kurt Partridge
19e05359e6
[TestPrep3] Add helper method to retrive dictionary
...
Change-Id: Id6e03c6f8a3e96979d589f0605ac056fcad7e1ff
2013-02-20 19:36:56 -08:00
Kurt Partridge
b6d05aeb7c
[TestPrep2] Rename a method
...
Change-Id: Id9a72045afa3558b20b9d63c8720fb7443d34fd9
2013-02-20 17:13:00 -08:00
Kurt Partridge
8d429bf1a8
[TestPrep1] Move MotionEvent.Action strings to LoggingUtils
...
Change-Id: I7b9ed800552f2fd546ed21e9dc06ea1ff5798337
2013-02-20 17:12:56 -08:00
Tadashi G. Takaoka
46878544ec
Add preliminary setup wizard
...
Bug: 8159728
Change-Id: I30d9cd637fb1d2e64588550e0aa4387bc1f7e6e5
2013-02-21 09:54:02 +09:00
Ed Heyl
7739190083
Merge remote-tracking branch 'goog/jb-mr2-release'
2013-02-20 13:47:33 -08:00
The Android Automerger
7c3ba9e7fe
merge in jb-mr2-release history after reset to master
2013-02-20 05:56:17 -08:00
Tadashi G. Takaoka
5701a6647f
Use WordComposer.addKeyInfo for testing
...
Change-Id: I500654e7a26717aa5547942357e56060afb72969
2013-02-20 17:09:25 +09:00
Satoshi Kataoka
c3c9539c7d
Merge "Add debug output"
2013-02-20 06:55:57 +00:00
Satoshi Kataoka
d1fff1adcc
Add debug output
...
Change-Id: I45fd249a6536e438125782e6e7800760f8e8d426
2013-02-20 15:53:44 +09:00
The Android Automerger
361a766f81
merge in jb-mr2-release history after reset to master
2013-02-19 09:52:05 -08:00