a8e668c81e
Merge "Move UUID preference reading to ResearchSettings.java"
2013-03-02 01:50:03 +00:00
b094372bd6
Remove MainLogBuffer#setSuggest()
...
multi-project commit with Ia98b1406fc2ee11a96893c77ea58d800fece7624
Change-Id: I8bc3d07b83dbe7d8fc56a618de07dade7f510b13
2013-03-01 13:32:11 -08:00
4f69ffad27
Import translations. DO NOT MERGE
...
Change-Id: Ic31bc6d188785972dd3f11d96ff22592040ceb9f
Auto-generated-cl: translation import
2013-03-01 12:19:21 -08:00
fa0f05487e
Import translations. DO NOT MERGE
...
Change-Id: If6d46dc75d94094554f018a3bc20d20363cab21a
Auto-generated-cl: translation import
2013-03-01 12:12:24 -08:00
7d2e465ac0
Import translations. DO NOT MERGE
...
Change-Id: I1852e989314ddd2e3f806486a0774ffe446473e8
Auto-generated-cl: translation import
2013-03-01 12:11:04 -08:00
fff70f11a8
am 578e71e2: am 99b0dc6f: Merge "Add setup wizard launcher icon" into jb-mr2-dev
...
* commit '578e71e28b8c95974ef7492a08d732735255c61d':
Add setup wizard launcher icon
2013-03-01 08:15:43 -08:00
578e71e28b
am 99b0dc6f: Merge "Add setup wizard launcher icon" into jb-mr2-dev
...
* commit '99b0dc6f0d18f5fdd8634e8fa533bf1b3f81a538':
Add setup wizard launcher icon
2013-03-01 16:13:45 +00:00
99b0dc6f0d
Merge "Add setup wizard launcher icon" into jb-mr2-dev
2013-03-01 16:08:09 +00:00
2223aa904a
am bc258870: Merge "[TestPrep22] Make variable package-private for testing"
...
* commit 'bc2588708abd548c83fd04a3b7f565bffc7d052f':
[TestPrep22] Make variable package-private for testing
2013-03-01 07:46:48 -08:00
bc2588708a
Merge "[TestPrep22] Make variable package-private for testing"
2013-03-01 14:48:43 +00:00
d1258a0276
am 2d8d20f4: am 5c681c17: Merge "Add translatable="false" to setup wizard\'s string resources" into jb-mr2-dev
...
* commit '2d8d20f4458db015f1a38d9128a4c933c7f2a7ed':
Add translatable="false" to setup wizard's string resources
2013-03-01 05:32:17 -08:00
2d8d20f445
am 5c681c17: Merge "Add translatable="false" to setup wizard\'s string resources" into jb-mr2-dev
...
* commit '5c681c17cec355d2cf839e0dfcc38c9bf37f5f0a':
Add translatable="false" to setup wizard's string resources
2013-03-01 13:29:29 +00:00
1ffdaafd83
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
2013-03-01 22:28:00 +09:00
5c681c17ce
Merge "Add translatable="false" to setup wizard's string resources" into jb-mr2-dev
2013-03-01 13:26:26 +00:00
2768f38ea1
am 31747ba7: am abaf5827: Separate suggestions from SuggestionView
...
* commit '31747ba7874f57fe6b259e8744e42dbfe02a8d40':
Separate suggestions from SuggestionView
2013-02-28 21:20:22 -08:00
31747ba787
am abaf5827: Separate suggestions from SuggestionView
...
* commit 'abaf5827e7a7f5f6c5d8d98e03e6b9528b0c9351':
Separate suggestions from SuggestionView
2013-03-01 05:17:52 +00:00
abaf5827e7
Separate suggestions from SuggestionView
...
This is a cleanup change, but it's also necessary for
Bug: 8152758
Change-Id: Id6ba06243f573fdb856f87d1df03277c9f2e5e71
2013-02-28 21:03:18 -08:00
419e3e5261
Add translatable="false" to setup wizard's string resources
...
Bug: 8265778
Change-Id: I351dc2b88e4fa33c2008107a1d6d19940c4db6ab
2013-03-01 13:31:57 +09:00
00ed4704f9
Move UUID preference reading to ResearchSettings.java
...
Change-Id: I8157249259cf8c3218c5c82a5729f4cbc1fb4eeb
2013-02-28 19:54:21 -08:00
bdd52d4480
am 9ba7ad8d: Merge "[TestPrep20] Clean up import statement"
...
* commit '9ba7ad8d4f399d31251c74f5f5116c8d580500cf':
[TestPrep20] Clean up import statement
2013-02-28 17:34:14 -08:00
9ba7ad8d4f
Merge "[TestPrep20] Clean up import statement"
2013-03-01 01:32:35 +00:00
14a0018d9d
am 100b6ae5: am 8ef4774a: Merge "Revert "Fix description of setup wizard 1st step"" into jb-mr2-dev
...
* commit '100b6ae5cadee35720a44c071211a436e7b8c80a':
Revert "Fix description of setup wizard 1st step"
2013-02-28 14:42:29 -08:00
5a2f14fd11
am 3ccb97a7: am 3516a1f6: Merge "Fix description of setup wizard 1st step" into jb-mr2-dev
...
* commit '3ccb97a7cdb2536962d9081da03b473d5df37d16':
Fix description of setup wizard 1st step
2013-02-28 14:42:28 -08:00
053ef607fb
am 040b442f: am 18e21d58: Remove closing method from KeyboardView
...
* commit '040b442f3cd4c0a212ef7e2ec0c55541b67ec7ce':
Remove closing method from KeyboardView
2013-02-28 14:42:27 -08:00
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
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
040b442f3c
am 18e21d58: Remove closing method from KeyboardView
...
* commit '18e21d58f7c0b5c5c001835c093221c573a841c4':
Remove closing method from KeyboardView
2013-02-28 22:38:11 +00:00
59912837b3
[TestPrep22] Make variable package-private for testing
...
Change-Id: I902a6a40df1c672c611672f34d2f3237b0d1821b
2013-02-28 06:45:35 -08:00
5cd50faaca
[TestPrep20] Clean up import statement
...
Change-Id: Ifcfec09b669d8b2012b1c960bd4b1471c7946870
2013-02-28 06:45:34 -08:00
8ef4774a86
Merge "Revert "Fix description of setup wizard 1st step"" into jb-mr2-dev
2013-02-28 10:28:50 +00:00
e359789593
Revert "Fix description of setup wizard 1st step"
...
This reverts commit b5f4cac532
2013-02-28 10:25:42 +00:00
3516a1f6dd
Merge "Fix description of setup wizard 1st step" into jb-mr2-dev
2013-02-28 07:55:53 +00:00
b5f4cac532
Fix description of setup wizard 1st step
...
Bug: 8265778
Change-Id: Ie25be9d43089b2e9cb7b690df374bad1f8966b16
2013-02-28 16:55:11 +09:00
a5070711d9
am abaa88fd: Merge "[TestPrep18] Make class public for testing"
...
* commit 'abaa88fd4e33de54f3efd980ac0fef4935e439db':
[TestPrep18] Make class public for testing
2013-02-27 17:02:59 -08:00
abaa88fd4e
Merge "[TestPrep18] Make class public for testing"
2013-02-28 01:00:46 +00:00
b06798c599
am a04fbce4: Merge "[TestPrep17] Allow fake dictionary for testing"
...
* commit 'a04fbce41273b0b7d464e4d823de5f0d54549673':
[TestPrep17] Allow fake dictionary for testing
2013-02-27 16:00:23 -08:00
a04fbce412
Merge "[TestPrep17] Allow fake dictionary for testing"
2013-02-27 23:59:01 +00:00
cbf3f2655a
am 2ed1ec41: am 016046eb: Keep Keyboard object while closing KeyboardView
...
* commit '2ed1ec411d8b539890359f8ced8e1fe8d90344cd':
Keep Keyboard object while closing KeyboardView
2013-02-27 15:27:35 -08:00
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
6aaeb7fc34
Import translations. DO NOT MERGE
...
Change-Id: Ib43ed30fcf7d9be1d29af9da9dfe148371a3aec7
Auto-generated-cl: translation import
2013-02-27 12:30:44 -08:00
32081df5d8
Import translations. DO NOT MERGE
...
Change-Id: I14643d519433db75403b8a7f5b9a409e316c1f1e
Auto-generated-cl: translation import
2013-02-27 12:25:14 -08:00
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
016046eb4e
Keep Keyboard object while closing KeyboardView
...
Bug: 8217626
Change-Id: Ie00ba827bc391aa152427965c57488b66308a75c
2013-02-27 17:30:16 +09:00
d9ca1a3f2c
am 424a976e: Merge "Ensure Preference listener is unregistered"
...
* commit '424a976e58ea40e44f28ac4b6aacc4656a4c1377':
Ensure Preference listener is unregistered
2013-02-26 19:51:14 -08:00
424a976e58
Merge "Ensure Preference listener is unregistered"
2013-02-27 03:49:40 +00:00
96d019f183
[TestPrep18] Make class public for testing
...
Change-Id: I4b457f44dd6a5a595c61a62061ea02c251fa9ab1
2013-02-26 19:22:56 -08:00
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
7e2c1e69bf
Ensure Preference listener is unregistered
...
Change-Id: I1a4d1e7bc45fc30cb1b63ea6020f0eee6e804333
2013-02-26 18:40:34 -08:00
14de0d22ab
am 64c34122: Merge "[TestPrep11] Only use mHasWrittenData to control JsonWriter#endArray() call"
...
* commit '64c34122f26f58a621ca9e2f9258ab47d99a1178':
[TestPrep11] Only use mHasWrittenData to control JsonWriter#endArray() call
2013-02-26 16:43:21 -08:00
64c34122f2
Merge "[TestPrep11] Only use mHasWrittenData to control JsonWriter#endArray() call"
2013-02-27 00:41:12 +00:00
7b4b16186d
am 62abc40d: Merge "[TestPrep10] Add some comments"
...
* commit '62abc40d7da0cfec3f3fa0409ae273a394167f4c':
[TestPrep10] Add some comments
2013-02-26 15:12:26 -08:00
62abc40d7d
Merge "[TestPrep10] Add some comments"
2013-02-26 23:09:48 +00:00
f170f145af
[TestPrep11] Only use mHasWrittenData to control JsonWriter#endArray() call
...
Change-Id: If2107e38575b009a4c372194ecd827e27bdbb2b4
2013-02-26 15:02:52 -08:00
a5e564bea0
[TestPrep10] Add some comments
...
Change-Id: Ia8e0bd72b0dc09bfc256ec5d1996637554376b5f
2013-02-26 15:02:52 -08:00
0a0e04e833
am c6ee9e69: am 183fe800: Small cleanup of RunInLocale
...
* commit 'c6ee9e692c02b49b2feabda494985f59eff33d68':
Small cleanup of RunInLocale
2013-02-26 05:59:24 -08:00
c6ee9e692c
am 183fe800: Small cleanup of RunInLocale
...
* commit '183fe8003163702a0ba9487d6fde2a7c025ab91a':
Small cleanup of RunInLocale
2013-02-26 13:57:06 +00:00
183fe80031
Small cleanup of RunInLocale
...
Change-Id: Ib588e67da2c88345fc4eb51587b07ebfa434e0bb
2013-02-26 19:11:49 +09:00
f7dbd99182
Import translations. DO NOT MERGE
...
Change-Id: I6592c412b60b21baaae7716dc897a65060463161
Auto-generated-cl: translation import
2013-02-25 10:21:33 -08:00
667a6b9981
Import translations. DO NOT MERGE
...
Change-Id: Iec690c5a0e2a945319ae9805a593b21ad50808fe
Auto-generated-cl: translation import
2013-02-25 10:15:29 -08:00
6b909d38f3
am 0f3c05cd: Merge "Send the dictionaries descriptions to the dict pack"
...
* commit '0f3c05cd6bee664e5ccaf632c35c34017eb1c5e9':
Send the dictionaries descriptions to the dict pack
2013-02-23 02:20:34 -08:00
0f3c05cd6b
Merge "Send the dictionaries descriptions to the dict pack"
2013-02-23 10:18:03 +00:00
81e13359a7
am 76ead0ea: Fix a possible crash
...
* commit '76ead0ead06ab1c09c698247c19d1d2f4bd35d23':
Fix a possible crash
2013-02-23 01:50:18 -08:00
c6799ffeab
Send the dictionaries descriptions to the dict pack
...
Bug: 8255795
Change-Id: I12a5922f50c2d2e3aa639457abcc1483e6a48721
2013-02-23 01:46:39 -08:00
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
1d08b1f0a7
am aefaec3c: Remove a cluttering log
...
* commit 'aefaec3c5fc4b9aa3126ae0a7f32133c0423e7e2':
Remove a cluttering log
2013-02-23 00:55:17 -08:00
aefaec3c5f
Remove a cluttering log
...
Bug: 8175067
Change-Id: I9a104a32ba2b3b52a5dfa250f8c642abd6169cc0
2013-02-23 00:48:10 -08:00
aeecc2f48e
am 1b05ecb7: Merge "Pass the client ID to the dictionary pack in settings"
...
* commit '1b05ecb7ba3124e7d4d6f8c75335c5b5138be86e':
Pass the client ID to the dictionary pack in settings
2013-02-23 00:09:57 -08:00
7aa9ff144a
am 8b4023c4: Merge "Tiny cleanup"
...
* commit '8b4023c4d631d7ac240d8a30702c212b33595e0b':
Tiny cleanup
2013-02-23 00:09:56 -08:00
1b05ecb7ba
Merge "Pass the client ID to the dictionary pack in settings"
2013-02-23 08:08:34 +00:00
8b4023c4d6
Merge "Tiny cleanup"
2013-02-23 08:07:27 +00:00
cd0f9aef05
am 2521edec: Fix a bug with the passed dictionary id
...
* commit '2521edec09373b2810093462c89221a2aca9e369':
Fix a bug with the passed dictionary id
2013-02-22 23:12:35 -08:00
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
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
da0d771fe9
Tiny cleanup
...
Change-Id: I5d7150a4abb3a498e790f41af569093217cb8b43
2013-02-22 19:42:45 -08:00
df32362794
am 8f794c72: Merge "Fix how the Enter action is decided"
...
* commit '8f794c72db07786c866e357c7853c339882b45ef':
Fix how the Enter action is decided
2013-02-22 16:16:01 -08:00
8f794c72db
Merge "Fix how the Enter action is decided"
2013-02-23 00:13:27 +00:00
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
97a5246f76
Merge "Import translations. DO NOT MERGE"
2013-02-22 23:49:17 +00:00
76cf68d1a8
Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
2013-02-22 23:47:27 +00:00
b9825bf30e
am b5c2033a: Merge "[TestPrep8] Narrow try/catch scope"
...
* commit 'b5c2033aa526b91b9ef3b71691a3ae11f657e135':
[TestPrep8] Narrow try/catch scope
2013-02-22 11:39:44 -08:00
beae302efe
Import translations. DO NOT MERGE
...
Change-Id: I75753bfe196bf52c7ec5534ce1996e035ea0f956
Auto-generated-cl: translation import
2013-02-22 10:51:10 -08:00
7a54c7a52d
Import translations. DO NOT MERGE
...
Change-Id: I86cb41c3f86a29bac9a3f93b6692e3f787156fdd
Auto-generated-cl: translation import
2013-02-22 10:46:46 -08:00
3e279243c1
am c3252cfa: Merge "[TestPrep7] Encapsulate JsonWriter creation"
...
* commit 'c3252cfaf750d706f7280d32d1259e4367670bd9':
[TestPrep7] Encapsulate JsonWriter creation
2013-02-22 06:15:40 -08:00
744b363ae8
[TestPrep8] Narrow try/catch scope
...
Change-Id: If15f250feb81c2ad55ce1bc7dc3dafa57de87aef
2013-02-21 17:01:08 -08:00
78c1ad32e6
[TestPrep7] Encapsulate JsonWriter creation
...
Change-Id: I4e97fa28dd0bb1101edc0db03f024432fee6f6fe
2013-02-21 17:01:08 -08:00
8375f4f2c5
am 07050549: Merge "[TestPrep5] Parameterize MainLogBuffer"
...
* commit '07050549b1f91a787fadb553cc834f9833617041':
[TestPrep5] Parameterize MainLogBuffer
2013-02-21 15:54:42 -08:00
07050549b1
Merge "[TestPrep5] Parameterize MainLogBuffer"
2013-02-21 23:52:05 +00:00
8cda557824
am bf0d6af3: Merge "[TestPrep4] Add some finals"
...
* commit 'bf0d6af3d38c1637b40ed9e844fc05471274a2d7':
[TestPrep4] Add some finals
2013-02-21 14:15:38 -08:00
4d13c6667d
am 7c996475: Merge "[TestPrep3] Add helper method to retrive dictionary"
...
* commit '7c996475d8531af413c09d4ece51423b96edd172':
[TestPrep3] Add helper method to retrive dictionary
2013-02-21 14:15:37 -08:00
14ff187c39
am c8a1ec6e: Merge "[TestPrep2] Rename a method"
...
* commit 'c8a1ec6e4128240a8f666120dbc3fb066a717f00':
[TestPrep2] Rename a method
2013-02-21 14:15:35 -08:00
be28c0c0b5
am 4e5a4ddb: Merge "[TestPrep1] Move MotionEvent.Action strings to LoggingUtils"
...
* commit '4e5a4ddbd06c3e98e931a789c13a9920fb3b4e16':
[TestPrep1] Move MotionEvent.Action strings to LoggingUtils
2013-02-21 14:15:34 -08:00
0e713e96b0
am 07296cf7: Merge "Use WordComposer.addKeyInfo for testing"
...
* commit '07296cf7fffad7282aee24d9313636cf64ffb178':
Use WordComposer.addKeyInfo for testing
2013-02-21 14:15:32 -08:00
c1b8f5f56c
am 46878544: Add preliminary setup wizard
...
* commit '46878544ec894fd3db368e183404a01c3e3ecc92':
Add preliminary setup wizard
2013-02-21 14:15:31 -08:00
bf0d6af3d3
Merge "[TestPrep4] Add some finals"
2013-02-21 22:13:05 +00:00
7c996475d8
Merge "[TestPrep3] Add helper method to retrive dictionary"
2013-02-21 21:18:32 +00:00
c8a1ec6e41
Merge "[TestPrep2] Rename a method"
2013-02-21 15:57:34 +00:00
4e5a4ddbd0
Merge "[TestPrep1] Move MotionEvent.Action strings to LoggingUtils"
2013-02-21 14:54:46 +00:00
07296cf7ff
Merge "Use WordComposer.addKeyInfo for testing"
2013-02-21 06:20:01 +00:00
ab0bda1499
[TestPrep5] Parameterize MainLogBuffer
...
Change-Id: I6d84f490922cd1f40e44ca4f95c9d950fba38290
2013-02-20 19:37:12 -08:00
22acdb540c
[TestPrep4] Add some finals
...
Change-Id: Ib437a6ad7fd6a897e2bbc65afe881ae8a3b1cbb0
2013-02-20 19:37:12 -08:00
Kurt Partridge
Baligh Uddin
Tadashi G. Takaoka
Jean Chalard