Merge lp:~unity-team/unity8/show-header-on-unlock into lp:unity8

Proposed by Andrea Cimitan
Status: Merged
Approved by: Michael Terry
Approved revision: 433
Merged at revision: 445
Proposed branch: lp:~unity-team/unity8/show-header-on-unlock
Merge into: lp:unity8
Diff against target: 23 lines (+5/-1)
2 files modified
Components/DragHandle.qml (+0/-1)
Dash/ScopeListView.qml (+5/-0)
To merge this branch: bzr merge lp:~unity-team/unity8/show-header-on-unlock
Reviewer Review Type Date Requested Status
Michael Terry Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+190625@code.launchpad.net

Commit message

The header of category list is already on screen after unlock

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:433
http://jenkins.qa.ubuntu.com/job/unity8-ci/1363/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4942/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2841
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2229
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/386/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1363
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1363/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1362
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1118/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/817
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/817/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2843
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2843/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2363
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2403

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1363/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Michael Terry (mterry) wrote :

LGTM, tested and it worked.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Components/DragHandle.qml'
2--- Components/DragHandle.qml 2013-07-01 21:45:57 +0000
3+++ Components/DragHandle.qml 2013-10-11 11:47:19 +0000
4@@ -208,5 +208,4 @@
5
6 d.previousStatus = status;
7 }
8-
9 }
10
11=== modified file 'Dash/ScopeListView.qml'
12--- Dash/ScopeListView.qml 2013-06-27 14:56:17 +0000
13+++ Dash/ScopeListView.qml 2013-10-11 11:47:19 +0000
14@@ -20,4 +20,9 @@
15 ListViewWithPageHeader {
16 maximumFlickVelocity: height * 10
17 flickDeceleration: height * 2
18+
19+ Connections {
20+ target: greeter
21+ onShownChanged: if (greeter.shown) showHeader()
22+ }
23 }

Subscribers

People subscribed via source and target branches