5c681c17ce
Merge "Add translatable="false" to setup wizard's string resources" into jb-mr2-dev
2013-03-01 13:26:26 +00: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
9ba7ad8d4f
Merge "[TestPrep20] Clean up import statement"
2013-03-01 01:32:35 +00: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
abaa88fd4e
Merge "[TestPrep18] Make class public for testing"
2013-02-28 01:00:46 +00:00
a04fbce412
Merge "[TestPrep17] Allow fake dictionary for testing"
2013-02-27 23:59:01 +00: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
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
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
64c34122f2
Merge "[TestPrep11] Only use mHasWrittenData to control JsonWriter#endArray() call"
2013-02-27 00:41:12 +00: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
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
0f3c05cd6b
Merge "Send the dictionaries descriptions to the dict pack"
2013-02-23 10:18:03 +00: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
aefaec3c5f
Remove a cluttering log
...
Bug: 8175067
Change-Id: I9a104a32ba2b3b52a5dfa250f8c642abd6169cc0
2013-02-23 00:48:10 -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
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
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
beae302efe
Import translations. DO NOT MERGE
...
Change-Id: I75753bfe196bf52c7ec5534ce1996e035ea0f956
Auto-generated-cl: translation import
2013-02-22 10:51:10 -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
07050549b1
Merge "[TestPrep5] Parameterize MainLogBuffer"
2013-02-21 23:52:05 +00: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
19e05359e6
[TestPrep3] Add helper method to retrive dictionary
...
Change-Id: Id6e03c6f8a3e96979d589f0605ac056fcad7e1ff
2013-02-20 19:36:56 -08:00
b6d05aeb7c
[TestPrep2] Rename a method
...
Change-Id: Id9a72045afa3558b20b9d63c8720fb7443d34fd9
2013-02-20 17:13:00 -08:00
8d429bf1a8
[TestPrep1] Move MotionEvent.Action strings to LoggingUtils
...
Change-Id: I7b9ed800552f2fd546ed21e9dc06ea1ff5798337
2013-02-20 17:12:56 -08:00
46878544ec
Add preliminary setup wizard
...
Bug: 8159728
Change-Id: I30d9cd637fb1d2e64588550e0aa4387bc1f7e6e5
2013-02-21 09:54:02 +09:00
5701a6647f
Use WordComposer.addKeyInfo for testing
...
Change-Id: I500654e7a26717aa5547942357e56060afb72969
2013-02-20 17:09:25 +09:00
da348e11ad
Fix layout direction of Keyboard and Suggestions view
...
Bug: 8167348
Change-Id: I5e0432707fff1dd3032686b733ba28bef305173a
2013-02-18 16:32:34 +09:00
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
4beaab2a88
Merge "Determine the protocol version of the dictionary pack"
2013-02-14 20:22:09 +00:00
cb0beaf3f1
Add placeholder of keyboard setup wizard
...
Bug: 8159728
Change-Id: I5552e9d0ffa8f94d183e76378d55bba6f718adfe
2013-02-14 18:00:11 +09:00
b1f27a2e26
Determine the protocol version of the dictionary pack
...
...for query.
Bug: 8167342
Change-Id: Ieb8e5b31c4b62bf507593c4631e31799aad5f267
2013-02-13 20:45:36 -08:00
de3e5fbf9d
Merge "Cleanup in preparation for tests"
2013-02-13 23:34:07 +00:00
d1f80f72e3
Merge "Clean up dictionary pack presence test."
2013-02-13 19:40:11 +00:00
4a81b571a3
Import translations. DO NOT MERGE
...
Change-Id: Ib49331c1511dcc9efac19ceda0b70e3604f30791
Auto-generated-cl: translation import
2013-02-13 10:49:33 -08:00
531dd150eb
Cleanup in preparation for tests
...
multi-project commit with I1212da392ecda0ad78962da68941870b5a651eee
Change-Id: Ie74af59d4e45bf954723fee9dcf350a36468c381
2013-02-12 20:48:44 -08:00
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
69cc3cfe1f
Import translations. DO NOT MERGE
...
Change-Id: I49fbafa8f9ef932fe4d2354c83fa86514726bb00
Auto-generated-cl: translation import
2013-02-12 13:33:27 -08:00
04de6802cc
Merge "Add batchMode field to PickSuggestionManually"
2013-02-12 16:54:35 +00:00
fdb1ca560e
Merge "Separate caps mode related utils to CapsModeUtils"
2013-02-12 09:26:16 +00:00
ce6bcdd1a5
Separate caps mode related utils to CapsModeUtils
...
Change-Id: I32700c434b296bb3fd39e040c2dda1fe90667daf
2013-02-12 18:15:42 +09:00
2c2942dd4b
Merge "Move parseCsvString to StringUtils"
2013-02-12 07:57:24 +00:00
b3fd701181
Move parseCsvString to StringUtils
...
Change-Id: I602f33991ca57b6057ec2defe01573552b322857
2013-02-12 16:18:19 +09:00
e26f0d4320
Merge "Cleanups"
2013-02-12 06:49:41 +00:00
4cbe84ad08
Merge "Fix RTL language key code mapping"
2013-02-12 06:43:40 +00:00
9a2039d94e
Fix RTL language key code mapping
...
Bug: 8168899
Bug: 8169343
Change-Id: I23120704e97d89d5ddec2b2bdff2a98a6daac4d5
2013-02-12 14:51:54 +09:00
1c5b2a41ec
Cleanups
...
Follow-up to Idc6f419a
Change-Id: I4aae8f4e19f27a0a309879dc19af6e40906d58c5
2013-02-11 21:14:56 -08:00
c6aaa48ea7
Merge "Some cleanups"
2013-02-12 05:09:31 +00:00
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
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
82441e60e2
Remove unnecessary whitespace
...
This is a cleanup followup to Id3dc510a
Change-Id: Ie64395eb4b6218fd8c73cacddeed2fba1df65d26
2013-02-11 13:31:47 -08:00
b2eac474ff
Don't try to issue delete() commands on missing provider
...
Bug: 8173622
Change-Id: Id3dc510ae3535169b5290e87075cb2f433a1f603
2013-02-11 12:38:24 -08:00
a92a97d2cd
Merge "Import translations. DO NOT MERGE"
2013-02-11 18:34:47 +00:00
d069d67038
Import translations. DO NOT MERGE
...
Change-Id: Ibd74870cf9822bce34f54504972e8f7d52c43036
Auto-generated-cl: translation import
2013-02-11 10:23:54 -08:00
d3c9ec8133
Merge "Close file properly"
2013-02-11 16:55:43 +00:00
d90e12aefb
Change targetSdkVersion to 17
...
Bug: 7405756
Change-Id: If933fcad56d81dcc956b6114727e01be9686ee9c
2013-02-08 18:53:34 -08:00
927c2d65e8
Merge "Import translations. DO NOT MERGE"
2013-02-08 20:19:02 +00:00
1a1d4d98da
Import translations. DO NOT MERGE
...
Change-Id: I1f4b366714462f2aa084ead58c67f8c82618cff5
Auto-generated-cl: translation import
2013-02-08 12:16:47 -08:00
b0767dd499
Separate resource file for dictionary pack metadata
...
Change-Id: I770335a25c3db12ec8440c4fcb208ca1d9c1fa32
2013-02-08 12:00:16 -08:00
2cabb7aed0
Close file properly
...
Change-Id: Ied55b6a6f1e64bbca558316d8d3d207d7655cf91
2013-02-08 11:43:51 -08:00
c52569ffcb
Add batchMode field to PickSuggestionManually
...
Change-Id: Iaaffc71378154240538bf90f0b85c3f17f3f78b3
2013-02-08 11:39:04 -08:00
3623ad238c
[B14] Implement sending the dictionary list.
...
Bug: 7005813
Change-Id: Ic3ef69510d2b385d0d403191b2f701b6527d0166
2013-02-06 19:19:30 -08:00
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
afe889a83d
Merge "[B9] Pass the client id parameter for dict info requests"
2013-02-06 04:38:44 +00:00
7165f926b4
Merge "Refactor LogStatement publishing method"
2013-02-06 01:30:33 +00:00
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
97135c29c5
Merge "[Rlog79c] Cleanup of feedback strings and text entry"
2013-02-05 20:11:24 +00:00
Tadashi G. Takaoka
Jean Chalard
Kurt Partridge
Baligh Uddin