nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
28,764 Commits
1 Branch
0 Tags
363 MiB
Commit Graph

8940 Commits (f21930dcace0f7c48537b5034b73ccd990fa75a2)

Author SHA1 Message Date
Yuichiro Hanada 1557de7aa4 Consolidate CharEncoding.writeString and BinaryDictIOUtils.writeString. 
Change-Id: I6f990fd84e7f08fd1149198c33d8bbf1cac8e078
 2013-10-16 00:30:45 +09:00
Yuichiro Hanada 522dc0d8ac Fix readAndFollowForwardLink. 
Change-Id: Ifda44e6139a4a1bd065468a7f74cd9483b343644
 2013-10-16 00:16:39 +09:00
Ken Wakasa b067be0e5f Merge "Revert "Revert "Add Swiss French and German keyboard layouts.""" 2013-10-15 14:12:29 +00:00
Ken Wakasa b044047227 mExpectingUpdateSelection was out of sync when nothing to delete. 
cherripick of I9c6a948331726a821bd3ccec9c1d02dec2c4703a
(forward cherrypicking this because the automerger is stuck now.)

This bug was leading to corrupted rendering of surrogate pairs in the following
scenario.

1. Type some emojis
2. Move the cursor at the beginning of the text field
3. Hit backspace even though there's nothing to delete
4. Move the cursor after some emoji
5. Hit backspace

The root cause of this issue was the out-of-sync mExpectingUpdateSelection if
handleBackspace() gets called when the cursor reaches at the beginning of the
TextView. In such case, mExpectingUpdateSelection shouldn't be set true because
there's nothing to delete, so there will be no onUpdateSelection() calls associated
with it. Due to this bug, the cache in RichInputConnection could get stale at step 4
described above. Then the following handleBackspace() that should delete a surrogate
pair was not working correctly because of the stale cache.

bug: 11181913
Change-Id: I1cbf444d8d105416e7de75c16d80b3797f470495
 2013-10-15 14:05:34 +09:00
Ken Wakasa 34ad4e0879 am b9ce8421: mExpectingUpdateSelection was out of sync when nothing to delete. 
* commit 'b9ce84214212f5b5072cd9fda458526887c3c739':
  mExpectingUpdateSelection was out of sync when nothing to delete.
 2013-10-14 19:49:12 -07:00
Ken Wakasa cf5dfd2464 am 3a3bbf4a: am eed74b81: am c8383eda: Fix wrong commitText parameter in sendKeyCodePoint() 
* commit '3a3bbf4a38870ecc42b7f6fbd3a7cae20fe020a7':
  Fix wrong commitText parameter in sendKeyCodePoint()
 2013-10-14 10:52:40 -07:00
Ken Wakasa b9ce842142 mExpectingUpdateSelection was out of sync when nothing to delete. 
This bug was leading to corrupted rendering of surrogate pairs in the following
scenario.

1. Type some emojis
2. Move the cursor at the beginning of the text field
3. Hit backspace even though there's nothing to delete
4. Move the cursor after some emoji
5. Hit backspace

The root cause of this issue was the out-of-sync mExpectingUpdateSelection if
handleBackspace() gets called when the cursor reaches at the beginning of the
TextView. In such case, mExpectingUpdateSelection shouldn't be set true because
there's nothing to delete, so there will be no onUpdateSelection() calls associated
with it. Due to this bug, the cache in RichInputConnection could get stale at step 4
described above. Then the following handleBackspace() that should delete a surrogate
pair was not working correctly because of the stale cache.

bug: 11181913
Change-Id: I9c6a948331726a821bd3ccec9c1d02dec2c4703a
 2013-10-14 17:57:48 +09:00
Ken Wakasa eed74b81a6 am c8383eda: Fix wrong commitText parameter in sendKeyCodePoint() 
* commit 'c8383eda8bb05e25b22fe6d66100248f7d0e33fa':
  Fix wrong commitText parameter in sendKeyCodePoint()
 2013-10-13 16:24:47 -07:00
Ken Wakasa c8383eda8b Fix wrong commitText parameter in sendKeyCodePoint() 
Small optimization on generating a String instance from a single code
point too.

