Unity 8

Merge lp://staging/~unity-team/unity8/rtm-20150213 into lp://staging/unity8/rtm-14.09

  1. rtm-20150213
  2. Merge into rtm-14.09
Proposed by Michał Sawicz
Status: Merged
Approved by: Michael Zanetti
Approved revision: 1425
Merged at revision: 1418
Proposed branch: lp://staging/~unity-team/unity8/rtm-20150213
Merge into: lp://staging/unity8/rtm-14.09
Diff against target: 2193 lines (+1176/-382)
27 files modified
debian/changelog (+26/-0)
plugins/Dash/CardAttributes.qml (+2/-0)
plugins/Dash/CardCreator.js (+5/-1)
qml/Components/Dialogs.qml (+4/-24)
qml/Components/PhysicalKeysMapper.qml (+113/-0)
qml/Components/VolumeKeyFilter.qml (+0/-63)
qml/Notifications/Notification.qml (+36/-6)
qml/Notifications/Notifications.qml (+2/-6)
qml/Panel/IndicatorItem.qml (+2/-0)
qml/Shell.qml (+12/-39)
tests/mocks/Unity/Notifications/CMakeLists.txt (+2/-1)
tests/mocks/Unity/Notifications/MockActionModel.cpp (+6/-4)
tests/mocks/Unity/Notifications/MockActionModel.h (+4/-2)
tests/mocks/Unity/Notifications/MockNotification.cpp (+156/-4)
tests/mocks/Unity/Notifications/MockNotification.h (+63/-5)
tests/mocks/Unity/Notifications/MockNotificationModel.cpp (+172/-0)
tests/mocks/Unity/Notifications/MockNotificationModel.h (+72/-0)
tests/mocks/Unity/Notifications/plugin.cpp (+5/-3)
tests/mocks/Unity/Notifications/plugin.h (+1/-2)
tests/qmltests/CMakeLists.txt (+1/-0)
tests/qmltests/Components/tst_PhysicalKeysMapper.qml (+119/-0)
tests/qmltests/Dash/tst_Card.qml (+9/-3)
tests/qmltests/Notifications/Notification.qml (+31/-0)
tests/qmltests/Notifications/tst_Notifications.qml (+271/-213)
tests/qmltests/Notifications/tst_OptionToggle.qml (+11/-6)
tests/qmltests/Notifications/tst_SwipeToAct.qml (+4/-0)
tests/qmltests/tst_ShellWithPin.qml (+47/-0)
To merge this branch: bzr merge lp://staging/~unity-team/unity8/rtm-20150213
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email: mp+249680@code.staging.launchpad.net
To post a comment you must log in.
lp://staging/~unity-team/unity8/rtm-20150213 updated
1423. By Michał Sawicz

Add changelog

1424. By Josh Arenson

Create a PhysicalKeyMapper to handle all physical/hardware keys

In addition, change the key combination for taking a screenshot from (Volume Up + Volume Down) to (Power + Volume Down).

1425. By Michał Sawicz

Update changelog

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

to all changes: