Merge lp:~mzanetti/unity8/homekey-dash into lp:unity8

[Michael Zanetti]

Adjust home key to still focus the dash instead of messing with the drawer

 * Are there any related MPs required for this MP to build/function as expected? Please list.
see prereq
 * Did you perform an exploratory manual test run of your code change and any related functionality?
yes
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
n/a
 * If you changed the UI, has there been a design review?
n/a

[Lukáš Tinkl (lukas-kde)]

I think pressign Super key alone should also close the appdrawer (when it's open), wdyt?

Otherwise the fix works fine

review: Needs Information

[Lukáš Tinkl (lukas-kde)]

Oh and, needs a new/adjusted test

review: Needs Fixing

[Michael Zanetti (mzanetti)]

> I think pressign Super key alone should also close the appdrawer (when it's
> open), wdyt?
>
> Otherwise the fix works fine

the launcher.fadeOut() is still there, that also hides the drawer

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

PASSED: Continuous integration, rev:2738
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2996/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3900
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2286
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2286
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3928
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3773
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3773/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3773
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3773/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3773
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3773/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3773
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3773/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3773
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3773/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3773
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3773/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Lukáš Tinkl (lukas-kde)]

> > I think pressign Super key alone should also close the appdrawer (when it's
> > open), wdyt?
> >
> > Otherwise the fix works fine
>
> the launcher.fadeOut() is still there, that also hides the drawer

Yup, it works now correctly

[lp:~mzanetti/unity8/homekey-dash]

2739. By Michael Zanetti on 2017-01-23

add a test

[Michael Zanetti (mzanetti)]

> Oh and, needs a new/adjusted test

test added

[Lukáš Tinkl (lukas-kde)]

Works fine, test passes locally, waiting on CI with the top approval.

review: Approve

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

FAILED: Continuous integration, rev:2739
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2998/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3902
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2288
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2288
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3930
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3776
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3776/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3776
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3776/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3776
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3776/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3776
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3776/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3776
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3776/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3776
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3776/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2017-01-23 14:25:44 +0000
+++ qml/Shell.qml	2017-01-23 14:25:44 +0000
@@ -240,7 +240,7 @@
             // Ignore when greeter is active, to avoid pocket presses
             if (!greeter.active) {
                 launcher.fadeOut();
-                shell.showHome();
+                ApplicationManager.requestFocusApplication("unity8-dash");
             }
         }
         onTouchBegun: { cursor.opacity = 0; }

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2017-01-23 14:25:44 +0000
+++ tests/qmltests/tst_Shell.qml	2017-01-23 14:25:44 +0000
@@ -1374,6 +1374,17 @@
             verify(coverPage.shown);
         }
 
+        function test_physicalHomeKeyPressFocusesDash() {
+            loadShell("phone");
+
+            var galleryApp = ApplicationManager.startApplication("gallery-app");
+            tryCompare(ApplicationManager, "focusedApplicationId", "gallery-app");
+
+            var windowInputMonitor = findInvisibleChild(shell, "windowInputMonitor");
+            windowInputMonitor.homeKeyActivated();
+            tryCompare(ApplicationManager, "focusedApplicationId", "unity8-dash");
+        }
+
         function test_tabletLogin_data() {
             return [
                 {tag: "auth error", user: "auth-error", loggedIn: false, password: ""},