bug: 11181913

Change-Id: I0f905e4dc6ec7841092bb4d3d940daf3b2303f5b
 2013-10-13 10:56:10 +09:00
Baligh Uddin 9e4210ba3a Import translations. DO NOT MERGE 
Change-Id: I6f722071496d4673ca2214cd5fe73dde1006f036
Auto-generated-cl: translation import
 2013-10-12 09:50:42 -07:00
Baligh Uddin cdc4c1dca7 Import translations. DO NOT MERGE 
Change-Id: Icbe028a32311c167219f366e695cb7932f5a9a71
Auto-generated-cl: translation import
 2013-10-12 09:43:32 -07:00
Baligh Uddin 8f99107bbb Merge "Import translations. DO NOT MERGE" 2013-10-11 15:35:33 +00:00
Baligh Uddin 40823338e2 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-11 15:35:27 +00:00
Baligh Uddin fc33cc6dba Import translations. DO NOT MERGE 
Change-Id: Iafd4f4b04b7c80e2d686d2a3953a5c6e41df2739
Auto-generated-cl: translation import
 2013-10-11 06:35:24 -07:00
Baligh Uddin 02ecae3aa3 Import translations. DO NOT MERGE 
Change-Id: I45a783763fce6254469a39374d03edb6a1867cc9
Auto-generated-cl: translation import
 2013-10-11 06:31:03 -07:00
Ken Wakasa fe97ff4083 am 60fb5865: am 06e1bdaa: am 3e35e072: Merge "Make emoji separators" into klp-dev 
* commit '60fb58654e33448651fea191ba22cfdc87e37466':
  Make emoji separators
 2013-10-11 05:10:21 -07:00
Satoshi Kataoka eb7fa4dc6d am 40506273: am ac6d0c65: am 6d915037: Merge "Fix a bug where emojis would remove the suggestion strip." into klp-dev 
* commit '405062733cfe066c4b9af719bfc36a9a516c9dd3':
  Fix a bug where emojis would remove the suggestion strip.
 2013-10-11 05:10:19 -07:00
Ken Wakasa 06e1bdaa25 am 3e35e072: Merge "Make emoji separators" into klp-dev 
* commit '3e35e0727ce02e29ae498fb09ebc70df7e103d14':
  Make emoji separators
 2013-10-11 05:05:11 -07:00
Satoshi Kataoka ac6d0c656e am 6d915037: Merge "Fix a bug where emojis would remove the suggestion strip." into klp-dev 
* commit '6d91503727a6d5b4eb942c56ee3f640984ae31a4':
  Fix a bug where emojis would remove the suggestion strip.
 2013-10-11 05:05:09 -07:00
Ken Wakasa 3e35e0727c Merge "Make emoji separators" into klp-dev 2013-10-11 11:57:07 +00:00
Satoshi Kataoka 6d91503727 Merge "Fix a bug where emojis would remove the suggestion strip." into klp-dev 2013-10-11 11:53:07 +00:00
Jean Chalard 6fc15b9fc4 Fix a bug where emojis would remove the suggestion strip. 
Bug: 11163495
Change-Id: I23d12c430125cc2a66a6e00715a4c609bb9e2bb1
 2013-10-11 20:51:13 +09:00
Jean Chalard 401fb908f0 Make emoji separators 
Bug: 11163495
Change-Id: I3247b8d1bbd3406b29a30a25aebd932c63431943
 2013-10-11 20:00:38 +09:00
Ken Wakasa 7abdab1c6f Merge "Add a time stamp for unigrams." 2013-10-11 10:17:01 +00:00
Jean Chalard 3def959e4d am 3f1c95db: am 331c84d7: am 5fe9ab1c: Merge "Fix the suggestion size." into klp-dev 
* commit '3f1c95dbdc18453dc0cd6f847b33e01db1f1d75b':
  Fix the suggestion size.
 2013-10-11 01:49:51 -07:00
Jean Chalard 331c84d790 am 5fe9ab1c: Merge "Fix the suggestion size." into klp-dev 
* commit '5fe9ab1cc680bed75160980f69f0a7d33f18fb5a':
  Fix the suggestion size.
 2013-10-11 01:43:29 -07:00
