Unity 8

Merge lp://staging/~josharenson/unity8/fix_trust_store_focus into lp://staging/unity8

  1. fix_trust_store_focus
  2. Merge into trunk
Proposed by Josh Arenson
Status: Merged
Approved by: Michael Zanetti
Approved revision: 1371
Merged at revision: 1436
Proposed branch: lp://staging/~josharenson/unity8/fix_trust_store_focus
Merge into: lp://staging/unity8
Diff against target: 73 lines (+40/-1)
3 files modified
qml/Stages/SessionContainer.qml (+4/-0)
tests/mocks/Unity/Application/Session.h (+1/-1)
tests/qmltests/Stages/tst_SessionContainer.qml (+35/-0)
To merge this branch: bzr merge lp://staging/~josharenson/unity8/fix_trust_store_focus
Reviewer Review Type Date Requested Status
Michael Zanetti (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+239567@code.staging.launchpad.net

Commit message

Return focus to the application after a tusted session overlay is closing.

Description of the change

* 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

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

Fix lp:1381292

This works around an issue where a trusted session dialog would steal focus from an underlying application/session and never return it.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1370
http://jenkins.qa.ubuntu.com/job/unity8-ci/4759/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6205
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1745
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1855
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1853
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5828
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7457
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7457/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15054

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Michael Zanetti (mzanetti) wrote :

With the current way we're doing focus I guess this is the way to go, not really a hack. What is the reason why you think this is a hack? What would you say is the proper fix?

I guess I'm fine with approving this, maybe we can even remove the FIXME comment.

review: Needs Information
Revision history for this message
Josh Arenson (josharenson) wrote :

> With the current way we're doing focus I guess this is the way to go, not
> really a hack. What is the reason why you think this is a hack? What would you
> say is the proper fix?
>
> I guess I'm fine with approving this, maybe we can even remove the FIXME
> comment.

If focus worked correctly, this wouldn't be a hack. I'll remove the FIXME because any focus changes we make should work with this anyway.

lp://staging/~josharenson/unity8/fix_trust_store_focus updated
1371. By Josh Arenson

Remove FIXME

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1371
http://jenkins.qa.ubuntu.com/job/unity8-ci/4876/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/138
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/41
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/131
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/138
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/138/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15715

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1371
http://jenkins.qa.ubuntu.com/job/unity8-ci/4877/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/139
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/54
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/132
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/139
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/139/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15716

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

review: Approve (continuous-integration)
Revision history for this message
Michael Zanetti (mzanetti) wrote :

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

yep

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

it did

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

yeah

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches