Unity 8

Merge lp://staging/~aacid/unity8/unrevertlp1193419 into lp://staging/unity8

  1. unrevertlp1193419
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Michael Zanetti
Approved revision: 362
Merged at revision: 371
Proposed branch: lp://staging/~aacid/unity8/unrevertlp1193419
Merge into: lp://staging/unity8
Diff against target: 160 lines (+81/-1)
6 files modified
Dash/DashApps.qml (+1/-0)
Dash/DashContent.qml (+1/-0)
Dash/GenericScopeView.qml (+3/-0)
Shell.qml (+1/-1)
tests/mocks/Unity/fake_applications_scope.cpp (+7/-0)
tests/qmltests/tst_Shell.qml (+68/-0)
To merge this branch: bzr merge lp://staging/~aacid/unity8/unrevertlp1193419
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Daniel d'Andrada (community) Approve
Michael Zanetti Pending
Unity Team Pending
Review via email: mp+188377@code.staging.launchpad.net

Commit message

Revert the reversion of r304 since it doesn't seem to crash anymore

Original commit was
Reset apps scope when returning from app to dash (LP #1193419)

If an app is on foreground and you perform a long left-edge swipe to minimize it,
and therefore return to the dash, the dash should be in the Applications scope
and showing the running/recents applications. Fixes: https://bugs.launchpad.net/bugs/1193419.

To post a comment you must log in.
Revision history for this message
Daniel d'Andrada (dandrader) wrote :

I confirm this is the rebased patch from https://code.launchpad.net/~dandrader/unity8/runningApps_lp1193419/+merge/177630

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

FAILED: Continuous integration, rev:362
http://jenkins.qa.ubuntu.com/job/unity8-ci/1174/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4194
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1861
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1936
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/197
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1174
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1174/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1173
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/490
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/62
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/62/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1863
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1863/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1559
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1571

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

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

FAILED: Continuous integration, rev:362
http://jenkins.qa.ubuntu.com/job/unity8-ci/1185/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy-vm/149
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1934/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1955
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/208
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1185
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1185/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1184
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-vm-saucy/106
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4297
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4297/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1936
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1936/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1629/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1647

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

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

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