1
=== modified file 'qml/Greeter/Greeter.qml'
2
--- qml/Greeter/Greeter.qml	2016-07-06 19:43:54 +0000
3
+++ qml/Greeter/Greeter.qml	2016-07-06 19:43:55 +0000
4
@@ -71,11 +71,14 @@
5
71
            d.isLockscreen = true;
71
            d.isLockscreen = true;
6
72
        }
72
        }
7
73
        forcedUnlock = false;
73
        forcedUnlock = false;
11
74
        if (!required) {
74
        if (required) {
12
75
            showNow(); // loader.onLoaded will select a user
75
            // Normally loader.onLoaded will select a user, but if we're
13
76
        } else {
76
            // already shown, do it manually.
14
77
            d.selectUser(d.currentIndex, true);
77
            d.selectUser(d.currentIndex, true);
15
78
        }
78
        }
16
79
        // Even though we may already be shown, we want to call show() for its
17
80
        // possible side effects, like hiding indicators and such.
18
81
        showNow();
19
79
    }
82
    }
20
80
83
21
81
    function notifyAppFocusRequested(appId) {
84
    function notifyAppFocusRequested(appId) {
22
82
85
23
=== modified file 'tests/qmltests/tst_Shell.qml'
24
--- tests/qmltests/tst_Shell.qml	2016-07-06 19:43:54 +0000
25
+++ tests/qmltests/tst_Shell.qml	2016-07-06 19:43:55 +0000
26
@@ -1161,6 +1161,17 @@
27
1161
            tryCompare(indicators, "fullyClosed", true);
1161
            tryCompare(indicators, "fullyClosed", true);
28
1162
        }
1162
        }
29
1163
1163
30
1164
        function test_greeterShownAgainHidesIndicators() {
31
1165
            // Regression test for https://launchpad.net/bugs/1595569
32
1166
33
1167
            loadShell("phone");
34
1168
            showIndicators();
35
1169
            showGreeter();
36
1170
37
1171
            var indicators = findChild(shell, "indicators");
38
1172
            tryCompare(indicators, "fullyClosed", true);
39
1173
        }
40
1174
41
1164
        function test_showAndHideGreeterDBusCalls() {
1175
        function test_showAndHideGreeterDBusCalls() {
42
1165
            loadShell("phone");
1176
            loadShell("phone");
43
1166
            swipeAwayGreeter();
1177
            swipeAwayGreeter();
Reviewer	Review Type	Date Requested	Status
Michael Terry			Approve on 2016-07-06
Unity8 CI Bot	continuous-integration	2016-07-06	Pending
Lukáš Tinkl		2016-07-06	Pending
Review via email: mp+299344@code.launchpad.net