Merge lp:~mterry/unity8/dialer-app-lock into lp:unity8

[Michael Terry]

Don't lock phone if user tries to switch back to an active call.

Don't lock phone if user tries to switch back to an active call.

== Checklist ==

 * 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

 * Did you make sure that your branch does not contain spurious tags?
 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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1370
http://jenkins.qa.ubuntu.com/job/unity8-ci/4807/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6375/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1793
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1903
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1901
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5977/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7627
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7627/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15288

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

review: Needs Fixing (continuous-integration)

[lp:~mterry/unity8/dialer-app-lock]

1371. By Michael Terry on 2014-10-31

Add tests

[Michael Terry (mterry)]

Added some tests to cover the locked and unlocked versions of this user interaction.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1371
http://jenkins.qa.ubuntu.com/job/unity8-ci/4811/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6383
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1797
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1907
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1905
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5985
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7635
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7635/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15300

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

After a merge with trunk some tests are failing: https://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1797/#showFailuresLink

review: Needs Fixing

[Michael Zanetti (mzanetti)]

> After a merge with trunk some tests are failing:
> https://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-
> utopic/1797/#showFailuresLink

works fine again after merging https://code.launchpad.net/~aacid/unity8/multimediaMocks/+merge/240248 too.

review: Abstain

[Michael Zanetti (mzanetti)]

 * 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.

nope. see previous comments

 * Did you make sure that the branch does not contain spurious tags?

yes

review: Approve

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2014-10-30 21:43:18 +0000
+++ qml/Shell.qml	2014-10-31 20:02:13 +0000
@@ -175,7 +175,7 @@
             target: ApplicationManager
             onFocusRequested: {
                 if (greeter.narrowMode) {
-                    if (appId === "dialer-app" && callManager.hasCalls) {
+                    if (appId === "dialer-app" && callManager.hasCalls && shell.locked) {
                         // If we are in the middle of a call, make dialer lockedApp and show it.
                         // This can happen if user backs out of dialer back to greeter, then
                         // launches dialer again.

=== modified file 'tests/qmltests/tst_ShellWithPin.qml'
--- tests/qmltests/tst_ShellWithPin.qml	2014-10-30 21:40:34 +0000
+++ tests/qmltests/tst_ShellWithPin.qml	2014-10-31 20:02:13 +0000
@@ -160,6 +160,7 @@
             AccountsService.enableLauncherWhileLocked = true
             AccountsService.enableIndicatorsWhileLocked = true
             AccountsService.demoEdges = false
+            callManager.foregroundCall = null
 
             // reload our test subject to get it in a fresh state once again
             shellLoader.active = true
@@ -212,6 +213,7 @@
             tryCompare(lockscreen, "shown", false)
             tryCompare(greeter, "hasLockedApp", true)
             tryCompare(greeter, "lockedApp", app)
+            tryCompare(LightDM.Greeter, "active", true)
             tryCompare(ApplicationManager, "focusedApplicationId", app)
         }
 
@@ -386,5 +388,61 @@
             callManager.foregroundCall = phoneCall
             confirmLockedApp("dialer-app")
         }
+
+        function test_emergencyDialerActiveCallPanel() {
+            // Make sure that the following sequence works:
+            // - Enter emergency mode call
+            // - Return to greeter
+            // - Click on active call panel
+            // - Should be back in emergency mode dialer
+
+            var greeter = findChild(shell, "greeter");
+            var lockscreen = findChild(shell, "lockscreen");
+
+            lockscreen.emergencyCall();
+            confirmLockedApp("dialer-app");
+            callManager.foregroundCall = phoneCall;
+
+            LightDM.Greeter.showGreeter();
+            tryCompare(lockscreen, "shown", true);
+            tryCompare(greeter, "hasLockedApp", false);
+
+            // simulate a callHint press, the real thing requires dialer: url support
+            ApplicationManager.requestFocusApplication("dialer-app");
+
+            confirmLockedApp("dialer-app");
+        }
+
+        function test_normalDialerActiveCallPanel() {
+            // Make sure that the following sequence works:
+            // - Log in
+            // - Start a call
+            // - Switch apps
+            // - Click on active call panel
+            // - Should be back in normal dialer
+            // (we've had a bug where we locked screen in this case)
+
+            var lockscreen = findChild(shell, "lockscreen");
+            var panel = findChild(shell, "panel");
+
+            enterPin("1234");
+            tryCompare(lockscreen, "shown", false);
+            tryCompare(LightDM.Greeter, "active", false);
+
+            ApplicationManager.startApplication("dialer-app", ApplicationManager.NoFlag);
+            tryCompare(ApplicationManager, "focusedApplicationId", "dialer-app");
+            callManager.foregroundCall = phoneCall;
+
+            ApplicationManager.requestFocusApplication("unity8-dash");
+            tryCompare(ApplicationManager, "focusedApplicationId", "unity8-dash");
+            tryCompare(panel.callHint, "visible", true);
+
+            // simulate a callHint press, the real thing requires dialer: url support
+            ApplicationManager.requestFocusApplication("dialer-app");
+
+            tryCompare(ApplicationManager, "focusedApplicationId", "dialer-app");
+            tryCompare(lockscreen, "shown", false);
+            tryCompare(LightDM.Greeter, "active", false);
+        }
     }
 }