Tadashi G. Takaoka
5c681c17ce
Merge "Add translatable="false" to setup wizard's string resources" into jb-mr2-dev
2013-03-01 13:26:26 +00:00
Jean Chalard
2768f38ea1
am 31747ba7: am abaf5827: Separate suggestions from SuggestionView
...
* commit '31747ba7874f57fe6b259e8744e42dbfe02a8d40':
Separate suggestions from SuggestionView
2013-02-28 21:20:22 -08:00
Jean Chalard
31747ba787
am abaf5827: Separate suggestions from SuggestionView
...
* commit 'abaf5827e7a7f5f6c5d8d98e03e6b9528b0c9351':
Separate suggestions from SuggestionView
2013-03-01 05:17:52 +00:00
Jean Chalard
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
Tadashi G. Takaoka
419e3e5261
Add translatable="false" to setup wizard's string resources
...
Bug: 8265778
Change-Id: I351dc2b88e4fa33c2008107a1d6d19940c4db6ab
2013-03-01 13:31:57 +09:00
Kurt Partridge
00ed4704f9
Move UUID preference reading to ResearchSettings.java
...
Change-Id: I8157249259cf8c3218c5c82a5729f4cbc1fb4eeb
2013-02-28 19:54:21 -08:00
Kurt Partridge
bdd52d4480
am 9ba7ad8d: Merge "[TestPrep20] Clean up import statement"
...
* commit '9ba7ad8d4f399d31251c74f5f5116c8d580500cf':
[TestPrep20] Clean up import statement
2013-02-28 17:34:14 -08:00
Kurt Partridge
9ba7ad8d4f
Merge "[TestPrep20] Clean up import statement"
2013-03-01 01:32:35 +00:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
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
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
Kurt Partridge
abaa88fd4e
Merge "[TestPrep18] Make class public for testing"
2013-02-28 01:00:46 +00:00
Kurt Partridge
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
Kurt Partridge
a04fbce412
Merge "[TestPrep17] Allow fake dictionary for testing"
2013-02-27 23:59:01 +00:00
Tadashi G. Takaoka
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
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
Baligh Uddin
32081df5d8
Import translations. DO NOT MERGE
...
Change-Id: I14643d519433db75403b8a7f5b9a409e316c1f1e
Auto-generated-cl: translation import
2013-02-27 12:25:14 -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
d9ca1a3f2c
am 424a976e: Merge "Ensure Preference listener is unregistered"
...
* commit '424a976e58ea40e44f28ac4b6aacc4656a4c1377':
Ensure Preference listener is unregistered
2013-02-26 19:51:14 -08: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
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
Kurt Partridge
64c34122f2
Merge "[TestPrep11] Only use mHasWrittenData to control JsonWriter#endArray() call"
2013-02-27 00:41:12 +00:00
Kurt Partridge
7b4b16186d
am 62abc40d: Merge "[TestPrep10] Add some comments"
...
* commit '62abc40d7da0cfec3f3fa0409ae273a394167f4c':
[TestPrep10] Add some comments
2013-02-26 15:12:26 -08: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
0a0e04e833
am c6ee9e69: am 183fe800: Small cleanup of RunInLocale
...
* commit 'c6ee9e692c02b49b2feabda494985f59eff33d68':
Small cleanup of RunInLocale
2013-02-26 05:59:24 -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
Baligh Uddin
f7dbd99182
Import translations. DO NOT MERGE
...
Change-Id: I6592c412b60b21baaae7716dc897a65060463161
Auto-generated-cl: translation import
2013-02-25 10:21:33 -08:00
Baligh Uddin
667a6b9981
Import translations. DO NOT MERGE
...
Change-Id: Iec690c5a0e2a945319ae9805a593b21ad50808fe
Auto-generated-cl: translation import
2013-02-25 10:15:29 -08:00
Jean Chalard
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
Jean Chalard
0f3c05cd6b
Merge "Send the dictionaries descriptions to the dict pack"
2013-02-23 10:18:03 +00:00
Jean Chalard
81e13359a7
am 76ead0ea: Fix a possible crash
...
* commit '76ead0ead06ab1c09c698247c19d1d2f4bd35d23':
Fix a possible crash
2013-02-23 01:50:18 -08: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
1d08b1f0a7
am aefaec3c: Remove a cluttering log
...
* commit 'aefaec3c5fc4b9aa3126ae0a7f32133c0423e7e2':
Remove a cluttering log
2013-02-23 00:55:17 -08:00
Jean Chalard
aefaec3c5f
Remove a cluttering log
...
Bug: 8175067
Change-Id: I9a104a32ba2b3b52a5dfa250f8c642abd6169cc0
2013-02-23 00:48:10 -08:00
Jean Chalard
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
Jean Chalard
7aa9ff144a
am 8b4023c4: Merge "Tiny cleanup"
...
* commit '8b4023c4d631d7ac240d8a30702c212b33595e0b':
Tiny cleanup
2013-02-23 00:09:56 -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
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
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
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
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
Baligh Uddin
76cf68d1a8
Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
2013-02-22 23:47:27 +00:00
Kurt Partridge
b9825bf30e
am b5c2033a: Merge "[TestPrep8] Narrow try/catch scope"
...
* commit 'b5c2033aa526b91b9ef3b71691a3ae11f657e135':
[TestPrep8] Narrow try/catch scope
2013-02-22 11:39:44 -08: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
Baligh Uddin
7a54c7a52d
Import translations. DO NOT MERGE
...
Change-Id: I86cb41c3f86a29bac9a3f93b6692e3f787156fdd
Auto-generated-cl: translation import
2013-02-22 10:46:46 -08:00
Kurt Partridge
3e279243c1
am c3252cfa: Merge "[TestPrep7] Encapsulate JsonWriter creation"
...
* commit 'c3252cfaf750d706f7280d32d1259e4367670bd9':
[TestPrep7] Encapsulate JsonWriter creation
2013-02-22 06:15:40 -08: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
8375f4f2c5
am 07050549: Merge "[TestPrep5] Parameterize MainLogBuffer"
...
* commit '07050549b1f91a787fadb553cc834f9833617041':
[TestPrep5] Parameterize MainLogBuffer
2013-02-21 15:54:42 -08:00
Kurt Partridge
07050549b1
Merge "[TestPrep5] Parameterize MainLogBuffer"
2013-02-21 23:52:05 +00:00
Kurt Partridge
8cda557824
am bf0d6af3: Merge "[TestPrep4] Add some finals"
...
* commit 'bf0d6af3d38c1637b40ed9e844fc05471274a2d7':
[TestPrep4] Add some finals
2013-02-21 14:15:38 -08:00
Kurt Partridge
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
Kurt Partridge
14ff187c39
am c8a1ec6e: Merge "[TestPrep2] Rename a method"
...
* commit 'c8a1ec6e4128240a8f666120dbc3fb066a717f00':
[TestPrep2] Rename a method
2013-02-21 14:15:35 -08:00
Kurt Partridge
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
Tadashi G. Takaoka
0e713e96b0
am 07296cf7: Merge "Use WordComposer.addKeyInfo for testing"
...
* commit '07296cf7fffad7282aee24d9313636cf64ffb178':
Use WordComposer.addKeyInfo for testing
2013-02-21 14:15:32 -08:00
Tadashi G. Takaoka
c1b8f5f56c
am 46878544: Add preliminary setup wizard
...
* commit '46878544ec894fd3db368e183404a01c3e3ecc92':
Add preliminary setup wizard
2013-02-21 14:15:31 -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
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
Tadashi G. Takaoka
5701a6647f
Use WordComposer.addKeyInfo for testing
...
Change-Id: I500654e7a26717aa5547942357e56060afb72969
2013-02-20 17:09:25 +09:00
Tadashi G. Takaoka
c4932d2616
am da348e11: Fix layout direction of Keyboard and Suggestions view
...
* commit 'da348e11ad43b5eaf70a6bad8551a86cd43a6512':
Fix layout direction of Keyboard and Suggestions view
2013-02-18 00:26:15 -08:00
Tadashi G. Takaoka
da348e11ad
Fix layout direction of Keyboard and Suggestions view
...
Bug: 8167348
Change-Id: I5e0432707fff1dd3032686b733ba28bef305173a
2013-02-18 16:32:34 +09:00
Jean Chalard
a2f89c525d
am d4cbc4fd: Implement getting data files with protocol v2
...
* commit 'd4cbc4fd078cbb23be4eafe1cb82a8a470fca3a0':
Implement getting data files with protocol v2
2013-02-15 19:41:27 -08:00
Jean Chalard
d4cbc4fd07
Implement getting data files with protocol v2
...
This also does it for deleting them
Bug: 8167342
Bug: 6789534
Change-Id: I1823f98508881f109a667146d3608003f87aa4cb
2013-02-15 11:09:16 -08:00
Jean Chalard
9cf5e32879
am 4beaab2a: Merge "Determine the protocol version of the dictionary pack"
...
# Via Android (Google) Code Review (1) and Jean Chalard (1)
* commit '4beaab2a88ce616bdc8ca35248d65c1b649943a9':
Determine the protocol version of the dictionary pack
2013-02-14 12:23:53 -08:00
Jean Chalard
4beaab2a88
Merge "Determine the protocol version of the dictionary pack"
2013-02-14 20:22:09 +00:00
Tadashi G. Takaoka
65bc373452
am 4c53e144: Merge "Add placeholder of keyboard setup wizard"
...
# Via Android (Google) Code Review (1) and Tadashi G. Takaoka (1)
* commit '4c53e144c184a7b084e9deecf5d1f1fe01ec1af9':
Add placeholder of keyboard setup wizard
2013-02-14 01:05:37 -08:00
Tadashi G. Takaoka
cb0beaf3f1
Add placeholder of keyboard setup wizard
...
Bug: 8159728
Change-Id: I5552e9d0ffa8f94d183e76378d55bba6f718adfe
2013-02-14 18:00:11 +09:00
Jean Chalard
b1f27a2e26
Determine the protocol version of the dictionary pack
...
...for query.
Bug: 8167342
Change-Id: Ieb8e5b31c4b62bf507593c4631e31799aad5f267
2013-02-13 20:45:36 -08:00
Kurt Partridge
d4d515f4bf
am de3e5fbf: Merge "Cleanup in preparation for tests"
...
# Via Android (Google) Code Review (1) and Kurt Partridge (1)
* commit 'de3e5fbf9dfb2e4e34095e0c34e8aec8d8de02f5':
Cleanup in preparation for tests
2013-02-13 15:35:50 -08:00
Kurt Partridge
de3e5fbf9d
Merge "Cleanup in preparation for tests"
2013-02-13 23:34:07 +00:00
Jean Chalard
81d09321f8
am d1f80f72: Merge "Clean up dictionary pack presence test."
...
# Via Android (Google) Code Review (1) and Jean Chalard (1)
* commit 'd1f80f72e33f79ae8ed94a279a9969cc238a83a7':
Clean up dictionary pack presence test.
2013-02-13 11:42:08 -08:00
Jean Chalard
d1f80f72e3
Merge "Clean up dictionary pack presence test."
2013-02-13 19:40:11 +00:00
Baligh Uddin
4a81b571a3
Import translations. DO NOT MERGE
...
Change-Id: Ib49331c1511dcc9efac19ceda0b70e3604f30791
Auto-generated-cl: translation import
2013-02-13 10:49:33 -08:00
Baligh Uddin
c63cfa5a99
Import translations. DO NOT MERGE
...
Change-Id: I856a4dac1396dcf20bfa45a53b81829ad8f3468d
Auto-generated-cl: translation import
2013-02-13 10:43:39 -08:00
Kurt Partridge
531dd150eb
Cleanup in preparation for tests
...
multi-project commit with I1212da392ecda0ad78962da68941870b5a651eee
Change-Id: Ie74af59d4e45bf954723fee9dcf350a36468c381
2013-02-12 20:48:44 -08:00
Jean Chalard
a9df972780
Clean up dictionary pack presence test.
...
This method is much cleaner and much more readable.
Change-Id: I8055c169ef7c4453ab45c463704bd56a6080da4f
2013-02-12 17:59:36 -08:00
Baligh Uddin
69cc3cfe1f
Import translations. DO NOT MERGE
...
Change-Id: I49fbafa8f9ef932fe4d2354c83fa86514726bb00
Auto-generated-cl: translation import
2013-02-12 13:33:27 -08:00
Baligh Uddin
f60fad3987
Import translations. DO NOT MERGE
...
Change-Id: Ic418597418363ba57704b6d44ea33a862fbc621e
Auto-generated-cl: translation import
2013-02-12 13:28:55 -08:00
Kurt Partridge
97895d1586
am 04de6802: Merge "Add batchMode field to PickSuggestionManually"
...
# Via Android (Google) Code Review (1) and Kurt Partridge (1)
* commit '04de6802cc275ac7125ae558e5718c5fab336fca':
Add batchMode field to PickSuggestionManually
2013-02-12 08:56:15 -08:00
Kurt Partridge
04de6802cc
Merge "Add batchMode field to PickSuggestionManually"
2013-02-12 16:54:35 +00:00
Tadashi G. Takaoka
d84c7a871d
am fdb1ca56: Merge "Separate caps mode related utils to CapsModeUtils"
...
# Via Android (Google) Code Review (1) and Tadashi G. Takaoka (1)
* commit 'fdb1ca560e426e67c60c7f7324bc52022b1b3f07':
Separate caps mode related utils to CapsModeUtils
2013-02-12 01:28:14 -08:00
Tadashi G. Takaoka
fdb1ca560e
Merge "Separate caps mode related utils to CapsModeUtils"
2013-02-12 09:26:16 +00:00
Tadashi G. Takaoka
ce6bcdd1a5
Separate caps mode related utils to CapsModeUtils
...
Change-Id: I32700c434b296bb3fd39e040c2dda1fe90667daf
2013-02-12 18:15:42 +09:00
Tadashi G. Takaoka
f6716e651f
am 2c2942dd: Merge "Move parseCsvString to StringUtils"
...
# Via Android (Google) Code Review (1) and Tadashi G. Takaoka (1)
* commit '2c2942dd4bdea8581191866e2f06a0fa9dec18ed':
Move parseCsvString to StringUtils
2013-02-11 23:59:49 -08:00
Tadashi G. Takaoka
2c2942dd4b
Merge "Move parseCsvString to StringUtils"
2013-02-12 07:57:24 +00:00
Tadashi G. Takaoka
b3fd701181
Move parseCsvString to StringUtils
...
Change-Id: I602f33991ca57b6057ec2defe01573552b322857
2013-02-12 16:18:19 +09:00
Jean Chalard
d16059f918
am e26f0d43: Merge "Cleanups"
...
# Via Android (Google) Code Review (1) and Jean Chalard (1)
* commit 'e26f0d4320b9f3ad49a5c6d3f5f2ee78bac74a48':
Cleanups
2013-02-11 22:50:51 -08:00
Jean Chalard
e26f0d4320
Merge "Cleanups"
2013-02-12 06:49:41 +00:00
Tadashi G. Takaoka
a869080b04
am 4cbe84ad: Merge "Fix RTL language key code mapping"
...
# Via Android (Google) Code Review (1) and Tadashi G. Takaoka (1)
* commit '4cbe84ad08f38bf9c6f8852b406f5052e862a747':
Fix RTL language key code mapping
2013-02-11 22:45:16 -08:00
Tadashi G. Takaoka
4cbe84ad08
Merge "Fix RTL language key code mapping"
2013-02-12 06:43:40 +00:00
Tadashi G. Takaoka
9a2039d94e
Fix RTL language key code mapping
...
Bug: 8168899
Bug: 8169343
Change-Id: I23120704e97d89d5ddec2b2bdff2a98a6daac4d5
2013-02-12 14:51:54 +09:00
Jean Chalard
1c5b2a41ec
Cleanups
...
Follow-up to Idc6f419a
Change-Id: I4aae8f4e19f27a0a309879dc19af6e40906d58c5
2013-02-11 21:14:56 -08:00
Jean Chalard
08a2bbc738
am c6aaa48e: Merge "Some cleanups"
...
# Via Android (Google) Code Review (1) and Jean Chalard (1)
* commit 'c6aaa48ea7fa021112cc163730b5bce574c6877b':
Some cleanups
2013-02-11 21:10:22 -08:00
Jean Chalard
c6aaa48ea7
Merge "Some cleanups"
2013-02-12 05:09:31 +00:00
Tadashi G. Takaoka
41d66bea35
am 0b491917: Add translatable="false" for dictionary-pack.xml
...
# Via Tadashi G. Takaoka
* commit '0b49191797071d6674cae46eea9f76a8947945da':
Add translatable="false" for dictionary-pack.xml
2013-02-11 21:03:22 -08:00
Jean Chalard
8018051022
Some cleanups
...
Improve a slew of logging statements, and put commands that we don't
expect to need protecting against exceptions out of a try {} block.
This is a followup to Id3dc510a
Change-Id: Idc6f419ac095b5b0f2d6862d58926ef888cb34e6
2013-02-11 19:47:15 -08:00
Tadashi G. Takaoka
0b49191797
Add translatable="false" for dictionary-pack.xml
...
This is a follow up of I770335a2.
Change-Id: If0c021f4fb630bda7e8985591094488e11917e9b
2013-02-12 12:07:03 +09:00
Jean Chalard
c38a348f1b
am 82441e60: Remove unnecessary whitespace
...
# Via Jean Chalard
* commit '82441e60e242681f2ea0d6e97105f819e3bd5071':
Remove unnecessary whitespace
2013-02-11 13:36:08 -08:00
Jean Chalard
82441e60e2
Remove unnecessary whitespace
...
This is a cleanup followup to Id3dc510a
Change-Id: Ie64395eb4b6218fd8c73cacddeed2fba1df65d26
2013-02-11 13:31:47 -08:00
Jean Chalard
d8348eeabf
am b2eac474: Don\'t try to issue delete() commands on missing provider
...
# Via Jean Chalard
* commit 'b2eac474ff82d0dad41991cd0f1ae80a58f01be2':
Don't try to issue delete() commands on missing provider
2013-02-11 12:50:32 -08:00
Jean Chalard
b2eac474ff
Don't try to issue delete() commands on missing provider
...
Bug: 8173622
Change-Id: Id3dc510ae3535169b5290e87075cb2f433a1f603
2013-02-11 12:38:24 -08:00
Kurt Partridge
71bc485b09
am d3c9ec81: Merge "Close file properly"
...
# Via Android (Google) Code Review (1) and Kurt Partridge (1)
* commit 'd3c9ec8133ae203b10eafc8547cbda51d995a44e':
Close file properly
2013-02-11 11:25:49 -08:00
Baligh Uddin
a92a97d2cd
Merge "Import translations. DO NOT MERGE"
2013-02-11 18:34:47 +00:00
Baligh Uddin
d069d67038
Import translations. DO NOT MERGE
...
Change-Id: Ibd74870cf9822bce34f54504972e8f7d52c43036
Auto-generated-cl: translation import
2013-02-11 10:23:54 -08:00
Baligh Uddin
d4ca979165
Import translations. DO NOT MERGE
...
Change-Id: If167e26b62d1fa89e672da77fbcde015659e635f
Auto-generated-cl: translation import
2013-02-11 10:18:58 -08:00
Kurt Partridge
d3c9ec8133
Merge "Close file properly"
2013-02-11 16:55:43 +00:00
Tadashi G. Takaoka
856057e6f1
am 5f5862c9: Merge "Change targetSdkVersion to 17"
...
# Via Android (Google) Code Review (1) and Tadashi G. Takaoka (1)
* commit '5f5862c9b44b45527a78c85e63b381e770f1bce6':
Change targetSdkVersion to 17
2013-02-08 19:46:48 -08:00
Tadashi G. Takaoka
d90e12aefb
Change targetSdkVersion to 17
...
Bug: 7405756
Change-Id: If933fcad56d81dcc956b6114727e01be9686ee9c
2013-02-08 18:53:34 -08:00
Baligh Uddin
927c2d65e8
Merge "Import translations. DO NOT MERGE"
2013-02-08 20:19:02 +00:00
Baligh Uddin
a4014e328e
Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
2013-02-08 20:18:46 +00:00
Baligh Uddin
1a1d4d98da
Import translations. DO NOT MERGE
...
Change-Id: I1f4b366714462f2aa084ead58c67f8c82618cff5
Auto-generated-cl: translation import
2013-02-08 12:16:47 -08:00
Tadashi G. Takaoka
95328b44db
am b0767dd4: Separate resource file for dictionary pack metadata
...
# Via Tadashi G. Takaoka
* commit 'b0767dd499264c8ab0dcb5ca833a66079524c4b3':
Separate resource file for dictionary pack metadata
2013-02-08 12:15:38 -08:00
Baligh Uddin
13b5417703
Import translations. DO NOT MERGE
...
Change-Id: I517465f48844921772713e7205ddee9c6c4dcb19
Auto-generated-cl: translation import
2013-02-08 12:12:26 -08:00
Tadashi G. Takaoka
b0767dd499
Separate resource file for dictionary pack metadata
...
Change-Id: I770335a25c3db12ec8440c4fcb208ca1d9c1fa32
2013-02-08 12:00:16 -08:00
Kurt Partridge
2cabb7aed0
Close file properly
...
Change-Id: Ied55b6a6f1e64bbca558316d8d3d207d7655cf91
2013-02-08 11:43:51 -08:00
Kurt Partridge
c52569ffcb
Add batchMode field to PickSuggestionManually
...
Change-Id: Iaaffc71378154240538bf90f0b85c3f17f3f78b3
2013-02-08 11:39:04 -08:00
Jean Chalard
a13f4942ad
am 3623ad23: [B14] Implement sending the dictionary list.
...
# Via Jean Chalard
* commit '3623ad238c3fa76f36cb54de63bd31cf320befb4':
[B14] Implement sending the dictionary list.
2013-02-07 09:29:40 -08:00
Jean Chalard
3623ad238c
[B14] Implement sending the dictionary list.
...
Bug: 7005813
Change-Id: Ic3ef69510d2b385d0d403191b2f701b6527d0166
2013-02-06 19:19:30 -08:00
Jean Chalard
3e2d7f27cf
am 73857910: Merge "[B11] Implement reset and passing of the URL to the dict pack"
...
# Via Android (Google) Code Review (1) and Jean Chalard (1)
* commit '738579103f112e2781848079235d79e98e65d6be':
[B11] Implement reset and passing of the URL to the dict pack
2013-02-06 16:07:25 -08:00
Jean Chalard
6ecb4c4dcc
[B11] Implement reset and passing of the URL to the dict pack
...
Bug: 7601410
Bug: 7595195
Change-Id: I78cf04dce7c1e64de6725d32317de288a83bd39d
2013-02-06 15:21:33 -08:00
Jean Chalard
22133221a1
am afe889a8: Merge "[B9] Pass the client id parameter for dict info requests"
...
# Via Android (Google) Code Review (1) and Jean Chalard (1)
* commit 'afe889a83d43afe23d22d28a443b051bb115f023':
[B9] Pass the client id parameter for dict info requests
2013-02-05 20:40:38 -08:00
Jean Chalard
afe889a83d
Merge "[B9] Pass the client id parameter for dict info requests"
2013-02-06 04:38:44 +00:00
Kurt Partridge
a023880bbc
am 7165f926: Merge "Refactor LogStatement publishing method"
...
# Via Android (Google) Code Review (1) and Kurt Partridge (1)
* commit '7165f926b4304a033c2abae7f93a40156062a1a1':
Refactor LogStatement publishing method
2013-02-05 17:32:20 -08:00
Kurt Partridge
7165f926b4
Merge "Refactor LogStatement publishing method"
2013-02-06 01:30:33 +00:00
Kurt Partridge
b02a19c49d
Refactor LogStatement publishing method
...
The method in LogUnit for publishing a LogStatement to a JsonWriter doesn't
depend on anything in the LogUnit.
multi-project commit with Id1d6ff4851148bba0e6b5a1ec6eec2b842d9c707
Change-Id: I323cec239d6ea1cee602c2ecf9b13713791e9283
2013-02-05 15:18:20 -08:00
Baligh Uddin
016c9df33f
Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
2013-02-05 20:28:05 +00:00
Kurt Partridge
5c701a627a
am 97135c29: Merge "[Rlog79c] Cleanup of feedback strings and text entry"
...
# Via Android (Google) Code Review (1) and Kurt Partridge (1)
* commit '97135c29c5b8312211e61691496b17baac652ce1':
[Rlog79c] Cleanup of feedback strings and text entry
2013-02-05 12:12:34 -08:00
Kurt Partridge
97135c29c5
Merge "[Rlog79c] Cleanup of feedback strings and text entry"
2013-02-05 20:11:24 +00:00
Baligh Uddin
104d245b3f
Merge "Import translations. DO NOT MERGE"
2013-02-05 16:41:28 +00:00
Tadashi G. Takaoka
d7185cfd57
am 298b4240: Separate IntentUtils from CompatUtils
...
# Via Tadashi G. Takaoka
* commit '298b4240f84344bbcd70b72dfb20806ba93ffd22':
Separate IntentUtils from CompatUtils
2013-02-04 18:33:00 -08:00
Tadashi G. Takaoka
298b4240f8
Separate IntentUtils from CompatUtils
...
Change-Id: I373ae7ad26eee44cc8e9720314f6a53b811d0021
2013-02-04 16:06:38 -08:00
Kurt Partridge
6a4d218f69
[Rlog79c] Cleanup of feedback strings and text entry
...
Change-Id: I97457ea8033a011c37e5970eb91d1a3273b81e2a
2013-02-04 14:42:08 -08:00
Tadashi G. Takaoka
62e14ad67d
am 70c63049: Make CHAR LIMIT to 66 for some strings
...
# Via Tadashi G. Takaoka
* commit '70c63049d3635220ccda6923b3333c5e72451192':
Make CHAR LIMIT to 66 for some strings
2013-02-04 14:39:36 -08:00
Tadashi G. Takaoka
70c63049d3
Make CHAR LIMIT to 66 for some strings
...
Bug: 8112520
Change-Id: Ia7303e9bae651a3990b781341002fae950997dc1
2013-02-04 14:18:07 -08:00
Kurt Partridge
4f801c586c
am 445d8e8b: Merge "[Rlog79b] Save channel name during internal use"
...
# Via Android (Google) Code Review (1) and Kurt Partridge (1)
* commit '445d8e8bf633dbec64e7e0833384777bee137ebf':
[Rlog79b] Save channel name during internal use
2013-02-04 11:18:30 -08:00
Kurt Partridge
445d8e8bf6
Merge "[Rlog79b] Save channel name during internal use"
2013-02-04 19:16:33 +00:00
Baligh Uddin
c67b825bd0
Import translations. DO NOT MERGE
...
Change-Id: I7e498ee5f83a3d4611fc46f34b0a6f0e19c143e5
Auto-generated-cl: translation import
2013-02-04 11:02:27 -08:00
Baligh Uddin
1f06d565a5
Import translations. DO NOT MERGE
...
Change-Id: Ib58eeaa07f3ef34207612a13065f5f9fef8b2b08
Auto-generated-cl: translation import
2013-02-04 10:57:14 -08:00
Kurt Partridge
54359d8604
am 5ca4afa5: Merge "[Rlog48c] Replay historical motion data"
...
# Via Android (Google) Code Review (1) and Kurt Partridge (1)
* commit '5ca4afa543a8ce8ba82d84e393a577de306582b3':
[Rlog48c] Replay historical motion data
2013-02-04 10:38:35 -08:00
Kurt Partridge
5ca4afa543
Merge "[Rlog48c] Replay historical motion data"
2013-02-04 18:36:57 +00:00
Kurt Partridge
32d171225b
am 82b4374c: Merge "[Rlog48b] Better visual indicator for logging state"
...
# Via Android (Google) Code Review (1) and Kurt Partridge (1)
* commit '82b4374c75ba64dd736b9509f27389a38b92c8ed':
[Rlog48b] Better visual indicator for logging state
2013-02-04 10:07:50 -08:00
Kurt Partridge
82b4374c75
Merge "[Rlog48b] Better visual indicator for logging state"
2013-02-04 18:06:41 +00:00
Kurt Partridge
7708bcf6fb
[Rlog48c] Replay historical motion data
...
Change-Id: Ib398ea61ff048b1a4ac3b7f7b4a772e173a7b294
2013-02-04 06:13:51 -08:00
Kurt Partridge
d34347bd4b
[Rlog79b] Save channel name during internal use
...
The feedback string is used as a channel name in internal builds. Add a flag
that lets it be saved between calls to make it easier to generate test data.
Change-Id: I5c6149b1e68239cd968b6852d03cc240ddde99ca
2013-02-04 06:09:45 -08:00
Jean Chalard
8192b4a6ef
[B9] Pass the client id parameter for dict info requests
...
Bug: 6789534
Change-Id: Ie3ea75b19ae4da2dea531e0077c58742a9502bc6
2013-02-02 18:23:40 +09:00
Jean Chalard
7f2caa4d82
am f1acb0e5: Make some strings private
...
# Via Jean Chalard
* commit 'f1acb0e52d2a104861cc2ee4cc3adcb9e0a81f3b':
Make some strings private
2013-02-02 01:09:05 -08:00
Jean Chalard
f1acb0e52d
Make some strings private
...
Change-Id: I0ffdbcf6bede86a3cdcb3a0e4ec263398502617c
2013-02-02 15:00:09 +09:00
Kurt Partridge
ce9e7f667d
[Rlog48b] Better visual indicator for logging state
...
Now applies yellow bars if recording, green bars if replaying.
Change-Id: I39d39de6254fd57107ea5355c43b154244520985
2013-02-01 17:10:56 -08:00
Baligh Uddin
44219ff28f
Merge "Import translations. DO NOT MERGE"
2013-02-01 18:37:26 +00:00
Baligh Uddin
867484ffaa
Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
2013-02-01 18:36:49 +00:00
Baligh Uddin
074e1ac422
Import translations. DO NOT MERGE
...
Change-Id: I385b565d8b768795e2917cb3726dae8cbb7d3ebd
Auto-generated-cl: translation import
2013-02-01 09:45:20 -08:00
Baligh Uddin
fe73a0f6f4
Import translations. DO NOT MERGE
...
Change-Id: Id2aa005657ac474635219de81758b71c39e6d9ff
Auto-generated-cl: translation import
2013-02-01 09:41:30 -08:00
Kurt Partridge
99ed4f1076
am ceffa0be: Merge "[Rlog79a] Disallow empty feedback messages"
...
# Via Android (Google) Code Review (1) and Kurt Partridge (1)
* commit 'ceffa0bec97f3b819dbd4eb37f53b6eac3db2b07':
[Rlog79a] Disallow empty feedback messages
2013-02-01 09:17:17 -08:00
Kurt Partridge
ceffa0bec9
Merge "[Rlog79a] Disallow empty feedback messages"
2013-02-01 17:15:07 +00:00
Kurt Partridge
59abd14ad9
am 0cafd658: Merge "[Rlog48a] Update and make logging strings consistent"
...
# Via Android (Google) Code Review (1) and Kurt Partridge (1)
* commit '0cafd6580c05de2b718652cdced8e7072efa3a21':
[Rlog48a] Update and make logging strings consistent
2013-02-01 08:35:42 -08:00
Kurt Partridge
0cafd6580c
Merge "[Rlog48a] Update and make logging strings consistent"
2013-02-01 16:33:42 +00:00
Kurt Partridge
d3f718fccd
[Rlog79a] Disallow empty feedback messages
...
Change-Id: I30f7c07606e466c3c9538adad94024d00f0901de
2013-02-01 07:08:32 -08:00
Kurt Partridge
f8dd2f4ebd
am 5bdd7bab: Merge "[Rlog47] Replayer service, inspect-researchLog.py"
...
# Via Android (Google) Code Review (1) and Kurt Partridge (1)
* commit '5bdd7bab11cee1be86d8ab3e2167059eb9d682e2':
[Rlog47] Replayer service, inspect-researchLog.py
2013-02-01 07:07:43 -08:00
Kurt Partridge
5bdd7bab11
Merge "[Rlog47] Replayer service, inspect-researchLog.py"
2013-02-01 15:05:58 +00:00
Tadashi G. Takaoka
8edb4e6b82
am 5c58133c: Clean up GestureFloatingPreviewText
...
# Via Tadashi G. Takaoka
* commit '5c58133c8098c73b687ac8483ed8b2c32a53c257':
Clean up GestureFloatingPreviewText
2013-01-31 23:02:41 -08:00
Tadashi G. Takaoka
5c58133c80
Clean up GestureFloatingPreviewText
...
Change-Id: Ie64dd06a99e54b2f432725f69dc4f38c81359ce6
2013-02-01 15:23:21 +09:00
Kurt Partridge
c20a415e15
[Rlog48a] Update and make logging strings consistent
...
Change-Id: Iae04115921aaf6bbc3c6ad6e7d2d0e7401af41f8
2013-01-31 19:08:54 -08:00
Kurt Partridge
a69795bdcf
am 40be4c3b: ResearchLogger invocation tests
...
# Via Kurt Partridge
* commit '40be4c3bdbca143034f1308848add258e9856ad5':
ResearchLogger invocation tests
2013-01-31 15:16:09 -08:00
Kurt Partridge
40be4c3bdb
ResearchLogger invocation tests
...
- Start with just a smoke test.
- Sets up a private SharedPreferences
multi-project commit with I81cceba23692d64c2ea58a46351fc36d118ff825
Change-Id: I96e02d9a8de70cb5c03fd7411b886903e7a83673
2013-01-31 14:54:14 -08:00
Kurt Partridge
588d9b5c8d
[Rlog47] Replayer service, inspect-researchLog.py
...
multi-project commit with Ia2dd81afb4ea124094a20a39e31ffd193edff3d2
Change-Id: I80fe8f2ce137fedf48038955d5f3d9deed04f763
2013-01-31 12:13:08 -08:00
Kurt Partridge
0d0d40d56e
am 6b574f80: Merge "[Rlog39] Remove unnecessary commitCurrentLogUnit() call"
...
# Via Android (Google) Code Review (1) and Kurt Partridge (1)
* commit '6b574f80567aa74e2b033ce1f71fa52f6cfe48f2':
[Rlog39] Remove unnecessary commitCurrentLogUnit() call
2013-01-31 10:54:53 -08:00
Kurt Partridge
6b574f8056
Merge "[Rlog39] Remove unnecessary commitCurrentLogUnit() call"
2013-01-31 18:52:31 +00:00