Unity

Merge lp://qastaging/~azzar1/unity/fix-1308540 into lp://qastaging/unity

fix-1308540
Merge into trunk

Proposed by Andrea Azzarone on 2014-07-11

Status:

Merged

Approved by:

Marco Trevisan (Treviño) on 2014-08-29

Approved revision:

no longer in the source branch.

Merged at revision:

3863

Proposed branch:

lp://qastaging/~azzar1/unity/fix-1308540

Merge into:

lp://qastaging/unity

Diff against target:

347 lines (+83/-33)

8 files modified

lockscreen/LockScreenAbstractShield.h (+9/-1)
lockscreen/LockScreenController.cpp (+18/-1)
lockscreen/LockScreenController.h (+5/-0)
lockscreen/LockScreenShield.cpp (+17/-22)
lockscreen/LockScreenShield.h (+6/-3)
lockscreen/LockScreenShieldFactory.cpp (+7/-2)
lockscreen/LockScreenShieldFactory.h (+12/-2)
tests/test_lockscreen_controller.cpp (+9/-2)

To merge this branch:

bzr merge lp://qastaging/~azzar1/unity/fix-1308540

Related bugs:

Bug #1308540: [lockscreen] the password entry is not shared between screens	Low	Fix Released
Bug #1311316: After locking screen there is no input field to type password for unlock	High	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Marco Trevisan (Treviño)		2014-07-11	Approve on 2014-08-29
PS Jenkins bot (community)	continuous-integration		Approve on 2014-08-27
Review via email: mp+226455@code.qastaging.launchpad.net

Commit message

Share lockscreen password entry between screens.

Description of the change

== Problem ==
[lockscreen] the password entry is not shared between screens

== Fix ==
Share the UserPromptView object between the shields.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-11:

FAILED: Continuous integration, rev:3791
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~andyrock/unity/fix-1308540/+merge/226455/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-ci/1021/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/108/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/108/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/108/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Marco Trevisan (Treviño) (3v1n0) wrote on 2014-07-11:

Mostly looks fine, just check these two comments...

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-11:

FAILED: Continuous integration, rev:3839
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~andyrock/unity/fix-1308540/+merge/226455/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-ci/1023/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/110
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/110
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/110

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-11:

FAILED: Continuous integration, rev:3840
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~andyrock/unity/fix-1308540/+merge/226455/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-ci/1024/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/111
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/111
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/111