aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE•••Change-Id: I6f722071496d4673ca2214cd5fe73dde1006f036 Auto-generated-cl: translation import Baligh Uddin2013-10-122-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-10-114-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE•••Change-Id: Iafd4f4b04b7c80e2d686d2a3953a5c6e41df2739 Auto-generated-cl: translation import Baligh Uddin2013-10-114-5/+5
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | am 60fb5865: am 06e1bdaa: am 3e35e072: Merge "Make emoji separators" into klp...•••* commit '60fb58654e33448651fea191ba22cfdc87e37466': Make emoji separators Ken Wakasa2013-10-112-9/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | am 3e35e072: Merge "Make emoji separators" into klp-dev•••* commit '3e35e0727ce02e29ae498fb09ebc70df7e103d14': Make emoji separators Ken Wakasa2013-10-112-9/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "Make emoji separators" into klp-devKen Wakasa2013-10-112-9/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | Make emoji separators•••Bug: 11163495 Change-Id: I3247b8d1bbd3406b29a30a25aebd932c63431943 Jean Chalard2013-10-112-9/+4
| | | | |/ / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | am 40506273: am ac6d0c65: am 6d915037: Merge "Fix a bug where emojis would re...•••* commit '405062733cfe066c4b9af719bfc36a9a516c9dd3': Fix a bug where emojis would remove the suggestion strip. Satoshi Kataoka2013-10-112-9/+15
|\| | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | am 6d915037: Merge "Fix a bug where emojis would remove the suggestion strip....•••* commit '6d91503727a6d5b4eb942c56ee3f640984ae31a4': Fix a bug where emojis would remove the suggestion strip. Satoshi Kataoka2013-10-112-9/+15
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge "Fix a bug where emojis would remove the suggestion strip." into klp-devSatoshi Kataoka2013-10-112-9/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | Fix a bug where emojis would remove the suggestion strip.•••Bug: 11163495 Change-Id: I23d12c430125cc2a66a6e00715a4c609bb9e2bb1 Jean Chalard2013-10-112-9/+15
| | | | |_|_|/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge "Add a time stamp for unigrams."Ken Wakasa2013-10-112-4/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Add a time stamp for unigrams.•••Bug: 10920255 Change-Id: I26d2cce3c322a4ff39a614f8615f43fb7bd3baed Yuichiro Hanada2013-10-112-4/+21
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | am 3f1c95db: am 331c84d7: am 5fe9ab1c: Merge "Fix the suggestion size." into ...•••* commit '3f1c95dbdc18453dc0cd6f847b33e01db1f1d75b': Fix the suggestion size. Jean Chalard2013-10-111-9/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | am 5fe9ab1c: Merge "Fix the suggestion size." into klp-dev•••* commit '5fe9ab1cc680bed75160980f69f0a7d33f18fb5a': Fix the suggestion size. Jean Chalard2013-10-111-9/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge "Fix the suggestion size." into klp-devJean Chalard2013-10-111-9/+26
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | 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 Jean Chalard2013-10-111-9/+26
| | | | |_|/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | am 7611af75: Merge "Do not merge. Save / restore the last used emoji category...•••* commit '7611af753af5ba112bcfc8c434caf88dc8f46325': Do not merge. Save / restore the last used emoji category Satoshi Kataoka2013-10-112-11/+25
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | 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 category•••Bug: 11029983 Change-Id: I5547910c7b5dd7974292fc075af33568940f4e81 Satoshi Kataoka2013-10-112-11/+25
| | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | am 6dac27ee: Merge "Tweak vertical gap of Emoji palette. DO NOT MERGE" into k...•••* commit '6dac27eeb4cfc969a07e646f013a25a27760c773': Tweak vertical gap of Emoji palette. DO NOT MERGE Ken Wakasa2013-10-091-2/+2
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | 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 MERGE•••cherrypick of I8163568a9d7f9d321148001e161c672f78796c96 Bug: 11140087 Change-Id: Ifd28f3017a8cf568a8c4a1045811564a129d85b7 Satoshi Kataoka2013-10-101-2/+2
| | | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | am f9d7d17f: Merge "Retry to tweak punctuations. DO NOT MERGE" into klp-dev•••* commit 'f9d7d17f8fe9aa30346a1e3c8d01163aac58098b': Retry to tweak punctuations. DO NOT MERGE Ken Wakasa2013-10-091-1/+1
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "Retry to tweak punctuations. DO NOT MERGE" into klp-devKen Wakasa2013-10-101-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | Retry to tweak punctuations. DO NOT MERGE•••cherrypick of I9ffc457ca44bccfa3eb3bdb0c26535d795215b26 Bug: 11130808 Change-Id: I1a65fd8acc4efe9b4e4786a3dc959498ae63c2f8 Satoshi Kataoka2013-10-101-1/+1
| | | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | am c8e4ad07: Support sw540 (ultra Z). DO NOT MERGE•••* commit 'c8e4ad0748d38fa589fc2ffa4bcf13f08c67d74b': Support sw540 (ultra Z). DO NOT MERGE Satoshi Kataoka2013-10-095-0/+0
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Support sw540 (ultra Z). DO NOT MERGE•••cherrypick of Ib930ba810b25e28bcc36ea1647d46731816d9def Bug: 11125351 Change-Id: Ifc4ab2a0495e886259c34f78bbe8cbf8fb75203b Satoshi Kataoka2013-10-105-0/+0
| | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | am a6a6abc8: Fix the security related API change for PreferenceActivity•••* commit 'a6a6abc81611023a0159fa678b731367d80d0aa6': Fix the security related API change for PreferenceActivity Satoshi Kataoka2013-10-096-4/+91
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Fix the security related API change for PreferenceActivity•••Bug: 10118761 Change-Id: I63501d6c2b5f561d7ab8b7362498665d805d5e1e Satoshi Kataoka2013-10-096-4/+91
| * | | | | | | | | | | | | | | | am 6862b819: Fix crash in AdditionalSubtypeUtils•••* commit '6862b8192df0c979ebf3a1fd566ede1b0dbd8a82': Fix crash in AdditionalSubtypeUtils Satoshi Kataoka2013-10-092-6/+68
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Fix crash in AdditionalSubtypeUtils•••Bug: 11136982 Change-Id: I9d022a178c47bad3566be4c0bd8ffbce0b14896d Satoshi Kataoka2013-10-092-6/+68
| | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | am 31e152e3: am de65b7c0: Merge "Fix the position of emoji palette"•••* commit '31e152e38012ddba520fc7efc527a2713e8166c1': Fix the position of emoji palette Satoshi Kataoka2013-10-091-1/+5
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | am de65b7c0: Merge "Fix the position of emoji palette"•••* commit 'de65b7c0b36963de0f5c4f5cede543b247a8ccd7': Fix the position of emoji palette Satoshi Kataoka2013-10-081-1/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | am 1d24f19b: am c040d59d: Merge "Add more_keys_for_* declarations for the Swe...•••* commit '1d24f19b00f93fa5ee14b68d7c862c73485b90b1': Add more_keys_for_* declarations for the Swedish keyboard. Ken Wakasa2013-10-091-14/+51
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | am c040d59d: Merge "Add more_keys_for_* declarations for the Swedish keyboard."•••* commit 'c040d59defe38ce4b55e54dc8859db2e48307f1f': Add more_keys_for_* declarations for the Swedish keyboard. Ken Wakasa2013-10-081-14/+51
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | am e9631bcd: am 0152ff53: Merge "Update dictionaries"•••* commit 'e9631bcda47b482dee5a17d87b82a39f4a2e3104': Update dictionaries Jean Chalard2013-10-092-0/+0
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | am 0152ff53: Merge "Update dictionaries"•••* commit '0152ff53a261e1b8dd2a876120480cc103b7a799': Update dictionaries Jean Chalard2013-10-082-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | am db7513bb: am a701501c: Merge "Reduce memory of emoji palette"•••* commit 'db7513bb25b1c1b84f69c91eb35367e80ac25e40': Reduce memory of emoji palette Satoshi Kataoka2013-10-093-5/+34
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | am a701501c: Merge "Reduce memory of emoji palette"•••* commit 'a701501cb67127f6a144f9cdbd62b8a97f37856f': Reduce memory of emoji palette Satoshi Kataoka2013-10-083-5/+34
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | am 17bec5cb: am 92190d9a: Merge "Show the keyboard earlier when rotating."•••* commit '17bec5cb1cb963e412201f3c85f00a16f0cbd9f2': Show the keyboard earlier when rotating. Jean Chalard2013-10-091-4/+5
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | am 92190d9a: Merge "Show the keyboard earlier when rotating."•••* commit '92190d9a756b7bad95648075828b23e61340358d': Show the keyboard earlier when rotating. Jean Chalard2013-10-081-4/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | am 67aa1a93: am 2d3e1210: Fix memory leak in EmojiPaletteView•••* commit '67aa1a93f8376d73511ca6d08052298326eb3b44': Fix memory leak in EmojiPaletteView Satoshi Kataoka2013-10-091-3/+6
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | am 2d3e1210: Fix memory leak in EmojiPaletteView•••* commit '2d3e121014a97b7de90f287f1ef82fa98f37007c': Fix memory leak in EmojiPaletteView Satoshi Kataoka2013-10-081-3/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | am 87f06033: am d900b90d: Merge "Prep for RAM footprint optimization for Emoj...•••* commit '87f060338043ed57e8064594d632be450536ee73': Prep for RAM footprint optimization for Emoji palettes Ken Wakasa2013-10-093-10/+15
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | am d900b90d: Merge "Prep for RAM footprint optimization for Emoji palettes"•••* commit 'd900b90db7d411c8cfc8ff9e41518bf98f50daff': Prep for RAM footprint optimization for Emoji palettes Ken Wakasa2013-10-083-10/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | am 62001702: am 36c56cae: Merge "Make the sentence separator a resource."•••* commit '620017028cd1ef7159c16343720e7062b09dc3ba': Make the sentence separator a resource. Jean Chalard2013-10-096-22/+31
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | am 36c56cae: Merge "Make the sentence separator a resource."•••* commit '36c56caee3049737a55e2421bf9e3727c4936f24': Make the sentence separator a resource. Jean Chalard2013-10-076-22/+31
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | am da9408c8: am 984aa60e: Merge "Extend hitbox of emoji keys"•••* commit 'da9408c8d8a1411331cf45e55f94bafbe717b234': Extend hitbox of emoji keys Satoshi Kataoka2013-10-091-13/+23
| |\| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | am 984aa60e: Merge "Extend hitbox of emoji keys"•••* commit '984aa60e11a160ae712527dcaa1bc837db2e7466': Extend hitbox of emoji keys Satoshi Kataoka2013-10-071-13/+23
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |