Jean Chalard
c54b61b9c6
am e2598657: am 1f8eab7d: am a6e7c3ff: am ff9476f1: Merge "Fix typos"
...
* commit 'e2598657c3b773ff23283b7f194a49a7d1482a70':
2013-10-09 22:40:55 -07:00
Jean Chalard
1508b0a7e3
am dc674273: am 805bae95: am 6f2830dc: am 2afa0e62: Merge "Fix a bug where gesture would delay update."
...
* commit 'dc674273aca7375c4647c8fb8248f637e0abdd44':
2013-10-09 22:40:52 -07:00
Ken Wakasa
cbf7517e7b
am 72b41953: am 3dd81856: am a9f5c55c: am 382094a7: Merge "Cleanup and remove redundant more keys on phones"
...
* commit '72b41953602690c14cf5fdcc0bcd8350d32bcd56':
2013-10-09 22:40:49 -07:00
Ken Wakasa
037e3e92fe
am 3d87eff7: am 272a8b79: am 88c946af: am 194c6360: Merge "Swap keys: exclamation, question, period, comma."
...
* commit '3d87eff739304a788302b0250303370d3b85a8bd':
2013-10-09 22:40:44 -07:00
Keisuke Kuroyanagi
067c45d7ae
am 1fa00902: am d5ff552c: am a231c2ab: am e89a179b: Merge "Separate "GC" and "GC with decay"."
...
* commit '1fa00902b31e8ce12b1b78606cdd24815e7ce128':
2013-10-09 22:40:41 -07:00
Ken Wakasa
bfbea5697b
am f7b2afdd: am b04568b4: am 1522e7be: am cc81a93b: Merge "Add skipPtNode to DictDecoders."
...
* commit 'f7b2afdd82d6c98bc3cde22f126cc2129f74f00b':
2013-10-09 22:40:38 -07:00
Satoshi Kataoka
157e561303
am 80e1b915: am acdd67bb: am 98da7cfc: am c2dda795: Tentatively revert inconsistent assets
...
* commit '80e1b915b95da33b3ae6f44f95d29ffeb406d0a1':
2013-10-09 22:40:34 -07:00
Satoshi Kataoka
d318214c9b
am bbc69086: am 8498002a: am db083a2b: am a4913994: Hide indication bar if only one page
...
* commit 'bbc6908670aa1ceec15af326491c4a3ec4147c59':
2013-10-09 22:40:30 -07:00
Keisuke Kuroyanagi
aa50b08a9c
am ebca9e69: am 07fe0997: am d00e4865: am 126d758c: Merge "Quit blocking getSuggestion during GC."
...
* commit 'ebca9e69f7a659a637afb68060fd4888ddfb6e4b':
2013-10-09 22:40:28 -07:00
Jean Chalard
4c13a5856d
am c92d7d26: am 645d9927: am bff2d14d: am 74730a46: Merge "Create the wiring for auto-commit confidence computation."
...
* commit 'c92d7d263ed44d98310350751d45e4120547f326':
2013-10-09 22:40:23 -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
Ken Wakasa
1dcd6dc13c
am 9257c049: Merge "Revert "Add Swiss French and German keyboard layouts.""
...
* commit '9257c049672c278c08029d344c85baf183c6ff2e':
Revert "Add Swiss French and German keyboard layouts."
2013-10-09 19:32:55 -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
Ken Wakasa
aa3ae615d2
am 72c870f5: am 596a565a: Merge "Remove some unused variables."
...
* commit '72c870f5e67c0b332b8bf0b394796c28b53f61a7':
Remove some unused variables.
2013-10-09 17:55:02 -07:00
Keisuke Kuroyanagi
a544cf0a41
am 879ae3aa: am 21ce9c4a: Merge "Stochastic decay."
...
* commit '879ae3aa927fd13d7fa49f19d87740e5c38a52e2':
Stochastic decay.
2013-10-09 17:54:59 -07:00
Ken Wakasa
8037b971c2
am da4d87ff: am 2dcb6337: Merge "Make SparseTable have multiple content tables."
...
* commit 'da4d87ff000b594ede7cdb7bcb10e9272484f467':
Make SparseTable have multiple content tables.
2013-10-09 17:54:56 -07:00
Jean Chalard
d0b02b526a
am 93c2fa8d: am cd7422f4: Merge "Fix a pernicious bug with caps."
...
* commit '93c2fa8d3e65ab91898760e64636d5d10942ea17':
Fix a pernicious bug with caps.
2013-10-09 17:54:48 -07:00
Keisuke Kuroyanagi
8ee8178eb7
am 0fbad0fa: am 52c20927: Merge "Change name of DecayingUtils."
...
* commit '0fbad0fac461c8d2472fd9918f59c056c0a7c347':
Change name of DecayingUtils.
2013-10-09 17:54:46 -07:00
Satoshi Kataoka
96fdbaa367
am 85eba056: am c5182c9a: Correspond to the security related API change for PreferenceActivity
...
* commit '85eba056f2326f5e3015e4153123d40b6f7cd98f':
Correspond to the security related API change for PreferenceActivity
2013-10-09 17:54:44 -07:00
Jean Chalard
4afd8ff474
am 0874939e: am a8b838b4: Merge "Fix a test and crash with a better error message when reading"
...
* commit '0874939e1086baceba9c1f94ca98a7a5837e7813':
Fix a test and crash with a better error message when reading
2013-10-09 17:54:40 -07:00