Merge lp:~mterry/unity8/greeter-hide-indicators into lp:unity8

[Michael Terry]

Make sure indicators and launcher hide when power button is pressed on greeter.

 * Are there any related MPs required for this MP to build/function as expected? Please list.
 No

 * 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?
 NA

 * If you changed the UI, has there been a design review?
 NA

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

FAILED: Continuous integration, rev:2527
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1653/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2193
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2221
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2127
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2127
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2127
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2118
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2118/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2118
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2118/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2118
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2118/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2118
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2118/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2118
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2118/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2118
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2118/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2118
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2118/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2118
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2118/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2118
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2118/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Lukáš Tinkl (lukas-kde)]

Better but not quite; you can still see the indicators "rolling up" when you wake the phone up. Previously you couldn't even see the animation, you were taken straight to the lockscreen.

review: Needs Information

[Michael Terry (mterry)]

Are you sure that's a regression? I think it just depends on how long you wait until turning the screen back on.

[Lukáš Tinkl (lukas-kde)]

Ah :) I stand corrected, indeed if you wait a moment, it will hide completely.

* Did you perform an exploratory manual test run of the code change and any related functionality?

Yes

* Did CI run pass? If not, please explain why.

Not completely, passing locally

review: Approve

[Michael Terry (mterry)]

I've rebased on sessions-model, just to help keep the coming stack of greeter branches conflict free.

Re-approving from before.

review: Approve

=== modified file 'qml/Greeter/Greeter.qml'
--- qml/Greeter/Greeter.qml	2016-07-06 19:43:54 +0000
+++ qml/Greeter/Greeter.qml	2016-07-06 19:43:55 +0000
@@ -71,11 +71,14 @@
             d.isLockscreen = true;
         }
         forcedUnlock = false;
-        if (!required) {
-            showNow(); // loader.onLoaded will select a user
-        } else {
+        if (required) {
+            // Normally loader.onLoaded will select a user, but if we're
+            // already shown, do it manually.
             d.selectUser(d.currentIndex, true);
         }
+        // Even though we may already be shown, we want to call show() for its
+        // possible side effects, like hiding indicators and such.
+        showNow();
     }
 
     function notifyAppFocusRequested(appId) {

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2016-07-06 19:43:54 +0000
+++ tests/qmltests/tst_Shell.qml	2016-07-06 19:43:55 +0000
@@ -1161,6 +1161,17 @@
             tryCompare(indicators, "fullyClosed", true);
         }
 
+        function test_greeterShownAgainHidesIndicators() {
+            // Regression test for https://launchpad.net/bugs/1595569
+
+            loadShell("phone");
+            showIndicators();
+            showGreeter();
+
+            var indicators = findChild(shell, "indicators");
+            tryCompare(indicators, "fullyClosed", true);
+        }
+
         function test_showAndHideGreeterDBusCalls() {
             loadShell("phone");
             swipeAwayGreeter();