Merge lp:~bfiller/ubuntu-keyboard/enable-emoji-by-default into lp:ubuntu-keyboard

[Bill Filler]

enable emoji by default

enable emoji by default

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:303
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/547/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1228
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/48
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/48
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/48/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/48
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1083
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1226
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1226/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17858

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/547/rebuild

review: Needs Fixing (continuous-integration)

[Michael Sheldon (michael-sheldon)]

Tested via "gsettings reset" and the correct defaults were set, autopilot failure is unrelated.

review: Approve

=== modified file 'data/schemas/com.canonical.keyboard.maliit.gschema.xml'
--- data/schemas/com.canonical.keyboard.maliit.gschema.xml	2015-01-14 12:07:03 +0000
+++ data/schemas/com.canonical.keyboard.maliit.gschema.xml	2015-02-06 19:44:06 +0000
@@ -9,7 +9,7 @@
     <key name="enabled-languages" type="as">
       <summary>Enabled languages</summary>
       <description>User-defined list of activatable languages.</description>
-      <default>[]</default>
+      <default>['en', 'emoji']</default>
     </key>
     <key name="auto-capitalization" type="b">
       <summary>Auto-capitalization</summary>