aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | Fix the suggestion size.Jean Chalard2013-10-111-9/+26
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am 7611af75: Merge "Do not merge. Save / restore the last used emoji ↵Satoshi Kataoka2013-10-112-11/+25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | category" into klp-dev * commit '7611af753af5ba112bcfc8c434caf88dc8f46325': Do not merge. Save / restore the last used emoji category
| * | | Merge "Do not merge. Save / restore the last used emoji category" into klp-devSatoshi Kataoka2013-10-112-11/+25
| |\ \ \ | | |/ / | |/| |
| | * | Do not merge. Save / restore the last used emoji categorySatoshi Kataoka2013-10-112-11/+25
| | |/ | | | | | | | | | | | | Bug: 11029983 Change-Id: I5547910c7b5dd7974292fc075af33568940f4e81
* | | am 6dac27ee: Merge "Tweak vertical gap of Emoji palette. DO NOT MERGE" into ↵Ken Wakasa2013-10-091-2/+2
|\| | | | | | | | | | | | | | | | | | | | klp-dev * commit '6dac27eeb4cfc969a07e646f013a25a27760c773': Tweak vertical gap of Emoji palette. DO NOT MERGE
| * | Merge "Tweak vertical gap of Emoji palette. DO NOT MERGE" into klp-devKen Wakasa2013-10-101-2/+2
| |\ \
| | * | Tweak vertical gap of Emoji palette. DO NOT MERGESatoshi Kataoka2013-10-101-2/+2
| | |/ | | | | | | | | | | | | | | | | | | cherrypick of I8163568a9d7f9d321148001e161c672f78796c96 Bug: 11140087 Change-Id: Ifd28f3017a8cf568a8c4a1045811564a129d85b7
* | | am f9d7d17f: Merge "Retry to tweak punctuations. DO NOT MERGE" into klp-devKen Wakasa2013-10-091-1/+1
|\| | | | | | | | | | | | | | * commit 'f9d7d17f8fe9aa30346a1e3c8d01163aac58098b': Retry to tweak punctuations. DO NOT MERGE
| * | Merge "Retry to tweak punctuations. DO NOT MERGE" into klp-devKen Wakasa2013-10-101-1/+1
| |\ \
| | * | Retry to tweak punctuations. DO NOT MERGESatoshi Kataoka2013-10-101-1/+1
| | |/ | | | | | | | | | | | | | | | | | | cherrypick of I9ffc457ca44bccfa3eb3bdb0c26535d795215b26 Bug: 11130808 Change-Id: I1a65fd8acc4efe9b4e4786a3dc959498ae63c2f8
* | | am c8e4ad07: Support sw540 (ultra Z). DO NOT MERGESatoshi Kataoka2013-10-095-0/+0
|\| | | | | | | | | | | | | | * commit 'c8e4ad0748d38fa589fc2ffa4bcf13f08c67d74b': Support sw540 (ultra Z). DO NOT MERGE
| * | Support sw540 (ultra Z). DO NOT MERGESatoshi Kataoka2013-10-105-0/+0
| |/ | | | | | | | | | | | | cherrypick of Ib930ba810b25e28bcc36ea1647d46731816d9def Bug: 11125351 Change-Id: Ifc4ab2a0495e886259c34f78bbe8cbf8fb75203b
* | am a6a6abc8: Fix the security related API change for PreferenceActivitySatoshi Kataoka2013-10-096-4/+91
|\| | | | | | | | | * commit 'a6a6abc81611023a0159fa678b731367d80d0aa6': Fix the security related API change for PreferenceActivity
| * Fix the security related API change for PreferenceActivitySatoshi Kataoka2013-10-096-4/+91
| | | | | | | | | | Bug: 10118761 Change-Id: I63501d6c2b5f561d7ab8b7362498665d805d5e1e
* | am 6862b819: Fix crash in AdditionalSubtypeUtilsSatoshi Kataoka2013-10-092-6/+68
|\| | | | | | | | | * commit '6862b8192df0c979ebf3a1fd566ede1b0dbd8a82': Fix crash in AdditionalSubtypeUtils
| * Fix crash in AdditionalSubtypeUtilsSatoshi Kataoka2013-10-092-6/+68
| | | | | | | | | | | | Bug: 11136982 Change-Id: I9d022a178c47bad3566be4c0bd8ffbce0b14896d
* | am 31e152e3: am de65b7c0: Merge "Fix the position of emoji palette"Satoshi Kataoka2013-10-091-1/+5
|\| | | | | | | | | * commit '31e152e38012ddba520fc7efc527a2713e8166c1': Fix the position of emoji palette
| * am de65b7c0: Merge "Fix the position of emoji palette"Satoshi Kataoka2013-10-081-1/+5
| |\ | | | | | | | | | | | | * commit 'de65b7c0b36963de0f5c4f5cede543b247a8ccd7': Fix the position of emoji palette
| | * Merge "Fix the position of emoji palette"Satoshi Kataoka2013-10-081-1/+5
| | |\
| | | * Fix the position of emoji paletteSatoshi Kataoka2013-10-081-1/+5
| | | | | | | | | | | | | | | | Change-Id: I07a3912cb9fef8e28f3605de4e73a201a900e95c
* | | | am 1d24f19b: am c040d59d: Merge "Add more_keys_for_* declarations for the ↵Ken Wakasa2013-10-091-14/+51
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Swedish keyboard." * commit '1d24f19b00f93fa5ee14b68d7c862c73485b90b1': Add more_keys_for_* declarations for the Swedish keyboard.
| * | | am c040d59d: Merge "Add more_keys_for_* declarations for the Swedish keyboard."Ken Wakasa2013-10-081-14/+51
| |\| | | | | | | | | | | | | | | | | | * commit 'c040d59defe38ce4b55e54dc8859db2e48307f1f': Add more_keys_for_* declarations for the Swedish keyboard.
| | * | Merge "Add more_keys_for_* declarations for the Swedish keyboard."Ken Wakasa2013-10-081-14/+51
| | |\ \
| | | * | Add more_keys_for_* declarations for the Swedish keyboard.Fredrik Roubert2013-10-081-14/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds all those popup keys that were included in commit b1cb13292f482627e64ccb35be905b7f3154d4ff when the Swedish keyboard was first added. Many of these definitions were later removed by commit 79b965e04f81ac5c49c84a386566a1aa68752af6 but most likely by mistake, as that commit log message doesn't mention anything about removing these. To help making this file more maintainable, this commit also moves a few definitions around so that all definitions now appear in alphabetical order. Change-Id: Iadef9e3dd1dc7b39fe87b2fc75210d0697b24361
* | | | | am e9631bcd: am 0152ff53: Merge "Update dictionaries"Jean Chalard2013-10-092-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'e9631bcda47b482dee5a17d87b82a39f4a2e3104': Update dictionaries
| * | | | am 0152ff53: Merge "Update dictionaries"Jean Chalard2013-10-082-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '0152ff53a261e1b8dd2a876120480cc103b7a799': Update dictionaries
| | * | | Merge "Update dictionaries"Jean Chalard2013-10-082-0/+0
| | |\ \ \
| | | * | | Update dictionariesJean Chalard2013-10-082-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | >>> dictionaries/en_GB_wordlist.combined.gz Header : date : 1381130519 <=> 1381226409 version : 41 <=> 42 Body : Added: haha 45 >>> dictionaries/en_US_wordlist.combined.gz Header : date : 1380293342 <=> 1381226409 version : 40 <=> 42 Body : Added: haha 45 >>> dictionaries/en_wordlist.combined.gz Header : date : 1380293363 <=> 1381226429 version : 40 <=> 42 Body : Added: haha 45 >>> dictionaries/fr_wordlist.combined.gz Header : date : 1380519383 <=> 1381226409 version : 40 <=> 42 Body : Freq changed: haha 0 -> 30 >>> java/res/raw/main_en.dict Header : date : 1380293363 <=> 1381226429 version : 40 <=> 42 Body : Added: haha 45 >>> java/res/raw/main_fr.dict Header : date : 1380519383 <=> 1381226409 version : 40 <=> 42 Body : Freq changed: haha 0 -> 30 Bug: 11114205 Change-Id: I39d429d24d93ee07a70d8613ce0752432b26acc4
* | | | | | am db7513bb: am a701501c: Merge "Reduce memory of emoji palette"Satoshi Kataoka2013-10-093-5/+34
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'db7513bb25b1c1b84f69c91eb35367e80ac25e40': Reduce memory of emoji palette
| * | | | | am a701501c: Merge "Reduce memory of emoji palette"Satoshi Kataoka2013-10-083-5/+34
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a701501cb67127f6a144f9cdbd62b8a97f37856f': Reduce memory of emoji palette
| | * | | | Merge "Reduce memory of emoji palette"Satoshi Kataoka2013-10-083-5/+34
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Reduce memory of emoji paletteSatoshi Kataoka2013-10-083-5/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10902556 Change-Id: I3c8da35a601de2bfb248292c7b59235fc1120988
* | | | | | am 17bec5cb: am 92190d9a: Merge "Show the keyboard earlier when rotating."Jean Chalard2013-10-091-4/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '17bec5cb1cb963e412201f3c85f00a16f0cbd9f2': Show the keyboard earlier when rotating.
| * | | | | am 92190d9a: Merge "Show the keyboard earlier when rotating."Jean Chalard2013-10-081-4/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '92190d9a756b7bad95648075828b23e61340358d': Show the keyboard earlier when rotating.
| | * | | | Merge "Show the keyboard earlier when rotating."Jean Chalard2013-10-081-4/+5
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Show the keyboard earlier when rotating.Jean Chalard2013-10-081-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11107229 Change-Id: I0b36341d60b634a860eb13fafd0dc69fe734bdeb
* | | | | | am 67aa1a93: am 2d3e1210: Fix memory leak in EmojiPaletteViewSatoshi Kataoka2013-10-091-3/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '67aa1a93f8376d73511ca6d08052298326eb3b44': Fix memory leak in EmojiPaletteView
| * | | | | am 2d3e1210: Fix memory leak in EmojiPaletteViewSatoshi Kataoka2013-10-081-3/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2d3e121014a97b7de90f287f1ef82fa98f37007c': Fix memory leak in EmojiPaletteView
| | * | | | Fix memory leak in EmojiPaletteViewSatoshi Kataoka2013-10-081-3/+6
| | | |/ / | | |/| | | | | | | | | | | | | | | | | Bug: 10902556 Change-Id: I3a8c1e08d6f953b462d914acd1f411c36f9d80f2
* | | | | am 87f06033: am d900b90d: Merge "Prep for RAM footprint optimization for ↵Ken Wakasa2013-10-093-10/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Emoji palettes" * commit '87f060338043ed57e8064594d632be450536ee73': Prep for RAM footprint optimization for Emoji palettes
| * | | | am d900b90d: Merge "Prep for RAM footprint optimization for Emoji palettes"Ken Wakasa2013-10-083-10/+15
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit 'd900b90db7d411c8cfc8ff9e41518bf98f50daff': Prep for RAM footprint optimization for Emoji palettes
| | * | | Merge "Prep for RAM footprint optimization for Emoji palettes"Ken Wakasa2013-10-083-10/+15
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Prep for RAM footprint optimization for Emoji palettesKen Wakasa2013-10-083-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | bug: 10902556 Change-Id: I313948c73b60cd33c437cf02e8d3fb61c288a240
* | | | | am 62001702: am 36c56cae: Merge "Make the sentence separator a resource."Jean Chalard2013-10-096-22/+31
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '620017028cd1ef7159c16343720e7062b09dc3ba': Make the sentence separator a resource.
| * | | | am 36c56cae: Merge "Make the sentence separator a resource."Jean Chalard2013-10-076-22/+31
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '36c56caee3049737a55e2421bf9e3727c4936f24': Make the sentence separator a resource.
| | * | | Make the sentence separator a resource.Jean Chalard2013-10-086-22/+31
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | This will help handing correctly the armenian full stop. Bug: 10082781 Change-Id: Id7bb219ebd89daba203216eab362d1cc26a65a36
* | | | am da9408c8: am 984aa60e: Merge "Extend hitbox of emoji keys"Satoshi Kataoka2013-10-091-13/+23
|\| | | | | | | | | | | | | | | | | | | * commit 'da9408c8d8a1411331cf45e55f94bafbe717b234': Extend hitbox of emoji keys
| * | | am 984aa60e: Merge "Extend hitbox of emoji keys"Satoshi Kataoka2013-10-071-13/+23
| |\| | | | | | | | | | | | | | | | | | * commit '984aa60e11a160ae712527dcaa1bc837db2e7466': Extend hitbox of emoji keys
| | * | Merge "Extend hitbox of emoji keys"Satoshi Kataoka2013-10-071-13/+23
| | |\ \
| | | * | Extend hitbox of emoji keysSatoshi Kataoka2013-10-071-13/+23
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11105065 Change-Id: I5e90ba55cf708bf7be27d7d101cbc0719ac583c8