Unity 8

Merge lp:~mterry/unity8/wizard-passphrase-osk into lp:unity8

  1. wizard-passphrase-osk
  2. Merge into trunk
Proposed by Michael Terry on 2014-12-10
Status: Merged
Approved by: Andrea Cimitan on 2014-12-17
Approved revision: 1484
Merged at revision: 1536
Proposed branch: lp:~mterry/unity8/wizard-passphrase-osk
Merge into: lp:unity8
Diff against target: 12 lines (+1/-1)
1 file modified
qml/Shell.qml (+1/-1)
To merge this branch: bzr merge lp:~mterry/unity8/wizard-passphrase-osk
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2015-01-08
Andrea Cimitan (community) 2014-12-10 Approve on 2015-01-07
Review via email: mp+244358@code.launchpad.net

Commit Message

Show OSK above the wizard.

Description of the Change

Show OSK above the wizard.

No test, because all the qmluitests that cover this don't use the OSK and while I would write an autopilot test for this, rhuddie is in the middle of making a suite of autopilot tests that cover the wizard.

== 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

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1484
http://jenkins.qa.ubuntu.com/job/unity8-ci/5018/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/519/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/183/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/183
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/451/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/517
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/517/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16502

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

review: Needs Fixing (continuous-integration)
Andrea Cimitan (cimi) wrote :

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Y
 * Did CI run pass? If not, please explain why.
ap
 * Did you make sure that the branch does not contain spurious tags?
Y

Andrea Cimitan (cimi) :
review: Approve
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1484
http://jenkins.qa.ubuntu.com/job/unity8-ci/5090/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/690
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/254
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/255
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/255
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/595
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/688
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/688/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16877

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

review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1484
http://jenkins.qa.ubuntu.com/job/unity8-ci/5100/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/703
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/264
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/265
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/265
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/607
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/701
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/701/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16893

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

review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1484
http://jenkins.qa.ubuntu.com/job/unity8-ci/5112/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/723
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/276
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/277
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/277
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/626
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/721
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/721/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16923

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

review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1484
http://jenkins.qa.ubuntu.com/job/unity8-ci/5117/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/728
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/281
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/282
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/282
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/630
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/726
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/726/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16929

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/Shell.qml'
2--- qml/Shell.qml 2014-12-02 18:47:49 +0000
3+++ qml/Shell.qml 2014-12-10 21:39:53 +0000
4@@ -312,7 +312,7 @@
5 id: inputMethod
6 objectName: "inputMethod"
7 anchors { fill: parent; topMargin: panel.panelHeight }
8- z: notifications.useModal || panel.indicators.shown ? overlay.z + 1 : overlay.z - 1
9+ z: notifications.useModal || panel.indicators.shown || wizard.active ? overlay.z + 1 : overlay.z - 1
10 }
11
12 Connections {

Subscribers

People subscribed via source and target branches