Merge lp:~mterry/unity8/pull-to-refresh-scope into lp:unity8
Status: | Merged |
---|---|
Approved by: | Albert Astals Cid |
Approved revision: | 1293 |
Merged at revision: | 1330 |
Proposed branch: | lp:~mterry/unity8/pull-to-refresh-scope |
Merge into: | lp:unity8 |
Diff against target: |
237 lines (+153/-4) 6 files modified
po/unity8.pot (+10/-2) qml/Dash/GenericScopeView.qml (+36/-1) qml/Dash/PullToRefreshScopeStyle.qml (+82/-0) tests/mocks/Unity/fake_scope.cpp (+1/-1) tests/mocks/Unity/fake_scope.h (+3/-0) tests/qmltests/Dash/tst_GenericScopeView.qml (+21/-0) |
To merge this branch: | bzr merge lp:~mterry/unity8/pull-to-refresh-scope |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Albert Astals Cid (community) | Approve | ||
James Mulholland | Pending | ||
Review via email: mp+236184@code.launchpad.net |
Commit message
Add pull-to-refresh functionality to scopes.
Description of the change
Add pull-to-refresh functionality to scopes.
I used a PullToRefresh object, though it did require a manual style override to avoid the default ActivityIndicator it uses.
== Checklist ==
* 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
* Did you make sure that your branch does not contain spurious tags?
Yes
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
NA
* If you changed the UI, has there been a design review?
TBD
FAILED: Continuous integration, rev:1288 jenkins. qa.ubuntu. com/job/ unity8- ci/4419/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- utopic- touch/5248 jenkins. qa.ubuntu. com/job/ unity-phablet- qmluitests- utopic/ 1415 jenkins. qa.ubuntu. com/job/ unity8- utopic- amd64-ci/ 1513 jenkins. qa.ubuntu. com/job/ unity8- utopic- i386-ci/ 1513 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- mako/4975 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/6500 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/6500/ artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 13843
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity8- ci/4419/ rebuild
http://