Jean Chalard 5fe9ab1cc6 Merge "Fix the suggestion size." into klp-dev 2013-10-11 08:38:31 +00:00
Ken Wakasa be22a01df3 Merge "Add resolveBigramPositions." 2013-10-11 07:45:20 +00:00
Jean Chalard c0bd0a244d Fix the suggestion size. 
The available space was not computed correctly. This makes the
decision to ellipsize/expand the middle suggestion correct.

Also, the scale was not applied correctly in some cases.

Finally, for some reason ellipsize does not work as we expect.
I'm not sure how to get it to work like we want it to, but
this works around the problem in a simple manner.

Bug: 11158757
Change-Id: I083e7ac56e157f100923733e67b92a6368a526c9
 2013-10-11 16:42:46 +09:00
Satoshi Kataoka ee1ff0da30 am 7611af75: Merge "Do not merge. Save / restore the last used emoji category" into klp-dev 
* commit '7611af753af5ba112bcfc8c434caf88dc8f46325':
  Do not merge. Save / restore the last used emoji category
 2013-10-11 00:23:38 -07:00
Satoshi Kataoka 7611af753a Merge "Do not merge. Save / restore the last used emoji category" into klp-dev 2013-10-11 07:21:35 +00:00
Satoshi Kataoka 7d3f53a1cb Do not merge. Save / restore the last used emoji category 
Bug: 11029983
Change-Id: I5547910c7b5dd7974292fc075af33568940f4e81
 2013-10-11 16:05:38 +09:00
Satoshi Kataoka 6026a95816 Merge "Save / restore the last used emoji category" 2013-10-11 07:04:42 +00:00
Satoshi Kataoka 6dc99dc200 Save / restore the last used emoji category 
Bug: 11029983
Change-Id: I1bec2c3c6b547de68562a818a8d6c9fef83787b7
 2013-10-11 16:00:33 +09:00
Yuichiro Hanada c32962b8f1 Add a time stamp for unigrams. 
Bug: 10920255
Change-Id: I26d2cce3c322a4ff39a614f8615f43fb7bd3baed
 2013-10-11 15:08:09 +09:00
Yuichiro Hanada 9514ed5c2a Add the new format of bigram entries. 
In new format, each bigram entry has flags (1 byte), a terminal id (3 byte),
a time-stamp (4 byte), a counter (1 byte) and a level (1 byte).

Bug: 10920255
Bug: 10920165
Change-Id: I0f7fc125a6178e6d25a07e8462afc41a7f57e3e1
 2013-10-11 14:50:41 +09:00
Jean Chalard 7e6ac9d727 Allow double-space-to-period after percent 
Bug: 11158604
Change-Id: If8c94ef91ed58bb5028f51be7c8d9beb677436a4
 2013-10-10 21:26:08 +09:00
Ken Wakasa 85dec741a7 am 6dac27ee: Merge "Tweak vertical gap of Emoji palette. DO NOT MERGE" into klp-dev 
* commit '6dac27eeb4cfc969a07e646f013a25a27760c773':
  Tweak vertical gap of Emoji palette. DO NOT MERGE
 2013-10-09 21:25:50 -07:00
Ken Wakasa 07baf17c6f am f9d7d17f: Merge "Retry to tweak punctuations. DO NOT MERGE" into klp-dev 
* commit 'f9d7d17f8fe9aa30346a1e3c8d01163aac58098b':
  Retry to tweak punctuations. DO NOT MERGE
 2013-10-09 21:25:49 -07:00
Satoshi Kataoka 49d8b8cacd am c8e4ad07: Support sw540 (ultra Z). DO NOT MERGE 
* commit 'c8e4ad0748d38fa589fc2ffa4bcf13f08c67d74b':
  Support sw540 (ultra Z). DO NOT MERGE
 2013-10-09 21:25:47 -07:00
