Merge lp:~mterry/unity8/dont-refocus-dialer into lp:unity8

[Michael Terry]

Don't refocus the dialer-app when a call is started by the user. Because of how qtmir works, this would cause the dialer-app to unfocus momentarily, causing interface oddities for the user.

Don't refocus the dialer-app when a call is started by the user. Because of how qtmir works, this would cause the dialer-app to unfocus momentarily, causing interface oddities for the user.

== 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, see bug for reproduction steps.

 * 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

[Bill Filler (bfiller)]

tested, fixes the issue and don't see any negative side effects or regressions.

review: Approve

[Gustavo Pichorim Boiko (boiko)]

Also tested it here, works fine and no regressions so far.

review: Approve

[Michael Zanetti (mzanetti)]

looks good to me.

review: Approve

[Michael Zanetti (mzanetti)]

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

Gustavo did.

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

not yet, waiting for it still

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

yes

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1562
http://jenkins.qa.ubuntu.com/job/unity8-ci/5168/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/906
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/332
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/333
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/333
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/797
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/904
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/904/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17296

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

review: Needs Fixing (continuous-integration)

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2015-01-09 10:41:41 +0000
+++ qml/Shell.qml	2015-01-21 16:20:41 +0000
@@ -652,7 +652,7 @@
         target: callManager
 
         onHasCallsChanged: {
-            if (shell.locked && callManager.hasCalls) {
+            if (shell.locked && callManager.hasCalls && greeter.lockedApp !== "dialer-app") {
                 // We just received an incoming call while locked.  The
                 // indicator will have already launched dialer-app for us, but
                 // there is a race between "hasCalls" changing and the dialer