Satoshi Kataoka
e167265f74
am 4a0af2cb: am 291ef1c9: Merge "Clear the cache of subtypes in onStartInputViewInternal"
...
* commit '4a0af2cbbac5a1a0de339f1a907f8b3c2a64b833':
Clear the cache of subtypes in onStartInputViewInternal
2013-10-09 20:59:48 -07:00
Jean Chalard
ea3a2f28ab
am 0675d374: am 86f77114: Merge "Don\'t auto-correct to non-whitelist shortcuts"
...
* commit '0675d37487f8f2ec92b0984b3ff28a5cd1d7a07e':
Don't auto-correct to non-whitelist shortcuts
2013-10-09 20:59:45 -07:00
Jean Chalard
e6b018aa5c
am d44b2490: am a6047aae: Merge "Set the shortcut frequency correctly."
...
* commit 'd44b249043754e5e0561d53ee337a250be14d492':
Set the shortcut frequency correctly.
2013-10-09 20:59:43 -07:00
Keisuke Kuroyanagi
2b1e16966c
am eafff65b: am be4d85fe: Merge "Fix bug and Add large test for decaying dictionary."
...
* commit 'eafff65bbe2583b5f97b8e80312ecd6bc5c6eac5':
Fix bug and Add large test for decaying dictionary.
2013-10-09 20:59:40 -07:00
Jean Chalard
adc7bacfb7
am dff82299: am 7da62bbe: Merge "Remove suggestions when string contains a period"
...
* commit 'dff8229925525c494154fc0cd050b5102b4a4231':
Remove suggestions when string contains a period
2013-10-09 20:59:36 -07:00
Satoshi Kataoka
9eb2acc7e5
am 6a83a875: am 47462172: Enter -> Alpha keyboard switcher in Emoji palette view
...
* commit '6a83a87569dba536f47e61cff0e15437c85c5595':
Enter -> Alpha keyboard switcher in Emoji palette view
2013-10-09 20:59:33 -07:00
Satoshi Kataoka
dd53038e4e
am 192414a4: am 32cf6f85: Show Emoji key by longpressing the enter key
...
* commit '192414a4b1e95668fcba1c302cdf5b4d7ff8f9e5':
Show Emoji key by longpressing the enter key
2013-10-09 20:59:31 -07:00
Satoshi Kataoka
72facc170b
am b3ac25f1: am 4deb824f: Add navigateEmoji
...
* commit 'b3ac25f1d9150ab47fd1184515ec5a8b39290451':
Add navigateEmoji
2013-10-09 20:59:29 -07:00
Satoshi Kataoka
bc5198b8d1
am 8822a52c: am 287c739d: Merge "Fix build"
...
* commit '8822a52c3f35acf34c10946e91cbcc230e4f88f5':
Fix build
2013-10-09 20:59:26 -07:00
Satoshi Kataoka
53e60a5e1c
am 6f726f6f: am d76b5529: Rename EmojiKeyboardView -> EmojiPalettesView
...
* commit '6f726f6fffb7cbd305a2707fab50f67afb183420':
Rename EmojiKeyboardView -> EmojiPalettesView
2013-10-09 20:59:22 -07:00
Ken Wakasa
6dac27eeb4
Merge "Tweak vertical gap of Emoji palette. DO NOT MERGE" into klp-dev
2013-10-10 03:39:30 +00:00
Ken Wakasa
f9d7d17f8f
Merge "Retry to tweak punctuations. DO NOT MERGE" into klp-dev
2013-10-10 03:39:17 +00:00
Satoshi Kataoka
c8e4ad0748
Support sw540 (ultra Z). DO NOT MERGE
...
cherrypick of Ib930ba810b25e28bcc36ea1647d46731816d9def
Bug: 11125351
Change-Id: Ifc4ab2a0495e886259c34f78bbe8cbf8fb75203b
2013-10-10 11:33:10 +09: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
Satoshi Kataoka
3a9ae65525
Tweak vertical gap of Emoji palette. DO NOT MERGE
...
cherrypick of I8163568a9d7f9d321148001e161c672f78796c96
Bug: 11140087
Change-Id: Ifd28f3017a8cf568a8c4a1045811564a129d85b7
2013-10-10 11:29:08 +09:00
Satoshi Kataoka
557a0935d4
Retry to tweak punctuations. DO NOT MERGE
...
cherrypick of I9ffc457ca44bccfa3eb3bdb0c26535d795215b26
Bug: 11130808
Change-Id: I1a65fd8acc4efe9b4e4786a3dc959498ae63c2f8
2013-10-10 11:14:37 +09:00
Ken Wakasa
56402cf10a
Revert "Add Swiss French and German keyboard layouts."
...
This reverts commit 220ce8f269e8d2507a2a57ec919e48ddb6f496f8.
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
0ded41149e
am 73ca0f2c: am 423921ca: Merge "Fallback on empty locales."
...
* commit '73ca0f2cec62cc67eceb526cd28d48948eae5b45':
Fallback on empty locales.
2013-10-09 18:55:06 -07:00
Jean Chalard
3ab42a00ec
am c5f7d74b: am 5db7eaba: Merge "Accept double-space-period after emoji."
...
* commit 'c5f7d74b2bb83e99bef7aad62924b0c043ce8961':
Accept double-space-period after emoji.
2013-10-09 18:55:03 -07:00
Satoshi Kataoka
f12df9e401
am 3bf2c598: am 1d188a28: Merge "Fix emoji"
...
* commit '3bf2c59881ebdd4cf77099806d26f280046623bf':
Fix emoji
2013-10-09 18:55:00 -07:00
Satoshi Kataoka
383da922a6
am 664f11f2: am 0b288985: Merge "Fix emoji recent key behavior"
...
* commit '664f11f2ffee2cfefe12a98bde79673abf909148':
Fix emoji recent key behavior
2013-10-09 18:54:57 -07:00
Ken Wakasa
d439ee371d
am f330de95: am c01707db: Merge "Suppress exceptions that have always been happening."
...
* commit 'f330de9526025448e64bdfe69b3d277e214c2512':
Suppress exceptions that have always been happening.
2013-10-09 18:54:53 -07:00
Ken Wakasa
bcb095e72f
am e6a64022: am 676bb517: Merge "Add Ver4DictUpdater."
...
* commit 'e6a6402258a9dae8b71be7af94d682ebb775b28f':
Add Ver4DictUpdater.
2013-10-09 18:54:51 -07:00
Ken Wakasa
f9de7ca5fd
am d5c90d9d: am 618158e6: Merge "Refactor BinaryDictIOUtilsTests."
...
* commit 'd5c90d9d8be05d848661aba10d11bac14cf70626':
Refactor BinaryDictIOUtilsTests.
2013-10-09 18:54:48 -07:00
Satoshi Kataoka
0f0cd69aa8
am 3944a67c: am 6ec0cf12: Merge "Tentatively revert assets"
...
* commit '3944a67c325478341be43a97017db0c50746c17c':
Tentatively revert assets
2013-10-09 18:54:45 -07:00
Yuichiro Hanada
1f6b9d7fef
am 10100b2c: am 14d31d46: Add AbstractDictDecoder.
...
* commit '10100b2c52fd6073b37eb3d8558439e62c6c9412':
Add AbstractDictDecoder.
2013-10-09 18:54:36 -07:00
Ken Wakasa
aa958adfaf
am 73ddd404: am 78409cd9: Merge "Separate shortcut targets from the trie file."
...
* commit '73ddd4041967babdcb201da33042e15460031faf':
Separate shortcut targets from the trie file.
2013-10-09 18:54:33 -07:00
Alan Viverette
26c006d8f0
am f6c2a0fe: am afa56511: Merge "Update string comments for translation"
...
* commit 'f6c2a0fe59444eb85a7e658ce36bf40edd8605da':
Update string comments for translation
2013-10-09 17:55:51 -07:00
Keisuke Kuroyanagi
8be44a2d87
am f28ca53b: am 864ee881: Merge "Fix UserHistoryDictionaryTests."
...
* commit 'f28ca53b33098a87938fc9eafff5577e6c02a822':
Fix UserHistoryDictionaryTests.
2013-10-09 17:55:48 -07:00
Yuichiro Hanada
98d7c6cde8
am be7db63a: am 3dd77a6d: Add SparseTableContentWriter to Ver4DictEncoder.
...
* commit 'be7db63ad91f3f1a6e78d55993adcd5c055fddea':
Add SparseTableContentWriter to Ver4DictEncoder.
2013-10-09 17:55:46 -07:00
Yuichiro Hanada
fd91482b5e
am 8e19d4a1: am d6e307a4: Add DictUpdater.
...
* commit '8e19d4a120bf57f6eebce99bac22a01941400d61':
Add DictUpdater.
2013-10-09 17:55:44 -07:00
Satoshi Kataoka
37da650b75
am 5fbd356a: am 85607c59: Merge "Fix the subtype id of the additional subtypes"
...
* commit '5fbd356a735ae02a671ca7db6dd57050e9fb0b17':
Fix the subtype id of the additional subtypes
2013-10-09 17:55:33 -07:00
Satoshi Kataoka
26a97909f6
am 3977cc97: am c7f8d54d: Merge "Prepare for changing text color for functional keys"
...
* commit '3977cc97528df0851d9b671578181d64c6b7a210':
Prepare for changing text color for functional keys
2013-10-09 17:55:25 -07:00
Keisuke Kuroyanagi
9115f38b42
am ec5ad29a: am d25cd26f: Merge "Try decaying user history at hourly intervals."
...
* commit 'ec5ad29a1f81b3d1a907c201f1d6fed01aea627b':
Try decaying user history at hourly intervals.
2013-10-09 17:55:08 -07: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
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
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
Satoshi Kataoka
3cc9602c57
am 319eb1c3: am 77144a64: Merge "Retain Emoji Keyboard after rotation"
...
* commit '319eb1c363a0d443cace14ee41c575a67ecfc93a':
Retain Emoji Keyboard after rotation
2013-10-09 17:54:37 -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
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
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