Merge lp:~mterry/unity8/greeter-osk into lp:unity8

[Michael Terry]

Set QT_IM_MODULE in the greeter so that the OSK can come up.

And do a little bit of cleanup.

When testing, make sure that stay-hidden is false. It might have been true from past versions of unity8.

sudo -H -u lightdm dbus-run-session gsettings get com.canonical.keyboard.maliit stay-hidden

You'll also note that once you enable the OSK, you can't turn it off again.

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2841
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3300/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4345
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2597
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2597
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4373
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4207
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4207/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4207
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4207/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4207
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4207/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4207
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4207/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4207
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4207/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4207
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4207/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3300/rebuild

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Y
 * Did CI run pass? If not, please explain why.
Y

review: Approve

=== modified file 'data/unity8-greeter-wrapper'
--- data/unity8-greeter-wrapper	2016-10-07 17:22:21 +0000
+++ data/unity8-greeter-wrapper	2017-03-07 14:40:57 +0000
@@ -49,9 +49,12 @@
     TOUCH_WRAPPER=ubuntu-touch-session
 fi
 
-# Pretend that we're in an ubuntu-touch session, so that indicator-network
-# will start.
-export DESKTOP_SESSION=ubuntu-touch
+# Advertise as a unity8 session, so that indicator-network will start.
+export XDG_SESSION_DESKTOP=unity8
+export DESKTOP_SESSION=$XDG_SESSION_DESKTOP
+
+set_greeter_var QT_IM_MODULE maliitphablet
+set_greeter_var QT_QPA_PLATFORM ubuntumirclient
 
 # We disable ofono using pulse.  It causes problems with racing with the user's
 # pulse.  We need to come up with a better long-term fix for this, because we
@@ -100,7 +103,7 @@
 fi
 
 # And finally actually start the greeter
-exec env QT_QPA_PLATFORM=ubuntumirclient MIR_SERVER_FILE=$SUB_SOCKET $TOUCH_WRAPPER $@ &
+exec env MIR_SERVER_FILE=$SUB_SOCKET $TOUCH_WRAPPER $@ &
 CMD_PID=$!
 wait $CMD_PID
 CMD_PID=