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
Tadashi G. Takaoka
651dd0a539
am ba8ac2ed
: am 6bcf315f
: am f32f75c7
: am bc19d290
: am 4b546c61
: am 8e519cf3
: am 854227ac
: am a3768015
: am 680fa7ba
: am 82a7b185
: am 16ec2e11
: Merge "Add finish action to setup wizard"
...
* commit 'ba8ac2edd085f37fc92ef87db1624355d9cc5d1a':
2013-10-09 18:06:47 -07:00
Jean Chalard
779e28dc13
am a7bdb35b
: am 51b3fd40
: am 00d78b87
: am a5283e19
: am 9a030f86
: am f650f359
: am 938fe9b5
: am ce957e05
: am c436f3a1
: am 1a835efc
: am ff078041
: am f1dde6a1
: am 758c74fe
: Merge "Fix an NPE in recorrection" into jb-mr2-dev
...
* commit 'a7bdb35b62267c9caab60d6d73a304ddd104da2f':
2013-10-09 18:06:44 -07:00
Jean Chalard
a3d2c925ab
am 4c997f05
: am 4e213389
: am 2a11dabc
: am 2e540372
: am c054cd7e
: am 4c5753b2
: am 32f2ea14
: am c6f4f13e
: am 7bb6c903
: am b7abaafe
: am e5cbdfe1
: am 3629605b
: am 77226ed0
: Merge "Fix an NPE in recapitalize" into jb-mr2-dev
...
* commit '4c997f052f884907c479108add1c1f0bcc56194d':
2013-10-09 18:06:41 -07:00
Tadashi G. Takaoka
8666930791
am 7bd53c61
: am c9da8866
: am 4f44466b
: am e610e392
: am e4cbf9ec
: am 6b6fb329
: am 8cff4b77
: am 48973cc7
: am 8f9a8734
: am fc2ca29d
: am f10046bd
: Remove ScrollView from setup wizard
...
* commit '7bd53c6129765cbfff088b36fee214f57f776077':
2013-10-09 18:06:38 -07:00
Tadashi G. Takaoka
75acd3ffba
am ba095b5d
: am a8158a9f
: am 2a661d8b
: am 3cd9c140
: am 5e883d06
: am fd2ea588
: am 59ae862c
: am 708e7b0d
: am 448b28be
: am ed0d1156
: am 30f102e2
: Move some attributes of setup wizard layouts to style files
...
* commit 'ba095b5d4e2b4fb5039dda4f204c19e921e4d701':
2013-10-09 18:06:35 -07:00
Tadashi G. Takaoka
b2e5e35a89
am abd8afa2
: am bdcf05b4
: am de84d8f9
: am 153c0230
: am 98db6091
: am 38484627
: am 10d4986d
: am e3407b75
: am 64510ad9
: am ae19f170
: am 1f6e06cf
: Merge "Make setup wizard step number highlighted when activated"
...
* commit 'abd8afa22688bb930c645914406eb3a22a9a0b63':
2013-10-09 18:06:33 -07:00
Tadashi G. Takaoka
ff69d96032
am 0ad7f698
: am 2fea38af
: am 5c304910
: am 06eadd26
: am 3a25db77
: am db8c29d4
: am 4c33e807
: am 68067fce
: am 8b085e7f
: am 7158438a
: am 88ee052c
: Merge "Update strings of setup wizard"
...
* commit '0ad7f698c0b572b2671cf35a84942d9fd4012b86':
2013-10-09 18:06:30 -07:00
Baligh Uddin
814d53af58
am 47cc6d6e
: am 120d48d7
: am c4285ab5
: (-s ours) am cb5f9318
: (-s ours) am 1de7860b
: (-s ours) am 8c765113
: (-s ours) am 3856755f
: (-s ours) am 12b3ae1b
: (-s ours) am 97c48a10
: (-s ours) am ef70fdd5
: am 04211b91
: (-s ours) am dcc59297
: am 1844bec2
: Merge "Import trans
...
* commit '47cc6d6e40a2c9d83c39e284989bd6a8f9b21f99':
2013-10-09 18:06:26 -07:00
Baligh Uddin
a7e3c0b18d
am 43df4466
: (-s ours) am 610aefd5
: (-s ours) am 2b17c3bf
: (-s ours) am 07aaf165
: (-s ours) am d93e39df
: (-s ours) am 1d7997ba
: (-s ours) am 052034e9
: (-s ours) am 9183a408
: (-s ours) am 4f87306b
: (-s ours) am 3f4d2105
: (-s ours) Merge "Import translations. DO NOT MERGE" into j
...
* commit '43df4466e7fc784ee2189226f3b5951a6997593e':
2013-10-09 18:06:24 -07:00
Ken Wakasa
e1fa087879
am d493f255
: am f1519ba0
: am cd7dadb8
: am b3fd4401
: am afe838e8
: am bcba9391
: am 73b8411a
: am c3425d97
: am 3239d7f6
: am 4f1a832d
: am f02e2693
: am 55b306c9
: am 64eda4f4
: Merge "Fix an infinite loop" into jb-mr2-dev
...
* commit 'd493f255fdb682f47f19aec2a0720ffaeb755f30':
2013-10-09 18:06:21 -07:00
Jean Chalard
9a20354e1b
am d8484f48
: am 5ea8667c
: am 1060a8a6
: am 8eef0934
: am c9f4b9fd
: am be9d5d71
: am b6584a6d
: am c5645d67
: am 1b1fc5d7
: am 936fc9ab
: am 3a18ae70
: am a5d2da82
: am d91268ad
: Initialize dictionaries at onStartInputView
...
* commit 'd8484f48910364b6d909bf1d8bf8f8647bd2238c':
2013-10-09 18:06:17 -07:00
Jean Chalard
5ac65f06d1
am ce09fd96
: am bfe2958f
: am a5bbad8f
: am 6f835f65
: am 7e9f08b1
: am 241050a8
: am ef2f8ce6
: am 0d3d8f53
: am 52e0b3d1
: am 0e64fbbc
: am 9cf46864
: Update dictionaries
...
* commit 'ce09fd9668ae343ff4c4514bf151be0bdf1ebf28':
2013-10-09 18:06:15 -07:00
Tadashi G. Takaoka
029c59564f
am 5f1c8f9b
: am cdc7e24f
: am 8c874504
: am cd81ac9c
: am cc138a5f
: am 485dc598
: am c2052268
: am c9848ad1
: am a06fdaad
: am 64e87b3e
: am 0b2d184a
: Merge "Update setup wizard icons"
...
* commit '5f1c8f9b8e6c96c546bdfa22b76cf819ad2b6673':
2013-10-09 18:06:11 -07:00
Kurt Partridge
acec94728f
am 9d178507
: am d6a7426f
: am c064f022
: am b0055a06
: am b410aab6
: am 4aeb5601
: am 9dcdd3ce
: am 70ee9dc1
: am 1efcbd67
: am 8acab80a
: am 56f35a10
: Merge "Fix bug in counting words between samples"
...
* commit '9d17850704fa575952753e550ed7195f63506956':
2013-10-09 18:06:08 -07:00
Tadashi G. Takaoka
0a9e4f01ad
am dbe0aa53
: am 5225eed7
: am 4004f339
: am c2a40f28
: am 941056ed
: am f3f8735b
: am 787085d4
: am fd140374
: am bec53aa0
: am 0163591d
: am 550824c7
: am 93c31e17
: am 530fd15e
: Fix bug to update last interpolated index of GestureStroke
...
* commit 'dbe0aa531fd95513e26be3aa7f34cfb3a17d4d66':
2013-10-09 18:06:06 -07:00
The Android Automerger
96e3ac2695
am b8d993e8
: am defdb798
: am d315a219
: am 164f8ac6
: am 5f252463
: am 96260e92
: am b86c20e5
: am 67f00c11
: am 4e37f65f
: am c986021b
: am 453c70a2
: am 17e55d3b
: am 45fd237c
: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
...
* commit 'b8d993e8cd09486a916fe9311b0bc0b32c4b3b60':
2013-10-09 18:06:00 -07:00
Tom Ouyang
41bc140389
am 3e7ffc01
: am c9e301ed
: am 11f8a122
: am 5ddb483d
: am 7b0c6682
: am 0b02eff7
: am 3777ee6b
: am 316908cb
: am 48cda918
: am af0d19b5
: am ac37c939
: am 05da1df8
: am 880cb618
: am 3970352e
: Make digraph lookups case insensitive
...
* commit '3e7ffc0139d1e27137176d7c1ef796511842040e':
2013-10-09 18:05:57 -07:00
Ken Wakasa
e74feb6e45
am d2cb668f
: am 96375630
: am 13f8529a
: am 3ca142e8
: am 287ec203
: am 8d6131b5
: am a10783fb
: am ce343db9
: am 4560a386
: am a6058856
: am 6aac8ba7
: am ad3ebcbd
: am ef83a2eb
: am e01e22e1
: Merge "Update SORTED_CHAR_MAP"
...
* commit 'd2cb668f93e5eaaa687d86d1e3c266438c3ef44e':
2013-10-09 18:05:53 -07:00
Jean Chalard
9f4db8ebaf
am 0ddf83df
: am 45371007
: am eaeb55d1
: am 39654ba6
: am b953b5a0
: am 33591fba
: am d357269c
: am 38a29eb3
: am 390318fb
: am 910bee79
: am f08505af
: am 38d52c0a
: am a694c9ba
: am ff766f8c
: Merge "Don\'t insert automatic spaces when text looks like a URL"
...
* commit '0ddf83df20aa580d369b01f26d5484ecb13b3c42':
2013-10-09 18:05:51 -07:00
Tadashi G. Takaoka
067e7a1fb0
am 2aa2f32e
: am 2d9ad296
: am 237f8644
: am fa9ed548
: am 0eb8f833
: am 8e923214
: am dcc42bbf
: am 2a7c8b90
: am b1b9fc03
: am f7e2ed72
: am 5b30137d
: am 38046a0a
: am 7abeccfa
: am 1711f986
: Merge "Add shadow to gesture preview trail"
...
* commit '2aa2f32ee01b9f1a4f41587c94a1fb77a34baed6':
2013-10-09 18:05:47 -07:00
Satoshi Kataoka
d4c4bcfca0
am bf0a284e
: am b894bea7
: am bd2d4669
: am 46956447
: am 53aec98e
: am 37d3bcb9
: am 4c6b7c50
: am 80fade03
: am 7e04bf26
: am 8fa3fae2
: am e1b9653b
: am a23e25cc
: am 93a429a7
: am 252412d7
: Use additional multi-word cost per language (for Russian)
...
* commit 'bf0a284e9ec798c7d40e5f3c3a5eef3b7499983b':
2013-10-09 18:05:44 -07:00
Jean Chalard
5140981799
am 7e2b8662
: am bcfa81c9
: am 2ec9629e
: am af283380
: am 91d465ef
: am 74d8aa93
: am 64820842
: am 79a64f35
: am d45893bd
: am eef11d43
: am 52a8f30e
: am 7f8e55ec
: am c6c17b93
: am 962c9f05
: Merge "Small cleanup"
...
* commit '7e2b866289d990a1336b5ad07c3af4d1618d0fbf':
2013-10-09 18:05:42 -07:00