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
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
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
The Android Automerger
ae0871ef15
merge in klp-release history after reset to klp-dev
2013-10-10 06:01:47 -07: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
Baligh Uddin
2783fcec44
am 2d74136e: keep history after reset to jb-ub-latinimegoogle-bayo
...
* commit '2d74136e5793af65d231e07a0cb058a80491cd57':
2013-10-09 21:08:02 -07:00
Baligh Uddin
e75cd64a2b
am 8105ea2f: keep history after reset to jb-ub-latinimegoogle-bayo
...
* commit '8105ea2f1d38dc86f3652a8a67abc868d77909d0':
2013-10-09 21:00:36 -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
The Android Automerger
3815e4d215
am 965eac66: merge in jb-ub-latinimegoogle-bayo history after reset to jb-ub-latinimegoogle
...
* commit '965eac663b26b1030074000b66e6980d6b310f5f':
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
2013-10-09 21:00:28 -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
156ea96116
am 6d4cdadb: am a2422c0b: Merge "Show more messages when reading a compressed combined format file."
...
* commit '6d4cdadb80cf05a8d4afa64192e9fed0525939e7':
Show more messages when reading a compressed combined format file.
2013-10-09 21:00:08 -07:00
Keisuke Kuroyanagi
ba13ae7990
am d168bd54: am 6d91e4ce: Fix offdevice test build.
...
* commit 'd168bd54d664e4fdc819c5e0d1520fdbab729514':
Fix offdevice test build.
2013-10-09 21:00:06 -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
Keisuke Kuroyanagi
394363c291
am 551cc99e: am 61aae2b4: Merge "Add Ime language switching test."
...
* commit '551cc99e44510457f8a15dff7252a5fedd2d4a39':
Add Ime language switching test.
2013-10-09 21:00:02 -07:00
Keisuke Kuroyanagi
584e0fd668
am a798a16a: am 6d3d5395: Merge "Fix a bug: wrong parent position is written when moving."
...
* commit 'a798a16a4230f5286bab7dc7e3201576a8fa1905':
Fix a bug: wrong parent position is written when moving.
2013-10-09 20:59:59 -07:00
Keisuke Kuroyanagi
8ddac9aeb6
am bf4c72c4: am a81d37ee: Merge "Add a large test adding bigrams for decaying dictionary."
...
* commit 'bf4c72c4d693bdcc300adb97067c4b56c1c2ed7c':
Add a large test adding bigrams for decaying dictionary.
2013-10-09 20:59:57 -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
11ab8f2e72
am 93622c4f: am 69d10385: Merge "Update en_GB dictionary"
...
* commit '93622c4fe0e1859eaadea88f15d481d1ca2734dd':
Update en_GB dictionary
2013-10-09 20:59:38 -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
Keisuke Kuroyanagi
178ec9d9e6
am 8b6b9e33: am 785eed9b: Merge "Parameter optimization."
...
* commit '8b6b9e3367b460f5bfe83d12c46c20a73d2e4ed7':
Parameter optimization.
2013-10-09 20:59:24 -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
Baligh Uddin
6fb8d3a655
am 7b8c9dd0: (-s ours) am a8f4efd0: (-s ours) am 069b185d: (-s ours) am 0de11871: (-s ours) am b2ffcd64: (-s ours) Import translations. DO NOT MERGE
...
* commit '7b8c9dd0b0249af40ab28efb129b90a7dacde7ea':
2013-10-09 20:59:20 -07:00
Baligh Uddin
eb2cf344bb
am e9557d4b: (-s ours) am f645402a: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit 'e9557d4b89ae81350699b2ae8d05cf1a0cbead81':
Import translations. DO NOT MERGE
2013-10-09 20:59:18 -07:00
Baligh Uddin
0cb0827f32
am d7e90dad: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
...
* commit 'd7e90dad0e010af33029f3d4a73769c8e5a00c6b':
Import translations. DO NOT MERGE
2013-10-09 20:59:16 -07:00
Qiwen Zhao
2008b38a1a
am e30c8885: (-s ours) am 791a5a6a: am 06ba3ef1: (-s ours) am 551a1c24: reset to klp-dev branch to fix merging problem.
...
* commit 'e30c888598328cf877e20954a96d12460e538423':
2013-10-09 20:59:15 -07:00