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
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
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
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
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
56e21a02f0
am 85dec741: am 6dac27ee: Merge "Tweak vertical gap of Emoji palette. DO NOT MERGE" into klp-dev
...
* commit '85dec741a70bf455d9aae583982580dc79df0209':
Tweak vertical gap of Emoji palette. DO NOT MERGE
2013-10-09 23:04:02 -07:00
Ken Wakasa
e38ed07cad
am 07baf17c: am f9d7d17f: Merge "Retry to tweak punctuations. DO NOT MERGE" into klp-dev
...
* commit '07baf17c6f6fff0725c75f4ba778d5a26a6eea67':
Retry to tweak punctuations. DO NOT MERGE
2013-10-09 23:04:00 -07:00
Satoshi Kataoka
3bd1f24f28
am 49d8b8ca: am c8e4ad07: Support sw540 (ultra Z). DO NOT MERGE
...
* commit '49d8b8cacd18cc0ca7c5c0faa531b3b41c7093e3':
Support sw540 (ultra Z). DO NOT MERGE
2013-10-09 23:03:58 -07:00
Baligh Uddin
273ca4c320
am 2783fcec: am 2d74136e: keep history after reset to jb-ub-latinimegoogle-bayo
...
* commit '2783fcec44750210fbc9d5eadbde44f8028166cd':
2013-10-09 21:26:57 -07:00
Baligh Uddin
6d0d4b850a
am e75cd64a: am 8105ea2f: keep history after reset to jb-ub-latinimegoogle-bayo
...
* commit 'e75cd64a2beecb0a6951b6eddc5d00b34d85abbf':
2013-10-09 21:26:55 -07:00
Satoshi Kataoka
ddb0f5a226
am 8e9ce07b: am a6a6abc8: Fix the security related API change for PreferenceActivity
...
* commit '8e9ce07b7f93b0dcbe552346b3f040db936a036a':
Fix the security related API change for PreferenceActivity
2013-10-09 21:26:52 -07:00
Satoshi Kataoka
22888291df
am 6beb03df: am 6862b819: Fix crash in AdditionalSubtypeUtils
...
* commit '6beb03df089965d19fc55c2d4179c044db5ca0d6':
Fix crash in AdditionalSubtypeUtils
2013-10-09 21:26:50 -07:00
The Android Automerger
b79226788e
am 3815e4d2: am 965eac66: merge in jb-ub-latinimegoogle-bayo history after reset to jb-ub-latinimegoogle
...
* commit '3815e4d2158ebf46115dc34e91d1377e011a4ffb':
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
2013-10-09 21:26:47 -07:00
Satoshi Kataoka
1a5e6a7446
am 6deea22c: am 31e152e3: am de65b7c0: Merge "Fix the position of emoji palette"
...
* commit '6deea22cf1957cc2bb90eec762e0752aba194ad7':
Fix the position of emoji palette
2013-10-09 21:26:45 -07:00
Ken Wakasa
5e70e91e2c
am ef2add6f: am 1d24f19b: am c040d59d: Merge "Add more_keys_for_* declarations for the Swedish keyboard."
...
* commit 'ef2add6f1a6e54dd8ab8574d05567ebdb27cd0fc':
Add more_keys_for_* declarations for the Swedish keyboard.
2013-10-09 21:26:43 -07:00
Jean Chalard
d0d728ebda
am 71895285: am e9631bcd: am 0152ff53: Merge "Update dictionaries"
...
* commit '718952855b6b8a26cc786f08375836b8e66619e5':
Update dictionaries
2013-10-09 21:26:41 -07:00
Satoshi Kataoka
2163a48d86
am 302102ee: am db7513bb: am a701501c: Merge "Reduce memory of emoji palette"
...
* commit '302102ee532ed23af17942c7bd8cc8238ce29559':
Reduce memory of emoji palette
2013-10-09 21:26:39 -07:00
Jean Chalard
5ff266e0b1
am 2b33fc74: am 17bec5cb: am 92190d9a: Merge "Show the keyboard earlier when rotating."
...
* commit '2b33fc74b681fbdbb2bd0aee753753236d919f4b':
Show the keyboard earlier when rotating.
2013-10-09 21:26:37 -07:00
Satoshi Kataoka
5908917cff
am 2715465b: am 67aa1a93: am 2d3e1210: Fix memory leak in EmojiPaletteView
...
* commit '2715465b9487c00fc38676494d1f9dd3ea1a15f2':
Fix memory leak in EmojiPaletteView
2013-10-09 21:26:35 -07:00
Ken Wakasa
86c6aff4aa
am 8d454af4: am 87f06033: am d900b90d: Merge "Prep for RAM footprint optimization for Emoji palettes"
...
* commit '8d454af44bb000ccbbcc2e00b15856e680017596':
Prep for RAM footprint optimization for Emoji palettes
2013-10-09 21:26:33 -07:00
Jean Chalard
4f1424f9e6
am 156ea961: am 6d4cdadb: am a2422c0b: Merge "Show more messages when reading a compressed combined format file."
...
* commit '156ea9611676a17f6b874eb54e226ba847c088fc':
Show more messages when reading a compressed combined format file.
2013-10-09 21:26:31 -07:00
Keisuke Kuroyanagi
96f54480cb
am ba13ae79: am d168bd54: am 6d91e4ce: Fix offdevice test build.
...
* commit 'ba13ae79905fa357346618398b273766b2db6ccd':
Fix offdevice test build.
2013-10-09 21:26:29 -07:00
Jean Chalard
86e0e06c36
am 9af39314: am 62001702: am 36c56cae: Merge "Make the sentence separator a resource."
...
* commit '9af393140e5717573e794dd6b8a193aae582bfcc':
Make the sentence separator a resource.
2013-10-09 21:26:27 -07:00
Keisuke Kuroyanagi
616eabaebb
am 394363c2: am 551cc99e: am 61aae2b4: Merge "Add Ime language switching test."
...
* commit '394363c291c851785e36ba2d480b01672ff59429':
Add Ime language switching test.
2013-10-09 21:26:26 -07:00
Keisuke Kuroyanagi
5b61f1d249
am 584e0fd6: am a798a16a: am 6d3d5395: Merge "Fix a bug: wrong parent position is written when moving."
...
* commit '584e0fd668d201f2fab66404a8fc11cd1949c90e':
Fix a bug: wrong parent position is written when moving.
2013-10-09 21:26:23 -07:00
Keisuke Kuroyanagi
3c01d78932
am 8ddac9ae: am bf4c72c4: am a81d37ee: Merge "Add a large test adding bigrams for decaying dictionary."
...
* commit '8ddac9aeb6de5ebd74090f448f2337e1331b9b62':
Add a large test adding bigrams for decaying dictionary.
2013-10-09 21:26:21 -07:00
Satoshi Kataoka
16dfdf755e
am 6d998b36: am da9408c8: am 984aa60e: Merge "Extend hitbox of emoji keys"
...
* commit '6d998b36357f974b80511fd99039ae8847b5e500':
Extend hitbox of emoji keys
2013-10-09 21:26:20 -07:00
Jean Chalard
83305e5338
am a3efde54: am 6e979246: am 7712baa5: Merge "Fix a possible IOOB"
...
* commit 'a3efde54d75f05145f1c4a085ef569e7c970fa7f':
Fix a possible IOOB
2013-10-09 21:26:18 -07:00
Jean Chalard
cc3bdb5901
am 322366d0: am 9493affc: am 3c4e8cb6: Call loadKeyboard later if it can\'t be called right away
...
* commit '322366d07ec2431ffc78767c37e58fd7c4a8aea3':
Call loadKeyboard later if it can't be called right away
2013-10-09 21:26:16 -07:00
Satoshi Kataoka
d24cb579f8
am e167265f: am 4a0af2cb: am 291ef1c9: Merge "Clear the cache of subtypes in onStartInputViewInternal"
...
* commit 'e167265f748fc1965b38a95bf723ceb31e6bd436':
Clear the cache of subtypes in onStartInputViewInternal
2013-10-09 21:26:14 -07:00
Jean Chalard
e1e95fd2e4
am ea3a2f28: am 0675d374: am 86f77114: Merge "Don\'t auto-correct to non-whitelist shortcuts"
...
* commit 'ea3a2f28ab602d1e2b7d1540c1863638832ec83a':
Don't auto-correct to non-whitelist shortcuts
2013-10-09 21:26:12 -07:00
Jean Chalard
05aaedd024
am e6b018aa: am d44b2490: am a6047aae: Merge "Set the shortcut frequency correctly."
...
* commit 'e6b018aa5c9f58dcc9e6acea8b80171f8f807887':
Set the shortcut frequency correctly.
2013-10-09 21:26:10 -07:00
Keisuke Kuroyanagi
34f6b9e8be
am 2b1e1696: am eafff65b: am be4d85fe: Merge "Fix bug and Add large test for decaying dictionary."
...
* commit '2b1e16966ced9df87383d02ddad8856bf7885107':
Fix bug and Add large test for decaying dictionary.
2013-10-09 21:26:08 -07:00
Jean Chalard
bf5889a32f
am 11ab8f2e: am 93622c4f: am 69d10385: Merge "Update en_GB dictionary"
...
* commit '11ab8f2e7265d509c7740a500c9f9d1935f67200':
Update en_GB dictionary
2013-10-09 21:26:06 -07:00
Jean Chalard
fe8d76b15e
am adc7bacf: am dff82299: am 7da62bbe: Merge "Remove suggestions when string contains a period"
...
* commit 'adc7bacfb713f0369e3629d72d96e299bfb703c6':
Remove suggestions when string contains a period
2013-10-09 21:26:04 -07:00
Satoshi Kataoka
746d53d815
am 9eb2acc7: am 6a83a875: am 47462172: Enter -> Alpha keyboard switcher in Emoji palette view
...
* commit '9eb2acc7e5933738550a3d5398e0ca223190b6fe':
Enter -> Alpha keyboard switcher in Emoji palette view
2013-10-09 21:26:01 -07:00
Satoshi Kataoka
38e3fac3c2
am dd53038e: am 192414a4: am 32cf6f85: Show Emoji key by longpressing the enter key
...
* commit 'dd53038e4e3a75f59755793e4a6fa67d4618c1e8':
Show Emoji key by longpressing the enter key
2013-10-09 21:25:59 -07:00
Satoshi Kataoka
17dd222ab5
am 72facc17: am b3ac25f1: am 4deb824f: Add navigateEmoji
...
* commit '72facc170b68ebf06cd64d21c40d754efbe5ec3e':
Add navigateEmoji
2013-10-09 21:25:57 -07:00
Satoshi Kataoka
1348564283
am bc5198b8: am 8822a52c: am 287c739d: Merge "Fix build"
...
* commit 'bc5198b8d1a5a92a541da9de528f61054988bfa3':
Fix build
2013-10-09 21:25:55 -07:00
Keisuke Kuroyanagi
489a6aa4a8
am 178ec9d9: am 8b6b9e33: am 785eed9b: Merge "Parameter optimization."
...
* commit '178ec9d9e6379a242273473488bb47afe336b14e':
Parameter optimization.
2013-10-09 21:25:52 -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
Satoshi Kataoka
1dcb5bdc94
am 53e60a5e: am 6f726f6f: am d76b5529: Rename EmojiKeyboardView -> EmojiPalettesView
...
* commit '53e60a5e1ca7c93feff7e7486592fe85c011195d':
Rename EmojiKeyboardView -> EmojiPalettesView
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