Ubuntu UI Toolkit

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/oldAppHeaderMoving into lp:ubuntu-ui-toolkit/staging

  1. oldAppHeaderMoving
  2. Merge into staging
Proposed by Christian Dywan on 2015-05-08
Status: Merged
Approved by: Tim Peeters on 2015-05-15
Approved revision: 1504
Merged at revision: 1507
Proposed branch: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/oldAppHeaderMoving
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 38 lines (+15/-2)
2 files modified
modules/Ubuntu/Components/1.2/AppHeader.qml (+14/-0)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py (+1/-2)
To merge this branch: bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/oldAppHeaderMoving
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2015-05-15
Tim Peeters 2015-05-08 Approve on 2015-05-15
Review via email: mp+258617@code.launchpad.net

Commit Message

Restore moving property on AppHeader 1.2

To post a comment you must log in.
Tim Peeters (tpeeters) wrote :

thanks

review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1503
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1748/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2689
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/476
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/478
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/478/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/475
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2326
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2687
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2687/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20319

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1748/rebuild

review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1504
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1751/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2728
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/479
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/481
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/481/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/478
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2355
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2726
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2726/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20397

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1751/rebuild

review: Needs Fixing (continuous-integration)
Tim Peeters (tpeeters) wrote :

retry landing

review: Approve
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
1=== modified file 'modules/Ubuntu/Components/1.2/AppHeader.qml'
2--- modules/Ubuntu/Components/1.2/AppHeader.qml 2015-04-30 08:32:44 +0000
3+++ modules/Ubuntu/Components/1.2/AppHeader.qml 2015-05-12 10:09:09 +0000
4@@ -166,6 +166,20 @@
5 */
6 property PageHeadConfiguration config: null
7
8+ /*!
9+ The header is not fully opened or fully closed.
10+
11+ This property is true if the header is animating towards a fully
12+ opened or fully closed state, or if the header is moving due to user
13+ interaction with the flickable.
14+
15+ The value of moving is always false when using an old version of
16+ PageHeadConfiguration (which does not have the visible property).
17+
18+ Used in tst_header_locked_visible.qml.
19+ */
20+ readonly property bool moving: false
21+
22 QtObject {
23 id: internal
24
25
26=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py'
27--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py 2015-05-08 11:40:28 +0000
28+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py 2015-05-12 10:09:09 +0000
29@@ -65,8 +65,7 @@
30 return
31
32 # Wait showing/hiding animation of the header.
33- if hasattr(self, 'moving'):
34- self.moving.wait_for(False)
35+ self.moving.wait_for(False)
36
37 @autopilot_logging.log_action(logger.info)
38 def switch_to_section_by_index(self, index):

Subscribers

People subscribed via source and target branches