unity-mir

Merge lp://qastaging/~gerboland/unity-mir/add-fail-and-resume-focus-support into lp://qastaging/unity-mir

  1. add-fail-and-resume-focus-support
  2. Merge into trunk
Proposed by Gerry Boland
Status: Merged
Approved by: Michał Sawicz
Approved revision: 107
Merged at revision: 100
Proposed branch: lp://qastaging/~gerboland/unity-mir/add-fail-and-resume-focus-support
Merge into: lp://qastaging/unity-mir
Prerequisite: lp://qastaging/~gerboland/unity-mir/use-upstart-app-launch2
Diff against target: 303 lines (+112/-15)
5 files modified
src/modules/Unity/Application/ApplicationImage.qml (+0/-1)
src/modules/Unity/Application/application_manager.cpp (+70/-7)
src/modules/Unity/Application/application_manager.h (+6/-2)
src/modules/Unity/Application/taskcontroller.cpp (+30/-2)
src/modules/Unity/Application/taskcontroller.h (+6/-3)
To merge this branch: bzr merge lp://qastaging/~gerboland/unity-mir/add-fail-and-resume-focus-support
Reviewer Review Type Date Requested Status
Michał Sawicz Approve
Ricardo Mendoza (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+188040@code.qastaging.launchpad.net

Commit message

Add support for upstart-app-launch to request application resume & focus. This revealed extra work: prevent unexpected focus events propagating to shell, fix lifecycle bug and add workaround for handling of non-application sessions (like QtWebProcess and maliit).

Description of the change

To be tested in conjunction with this: https://code.launchpad.net/~gerboland/unity8/unity8-with-WM-fixes/+merge/188946

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

FAILED: Continuous integration, rev:100
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/81/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-amd64-ci/23/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/81/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-i386-ci/81/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-mir-ci/81/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) wrote :

How does upstart know if an app stop was expected or not? Exit code?

77 + // be notified of that through the onProcessStarted slot. Else resume.

No such slot anymore.

review: Needs Information
Revision history for this message
Gerry Boland (gerboland) wrote :

> How does upstart know if an app stop was expected or not? Exit code?
An excellent question that I cannot answer.

> 77 + // be notified of that through the onProcessStarted slot. Else
> resume.
>
> No such slot anymore.
Fixed

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

FAILED: Continuous integration, rev:101
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/83/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-amd64-ci/25/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/83/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-i386-ci/83/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-mir-ci/83/rebuild

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

PASSED: Continuous integration, rev:101
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/85/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/85
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/85/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-i386-ci/85

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-mir-ci/85/rebuild

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

PASSED: Continuous integration, rev:105
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/88/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-amd64-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/88
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/88/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-i386-ci/88

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-mir-ci/88/rebuild

review: Approve (continuous-integration)
Revision history for this message
Gerry Boland (gerboland) wrote :

Oops, pushed bad stuff here. Will fix

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

PASSED: Continuous integration, rev:106
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/89/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-amd64-ci/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/89
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/89/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-i386-ci/89

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-mir-ci/89/rebuild

review: Approve (continuous-integration)
Revision history for this message
Gerry Boland (gerboland) wrote :

Ok, ready for final review

lp://qastaging/~gerboland/unity-mir/add-fail-and-resume-focus-support updated
107. By Gerry Boland

Message a bit noisy, make it debug only

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

PASSED: Continuous integration, rev:107
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/90/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-amd64-ci/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/90
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/90/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-i386-ci/90

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-mir-ci/90/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ricardo Mendoza (ricmm) wrote :

Tried and tested on Nexus4, perfecto.

review: Approve
Revision history for this message
Michał Sawicz (saviq) wrote :

Code-wise looks good, will need someone else to have a look functionally.

review: Approve (code)
Revision history for this message
Michał Sawicz (saviq) wrote :

OK, worky!

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