Commit Graph

28697 Commits (fd9f8008641e618f085e0e8c168a337b00b0d0af)

Author SHA1 Message Date
Ken Wakasa a3e90243bb am fe97ff40: am 60fb5865: am 06e1bdaa: am 3e35e072: Merge "Make emoji separators" into klp-dev
* commit 'fe97ff40836e71ef80c35d93367a54088586452e':
  Make emoji separators
2013-10-11 05:14:23 -07:00
Satoshi Kataoka 614a553a70 am eb7fa4dc: am 40506273: am ac6d0c65: am 6d915037: Merge "Fix a bug where emojis would remove the suggestion strip." into klp-dev
* commit 'eb7fa4dc6d1bd629a34adcf6423c534352d0b00c':
  Fix a bug where emojis would remove the suggestion strip.
2013-10-11 05:14:20 -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 60fb58654e am 06e1bdaa: am 3e35e072: Merge "Make emoji separators" into klp-dev
* commit '06e1bdaa2582293193df7c1b1dd0784b9c327b87':
  Make emoji separators
2013-10-11 05:07:02 -07:00
Satoshi Kataoka 405062733c am ac6d0c65: am 6d915037: Merge "Fix a bug where emojis would remove the suggestion strip." into klp-dev
* commit 'ac6d0c656e1788d796c3c78434ceb049b43abb42':
  Fix a bug where emojis would remove the suggestion strip.
2013-10-11 05:07:00 -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 075d8fa65a am 7abdab1c: Merge "Add a time stamp for unigrams."
* commit '7abdab1c6fe693f11cc5ee385b2ff4d5a84cfaf4':
  Add a time stamp for unigrams.
2013-10-11 03:19:38 -07:00
Ken Wakasa 7abdab1c6f Merge "Add a time stamp for unigrams." 2013-10-11 10:17:01 +00:00
Ken Wakasa 966ee8a8ca am 00e02489: Merge "Fix unit test for If8c94ef91ed58bb5028f51be7c8d9beb677436a4"
* commit '00e0248984c4fca912c59568eb6c394bf9530b73':
  Fix unit test for If8c94ef91ed58bb5028f51be7c8d9beb677436a4
2013-10-11 01:55:54 -07:00
Jean Chalard 32cc5ba274 am 3def959e: am 3f1c95db: am 331c84d7: am 5fe9ab1c: Merge "Fix the suggestion size." into klp-dev
* commit '3def959e4deda3d8cbc9a1a7518c335086e3d062':
  Fix the suggestion size.
2013-10-11 01:52:39 -07:00
Ken Wakasa 00e0248984 Merge "Fix unit test for If8c94ef91ed58bb5028f51be7c8d9beb677436a4" 2013-10-11 08:51:26 +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 3f1c95dbdc am 331c84d7: am 5fe9ab1c: Merge "Fix the suggestion size." into klp-dev
* commit '331c84d790cfc04040e7b4e4102519f7be3f5e48':
  Fix the suggestion size.
2013-10-11 01:46:44 -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 eacb2be8fe Fix unit test for If8c94ef91ed58bb5028f51be7c8d9beb677436a4
Change-Id: I056013de3a5e09feed429dfd8097d3d85331a0ab
2013-10-11 16:52:12 +09:00
Ken Wakasa ff013a1fbf am be22a01d: Merge "Add resolveBigramPositions."
* commit 'be22a01df33d809a83c4bed402428f98fa47c370':
  Add resolveBigramPositions.
2013-10-11 00:47:10 -07: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 ff82b5fee1 am ed7d262e: (-s ours) am 16b2dd43: (-s ours) am ee1ff0da: am 7611af75: Merge "Do not merge. Save / restore the last used emoji category" into klp-dev
* commit 'ed7d262eeb86b1f336ca9b79db072aa53ac956fb':
  Do not merge. Save / restore the last used emoji category
2013-10-11 00:27:56 -07:00
Satoshi Kataoka ed7d262eeb am 16b2dd43: (-s ours) am ee1ff0da: am 7611af75: Merge "Do not merge. Save / restore the last used emoji category" into klp-dev
* commit '16b2dd439634e469edcfbd9b876be6288014df58':
  Do not merge. Save / restore the last used emoji category
2013-10-11 00:26:25 -07:00
Satoshi Kataoka 16b2dd4396 am ee1ff0da: am 7611af75: Merge "Do not merge. Save / restore the last used emoji category" into klp-dev
* commit 'ee1ff0da30f7895d38a1d93d1810425dcd04390a':
  Do not merge. Save / restore the last used emoji category
2013-10-11 00:24:52 -07: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 c16be0237e am 6026a958: Merge "Save / restore the last used emoji category"
* commit '6026a9581685b2d91fc5bd6cf33a506d5560c238':
  Save / restore the last used emoji category