Satoshi Kataoka 8e9ce07b7f am a6a6abc8: Fix the security related API change for PreferenceActivity 
* commit 'a6a6abc81611023a0159fa678b731367d80d0aa6':
  Fix the security related API change for PreferenceActivity
 2013-10-09 21:00:34 -07:00
Satoshi Kataoka 6beb03df08 am 6862b819: Fix crash in AdditionalSubtypeUtils 
* commit '6862b8192df0c979ebf3a1fd566ede1b0dbd8a82':
  Fix crash in AdditionalSubtypeUtils
 2013-10-09 21:00:31 -07:00
Satoshi Kataoka 6deea22cf1 am 31e152e3: am de65b7c0: Merge "Fix the position of emoji palette" 
* commit '31e152e38012ddba520fc7efc527a2713e8166c1':
  Fix the position of emoji palette
 2013-10-09 21:00:25 -07:00
Ken Wakasa ef2add6f1a am 1d24f19b: am c040d59d: Merge "Add more_keys_for_* declarations for the Swedish keyboard." 
* commit '1d24f19b00f93fa5ee14b68d7c862c73485b90b1':
  Add more_keys_for_* declarations for the Swedish keyboard.
 2013-10-09 21:00:24 -07:00
Jean Chalard 718952855b am e9631bcd: am 0152ff53: Merge "Update dictionaries" 
* commit 'e9631bcda47b482dee5a17d87b82a39f4a2e3104':
  Update dictionaries
 2013-10-09 21:00:21 -07:00
Satoshi Kataoka 302102ee53 am db7513bb: am a701501c: Merge "Reduce memory of emoji palette" 
* commit 'db7513bb25b1c1b84f69c91eb35367e80ac25e40':
  Reduce memory of emoji palette
 2013-10-09 21:00:18 -07:00
Jean Chalard 2b33fc74b6 am 17bec5cb: am 92190d9a: Merge "Show the keyboard earlier when rotating." 
* commit '17bec5cb1cb963e412201f3c85f00a16f0cbd9f2':
  Show the keyboard earlier when rotating.
 2013-10-09 21:00:15 -07:00
Satoshi Kataoka 2715465b94 am 67aa1a93: am 2d3e1210: Fix memory leak in EmojiPaletteView 
* commit '67aa1a93f8376d73511ca6d08052298326eb3b44':
  Fix memory leak in EmojiPaletteView
 2013-10-09 21:00:13 -07:00
Ken Wakasa 8d454af44b am 87f06033: am d900b90d: Merge "Prep for RAM footprint optimization for Emoji palettes" 
* commit '87f060338043ed57e8064594d632be450536ee73':
  Prep for RAM footprint optimization for Emoji palettes
 2013-10-09 21:00:10 -07:00
Jean Chalard 9af393140e am 62001702: am 36c56cae: Merge "Make the sentence separator a resource." 
* commit '620017028cd1ef7159c16343720e7062b09dc3ba':
  Make the sentence separator a resource.
 2013-10-09 21:00:04 -07:00
Satoshi Kataoka 6d998b3635 am da9408c8: am 984aa60e: Merge "Extend hitbox of emoji keys" 
* commit 'da9408c8d8a1411331cf45e55f94bafbe717b234':
  Extend hitbox of emoji keys
 2013-10-09 20:59:55 -07:00
Jean Chalard a3efde54d7 am 6e979246: am 7712baa5: Merge "Fix a possible IOOB" 
* commit '6e979246be424db462b594ad2a63b9f9841d39f8':
  Fix a possible IOOB
 2013-10-09 20:59:53 -07:00
Jean Chalard 322366d07e am 9493affc: am 3c4e8cb6: Call loadKeyboard later if it can\'t be called right away 
* commit '9493affce3156067acbaa895f921c70b32139a5f':
  Call loadKeyboard later if it can't be called right away
 2013-10-09 20:59:51 -07:00
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
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 856b06a3ac Revert "Revert "Add Swiss French and German keyboard layouts."" 
This reverts commit 56402cf10a.

I'll submit this on 10/16 after the final cut for Bayo.

Change-Id: I0fe4ab64fd8dfa1e63e29adf00388743fca6a1ed
bug: 11144401
 2013-10-10 02:07:04 +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 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