Keisuke Kuroyanagi
c6bb1ffc94
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 '777b078d75f8c9c841ea8f0d4770b36eb512a6c4':
2013-10-09 22:41:08 -07:00
Satoshi Kataoka
20deff0707
am 9d527c02
: am 2e7f74f0
: am 615509cf
: am 9d763910
: Merge "Unfortunately, hide some broken "emoji"s"
...
* commit '9d527c0225426717cdf83c8c2756a242f5b61290':
2013-10-09 22:41:06 -07:00
Jean Chalard
fcdfe6f3c2
am e8c01167
: am e398d09a
: am af75e48e
: am 74577bed
: Merge "Implement the heuristic for auto-commit."
...
* commit 'e8c011679ae2bcc880902d86bc106f37f7d9136f':
2013-10-09 22:40:59 -07:00
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
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
Keisuke Kuroyanagi
2e082f46aa
am e0547020
: am a6095365
: (-s ours) am ef63947f
: (-s ours) Add boundary checking for PtNode Array reading. DO NOT MERGE
...
* commit 'e0547020f13c3cde2bfca5665e8b289729c15de0':
2013-10-09 17:54:04 -07:00
Satoshi Kataoka
2e7f74f00c
am 615509cf
: am 9d763910
: Merge "Unfortunately, hide some broken "emoji"s"
...
* commit '615509cf27839e946280787cf27d8c091079b91b':
Unfortunately, hide some broken "emoji"s
2013-10-09 17:54:01 -07:00
Jean Chalard
e398d09a50
am af75e48e
: am 74577bed
: Merge "Implement the heuristic for auto-commit."
...
* commit 'af75e48efdc5be7d0b1c3d411017757454ed1799':
Implement the heuristic for auto-commit.
2013-10-09 17:53:58 -07:00
Jean Chalard
1f8eab7d79
am a6e7c3ff
: am ff9476f1
: Merge "Fix typos"
...
* commit 'a6e7c3ff29c2b9eaf406f96dd3ee44cafa293452':
Fix typos
2013-10-09 17:53:55 -07:00
Jean Chalard
805bae9575
am 6f2830dc
: am 2afa0e62
: Merge "Fix a bug where gesture would delay update."
...
* commit '6f2830dcb91fd2d00088c7522c91a45e90a1f3e6':
Fix a bug where gesture would delay update.
2013-10-09 17:53:52 -07:00
Ken Wakasa
3dd8185656
am a9f5c55c
: am 382094a7
: Merge "Cleanup and remove redundant more keys on phones"
...
* commit 'a9f5c55ca2f075ed6923e0040fa66c07a5a37176':
Cleanup and remove redundant more keys on phones
2013-10-09 17:53:49 -07:00
Ken Wakasa
272a8b79d8
am 88c946af
: am 194c6360
: Merge "Swap keys: exclamation, question, period, comma."
...
* commit '88c946af0c8a8e07092be71a7b98957d021e499b':
Swap keys: exclamation, question, period, comma.
2013-10-09 17:53:47 -07:00
Keisuke Kuroyanagi
d5ff552c9e
am a231c2ab
: am e89a179b
: Merge "Separate "GC" and "GC with decay"."
...
* commit 'a231c2ab72e92a3f849c347bc46d3f8599547510':
Separate "GC" and "GC with decay".
2013-10-09 17:53:44 -07:00
Ken Wakasa
b04568b460
am 1522e7be
: am cc81a93b
: Merge "Add skipPtNode to DictDecoders."
...
* commit '1522e7be20ac53c3870d493e3a9fb7946edbbea4':
Add skipPtNode to DictDecoders.
2013-10-09 17:53:41 -07:00
Satoshi Kataoka
acdd67bb42
am 98da7cfc
: am c2dda795
: Tentatively revert inconsistent assets
...
* commit '98da7cfc0b9afc75db240d10c20f3360fe693320':
Tentatively revert inconsistent assets
2013-10-09 17:53:39 -07:00
Satoshi Kataoka
8498002afb
am db083a2b
: am a4913994
: Hide indication bar if only one page
...
* commit 'db083a2b25d057f21a22333251ea0a78668e6326':
Hide indication bar if only one page
2013-10-09 17:53:37 -07:00
Keisuke Kuroyanagi
07fe099765
am d00e4865
: am 126d758c
: Merge "Quit blocking getSuggestion during GC."
...
* commit 'd00e48656b02ff49fc834ed6762dc194d00b42ad':
Quit blocking getSuggestion during GC.
2013-10-09 17:53:34 -07:00
Jean Chalard
645d992786
am bff2d14d
: am 74730a46
: Merge "Create the wiring for auto-commit confidence computation."
...
* commit 'bff2d14d1caf4d70f8c1fdcbbf8e9b41209a3e94':
Create the wiring for auto-commit confidence computation.
2013-10-09 17:53:32 -07:00
Ken Wakasa
064661a35c
Merge "Add Swiss French and German keyboard layouts."
2013-10-09 22:13:10 +00:00
Ed Heyl
6b211313b7
am 6c69c218
: am d8d2a9fc
: am 02092936
: merge in KQS81M
...
* commit '6c69c218478a19e6039311b28961cb601da83016':
Import translations. DO NOT MERGE
2013-10-09 09:12:43 -07:00
Fredrik Roubert
220ce8f269
Add Swiss French and German keyboard layouts.
...
There used to be two "Swiss" keyboard layouts, labelled fr_CH and de_QY,
available in LatinIME. They were, however, not actually Swiss layouts
but instead work-arounds to be able to get French or German with qwertz
or qwerty (instead of azerty and qwertz) layouts, respectively. These
were thus removed by commit f6972561fc
replacing them with the generic fr-qwertz and de-qwerty layouts instead.
Here, now, is a proper Swiss keyboard layout, following Swiss standards
for people accustomed to typing on Swiss keyboards, with the expected
tailorings for French and German.
Change-Id: I9feed752053ecc694c84db713284f69bc1daf155
2013-10-09 17:42:17 +02:00
Satoshi Kataoka
9a802e0dba
Merge "Support sw540 (ultra Z)"
2013-10-09 08:52:58 +00:00
Satoshi Kataoka
e55446b6bd
Support sw540 (ultra Z)
...
Bug: 11125351
Change-Id: Ib930ba810b25e28bcc36ea1647d46731816d9def
2013-10-09 17:45:53 +09:00
Satoshi Kataoka
56997a80c2
Retry to tweak punctuations
...
Bug: 11130808
Change-Id: I9ffc457ca44bccfa3eb3bdb0c26535d795215b26
2013-10-09 15:39:23 +09:00
Satoshi Kataoka
30ef03d865
Tweak vertical gap of Emoji palette
...
Bug: 11140087
Change-Id: I8163568a9d7f9d321148001e161c672f78796c96
2013-10-09 14:56:39 +09:00
Satoshi Kataoka
83994ad66b
Merge "Fix the security related API change for PreferenceActivity"
2013-10-09 05:46:15 +00:00
Satoshi Kataoka
64f64bdf58
Fix the security related API change for PreferenceActivity
...
Bug: 10118761
Change-Id: I63501d6c2b5f561d7ab8b7362498665d805d5e1e
2013-10-09 14:34:06 +09:00