Unity 8

Merge lp://qastaging/~unity-team/unity8/flickables-speed-workaround into lp://qastaging/unity8

flickables-speed-workaround
Merge into trunk

Proposed by Andrea Cimitan on 2014-10-10

Status:

Merged

Approved by:

Albert Astals Cid on 2014-10-10

Approved revision:

1243

Merged at revision:

1362

Proposed branch:

lp://qastaging/~unity-team/unity8/flickables-speed-workaround

Merge into:

lp://qastaging/unity8

Diff against target:

747 lines (+157/-44)

32 files modified

qml/Components/Carousel.qml (+2/-3)
qml/Components/Flickables/Flickable.qml (+23/-0)
qml/Components/Flickables/GridView.qml (+25/-0)
qml/Components/Flickables/ListView.qml (+25/-0)
qml/Components/Flickables/ListViewWithPageHeader.qml (+23/-0)
qml/Components/ResponsiveGridView.qml (+2/-1)
qml/Components/ZoomableImage.qml (+2/-2)
qml/Dash/CardHorizontalList.qml (+2/-1)
qml/Dash/DashContent.qml (+2/-3)
qml/Dash/DashNavigationButton.qml (+2/-1)
qml/Dash/DashNavigationList.qml (+2/-1)
qml/Dash/PageHeader.qml (+2/-1)
qml/Dash/PreviewListView.qml (+2/-3)
qml/Dash/Previews/Preview.qml (+2/-1)
qml/Dash/Previews/PreviewImageGallery.qml (+3/-2)
qml/Dash/ScopeListView.qml (+3/-6)
qml/Dash/ScopeSettingsPage.qml (+2/-1)
qml/Dash/ScopesOverviewAll.qml (+2/-1)
qml/Dash/ScopesOverviewFavorites.qml (+4/-2)
qml/Greeter/LoginList.qml (+2/-2)
qml/Hud/Hud.qml (+2/-1)
qml/Hud/HudParametrizedActionsPage.qml (+2/-1)
qml/Launcher/LauncherPanel.qml (+2/-1)
qml/Notifications/Notification.qml (+2/-1)
qml/Notifications/Notifications.qml (+2/-1)
qml/Panel/IndicatorRow.qml (+2/-1)
qml/Panel/Indicators/DefaultIndicatorPage.qml (+2/-1)
qml/Panel/Indicators/client/IndicatorsList.qml (+2/-1)
qml/Panel/Indicators/client/IndicatorsTree.qml (+2/-1)
qml/Panel/MenuContent.qml (+3/-2)
qml/Stages/PhoneStage.qml (+2/-1)
qml/Stages/TabletStage.qml (+2/-1)

To merge this branch:

bzr merge lp://qastaging/~unity-team/unity8/flickables-speed-workaround

High

Invalid

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration	2014-10-10	Needs Fixing on 2014-10-10
Albert Astals Cid (community)		2014-10-10	Approve on 2014-10-10
Review via email: mp+237944@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2014-09-11.

Commit message

Fix flickable speed to be resolution independent, by subclassing components

Description of the change

* 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?
n/a
* If you changed the UI, has there been a design review?
n/a

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-11: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1237
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~unity-team/unity8/flickables-speed-workaround/+merge/234298/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/4276/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4722/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1277
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1370
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1370
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4493/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5974
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5974/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13063

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-16: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1238
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~unity-team/unity8/flickables-speed-workaround/+merge/234298/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/4314/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4837/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1315
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1408
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1408
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4599/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6089
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6089/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13235

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-09-17: Posted in a previous version of this proposal

I'll review this after we land lp:~unity-team/unity8/scopes_more_things_on_memory

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-30: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1239
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~unity-team/unity8/flickables-speed-workaround/+merge/234298/+edit-commit-message

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-30: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1241
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~unity-team/unity8/flickables-speed-workaround/+merge/234298/+edit-commit-message

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-10-06: Posted in a previous version of this proposal

Text conflict in debian/control
Text conflict in plugins/Dash/CardCreator.js
Text conflict in qml/Dash/GenericScopeView.qml
Text conflict in qml/Dash/ScopeSettingsPage.qml
Text conflict in qml/Panel/Indicators/DefaultIndicatorPage.qml
Text conflict in qml/Panel/MenuContent.qml
Text conflict in tests/plugins/Dash/cardcreator/2.res
Text conflict in tests/plugins/Dash/cardcreator/7.res
Text conflict in tests/qmltests/Dash/tst_GenericScopeView.qml
9 conflicts encountered.

review: Needs Fixing

lp://qastaging/~unity-team/unity8/flickables-speed-workaround updated on 2014-10-10

1243. By Andrea Cimitan on 2014-10-10: Attempt to merge

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-10: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1242
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~unity-team/unity8/flickables-speed-workaround/+merge/234298/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/4604/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5809/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1590
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1700
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1698
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5463/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7061
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7061/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14499