2013-10-11 00:07:41 -07: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 c068780b9d am 9514ed5c: Add the new format of bigram entries.
* commit '9514ed5c2a49e645e2d468f7191d54d77d9f127f':
  Add the new format of bigram entries.
2013-10-10 23:57:54 -07: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
Ken Wakasa 39c6ea2115 am 84994295: (-s ours) am 56e21a02: (-s ours) am 85dec741: am 6dac27ee: Merge "Tweak vertical gap of Emoji palette. DO NOT MERGE" into klp-dev
* commit '849942950e50f5f53c5fd22a7a5641e9d496fdeb':
  Tweak vertical gap of Emoji palette. DO NOT MERGE
2013-10-10 08:39:41 -07:00
Ken Wakasa 176c7111de am 604f523e: (-s ours) am e38ed07c: (-s ours) am 07baf17c: am f9d7d17f: Merge "Retry to tweak punctuations. DO NOT MERGE" into klp-dev
* commit '604f523ef20c4ef565386a203ccba15a699c5595':
  Retry to tweak punctuations. DO NOT MERGE
2013-10-10 08:39:36 -07:00
Satoshi Kataoka 34aa8e26e9 am 295fda09: (-s ours) am 3bd1f24f: (-s ours) am 49d8b8ca: am c8e4ad07: Support sw540 (ultra Z). DO NOT MERGE
* commit '295fda09ecc8a3f6de8300765662d86d7d7289f2':
  Support sw540 (ultra Z). DO NOT MERGE
2013-10-10 08:39:33 -07:00
Baligh Uddin d665fab95b am ae408df1: am 273ca4c3: am 2783fcec: am 2d74136e: keep history after reset to jb-ub-latinimegoogle-bayo
* commit 'ae408df19ccd6ec7113702fb4276a3be8e95c6f5':
2013-10-10 08:39:29 -07:00
Baligh Uddin acb11ce46d am c48143b9: am 6d0d4b85: am e75cd64a: am 8105ea2f: keep history after reset to jb-ub-latinimegoogle-bayo
* commit 'c48143b9220abd64d681f3a4ff81f2b2cbbcc531':
2013-10-10 08:39:26 -07:00
Satoshi Kataoka 9831f80365 am 4d7b1102: am ddb0f5a2: am 8e9ce07b: am a6a6abc8: Fix the security related API change for PreferenceActivity
* commit '4d7b11020a5249fd987400fa9dad195cf6917d4a':
  Fix the security related API change for PreferenceActivity
2013-10-10 08:39:22 -07:00
Satoshi Kataoka f21d8ef7f1 am 44df1394: am 22888291: am 6beb03df: am 6862b819: Fix crash in AdditionalSubtypeUtils
* commit '44df13949a069eb18e99ae6584ff5ac72f1d39aa':
  Fix crash in AdditionalSubtypeUtils
2013-10-10 08:39:18 -07:00
The Android Automerger 687d15b8e4 am 51764e83: am b7922678: am 3815e4d2: am 965eac66: merge in jb-ub-latinimegoogle-bayo history after reset to jb-ub-latinimegoogle
* commit '51764e8347fcee99e4c23073e16252d01484239f':
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
2013-10-10 08:39:14 -07:00
Satoshi Kataoka acc4a607ee am ab581457: am 1a5e6a74: am 6deea22c: am 31e152e3: am de65b7c0: Merge "Fix the position of emoji palette"
* commit 'ab581457ae46e43bbfcc4927cd48b2fc1262c983':
2013-10-10 08:39:10 -07:00
Ken Wakasa 8149aa3c77 am 6b1fbd50: am 5e70e91e: am ef2add6f: am 1d24f19b: am c040d59d: Merge "Add more_keys_for_* declarations for the Swedish keyboard."
* commit '6b1fbd50e790893689f244a986a547d38bdc7a11':
2013-10-10 08:39:04 -07:00
Jean Chalard 56b6f4f269 am f68d6e42: am d0d728eb: am 71895285: am e9631bcd: am 0152ff53: Merge "Update dictionaries"
* commit 'f68d6e424ddbf788a170d34f05d9cb8804ff51a2':
2013-10-10 08:39:00 -07:00
Satoshi Kataoka 25c7690fab am cffaaa56: am 2163a48d: am 302102ee: am db7513bb: am a701501c: Merge "Reduce memory of emoji palette"
* commit 'cffaaa56a4df0e70963c61e66bc4362b1a7050c1':
2013-10-10 08:38:48 -07:00
Jean Chalard 561b74acc3 am ca237747: am 5ff266e0: am 2b33fc74: am 17bec5cb: am 92190d9a: Merge "Show the keyboard earlier when rotating."
* commit 'ca237747fba58dd3b90517eaf1165995e102deef':
2013-10-10 08:38:44 -07:00