Keisuke Kuroyanagi
3a82852bdd
am 08cb102b
: am 372ce559
: am 7e6e9701
: Merge "Fix: Native crash when an empty attribute is written."
...
* commit '08cb102bd8d24fcb56ee884018c97cd811ad0ac3':
Fix: Native crash when an empty attribute is written.
2013-10-09 19:33:27 -07:00
Satoshi Kataoka
12dde1e931
am 37da650b
: am 5fbd356a
: am 85607c59
: Merge "Fix the subtype id of the additional subtypes"
...
* commit '37da650b75862296569d769d70ce025a2ecefb05':
Fix the subtype id of the additional subtypes
2013-10-09 19:33:25 -07:00
Satoshi Kataoka
efa3ef17e9
am 26a97909
: am 3977cc97
: am c7f8d54d
: Merge "Prepare for changing text color for functional keys"
...
* commit '26a97909f6d1cfad2cc417a2bef91d977b076158':
Prepare for changing text color for functional keys
2013-10-09 19:33:22 -07:00
Baligh Uddin
2512314de1
am 9eea9b07
: (-s ours) am 38d169b3
: (-s ours) am 1bbd4933
: (-s ours) Import translations. DO NOT MERGE
...
* commit '9eea9b077d739811c67931966357d803a6151c20':
Import translations. DO NOT MERGE
2013-10-09 19:33:18 -07:00
Baligh Uddin
73fd6c75fe
am 159e970c
: (-s ours) am e1e6819a
: (-s ours) Import translations. DO NOT MERGE
...
* commit '159e970c8b4cb2408b518a60c364f549bea184d3':
Import translations. DO NOT MERGE
2013-10-09 19:33:16 -07:00
Keisuke Kuroyanagi
9ee3d14b83
am 732b5e13
: am 96b0f24f
: am 3d929541
: Fix build.
...
* commit '732b5e133b07d6ead717ed91ec121f8f1b8024a2':
Fix build.
2013-10-09 19:33:12 -07:00
Keisuke Kuroyanagi
2c79a62cf5
am 9115f38b
: am ec5ad29a
: am d25cd26f
: Merge "Try decaying user history at hourly intervals."
...
* commit '9115f38b42e050987787f1e25f84bff620bcea6d':
Try decaying user history at hourly intervals.
2013-10-09 19:33:10 -07:00
Keisuke Kuroyanagi
4d8f27ad09
am 3cabfcef
: am 28efd918
: am ba9dc086
: Merge "Use probability table for decaying dictionaries."
...
* commit '3cabfcef68e12b8c7f606dacb13ce2d57f08d2e1':
Use probability table for decaying dictionaries.
2013-10-09 19:33:07 -07:00
Ken Wakasa
5ec9e14eb1
am aa3ae615
: am 72c870f5
: am 596a565a
: Merge "Remove some unused variables."
...
* commit 'aa3ae615d29e8371f873ec870d10e20f67d7c33d':
Remove some unused variables.
2013-10-09 19:33:04 -07:00
Keisuke Kuroyanagi
4ff72a6240
am a544cf0a
: am 879ae3aa
: am 21ce9c4a
: Merge "Stochastic decay."
...
* commit 'a544cf0a4185ff46bdaa229dac4ff865c8bc4495':
Stochastic decay.
2013-10-09 19:33:00 -07:00
Ken Wakasa
fce7e730f0
am 8037b971
: am da4d87ff
: am 2dcb6337
: Merge "Make SparseTable have multiple content tables."
...
* commit '8037b971c24d150deb8aef4b442ed2b21e44e83a':
Make SparseTable have multiple content tables.
2013-10-09 19:32:57 -07:00
Jean Chalard
ff95897fea
am d0b02b52
: am 93c2fa8d
: am cd7422f4
: Merge "Fix a pernicious bug with caps."
...
* commit 'd0b02b526abcb71245c7f6021170e31988b75bab':
Fix a pernicious bug with caps.
2013-10-09 19:32:54 -07:00
Keisuke Kuroyanagi
14307df8ff
am 8ee8178e
: am 0fbad0fa
: am 52c20927
: Merge "Change name of DecayingUtils."
...
* commit '8ee8178eb7f99bdaf87d715a3e134fb29909523e':
Change name of DecayingUtils.
2013-10-09 19:32:51 -07:00
Satoshi Kataoka
03c5029cdb
am 96fdbaa3
: am 85eba056
: am c5182c9a
: Correspond to the security related API change for PreferenceActivity
...
* commit '96fdbaa367b0bd7d052df48cb7a3197c1a37ac8e':
Correspond to the security related API change for PreferenceActivity
2013-10-09 19:32:48 -07:00
Jean Chalard
6877060b7b
am 4afd8ff4
: am 0874939e
: am a8b838b4
: Merge "Fix a test and crash with a better error message when reading"
...
* commit '4afd8ff474eb0e363a14393298b3f372ce813d1d':
Fix a test and crash with a better error message when reading
2013-10-09 19:32:45 -07:00
Satoshi Kataoka
3aa8c4cc1f
am 3cc9602c
: am 319eb1c3
: am 77144a64
: Merge "Retain Emoji Keyboard after rotation"
...
* commit '3cc9602c578ed43d34462dc0af4d9c0d6847a86f':
Retain Emoji Keyboard after rotation
2013-10-09 19:32:43 -07:00
Keisuke Kuroyanagi
2d8f1ca8c2
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 '193fea55d98b3964f1c8d7174e39abc40bb0633e':
2013-10-09 19:32:40 -07:00
Yuichiro Hanada
1f3218756b
am 1a33d3eb
: am a1ff53fb
: am 4b540703
: am 2913ce41
: am a0c9846f
: am ceb364c0
: Fix PrioritizedSerialExecutor.
...
* commit '1a33d3eb6e1c3ddefc860eb6f3030d862f473e5e':
2013-10-09 19:32:37 -07:00
Keisuke Kuroyanagi
68ccd8718a
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 'a0efc4d1e1dbaa95458605c6e0a9b4d0dacdc1fe':
2013-10-09 19:32:34 -07:00
Keisuke Kuroyanagi
db9a3e2fd0
am c53202b4
: am 3c623101
: am 5e375d42
: (-s ours) am 1e113c13
: (-s ours) am e628cd3c
: Use reentrant lock for main dictionaries. DO NOT MERGE
...
* commit 'c53202b441def12d0a88266c8d7f4467a84061e6':
2013-10-09 19:32:31 -07:00
Yuichiro Hanada
793047bb60
am 89b44b43
: am a317bf58
: am 6bbaf2f8
: am 1ef00b28
: am ceb364c0
: Fix PrioritizedSerialExecutor.
...
* commit '89b44b43f42809442c9a99d334aa5f6fa5be1330':
2013-10-09 19:32:28 -07:00
Keisuke Kuroyanagi
872760d091
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 '806a622b23358e7f6e206e90d72bd5b670bd2b1b':
2013-10-09 19:32:25 -07:00
Keisuke Kuroyanagi
55754a8536
am 99ea6cbb
: am 9de5ec25
: am 49410adb
: (-s ours) am dd8ea0a3
: (-s ours) am 10fa6a2e
: Stop reading dictionary while regenerating. (DO NOT MERGE)
...
* commit '99ea6cbb58870853372ab5eadf49910ba1ea2298':
2013-10-09 19:32:22 -07:00
Keisuke Kuroyanagi
472bace7db
am 750fc3cb
: am eff90276
: am 9b9d17f9
: (-s ours) am e628cd3c
: (-s ours) Use reentrant lock for main dictionaries. DO NOT MERGE
...
* commit '750fc3cb227be627af0f50f00ea19ef3a2f63673':
2013-10-09 19:32:17 -07:00
Yuichiro Hanada
7a00c08c6d
am 183718f2
: am d2265036
: am f9ba073d
: am ceb364c0
: Fix PrioritizedSerialExecutor.
...
* commit '183718f2762fa7616899770124c943c97f8f138a':
2013-10-09 19:32:14 -07:00
Keisuke Kuroyanagi
777b078d75
am 2e082f46
: am e0547020
: am a6095365
: (-s ours) am ef63947f
: (-s ours) Add boundary checking for PtNode Array reading. DO NOT MERGE
...
* commit '2e082f46aad2b2a6f6d0f9786fdb40bbe592077e':
2013-10-09 19:32:11 -07:00
Satoshi Kataoka
9d527c0225
am 2e7f74f0
: am 615509cf
: am 9d763910
: Merge "Unfortunately, hide some broken "emoji"s"
...
* commit '2e7f74f00cd6e9ba7e7be9ee1ba07ec0066ffe15':
Unfortunately, hide some broken "emoji"s
2013-10-09 19:32:07 -07:00
Jean Chalard
e8c011679a
am e398d09a
: am af75e48e
: am 74577bed
: Merge "Implement the heuristic for auto-commit."
...
* commit 'e398d09a50486d1b91ce109f4bd1a7529560c634':
Implement the heuristic for auto-commit.
2013-10-09 19:32:05 -07:00
Jean Chalard
e2598657c3
am 1f8eab7d
: am a6e7c3ff
: am ff9476f1
: Merge "Fix typos"
...
* commit '1f8eab7d79f35d11162c45726b3ee95bbe7ad961':
Fix typos
2013-10-09 19:32:02 -07:00
Jean Chalard
dc674273ac
am 805bae95
: am 6f2830dc
: am 2afa0e62
: Merge "Fix a bug where gesture would delay update."
...
* commit '805bae9575809be17e61aa1f82e36c9f0d365ba7':
Fix a bug where gesture would delay update.
2013-10-09 19:31:59 -07:00
Ken Wakasa
72b4195360
am 3dd81856
: am a9f5c55c
: am 382094a7
: Merge "Cleanup and remove redundant more keys on phones"
...
* commit '3dd818565676f8a08b4bd29ba4909b1593a1d924':
Cleanup and remove redundant more keys on phones
2013-10-09 19:31:56 -07:00
Ken Wakasa
3d87eff739
am 272a8b79
: am 88c946af
: am 194c6360
: Merge "Swap keys: exclamation, question, period, comma."
...
* commit '272a8b79d81f77f244a9836f3d02516bb29063e5':
Swap keys: exclamation, question, period, comma.
2013-10-09 19:31:53 -07:00
Keisuke Kuroyanagi
1fa00902b3
am d5ff552c
: am a231c2ab
: am e89a179b
: Merge "Separate "GC" and "GC with decay"."
...
* commit 'd5ff552c9e5fe0bfcfd01d78dc8cd44d618981e4':
Separate "GC" and "GC with decay".
2013-10-09 19:31:50 -07:00
Ken Wakasa
f7b2afdd82
am b04568b4
: am 1522e7be
: am cc81a93b
: Merge "Add skipPtNode to DictDecoders."
...
* commit 'b04568b460837c01f99cc04be81f10077b54c473':
Add skipPtNode to DictDecoders.
2013-10-09 19:31:47 -07:00
Satoshi Kataoka
80e1b915b9
am acdd67bb
: am 98da7cfc
: am c2dda795
: Tentatively revert inconsistent assets
...
* commit 'acdd67bb42de51d429f449bf173a0cd9f841f012':
Tentatively revert inconsistent assets
2013-10-09 19:31:44 -07:00
Satoshi Kataoka
bbc6908670
am 8498002a
: am db083a2b
: am a4913994
: Hide indication bar if only one page
...
* commit '8498002afb7e8a76552aca89e9fb1beeabd76349':
Hide indication bar if only one page
2013-10-09 19:31:41 -07:00
Keisuke Kuroyanagi
ebca9e69f7
am 07fe0997
: am d00e4865
: am 126d758c
: Merge "Quit blocking getSuggestion during GC."
...
* commit '07fe09976580bf3432425ab208d149fc38f0696d':
Quit blocking getSuggestion during GC.
2013-10-09 19:31:39 -07:00
Jean Chalard
c92d7d263e
am 645d9927
: am bff2d14d
: am 74730a46
: Merge "Create the wiring for auto-commit confidence computation."
...
* commit '645d992786ab521bbfa4533dc7f9de4f76dac475':
Create the wiring for auto-commit confidence computation.
2013-10-09 19:31:36 -07:00
Ken Wakasa
9257c04967
Merge "Revert "Add Swiss French and German keyboard layouts.""
2013-10-10 02:06:12 +00:00
Ken Wakasa
56402cf10a
Revert "Add Swiss French and German keyboard layouts."
...
This reverts commit 220ce8f269
.
Sorry, but we are now in the week before the final cut for the next launch. We shouldn't be taking new features like this at this point. Let me revert this change for now. I'll re-revert this after the cut next week.
Change-Id: Ia8b00680c992ec526e6a858945f2380cbcdfdd55
2013-10-10 02:05:50 +00:00
Jean Chalard
9945198448
am ff579f18
: am f84f4755
: am 18844fcf
: am 05547ac0
: am a4f4b660
: am db16a616
: am 202677b7
: am 5267bbc5
: am 926abffa
: am 42abed7f
: am 9a98ef69
: Merge "[ZF3] Add the option to block potentially offensive words"
...
* commit 'ff579f187dd30676a5d4730d9d8711f863553d52':
2013-10-09 18:09:34 -07:00
Jean Chalard
ca94c14362
am ed2bdbe7
: am a91f7c64
: am 8da8a884
: am 1f95ce93
: am ffee718e
: am 46704d26
: am c5015deb
: am 1101227f
: am 3160671b
: am 330072b0
: am c03aaa1b
: Merge "[ZF2] Read settings for profanity filtering."
...
* commit 'ed2bdbe7839d860469613d4281a09d0cce6a3738':
2013-10-09 18:09:31 -07:00
Jean Chalard
c54ff2a2da
am e1d23684
: am 3dd074f0
: am e0f78d5a
: am 9b525ef6
: am 8ab5967a
: am 0b459d21
: am edfb5bc9
: am 3d3902ff
: am 4746093c
: am a9b0c4fb
: am 1ff8b1ce
: Merge "Update dictionaries"
...
* commit 'e1d23684d88226ab85a41466f2b271671fa13568':
2013-10-09 18:09:28 -07:00
Satoshi Kataoka
0a230b9162
am 179108b1
: am 03bf6a49
: am ae478dc0
: am b8dc0e0d
: am 5f0d026b
: am d7260980
: am 6e77dadf
: am 501a4755
: am 685b6558
: am 75a6a525
: am adbafa1a
: Merge "Support ICS on the user dictionary settings"
...
* commit '179108b171504990ca3a87a0bfc22e55aa538750':
2013-10-09 18:09:25 -07:00
Tadashi G. Takaoka
9d75fa96e2
am f17593b6
: am 6a6a0331
: am 7803072f
: am ca385e30
: am eb6be873
: am 6b21eca0
: am a7458183
: am 4036c18a
: am e681b528
: am 7a2fbbb3
: am 4bb312c7
: Merge "Add strings-appname.xml to AOSP Android Keyboard project"
...
* commit 'f17593b6214622c1b496cc647a5818e6dd1f7800':
2013-10-09 18:09:22 -07:00
Tadashi G. Takaoka
736bb6683d
am f5060284
: am d93482a9
: am 219eef3f
: am b09e9222
: am 913ce054
: am b7407520
: am 4ac9456c
: am 41d46c84
: am 33eaf073
: am 01f044b0
: am dca46b50
: Merge "Keep task stack when invoking settings from setup wizard"
...
* commit 'f506028466ad2970064990c536a623769809697a':
2013-10-09 18:09:19 -07:00
Tadashi G. Takaoka
9b7f06501f
am 51b70e0c
: am f7fd2259
: am 375024af
: am 82a0080a
: am a29d3b63
: am 1ac906a7
: am 30ef393d
: am 09b8783d
: am 037be7fa
: am 3385fe8f
: am 9fc82bdb
: Merge "Remove graying animation of alt-code keys while typing"
...
* commit '51b70e0c65e340115bd878ebdb3dc475d3344f00':
2013-10-09 18:09:16 -07:00
Tom Ouyang
4c5b824b70
am 4a0a1ef5
: am 589ea327
: am 274a9c6d
: am d40e77d8
: am 49992dac
: am d248d49c
: am 77b4c24a
: am d0e57396
: am b55f0be8
: am 17fce9e3
: am fd02ec10
: Always consider corrections of intentional omissions (e.g., apostrophe)
...
* commit '4a0a1ef544b191ad4600c1bf9f532506cffcdfa4':
2013-10-09 18:09:14 -07:00
Jean Chalard
98ba25ab84
am 84ce99ca
: am 7d6b55a0
: am 4318a311
: am 99915d92
: am 87de110c
: am 0185bdf8
: am 97fe53b9
: am c471c0e5
: am 511432b2
: am ba4677fe
: am df3ca042
: Fix deleting a dictionary
...
* commit '84ce99ca8a483112665c1cc9f29da93f613cfbc8':
2013-10-09 18:09:12 -07:00
Jean Chalard
b2e96dd31a
am 30317458
: am cd620000
: am b135da78
: am 0f978c4d
: am a024aba2
: am 334f5e8e
: am b5ba5f4b
: am f089e298
: am 5ca33bdc
: am 12b35158
: am 1919072c
: Merge "[ZF1] Check profanity in Java rather than in native"
...
* commit '303174587058beab4da05c4ea86cbd58acfac32a':
2013-10-09 18:09:09 -07:00