Commit graph

11238 commits

Author SHA1 Message Date
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
131151220f am 6aaeb7fc: (-s ours) Import translations. DO NOT MERGE
* commit '6aaeb7fc34f98e9f72bfede6624c238d6ff15ccd':
  Import translations. DO NOT MERGE
2013-02-27 13:10:42 -08: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
Tadashi G. Takaoka
2b12faa69b am 16cbc30a: am e621ea5f: Merge "Fix failed unit test due to resource string change" into jb-mr2-dev
* commit '16cbc30ae5c4b3249ff1551c7f5c2e20bd4cd299':
  Fix failed unit test due to resource string change
2013-02-26 16:16:57 -08: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
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
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
cb2b3567b0 am f7dbd991: (-s ours) Import translations. DO NOT MERGE
* commit 'f7dbd991820794939992219c932276ff3fb9bf6d':
  Import translations. DO NOT MERGE
2013-02-25 10:33:58 -08: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