44456dcbf2
Merge remote-tracking branch 'goog/master' into mergescriptpackage
...
Conflicts:
java/res/values-af/strings.xml
java/res/values-cs/strings.xml
java/res/values-et/strings.xml
java/res/values-fi/strings.xml
java/res/values-hi/strings.xml
java/res/values-hr/strings.xml
java/res/values-hu/strings.xml
java/res/values-in/strings.xml
java/res/values-ja/strings.xml
java/res/values-ko/strings.xml
java/res/values-lt/strings.xml
java/res/values-lv/strings.xml
java/res/values-ms/strings.xml
java/res/values-pt/strings.xml
java/res/values-ro/strings.xml
java/res/values-ru/strings.xml
java/res/values-sk/strings.xml
java/res/values-sl/strings.xml
java/res/values-sr/strings.xml
java/res/values-sw/strings.xml
java/res/values-tr/strings.xml
java/res/values-vi/strings.xml
java/res/values-zh-rCN/strings.xml
java/res/values-zh-rTW/strings.xml
Change-Id: Ib4141aca0b35148d62d22d4f32309f890c84303a
2012-08-06 16:04:07 +09:00
d299bde24b
am 76bfe7f7: am 44f12ed9: Merge "Separate updateSuggestionStrip from commitTyped" into jb-mr1-dev
...
* commit '76bfe7f7b0f6b231e0596e400620cd34265a044f':
Separate updateSuggestionStrip from commitTyped
2012-08-05 22:49:27 -07:00
76bfe7f7b0
am 44f12ed9: Merge "Separate updateSuggestionStrip from commitTyped" into jb-mr1-dev
...
* commit '44f12ed900f57af7318884347d9e1c434422a3ca':
Separate updateSuggestionStrip from commitTyped
2012-08-05 22:47:49 -07:00
44f12ed900
Merge "Separate updateSuggestionStrip from commitTyped" into jb-mr1-dev
2012-08-05 22:45:49 -07:00
0a524de3df
Separate updateSuggestionStrip from commitTyped
...
The commitTyped() called updateSuggestionStrip(), and that led to call
Suggest.getSuggestedWordsForTypingInput() even after a batch input was
started because WordComposer.commitWord() reset the batch input state.
Bug: 6932442
Change-Id: If645b1ef0343aa1e21ca71a9275b40c6c3be13df
2012-08-06 14:31:01 +09:00
56b6c269f2
am b808e970: am e2a6badf: Merge "Show results in the native code." into jb-mr1-dev
...
* commit 'b808e970f4c6d543ef896c25726e522601a49f83':
Show results in the native code.
2012-08-05 19:37:10 -07:00
b808e970f4
am e2a6badf: Merge "Show results in the native code." into jb-mr1-dev
...
* commit 'e2a6badf601e7b637a709a11e430bd21bb46f6f9':
Show results in the native code.
2012-08-05 19:36:19 -07:00
e2a6badf60
Merge "Show results in the native code." into jb-mr1-dev
2012-08-05 19:34:23 -07:00
586b0ca1a2
Show results in the native code.
...
Change-Id: I712ba49cf4a89a36836fbf49cd72e7eef218e61f
2012-08-06 11:26:13 +09:00
6b4cada7b2
am 2687b667: am 4e9e6cd1: Fix IllegalStateException of KeyDetector
...
* commit '2687b667a7edb889fd2704380fee45f848da6626':
Fix IllegalStateException of KeyDetector
2012-08-05 19:25:20 -07:00
2687b667a7
am 4e9e6cd1: Fix IllegalStateException of KeyDetector
...
* commit '4e9e6cd1544f59be2ae02536af62fe5301e0cebb':
Fix IllegalStateException of KeyDetector
2012-08-05 19:23:25 -07:00
4e9e6cd154
Fix IllegalStateException of KeyDetector
...
A KeyDetector without Keyboard may exist in some rare cases. This
change eliminates throwing IllegalStateException and checks explicitly
against null.
Bug: 6891020
Change-Id: I29ec3e9f10484f30288fac76f0c45b3707bc2259
2012-08-06 11:09:50 +09:00
838e6c1e5b
ResearchLogging capture full n-gram data
...
- Captures complete motion data for all words in an n-gram.
- Also filters n-grams properly; if any word in the n-gram is not
in the dictionary, it is not included.
- Simplify ResearchLog to not require explicit state
- Added LogBuffer class MainLogBuffer class to allow n-gram-level decisions
about privacy.
- Moved LogUnit out from ResearchLogger
multi-project change with Id997fb6572daa3ff55591afa1676953bb204f33a
Because of a strange Gerrit interaction, earlier patchsets were recorded
as the following separate changes (to soon be abandoned):
- I59d86ae28123890ddb7aabc7dc9a73a75eecbca4
- I9cc95266fa4500d019e09ec53ec00e5dea7ffd38
- Ie6f23a2035e160f231406df1388a43725380df1d
- Id87909e96fa7fa91174c86395a964404f3490fe1
- I57c5cbde0425c42538d589fa4d1802b3e5688f7c
- Ic1f9d7727e416da1b6c4f1a45b53750cd4088dcf
- I20a72ccc4ba1bc08ed3ee39bff71d2adb376588c
- I417f6f364144b90085f5fef4bd2de1a40b5dfa79
Bug: 6188932
Change-Id: I771e57e3b8c0eb6721c2022e775cb0b528bdff93
2012-08-05 00:55:58 -07:00
5400f24bed
am 99403af5: (-s ours) am 0ef87868: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '99403af5bb2b9ae61e0feb0e4aaac0874c1362d1':
Import translations. DO NOT MERGE
2012-08-03 14:40:39 -07:00
99403af5bb
am 0ef87868: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '0ef87868c2a1f0cb0249cfc0e53c357f04ea9366':
Import translations. DO NOT MERGE
2012-08-03 14:37:57 -07:00
6f577e16aa
Merge "Import translations. DO NOT MERGE"
2012-08-03 14:35:22 -07:00
0ef87868c2
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-08-03 14:35:17 -07:00
f06db84d19
Import translations. DO NOT MERGE
...
Change-Id: I5b3c408ec87801fb3e6475d8cce0336fa7d26872
Auto-generated-cl: translation import
2012-08-03 14:30:57 -07:00
3d5a0b90f8
Import translations. DO NOT MERGE
...
Change-Id: I9510061c7ae1f4020cd5c5d24ed75348556ee085
Auto-generated-cl: translation import
2012-08-03 14:25:41 -07:00
7932a0c535
am ff05b219: am 3598053d: Move dicttool tests and make a script to run them (A4)
...
* commit 'ff05b2192feb7b043d5d4e722bd135208e9232c9':
Move dicttool tests and make a script to run them (A4)
2012-08-03 10:10:19 -07:00
a010493746
am 3213133c: am 5284a1e3: Fix the build
...
* commit '3213133c33f976e552f281d7c89617f3a7baf05e':
Fix the build
2012-08-03 10:10:17 -07:00
ff05b2192f
am 3598053d: Move dicttool tests and make a script to run them (A4)
...
* commit '3598053d41d1becf7b6d6b5d35bc6a4ec95f9884':
Move dicttool tests and make a script to run them (A4)
2012-08-03 10:01:18 -07:00
3213133c33
am 5284a1e3: Fix the build
...
* commit '5284a1e3d3472e7ec91802409eae5de3d2860919':
Fix the build
2012-08-03 09:56:34 -07:00
3598053d41
Move dicttool tests and make a script to run them (A4)
...
Change-Id: If582e81741c5edaf345dcb55517dcad0baa64c9e
2012-08-04 01:55:33 +09:00
5284a1e3d3
Fix the build
...
Change-Id: I0d6570332bcf569d8c43b3edd8b3ab52263ef179
2012-08-04 01:48:17 +09:00
78b17bb021
am 2fb40ef3: am 15b28432: Merge "Cleanup unused code" into jb-mr1-dev
...
* commit '2fb40ef30121da62386d64a2c9c5f5abffdcbc98':
Cleanup unused code
2012-08-03 09:37:19 -07:00
7c2ec76ed8
am 900910c0: am 54e84a00: Make a makedict command for dicttool (A3)
...
* commit '900910c02bc10f902a27681311b8a93279c34ec2':
Make a makedict command for dicttool (A3)
2012-08-03 09:35:16 -07:00
2fb40ef301
am 15b28432: Merge "Cleanup unused code" into jb-mr1-dev
...
* commit '15b28432bab6b530d82ba01e0ef6a19cd1a4c698':
Cleanup unused code
2012-08-03 09:35:06 -07:00
15b28432ba
Merge "Cleanup unused code" into jb-mr1-dev
2012-08-03 09:32:27 -07:00
900910c02b
am 54e84a00: Make a makedict command for dicttool (A3)
...
* commit '54e84a00fc032ba566cbda41feafa71de77e1c43':
Make a makedict command for dicttool (A3)
2012-08-03 09:28:42 -07:00
8ee4b35c70
Cleanup unused code
...
The Italian dictionary has been amended to contain words that
include apostrophes, and accordingly the apostrophe is now
excluded from word separators in Italian.
This code was only used for Italian, and in the general case
it does the wrong thing; it was only needed by limitations of
the old dictionary.
Bug: 6929108
Change-Id: I7ff4615e01899a1cebed2c4c51679cd0746740fe
2012-08-04 01:15:04 +09:00
54e84a00fc
Make a makedict command for dicttool (A3)
...
This behaves exactly as the old makedict command. Further
changes will redirect the calls to makedict to this, so as
to consolidate similar code.
Groundwork for
Bug: 6429606
Change-Id: Ibeadbf48bec70f988a15ca36ebf5d1ce3b5b54ea
2012-08-04 01:11:46 +09:00
f4e139a7b5
am 9a0e1df2: am 1644a3c7: Merge "Update French and Italian separators." into jb-mr1-dev
...
* commit '9a0e1df25c1f679b1458d2205d1bc09e2af0ccbd':
Update French and Italian separators.
2012-08-03 08:11:05 -07:00
9a0e1df25c
am 1644a3c7: Merge "Update French and Italian separators." into jb-mr1-dev
...
* commit '1644a3c7323ae33063774d32ce2e0f8698ff712d':
Update French and Italian separators.
2012-08-03 08:09:11 -07:00
1644a3c732
Merge "Update French and Italian separators." into jb-mr1-dev
2012-08-03 08:07:58 -07:00
beccb6e573
Update French and Italian separators.
...
French and Italian separators used to be decided this way
because of how the old dictionaries were made.
However, the new dictionaries actually do include the
composite words, and in both French and Italian, apostrophes
and dashes shouldn't be treated as separators any more.
Change-Id: If11c42625c819e223502a76749dbe797163d3c18
2012-08-04 00:04:13 +09:00
3695f4be47
am 53f4acf8: am 3f805418: Merge "Fix an OOB exception" into jb-mr1-dev
...
* commit '53f4acf86f6d330146af72f3688ad71428cb8bb6':
Fix an OOB exception
2012-08-03 07:22:09 -07:00
cc2ae5e24b
am 288caf33: am a777a86f: Merge "Simplification (A2)" into jb-mr1-dev
...
* commit '288caf33cb7671f4038e218c8d65316763258afd':
Simplification (A2)
2012-08-03 07:20:30 -07:00
53f4acf86f
am 3f805418: Merge "Fix an OOB exception" into jb-mr1-dev
...
* commit '3f80541844672a7625eb298adc6141ecf14bb883':
Fix an OOB exception
2012-08-03 07:20:03 -07:00
4f7d137e45
am 36fe3241: am 68966c7e: Merge "Remove arity from dicttool commands (A1)" into jb-mr1-dev
...
* commit '36fe3241842819b6bffb9309b0c7f4d48cd910bd':
Remove arity from dicttool commands (A1)
2012-08-03 07:18:48 -07:00
288caf33cb
am a777a86f: Merge "Simplification (A2)" into jb-mr1-dev
...
* commit 'a777a86f4b311ccdf1443faf0d1759e445ef138e':
Simplification (A2)
2012-08-03 07:18:22 -07:00
3f80541844
Merge "Fix an OOB exception" into jb-mr1-dev
2012-08-03 07:17:37 -07:00
36fe324184
am 68966c7e: Merge "Remove arity from dicttool commands (A1)" into jb-mr1-dev
...
* commit '68966c7e0ec89ccb0d2e1f285917163ea9e7b5ee':
Remove arity from dicttool commands (A1)
2012-08-03 07:16:41 -07:00
a777a86f4b
Merge "Simplification (A2)" into jb-mr1-dev
2012-08-03 07:15:47 -07:00
68966c7e0e
Merge "Remove arity from dicttool commands (A1)" into jb-mr1-dev
2012-08-03 07:14:23 -07:00
4c976aceee
Fix an OOB exception
...
Not sure exactly how this can happen, but at least this should
prevent us from crashing.
Bug: 6920884
Change-Id: I451864756b48c5cb5e98b06edee917d88766d77f
2012-08-03 23:10:47 +09:00
82cd20ee98
Simplification (A2)
...
A single command at a time and no arity gives opportunity to simplify
the argument parsing code.
Change-Id: Iff7bab78ede7448a662092f221c590a9eedae2a5
2012-08-03 23:02:39 +09:00
77c8c73837
Remove arity from dicttool commands (A1)
...
This unnecessarily complicates and limits commands.
It's simpler to just have one command by invocation.
Groundwork for
Bug: 6429606
Change-Id: I24cf267a9cbc937a5ba53942b29e28e7095d2fd2
2012-08-03 23:02:06 +09:00
83b3289a03
am be7897a0: am 6242564c: Merge "Using hardware accelerated drawing" into jb-mr1-dev
...
* commit 'be7897a04ab38a91d1b4afcf54c9ac668abf2e44':
Using hardware accelerated drawing
2012-08-03 04:59:09 -07:00
be7897a04a
am 6242564c: Merge "Using hardware accelerated drawing" into jb-mr1-dev
...
* commit '6242564c91d47885075bf2bd1e1bb0760de76c10':
Using hardware accelerated drawing
2012-08-03 04:55:54 -07:00
Satoshi Kataoka
Tadashi G. Takaoka
Ken Wakasa
Kurt Partridge
Ying Wang
Jean Chalard