Merge lp://staging/~unity-team/qtmir/rtm-20150116 into lp://staging/qtmir/rtm-14.09

Proposed by Michał Sawicz
Status: Merged
Approved by: Michael Zanetti
Approved revision: 295
Merged at revision: 293
Proposed branch: lp://staging/~unity-team/qtmir/rtm-20150116
Merge into: lp://staging/qtmir/rtm-14.09
Prerequisite: lp://staging/~unity-team/qtmir/rtm-20150114
Diff against target: 1107 lines (+798/-3)
17 files modified
debian/changelog (+14/-0)
src/common/abstractdbusservicemonitor.cpp (+101/-0)
src/common/abstractdbusservicemonitor.h (+68/-0)
src/modules/Unity/Application/Application.pro (+4/-0)
src/modules/Unity/Application/application.cpp (+20/-0)
src/modules/Unity/Application/application.h (+4/-0)
src/modules/Unity/Application/application_manager.cpp (+8/-0)
src/modules/Unity/Application/application_manager.h (+3/-0)
src/modules/Unity/Application/session.cpp (+1/-1)
src/modules/Unity/Application/sharedwakelock.cpp (+168/-0)
src/modules/Unity/Application/sharedwakelock.h (+50/-0)
tests/modules/Application/Application.pro (+16/-0)
tests/modules/Application/application_test.cpp (+122/-0)
tests/modules/SharedWakelock/sharedwakelock_test.cpp (+170/-0)
tests/modules/common/mock_shared_wakelock.h (+44/-0)
tests/modules/common/qtmir_test.h (+4/-1)
tests/modules/modules.pro (+1/-1)
To merge this branch: bzr merge lp://staging/~unity-team/qtmir/rtm-20150116
Reviewer Review Type Date Requested Status
Gerry Boland (community) functional Approve
Mir development team Pending
Review via email: mp+246680@code.staging.launchpad.net

Commit message

[ Gerry Boland ]
  * Add Wakelock support - ensures device drops to deep-sleep mode only
    when all AppMan suspend tasks have completed (LP: #1309915)

[ Ricardo Mendoza ]
  * Reduce suspend timeout to half of the previous value because the
    long value was too apparent on fast paced apps, like web games of
    music players; it broke the user experience according to design.
    (LP: #1402650)

To post a comment you must log in.
Revision history for this message
Gerry Boland (gerboland) wrote :

Code fine, need to test from silo

review: Approve (code)
295. By Michael Zanetti

merge

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

Tested silo, lgtm. MZanetti trying AP tests now

review: Approve (functional)

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