Kurt Partridge
9ba7ad8d4f
Merge "[TestPrep20] Clean up import statement"
2013-03-01 01:32:35 +00:00
Tadashi G. Takaoka
100b6ae5ca
am 8ef4774a
: Merge "Revert "Fix description of setup wizard 1st step"" into jb-mr2-dev
...
* commit '8ef4774a8614e8b67f995f016d3200ff3fd16e30':
Revert "Fix description of setup wizard 1st step"
2013-02-28 22:38:26 +00:00
Tadashi G. Takaoka
3ccb97a7cd
am 3516a1f6
: Merge "Fix description of setup wizard 1st step" into jb-mr2-dev
...
* commit '3516a1f6ddcb9cc608b2e783143f5f4eded31a1f':
Fix description of setup wizard 1st step
2013-02-28 22:38:25 +00:00
Tadashi G. Takaoka
040b442f3c
am 18e21d58
: Remove closing method from KeyboardView
...
* commit '18e21d58f7c0b5c5c001835c093221c573a841c4':
Remove closing method from KeyboardView
2013-02-28 22:38:11 +00:00
Kurt Partridge
59912837b3
[TestPrep22] Make variable package-private for testing
...
Change-Id: I902a6a40df1c672c611672f34d2f3237b0d1821b
2013-02-28 06:45:35 -08:00
Kurt Partridge
5cd50faaca
[TestPrep20] Clean up import statement
...
Change-Id: Ifcfec09b669d8b2012b1c960bd4b1471c7946870
2013-02-28 06:45:34 -08: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
Kurt Partridge
abaa88fd4e
Merge "[TestPrep18] Make class public for testing"
2013-02-28 01:00:46 +00:00
Kurt Partridge
a04fbce412
Merge "[TestPrep17] Allow fake dictionary for testing"
2013-02-27 23:59:01 +00:00
Tadashi G. Takaoka
2ed1ec411d
am 016046eb
: Keep Keyboard object while closing KeyboardView
...
* commit '016046eb4e3ea28745b9a29c41c126801f177f58':
Keep Keyboard object while closing KeyboardView
2013-02-27 23:22:32 +00:00
Baligh Uddin
6aaeb7fc34
Import translations. DO NOT MERGE
...
Change-Id: Ib43ed30fcf7d9be1d29af9da9dfe148371a3aec7
Auto-generated-cl: translation import
2013-02-27 12:30:44 -08: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
Kurt Partridge
424a976e58
Merge "Ensure Preference listener is unregistered"
2013-02-27 03:49:40 +00:00
Kurt Partridge
96d019f183
[TestPrep18] Make class public for testing
...
Change-Id: I4b457f44dd6a5a595c61a62061ea02c251fa9ab1
2013-02-26 19:22:56 -08:00
Kurt Partridge
5ee261a990
[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
2013-02-26 19:22:55 -08:00
Kurt Partridge
7e2c1e69bf
Ensure Preference listener is unregistered
...
Change-Id: I1a4d1e7bc45fc30cb1b63ea6020f0eee6e804333
2013-02-26 18:40:34 -08:00
Kurt Partridge
64c34122f2
Merge "[TestPrep11] Only use mHasWrittenData to control JsonWriter#endArray() call"
2013-02-27 00:41:12 +00:00
Tadashi G. Takaoka
16cbc30ae5
am e621ea5f
: Merge "Fix failed unit test due to resource string change" into jb-mr2-dev
...
* commit 'e621ea5fdc4af0034c7c1d41e2d10aefc86e8aab':
Fix failed unit test due to resource string change
2013-02-27 00:15:25 +00: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
Kurt Partridge
62abc40d7d
Merge "[TestPrep10] Add some comments"
2013-02-26 23:09:48 +00:00
Kurt Partridge
f170f145af
[TestPrep11] Only use mHasWrittenData to control JsonWriter#endArray() call
...
Change-Id: If2107e38575b009a4c372194ecd827e27bdbb2b4
2013-02-26 15:02:52 -08:00
Kurt Partridge
a5e564bea0
[TestPrep10] Add some comments
...
Change-Id: Ia8e0bd72b0dc09bfc256ec5d1996637554376b5f
2013-02-26 15:02:52 -08:00
Tadashi G. Takaoka
c6ee9e692c
am 183fe800
: Small cleanup of RunInLocale
...
* commit '183fe8003163702a0ba9487d6fde2a7c025ab91a':
Small cleanup of RunInLocale
2013-02-26 13:57:06 +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
Baligh Uddin
f7dbd99182
Import translations. DO NOT MERGE
...
Change-Id: I6592c412b60b21baaae7716dc897a65060463161
Auto-generated-cl: translation import
2013-02-25 10:21:33 -08: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