Unity 8

Merge lp:~dandrader/unity8/greeter_edge_hint into lp:unity8

  1. greeter_edge_hint
  2. Merge into trunk
Proposed by Daniel d'Andrada
Status: Merged
Approved by: Michał Sawicz
Approved revision: 529
Merged at revision: 540
Proposed branch: lp:~dandrader/unity8/greeter_edge_hint
Merge into: lp:unity8
Diff against target: 23 lines (+2/-5)
1 file modified
Greeter/Greeter.qml (+2/-5)
To merge this branch: bzr merge lp:~dandrader/unity8/greeter_edge_hint
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michael Zanetti (community) Approve
Unity Team Pending
Review via email: mp+195591@code.launchpad.net

Commit message

Add right-edge drag hinting to Greeter

To match with the existing teasing animation when you tap on the right half of
the Greeter.

Also has the side benefit of making the code look a bit nicer.

To post a comment you must log in.
Revision history for this message
Michael Zanetti (mzanetti) wrote :

nice!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/704/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/3248
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/812
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/800/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/279
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-autolanding/90
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/90
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/90/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-autolanding/90
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/736
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/812
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/812/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/800
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/800/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3415/console
    SUCCESS: http://s-jenkins:8080/job/touch-flash-device/1503

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:529
http://jenkins.qa.ubuntu.com/job/unity8-ci/1667/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/821
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/809
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/282
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/190
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/191
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/191/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/190
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/742
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/821
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/821/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/809
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/809/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3420
    SUCCESS: http://s-jenkins:8080/job/touch-flash-device/1508

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/716/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/3260
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/835
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/823
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/295/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-autolanding/102
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/102
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/102/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-autolanding/102
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/752
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/835
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/835/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/823
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/823/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3431
    SUCCESS: http://s-jenkins:8080/job/touch-flash-device/1520

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/723/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3298
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/877
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/865
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/306/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-autolanding/109
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/109
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/109/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-autolanding/109
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/788
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/877
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/877/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/865
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/865/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3466
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/1555

review: Needs Fixing (continuous-integration)
Revision history for this message
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 'Greeter/Greeter.qml'
2--- Greeter/Greeter.qml 2013-11-08 08:48:11 +0000
3+++ Greeter/Greeter.qml 2013-11-18 12:20:39 +0000
4@@ -89,7 +89,7 @@
5 when: teasingTimer.running
6 PropertyChanges {
7 target: greeter
8- x: -units.gu(2)
9+ x: -dragHandle.hintDisplacement
10 }
11 }
12 ]
13@@ -113,10 +113,7 @@
14 anchors.bottom: parent.bottom
15 anchors.right: parent.right
16
17- // no need for requiring a directional drag since we are covering the screen
18- // anyway (i.e., no change user could be trying to interact with some other
19- // UI element)
20- distanceThreshold: 0
21+ hintDisplacement: units.gu(2)
22
23 enabled: greeter.narrowMode || !greeter.locked
24

Subscribers

People subscribed via source and target branches