2cd2af087a
am e6030b7c: am 6ea5f8d7: am f08c2e18: am ff95897f: am d0b02b52: am 93c2fa8d: am cd7422f4: Merge "Fix a pernicious bug with caps."
...
* commit 'e6030b7c92809db5af37ca4fdac972812a8dc621':
2013-12-13 01:39:38 -08:00
e1cce9bbbe
am 2b253559: am a4313507: am 36d64fc6: am 14307df8: am 8ee8178e: am 0fbad0fa: am 52c20927: Merge "Change name of DecayingUtils."
...
* commit '2b253559b3e6e72d58124ecf6269be3e3e4f73cb':
2013-12-13 01:39:34 -08:00
78f35deeb5
am 6cfb583a: am 6269b2d2: am c4f9bec4: am 03c5029c: am 96fdbaa3: am 85eba056: am c5182c9a: Correspond to the security related API change for PreferenceActivity
...
* commit '6cfb583aac22772fd8b19dd6b686a2bda9735f51':
2013-12-13 01:39:30 -08:00
27ff68b86e
am c47e7d77: am 961499ed: am a4d94493: am 6877060b: am 4afd8ff4: am 0874939e: am a8b838b4: Merge "Fix a test and crash with a better error message when reading"
...
* commit 'c47e7d77adb45daa3d3f13d9481239cf37124f5b':
2013-12-13 01:39:26 -08:00
bd2ee3bc46
am ef27a404: am b4b5bb13: am db90aa44: am 3aa8c4cc: am 3cc9602c: am 319eb1c3: am 77144a64: Merge "Retain Emoji Keyboard after rotation"
...
* commit 'ef27a404cec79b0f508cbd0f6d90db7bf1ea1a0d':
2013-12-13 01:39:22 -08:00
fe4168de3b
am 96fce9da: (-s ours) am 47a28073: am e90347d5: (-s ours) am 2d8f1ca8: (-s ours) am 193fea55: am 358e152b: am e95262a8: (-s ours) am 847fdcf7: (-s ours) am 2f14418c: am e628cd3c: (-s ours) Use reentrant lock for main dictionaries. DO NOT MERGE
...
* commit '96fce9daf457dd33f73ef5c84d66abfa121ac646':
2013-12-13 01:39:18 -08:00
16f89b2c5d
am 0d023cad: am d2cb641f: am ee69dfab: am 1f321875: am 1a33d3eb: am a1ff53fb: am 4b540703: am 2913ce41: am a0c9846f: am ceb364c0: Fix PrioritizedSerialExecutor.
...
* commit '0d023cade22ac1d92f7e06ccd63a13a271179ef0':
2013-12-13 01:39:13 -08:00
764ba676cf
am 8b29b39e: (-s ours) am aae39dca: am b55fc4a3: (-s ours) am 68ccd871: (-s ours) am a0efc4d1: am ab5affde: am b924b2bb: (-s ours) am 83d1648b: (-s ours) am cecb793f: am ef63947f: (-s ours) Add boundary checking for PtNode Array reading. DO NOT MERGE
...
* commit '8b29b39eaa55f727bb4fe66883e6b4f6ee2185e8':
2013-12-13 01:39:09 -08:00
eb8deebfa2
am 917117e8: (-s ours) am e3547be8: am ad51305a: (-s ours) am db9a3e2f: (-s ours) am c53202b4: am 3c623101: am 5e375d42: (-s ours) am 1e113c13: (-s ours) am e628cd3c: Use reentrant lock for main dictionaries. DO NOT MERGE
...
* commit '917117e8d68dabb0378ab45707e0f199acc98e6c':
2013-12-13 01:39:00 -08:00
a8c828116b
am 0d6e05fc: am 012d6776: am 2ee4749d: am 793047bb: am 89b44b43: am a317bf58: am 6bbaf2f8: am 1ef00b28: am ceb364c0: Fix PrioritizedSerialExecutor.
...
* commit '0d6e05fc9d2fd12bcf56ba6249935363d56c71c1':
2013-12-13 01:38:55 -08:00
30af904e8b
am d3cbcd51: (-s ours) am 0c6110c4: am 909d11d2: (-s ours) am 872760d0: (-s ours) am 806a622b: am 30ca32de: am 6ed55278: (-s ours) am 3b3cb4fe: (-s ours) am ef63947f: Add boundary checking for PtNode Array reading. DO NOT MERGE
...
* commit 'd3cbcd518f7170db52c974e24ca71d8dae33991f':
2013-12-13 01:38:51 -08:00
55723c5295
am 1bd4de3c: (-s ours) am 6f291ff1: am bb4c4a9e: (-s ours) am 55754a85: (-s ours) am 99ea6cbb: am 9de5ec25: am 49410adb: (-s ours) am dd8ea0a3: (-s ours) am 10fa6a2e: Stop reading dictionary while regenerating. (DO NOT MERGE)
...
* commit '1bd4de3ce610422be788528b3296b808aa4c60ff':
2013-12-13 01:38:47 -08:00
70bff0fccc
am aebdc758: (-s ours) am 86b5fedf: am 69de823e: (-s ours) am 472bace7: (-s ours) am 750fc3cb: am eff90276: am 9b9d17f9: (-s ours) am e628cd3c: (-s ours) Use reentrant lock for main dictionaries. DO NOT MERGE
...
* commit 'aebdc7585b1635fb11d8936a6508ee2539c615ef':
2013-12-13 01:38:44 -08:00
c3bb34dd0b
am 189f0631: am 4671e069: am a07ca2fb: am 7a00c08c: am 183718f2: am d2265036: am f9ba073d: am ceb364c0: Fix PrioritizedSerialExecutor.
...
* commit '189f06313286c5b9b8dd0eb2e6b6450712e32a2f':
2013-12-13 01:38:34 -08:00
8b5f55dcaa
am 129223f5: (-s ours) am 718ea3a0: am c6bb1ffc: (-s ours) am 777b078d: (-s ours) am 2e082f46: am e0547020: am a6095365: (-s ours) am ef63947f: (-s ours) Add boundary checking for PtNode Array reading. DO NOT MERGE
...
* commit '129223f5bf6e83f0f6e719a64771d68365cb3ec1':
2013-12-13 01:38:31 -08:00
0a55ed3511
am 5c9eb96f: am c07eb2a0: am 20deff07: am 9d527c02: am 2e7f74f0: am 615509cf: am 9d763910: Merge "Unfortunately, hide some broken "emoji"s"
...
* commit '5c9eb96fad437cb6afc59f63f679dae2a5c33188':
2013-12-13 01:38:27 -08:00
5df6c582ce
am 4f47e036: am 1229050f: am fcdfe6f3: am e8c01167: am e398d09a: am af75e48e: am 74577bed: Merge "Implement the heuristic for auto-commit."
...
* commit '4f47e036e271fb96dc9a80239fd2f4ba344a623d':
2013-12-13 01:38:23 -08:00
b13a8ac28f
am 7a3cb2ae: am a9170be5: am c54b61b9: am e2598657: am 1f8eab7d: am a6e7c3ff: am ff9476f1: Merge "Fix typos"
...
* commit '7a3cb2ae76832cc2f8d2cc07689e74e0fd85f475':
2013-12-13 01:38:18 -08:00
2d28f0f1f5
am fc329909: am 3e1332de: am 1508b0a7: am dc674273: am 805bae95: am 6f2830dc: am 2afa0e62: Merge "Fix a bug where gesture would delay update."
...
* commit 'fc329909d89d4e8e2c0764a8d7cf613be32e80ed':
2013-12-13 01:38:14 -08:00
c47012d61c
am 9cd45069: am 9cbfee4d: am cbf7517e: am 72b41953: am 3dd81856: am a9f5c55c: am 382094a7: Merge "Cleanup and remove redundant more keys on phones"
...
* commit '9cd450690424e840621dd2c5cf8f671bd78dcded':
2013-12-13 01:38:09 -08:00
7e117e872f
am eeccfab7: am 956ac0d6: am 037e3e92: am 3d87eff7: am 272a8b79: am 88c946af: am 194c6360: Merge "Swap keys: exclamation, question, period, comma."
...
* commit 'eeccfab716913ba523a56f8b3c6478df6aa4fd1d':
2013-12-13 01:38:00 -08:00
2689bc7c7e
am 43438cd7: am 9e8a781f: am 067c45d7: am 1fa00902: am d5ff552c: am a231c2ab: am e89a179b: Merge "Separate "GC" and "GC with decay"."
...
* commit '43438cd731537acc207b5c7d9687d6fec9c5c6a3':
2013-12-13 01:37:55 -08:00
52bc0b3563
am ef61cc3d: am 3ada5eff: am bfbea569: am f7b2afdd: am b04568b4: am 1522e7be: am cc81a93b: Merge "Add skipPtNode to DictDecoders."
...
* commit 'ef61cc3db0b7dbafffdeb30b42dc8ecec6555a7a':
2013-12-13 01:37:51 -08:00
955269ee1f
am 441ac782: am 43da969b: am 157e5613: am 80e1b915: am acdd67bb: am 98da7cfc: am c2dda795: Tentatively revert inconsistent assets
...
* commit '441ac7829a7dbdfa02e5916cb64c3ed143f2bfd5':
2013-12-13 01:37:47 -08:00
30e241c2ee
am 685e222d: am 5da6dd4f: am d318214c: am bbc69086: am 8498002a: am db083a2b: am a4913994: Hide indication bar if only one page
...
* commit '685e222d81a396ed610b2fa5d9dde9d20a284048':
2013-12-13 01:37:42 -08:00
382aa7d904
am faeca3b2: am 0b8afe47: am aa50b08a: am ebca9e69: am 07fe0997: am d00e4865: am 126d758c: Merge "Quit blocking getSuggestion during GC."
...
* commit 'faeca3b2139bbd6374b747d3b13590781e7058de':
2013-12-13 01:37:38 -08:00
e8e7ed5ca8
am 755921e5: am ac92967e: am 4c13a585: am c92d7d26: am 645d9927: am bff2d14d: am 74730a46: Merge "Create the wiring for auto-commit confidence computation."
...
* commit '755921e5effb55afa35ac19e30ead89b9317ec04':
2013-12-13 01:37:33 -08:00
7784324c97
am 34442ed0: am 1dcd6dc1: am 9257c049: Merge "Revert "Add Swiss French and German keyboard layouts.""
...
* commit '34442ed0e06d77ba1f4cf56615070cf984380af6':
2013-12-13 01:37:29 -08:00
cc1bb3e16d
am e5bbe23e: am a0797f45: am 064661a3: Merge "Add Swiss French and German keyboard layouts."
...
* commit 'e5bbe23ee30b2ff7f9f4793edc98fbe1627b6b0c':
2013-12-13 01:37:25 -08:00
a68484a4f4
am d412279e: am 550a2e54: am 6b211313: am 6c69c218: am d8d2a9fc: am 02092936: merge in KQS81M
...
* commit 'd412279e4ad900b22657ee08aba725ab729156a5':
2013-12-13 01:37:20 -08:00
a642996dad
am 16844cb9: am 0a90c5a5: am 9a802e0d: Merge "Support sw540 (ultra Z)"
...
* commit '16844cb98c171424d27eadbc75f78a77cc74c9a8':
2013-12-13 01:37:12 -08:00
815a339201
Fix key top letter color in shifted layout
...
There is a chance to have an empty hint label even though
keyLabelFlags has hasShiftedLetterHint flag.
Change-Id: I63b9fcc42a40391d5902814cae4c75abb61e4b94
2013-12-13 18:34:30 +09:00
a245d15da5
Have dicttool use the native library to generate v4 dicts.
...
Yay !
Change-Id: Iea8ced9e81031b9ab7eff05ad9ef7215be248de9
2013-12-13 18:18:20 +09:00
af0c222a5e
Merge "Remove flags from Java side."
2013-12-13 09:17:10 +00:00
7b55cd3e2b
Remove flags from Java side.
...
This simplifies the code quite a bit.
- GERMAN_UMLAUTS are now handled through a key-value attribute.
The dictionary generator does not need to know about it any more.
- FRENCH_LIGATURES are deprecated as we handle them with shortcuts now.
- CONTAINS_BIGRAMS is deprecated. Bigram processing is always applied
regardless of this flag.
Bug: 11281748
Change-Id: If567e52e245a9342adc7f3104a0f7d8d782df8c1
2013-12-13 18:15:05 +09:00
a5b196e939
[FIX] Separate form factor dependent config resources
...
This is a cherry-pick of I668b55a514.
Change-Id: I00e9a74812d622c12af0337ba50e1b2f1d675cf1
2013-12-13 18:01:01 +09:00
7345059fa6
Merge "Make ExpandableBinaryDictionary usable for offdevice tests."
2013-12-13 08:54:15 +00:00
07e2b6b865
am 5e11efa5: keep history after reset to klp-volantis-dev
...
* commit '5e11efa5152d3bb822ed80201402762db8d797f1':
2013-12-13 00:37:23 -08:00
2efeae27ef
am e60d947c: keep history after reset to klp-dev-plus-aosp
...
* commit 'e60d947c1fbac3e2c2ff9c1e4f600895390351cb':
2013-12-13 00:37:18 -08:00
941b0226a5
am 847d956c: keep history after reset to klp-ub-dev
...
* commit '847d956c7099a0a39f190acfd4d8e86b571f65dd':
2013-12-13 00:37:14 -08:00
f2050bbe97
am 555741ae: (-s ours) keep history after reset to klp-dev
...
* commit '555741aef7ae96071884a65cfb2c82a9e907603b':
2013-12-13 00:37:06 -08:00
ca8cb7a983
am fd9f8008: (-s ours) keep history after reset to jb-ub-latinimegoogle-bayo
...
* commit 'fd9f8008641e618f085e0e8c168a337b00b0d0af':
2013-12-13 00:31:28 -08:00
a04c92cbe4
am 8db783ba: (-s ours) Import translations. DO NOT MERGE
...
* commit '8db783ba81d8f91d6a80effdb6abcea1e6e1bf1a':
Import translations. DO NOT MERGE
2013-12-13 00:25:46 -08:00
508aa7a6c0
am 7debaee7: (-s ours) Import translations. DO NOT MERGE
...
* commit '7debaee7a4ecdb1cc726f5387654d27c2a6aed68':
Import translations. DO NOT MERGE
2013-12-13 00:25:42 -08:00
97184dfa5e
am 2eea2d50: (-s ours) Update Color Scheme summary explicitly
...
* commit '2eea2d50079275675666a830ae7a4228fa512c1d':
Update Color Scheme summary explicitly
2013-12-13 00:25:38 -08:00
0f93d7d79c
am ca5cdc69: (-s ours) Show mic key option on sw540 device
...
* commit 'ca5cdc69967441a50b9297edccacc426116bf8ce':
Show mic key option on sw540 device
2013-12-13 00:20:01 -08:00
7d36f1614e
am ea8f8da1: Fix unusual NPE after onDestroy
...
* commit 'ea8f8da1acf4082b56cb461048d9038f634439be':
Fix unusual NPE after onDestroy
2013-12-13 00:14:02 -08:00
893a83dda0
am db86a6f2: (-s ours) Add keyboard color switch option
...
* commit 'db86a6f271e5ca446382061f219928c5eb6b9f01':
Add keyboard color switch option
2013-12-13 00:13:58 -08:00
2fa3693c26
Reset to 9bd6dac470
...
The bulk merge from -bayo to klp-dev should not have been merged to master.
Change-Id: I527a03a76f5247e4939a672f27c314dc11cbb854
2013-12-13 17:13:32 +09:00
ede5105fd8
am 51352009: (-s ours) Add JB/ICS resources from Azuki MR1 release
...
* commit '51352009b5ac418d20826e034e5989705131aeca':
Add JB/ICS resources from Azuki MR1 release
2013-12-13 00:03:11 -08:00
Jean Chalard
Keisuke Kuroyanagi
Satoshi Kataoka
Yuichiro Hanada
Ken Wakasa
Ed Heyl
Tadashi G. Takaoka
Baligh Uddin
Geoff Mendal