Merge lp:~aacid/unity8/passphrase_kewboard into lp:unity8

[Albert Astals Cid]

Focus the shutdown dialog

This way the keyboard will hide and we won't have a weird situation in which the keyaboard is half shown in shutdown dialog when we try get it on the passphrase dialog in the LockScreen

 * Are there any related MPs required for this MP to build/function as expected?
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?
N/A

 * If you changed the UI, has there been a design review?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1690
http://jenkins.qa.ubuntu.com/job/unity8-ci/5470/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1888/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/634
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/635
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/635
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1666/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1886
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1886/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19033

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

can you please add a tryCompare(dialog, "activeFocus", true) to the test after it opens the dialog?

review: Needs Fixing

[lp:~aacid/unity8/passphrase_kewboard]

1691. By Albert Astals Cid on 2015-03-26

test item gets the focus as suggested by mzanetti

[Albert Astals Cid (aacid)]

Done

[lp:~aacid/unity8/passphrase_kewboard]

1692. By Albert Astals Cid on 2015-03-26

unbreak tryDialogs

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

as much as it can. qmltests are fine. AP not affected by this afaict.

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

yes

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1692
http://jenkins.qa.ubuntu.com/job/unity8-ci/5492/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1995
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/656
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/657
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/657
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1757
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1993
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1993/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19202

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

review: Approve (continuous-integration)

=== modified file 'qml/Components/Dialogs.qml'
--- qml/Components/Dialogs.qml	2015-03-13 10:07:57 +0000
+++ qml/Components/Dialogs.qml	2015-03-26 15:39:44 +0000
@@ -51,11 +51,13 @@
             if (!dialogLoader.active) {
                 dialogLoader.sourceComponent = powerDialogComponent;
                 dialogLoader.active = true;
+                dialogLoader.item.forceActiveFocus();
             }
         }
     }
     Loader {
         id: dialogLoader
+        objectName: "dialogLoader"
         anchors.fill: parent
         active: false
     }

=== modified file 'tests/qmltests/Components/tst_Dialogs.qml'
--- tests/qmltests/Components/tst_Dialogs.qml	2014-12-08 13:39:01 +0000
+++ tests/qmltests/Components/tst_Dialogs.qml	2015-03-26 15:39:44 +0000
@@ -79,7 +79,7 @@
         Column {
             anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
             spacing: units.gu(1)
-            Button { text: "Power dialog"; onClicked: { testCase.showPowerDialog(); } }
+            Button { text: "Power dialog"; onClicked: { testCase.test_showPowerDialog(); } }
             Button { text: "Logout Requested"; onClicked: { fakeUnitySession.logoutRequested(); } }
             Button { text: "Shutdown Requested"; onClicked: { fakeUnitySession.shutdownRequested(); } }
             Button { text: "Reboot Requested"; onClicked: { fakeUnitySession.rebootRequested(); } }
@@ -96,9 +96,11 @@
         name: "Dialogs"
         when: windowShown
 
-        function showPowerDialog() {
+        function test_showPowerDialog() {
             var dialogsPrivate = findInvisibleChild(dialogs, "dialogsPrivate");
             dialogsPrivate.showPowerDialog();
+            var dialogLoader = findInvisibleChild(dialogs, "dialogLoader");
+            tryCompare(dialogLoader.item, "focus", true);
         }
     }
 }