summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Automatic translation importstable/cm-13.0-ZNH2KBAbhisek Devkota2016-06-281-0/+88
| | | | | Change-Id: I386f2582fc81aa29b84f3458f81c709ff2bb8625 Ticket: RM-231
* Automatic translation importclyde@build012016-06-201-0/+13
| | | | | Change-Id: I8477d2c2fe0f2a8b566da47ca908929fa41c86fb Ticket: RM-231
* Automatic translation importinky@build012016-06-173-0/+106
| | | | | Change-Id: I655e7958df7c8c212b4833a58860174e2ac1c460 Ticket: RM-231
* Automatic translation importAbhisek Devkota2016-05-172-0/+5
| | | | | Change-Id: I545525b877a313eb2a5e86c02fc64951d7735cba Ticket: RM-231
* Automatic translation importAbhisek Devkota2016-05-149-0/+2041
| | | | | Change-Id: If74b4eccbfafea5e1d04f83cf4a03493d23f7222 Ticket: RM-231
* Partially revert "Merge tag 'android-6.0.1_r22' of ↵Michael Bestas2016-05-1365-224/+2019
| | | | | | | | | | | https://android.googlesource.com/platform/packages/inputmethods/LatinIME into cm-13.0" This reverts commit f6f0971d559a8fcf9c0a7769fd30f69cc184d1c9, reversing changes made to bdf269e6c0cd01d06f9ad6d66e0e059800b0e253. RM-231 Change-Id: Iba43bdaf61a649970b0ad83893c3c8540c582c1b (cherry picked from commit 88df494c13145723c71950387b744331c789af4a)
* Automatic translation importMichael Bestas2016-04-068-0/+2040
| | | | | | RM-231 Change-Id: I83a8ce1de981a1c8419480a3cfbb046e4e59314e (cherry picked from commit 2eb45ea67612a831828bba2af9734be922465aa6)
* LatinIME: Disable Hungarian spell checkingMichael Bestas2016-03-291-4/+0
| | | | | | | * The current dictionary is corrupt and we cannot generate a new one because the wordlist contains invalid entries with commas Change-Id: I2057fd0d4ce522f66c714764a3e9bb3d8da59cb0
* LatinIME: Add Bulgarian, Georgian and Ukrainian wordlistsMichael Bestas2016-03-293-0/+0
| | | | | | * Generated from the current dictionaries in vendor/cm Change-Id: I958af20e44f87a097645ccf0bd96879ef3d72048
* Automatic translation importMichael Bestas2016-03-2815-1/+4024
| | | | Change-Id: Ic68db8bce63849c8751f198857ec14df987dd29e
* Automatic translation importMichael Bestas2016-03-1710-1/+10
| | | | Change-Id: I8fffcdad055b8abb8ff355b9dad66421e3b9aa0e
* Merge tag 'android-6.0.1_r22' of ↵staging/cm-13.0+r22Steve Kondik2016-03-10219-2102/+71301
|\ | | | | | | | | | | https://android.googlesource.com/platform/packages/inputmethods/LatinIME into cm-13.0 Android 6.0.1 release 22
| * Import translations. DO NOT MERGEGeoff Mendal2015-12-071-2/+2
| | | | | | | | | | Change-Id: Iad1409117bddf84a193f3999bbc502ad36c2ad84 Auto-generated-cl: translation import
| * Import translations. DO NOT MERGE am: fdbd6fe212 -s oursGeoff Mendal2015-11-250-0/+0
| |\ | | | | | | | | | | | | | | | | | | am: c2483d98b5 -s ours * commit 'c2483d98b58977b80bb3645bfdee516eedab2141': Import translations. DO NOT MERGE
| | * Import translations. DO NOT MERGEGeoff Mendal2015-11-250-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | am: fdbd6fe212 -s ours * commit 'fdbd6fe212eafe89c889a900fe235dfd5141b10b': Import translations. DO NOT MERGE
| | | * Import translations. DO NOT MERGEGeoff Mendal2015-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I3b0659978c7d5b8d37020621ce41a56366cf0b27 Auto-generated-cl: translation import
| * | | Import translations. DO NOT MERGEGeoff Mendal2015-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: If7cc2bd21fbc9f806909e544495cce1acf951b29 Auto-generated-cl: translation import
| * | | Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-devGeoff Mendal2015-11-1677-85/+817
| |\ \ \
| | * | | Import translations. DO NOT MERGEGeoff Mendal2015-11-1677-85/+817
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id9670893071d981904e3a9eca8ebef55ac1cc265 Auto-generated-cl: translation import
| * | | | Import translations. DO NOT MERGEGeoff Mendal2015-11-1677-59/+73995
| |/ / / | | | | | | | | | | | | | | | | Change-Id: Iab1557d1610a2b3a68f9a29b1bff565a83fe3ff0 Auto-generated-cl: translation import
| * | | Import translations. DO NOT MERGE am: 76218d9045 -s oursGeoff Mendal2015-11-140-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: b6e8df2cf1 -s ours * commit 'b6e8df2cf10acff16a0267483ec3764b8f78a617': Import translations. DO NOT MERGE
| | * | Import translations. DO NOT MERGEGeoff Mendal2015-11-140-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | am: 76218d9045 -s ours * commit '76218d9045409d1881a72a20ece23dc6371070e7': Import translations. DO NOT MERGE
| | | * Import translations. DO NOT MERGEGeoff Mendal2015-11-1477-77/+539
| | | | | | | | | | | | | | | | | | | | Change-Id: I2f10dd89298df82a8cf092a0de3d4a635ab7e696 Auto-generated-cl: translation import
| * | | Unicode 8.0 emoji additions to Google Keyboard. am: 7674a65367Chieu Nguyen2015-11-11114-26/+3583
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: fab2818b96 * commit 'fab2818b96c7b85f4c415576dd8c03fa6e067c7e': Unicode 8.0 emoji additions to Google Keyboard.
| | * | Unicode 8.0 emoji additions to Google Keyboard.Chieu Nguyen2015-11-11114-26/+3583
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | am: 7674a65367 * commit '7674a653678b542d795b0bd05c241654ffe1015a': Unicode 8.0 emoji additions to Google Keyboard.
| | | * Unicode 8.0 emoji additions to Google Keyboard.Chieu Nguyen2015-11-11114-26/+3583
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit 8e86347b024e2460a17264fbcaa20cd6e5fd6018 Author: Chieu Nguyen <cvnguyen@google.com> Date: Tue Nov 10 11:29:44 2015 -0800 Remove check for version code. This was unnecessary and caused multi-codepoint emoji to not show up on any device. Bug: 25369504 Change-Id: Ia1e61c052444aaab824b18463c26b5a8066c65ed commit 1b924816665a3a2c48307dbdd1078f61dd3179f2 Author: Chieu Nguyen <cvnguyen@google.com> Date: Fri Nov 6 18:12:58 2015 -0800 Fix Material icons for new tab. Bug: 25369504 Bug: 16185905 Change-Id: I873eb9e8fc1259ac94a974c04a80a4f0d005f9c2 commit 956d5f86d2552d90d2c3240a85d5c1cddf05eda9 Author: Chieu Nguyen <cvnguyen@google.com> Date: Fri Nov 6 17:16:10 2015 -0800 Remove extraneous TalkBack descriptions. Bug: 25369504 Bug: 16185905 Change-Id: Iec4f0f46cf9dda169c5827168ef207e56d619096 commit 07357bdec69b5fc118c82401d59b61ad7b802c22 Author: Chieu Nguyen <cvnguyen@google.com> Date: Fri Nov 6 16:01:34 2015 -0800 Better checking of whether to display new emoji. Bug: 25369504 Bug: 16185905 Change-Id: I61f1b428e5a805f66eb4e9db346be8756fc84b8f commit 666a92f17034f5a1948e70f40226ed995c72d81f Author: Chieu Nguyen <cvnguyen@google.com> Date: Fri Nov 6 12:54:53 2015 -0800 Fix shading on emoji category icons. Bug: 25369504 Bug: 16185905 Change-Id: I217af3d97120e7910e9850de7ea331a461ae7e56 commit 2712432c0e7a1b90ebb7ed6bde8f87eec7bf1094 Author: Chieu Nguyen <cvnguyen@google.com> Date: Thu Nov 5 19:06:57 2015 -0800 Add new emoji categories to Holo Blue. Bug: 25369504 Bug: 16185905 Change-Id: Ie32af93e68e08b36a4a5861a06de511b2b190dca commit 04c79b1f53912b263d7f7eb8b71ac802ed960a8a Author: Chieu Nguyen <cvnguyen@google.com> Date: Thu Nov 5 18:06:35 2015 -0800 Fix default category, remove xxxhdpi Holo icons. Bug: 25369504 Bug: 16185905 Change-Id: I9bca795675297dceb93777d998e8f2935f7031a6 commit 15c0b578343db2baa873096891a69305398eb830 Merge: 77bc6fc 8604ce3 Author: Chieu Nguyen <cvnguyen@google.com> Date: Fri Nov 6 00:59:08 2015 +0000 Merge changes into jb-ub-latinimegoogle commit 77bc6fcfd760232757b5751993c0046f2a43626a Merge: b0380a0 8604ce3 Author: Chieu Nguyen <cvnguyen@google.com> Date: Fri Nov 6 00:59:04 2015 +0000 Merge "Remove Kosovo from flags (no glyph)." into jb-ub-latinimegoogle commit b0380a0744647039278ad6648b7a1bc94eeab623 Author: Chieu Nguyen <cvnguyen@google.com> Date: Thu Nov 5 16:42:24 2015 -0800 Add icons for new emoji categories. Bug: 25369504 Bug: 16185905 Change-Id: I1182e031994332b2e618406ad1cd467cb050766e commit 8604ce3a34b65598101cac37a3ed3e8087fe38ca Author: Chieu Nguyen <cvnguyen@google.com> Date: Thu Nov 5 16:29:33 2015 -0800 Remove Kosovo from flags (no glyph). Bug: 25369504 Bug: 16185905 Change-Id: I92c9ace19d3600cfa1f27678ada0cf45af42d8f5 commit e0489eab47d3a6d138bfa00a668f02bcb473cf88 Author: Chieu Nguyen <cvnguyen@google.com> Date: Thu Nov 5 14:30:58 2015 -0800 Update emoji set to blacklist non-color glyphs. Bug: 25369504 Bug: 16185905 Change-Id: I8b54217fa68da8ddaa1bbcd1845e0123ed106463 commit 9ffdcdff058d6b44cab70e4fb0bb301e39699483 Author: Chieu Nguyen <cvnguyen@google.com> Date: Wed Nov 4 17:18:22 2015 -0800 Add Unicode 8.0 emoji to emoji palette. Currently all emoji category tabs use the flower icon. A future CL will update these once the icons are finalized. If glyphs do not exist for new emoji, the old categories will be shown. Bug: 25369504 Bug: 16185905 Change-Id: Ie3759bfc4c8469a17f3205b45609ce6ef7510121 commit 4a4a042072790b19048a14d2ddab655b1be31a6e Author: Chieu Nguyen <cvnguyen@google.com> Date: Sun Nov 1 18:38:20 2015 -0800 Add description strings for Unicode 8.0 new emoji. Bug: 16185905 Bug: 25369504 Change-Id: I6048609ace715a23db5f82d47fefe4868ccb3d17 Change-Id: I30a043554b14531ab9cf89a1f663b6970d7d6863
| * | | Import translations. DO NOT MERGE am: 4de1e2262e -s oursGeoff Mendal2015-11-110-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: 826c31f06d -s ours * commit '826c31f06dc2c6abd466195a3e1f2c5f511c18b1': Import translations. DO NOT MERGE
| | * | Import translations. DO NOT MERGEGeoff Mendal2015-11-110-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | am: 4de1e2262e -s ours * commit '4de1e2262e1d81f8d015a2ea3ccace35316308d0': Import translations. DO NOT MERGE
| | | * Import translations. DO NOT MERGEGeoff Mendal2015-11-112-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib2017e067aadd10ca7d2ea82c3a54c2b04fc2cf3 Auto-generated-cl: translation import
| * | | Revert "Unicode 8.0 emoji changes to Google Keyboard." am: e1d5012683Ian Pedowitz2015-11-10113-2672/+26
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: 1ce99504c5 * commit '1ce99504c5295eb4aef5df87db8d2bfc42001302': Revert "Unicode 8.0 emoji changes to Google Keyboard."
| | * | Revert "Unicode 8.0 emoji changes to Google Keyboard."Ian Pedowitz2015-11-10113-2672/+26
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | am: e1d5012683 * commit 'e1d501268396e58bfdd37a0a50dfeb2ac48139a8': Revert "Unicode 8.0 emoji changes to Google Keyboard."
| | | * Revert "Unicode 8.0 emoji changes to Google Keyboard."Ian Pedowitz2015-11-10113-2672/+26
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9cc42549d18f1e28ffc8dae94ff36728933f53f1. Change-Id: Ia3b037160e55bc54ef55194b967d9c91f6814ff8
| * | | Merge "Revert "Add description strings for Unicode 8.0 new emoji."" into ↵Ian Pedowitz2015-11-101-916/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev am: 9dfac101f2 am: 89efd96db6 * commit '89efd96db6b8d76c256e65968cb166af1f0df698': Revert "Add description strings for Unicode 8.0 new emoji."
| | * | Merge "Revert "Add description strings for Unicode 8.0 new emoji."" into ↵Ian Pedowitz2015-11-101-916/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev am: 9dfac101f2 * commit '9dfac101f2c7c34992e0214c09ee34f20b396bb1': Revert "Add description strings for Unicode 8.0 new emoji."
| | | * Merge "Revert "Add description strings for Unicode 8.0 new emoji."" into ↵Ian Pedowitz2015-11-101-916/+0
| | | |\ | | | | | | | | | | | | | | | mnc-dr-dev
| | | | * Revert "Add description strings for Unicode 8.0 new emoji."Ian Pedowitz2015-11-101-916/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 332181b8343492c8f0bc5237610ae4014fd5b225. Change-Id: Ic7c494292249f86159ec6f4bc1f7a72859b10282
| * | | | Merge "Add description strings for Unicode 8.0 new emoji." into mnc-dr-dev ↵Reena Lee2015-11-091-0/+916
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9749f1f1c3 am: 2c56e60003 * commit '2c56e600037bf48e64474d06cf491ca0347ff5fc': Add description strings for Unicode 8.0 new emoji.
| | * | | Merge "Add description strings for Unicode 8.0 new emoji." into mnc-dr-devReena Lee2015-11-091-0/+916
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9749f1f1c3 * commit '9749f1f1c3755ece6ddfc822d642ac0e8218d138': Add description strings for Unicode 8.0 new emoji.
| | | * | Merge "Add description strings for Unicode 8.0 new emoji." into mnc-dr-devReena Lee2015-11-091-0/+916
| | | |\|
| | | | * Add description strings for Unicode 8.0 new emoji.Chieu Nguyen2015-11-061-0/+916
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16185905 Bug: 25369504 Change-Id: I6048609ace715a23db5f82d47fefe4868ccb3d17 (cherry picked from commit 4a4a042072790b19048a14d2ddab655b1be31a6e)
| * | | | Unicode 8.0 emoji changes to Google Keyboard. am: 9cc42549d1Chieu Nguyen2015-11-09113-26/+2672
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 72d0a185d9 * commit '72d0a185d9227e8ec43ceb2bd0d3f9d7cc0f5c97': Unicode 8.0 emoji changes to Google Keyboard.
| | * | | Unicode 8.0 emoji changes to Google Keyboard.Chieu Nguyen2015-11-09113-26/+2672
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9cc42549d1 * commit '9cc42549d18f1e28ffc8dae94ff36728933f53f1': Unicode 8.0 emoji changes to Google Keyboard.
| | | * | Unicode 8.0 emoji changes to Google Keyboard.Chieu Nguyen2015-11-06113-26/+2672
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit 1b924816665a3a2c48307dbdd1078f61dd3179f2 Author: Chieu Nguyen <cvnguyen@google.com> Date: Fri Nov 6 18:12:58 2015 -0800 Fix Material icons for new tab. Bug: 25369504 Bug: 16185905 Change-Id: I873eb9e8fc1259ac94a974c04a80a4f0d005f9c2 commit 956d5f86d2552d90d2c3240a85d5c1cddf05eda9 Author: Chieu Nguyen <cvnguyen@google.com> Date: Fri Nov 6 17:16:10 2015 -0800 Remove extraneous TalkBack descriptions. Bug: 25369504 Bug: 16185905 Change-Id: Iec4f0f46cf9dda169c5827168ef207e56d619096 commit 07357bdec69b5fc118c82401d59b61ad7b802c22 Author: Chieu Nguyen <cvnguyen@google.com> Date: Fri Nov 6 16:01:34 2015 -0800 Better checking of whether to display new emoji. Bug: 25369504 Bug: 16185905 Change-Id: I61f1b428e5a805f66eb4e9db346be8756fc84b8f commit 666a92f17034f5a1948e70f40226ed995c72d81f Author: Chieu Nguyen <cvnguyen@google.com> Date: Fri Nov 6 12:54:53 2015 -0800 Fix shading on emoji category icons. Bug: 25369504 Bug: 16185905 Change-Id: I217af3d97120e7910e9850de7ea331a461ae7e56 commit 2712432c0e7a1b90ebb7ed6bde8f87eec7bf1094 Author: Chieu Nguyen <cvnguyen@google.com> Date: Thu Nov 5 19:06:57 2015 -0800 Add new emoji categories to Holo Blue. Bug: 25369504 Bug: 16185905 Change-Id: Ie32af93e68e08b36a4a5861a06de511b2b190dca commit 04c79b1f53912b263d7f7eb8b71ac802ed960a8a Author: Chieu Nguyen <cvnguyen@google.com> Date: Thu Nov 5 18:06:35 2015 -0800 Fix default category, remove xxxhdpi Holo icons. Bug: 25369504 Bug: 16185905 Change-Id: I9bca795675297dceb93777d998e8f2935f7031a6 commit 15c0b578343db2baa873096891a69305398eb830 Merge: 77bc6fc 8604ce3 Author: Chieu Nguyen <cvnguyen@google.com> Date: Fri Nov 6 00:59:08 2015 +0000 Merge changes into jb-ub-latinimegoogle commit 77bc6fcfd760232757b5751993c0046f2a43626a Merge: b0380a0 8604ce3 Author: Chieu Nguyen <cvnguyen@google.com> Date: Fri Nov 6 00:59:04 2015 +0000 Merge "Remove Kosovo from flags (no glyph)." into jb-ub-latinimegoogle commit b0380a0744647039278ad6648b7a1bc94eeab623 Author: Chieu Nguyen <cvnguyen@google.com> Date: Thu Nov 5 16:42:24 2015 -0800 Add icons for new emoji categories. Bug: 25369504 Bug: 16185905 Change-Id: I1182e031994332b2e618406ad1cd467cb050766e commit 8604ce3a34b65598101cac37a3ed3e8087fe38ca Author: Chieu Nguyen <cvnguyen@google.com> Date: Thu Nov 5 16:29:33 2015 -0800 Remove Kosovo from flags (no glyph). Bug: 25369504 Bug: 16185905 Change-Id: I92c9ace19d3600cfa1f27678ada0cf45af42d8f5 commit e0489eab47d3a6d138bfa00a668f02bcb473cf88 Author: Chieu Nguyen <cvnguyen@google.com> Date: Thu Nov 5 14:30:58 2015 -0800 Update emoji set to blacklist non-color glyphs. Bug: 25369504 Bug: 16185905 Change-Id: I8b54217fa68da8ddaa1bbcd1845e0123ed106463 commit 9ffdcdff058d6b44cab70e4fb0bb301e39699483 Author: Chieu Nguyen <cvnguyen@google.com> Date: Wed Nov 4 17:18:22 2015 -0800 Add Unicode 8.0 emoji to emoji palette. Currently all emoji category tabs use the flower icon. A future CL will update these once the icons are finalized. If glyphs do not exist for new emoji, the old categories will be shown. Bug: 25369504 Bug: 16185905 Change-Id: Ie3759bfc4c8469a17f3205b45609ce6ef7510121 Change-Id: Ia5a5879cea828ea4cb4c678765fe5d9e5ecbfcd2
| * | | am b1cd4006: am 28e65858: Do not start in recents tab if we do not have ↵Dmitry Torokhov2015-10-161-7/+14
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | recent emojis * commit 'b1cd4006027af90db427839b3c477930ab6aee31': Do not start in recents tab if we do not have recent emojis
| | * | am 28e65858: Do not start in recents tab if we do not have recent emojisDmitry Torokhov2015-10-161-7/+14
| | |\| | | | | | | | | | | | | | | | | * commit '28e65858d9f7e8f94e0b298275624703fd74af05': Do not start in recents tab if we do not have recent emojis
| * | | am 1194ad63: am 1fdb8f31: Define shortcuts for toggling IME layouts.Dan Zivkovic2015-10-164-82/+224
| |\| | | | | | | | | | | | | | | | | | * commit '1194ad63ee11ccccab4cd6bdeaa0dc85852008a9': Define shortcuts for toggling IME layouts.
| | * | am 1fdb8f31: Define shortcuts for toggling IME layouts.Dan Zivkovic2015-10-164-82/+224
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '1fdb8f31562eeef78167585a878eb0450310036b': Define shortcuts for toggling IME layouts.
| * | | | am 33bbbb0d: am de674ac0: Re-activate emoji keyboard shortcut.Dan Zivkovic2015-10-161-4/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '33bbbb0d333223451eb24d6b462840755fb51152': Re-activate emoji keyboard shortcut.
| | * | | am de674ac0: Re-activate emoji keyboard shortcut.Dan Zivkovic2015-10-161-4/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'de674ac02ee0090078f1ec0d286f26ef19cdeebb': Re-activate emoji keyboard shortcut.
| * | | | | am e8e27b0b: (-s ours) am cada0b33: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2015-09-250-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into mnc-dr-dev * commit 'e8e27b0bd73d7b7bdfc52daecbf359ab8e951c3f': Import translations. DO NOT MERGE