Unity 8

Merge lp:~mterry/unity8/greeter-ux-fixes into lp:unity8

greeter-ux-fixes
Merge into trunk

Proposed by Michael Terry on 2014-03-08

Status:

Merged

Approved by:

Michał Sawicz on 2014-04-25

Approved revision:

784

Merged at revision:

861

Proposed branch:

lp:~mterry/unity8/greeter-ux-fixes

Merge into:

lp:unity8

Diff against target:

612 lines (+247/-174)

8 files modified

po/unity8.pot (+7/-3)
qml/Greeter/Greeter.qml (+124/-51)
qml/Greeter/GreeterContent.qml (+1/-10)
qml/Greeter/Infographics.qml (+3/-0)
qml/Hud/Hud.qml (+1/-1)
qml/Shell.qml (+65/-51)
tests/qmltests/Greeter/tst_Phone.qml (+10/-50)
tests/qmltests/Greeter/tst_Tablet.qml (+36/-8)

To merge this branch:

bzr merge lp:~mterry/unity8/greeter-ux-fixes

Related bugs:

Bug #1308475: Greeter is seen flying to left of screen on tapping on Ubuntu icon	Undecided	Fix Released
Bug #1308477: left edge hint comes up everytime trying to unlock the greeter	Undecided	Won't Fix

Link a bug report

Reviewer	Review Type	Date Requested	Status
Michał Sawicz		2014-03-08	Approve on 2014-04-25
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-04-23
Albert Astals Cid (community)			Approve on 2014-04-10
Review via email: mp+210042@code.launchpad.net

Commit message

Make swipe teases in the greeter more helpful and obvious

Description of the change

Make swipe teases in the greeter more helpful and obvious.

This branch tries to implement a new design spec [1] for responding to some user feedback about the obviousness of swiping the greeter away.

Jouni, Christina, and John have said they like the current state of this branch, so once code reviewers are happy, we're good to land this.

[1] https://docs.google.com/a/canonical.com/document/d/1tgCqXDC6aRDVjb6hoMPtlLj526u_gZgEg2Fym6tWGjo

== 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

* 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?
- Yes. Jouni, Christina, and John Lea approved.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-08:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-03-10:

Hmm swiping the infographic was meant to allow switching between different infographic images (waiting for new infographic backend), did that approach change?

review: Needs Information

Revision history for this message

Michael Terry (mterry) wrote on 2014-03-11:

Saviq, double-pressing does that.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-11:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-03-11:

That's *now*, new design was just swipe through them on the welcome screen. Can you please verify that this is thought of?

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-03-17:

Doesn't merge with trunk:
Text conflict in qml/Shell.qml

review: Needs Fixing

Revision history for this message

Michael Terry (mterry) wrote on 2014-03-18:

Saviq, can you point me at the design doc for that swipe behavior? I'm just working off [1] which doesn't mention a change in infographics.

[1] https://docs.google.com/a/canonical.com/document/d/1tgCqXDC6aRDVjb6hoMPtlLj526u_gZgEg2Fym6tWGjo

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-18:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Terry (mterry) wrote on 2014-03-18:

JohnLea: "...lets leave it as double tap for now (swipe has possible conflicts with the unlock gesture)"

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-19:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-19:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-03-20:

Checklist, please.

Revision history for this message

Michael Terry (mterry) wrote on 2014-03-21:

Gah, I always forget that. Checklist added, Saviq!

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-21:

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-27:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-27:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-31:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-31:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-04-02:

Text conflict in qml/Shell.qml

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-02:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Terry (mterry) wrote on 2014-04-03:

Fixed conflict.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-08:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-09:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-09:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-04-10:

When swiping the greeter the Dash doesn't have the scale animation anymore, is that on purpose?

review: Needs Information

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-04-10:

When initiating a valid unlock drag of the greeter, the panel always makes the hinting animation. This is specially weird when you're dragging the greeter to the right, since for a split second there's something that follows the greeter and then goes back.

Is this on purpose?

review: Needs Information

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-04-10:

and in the previous comment panel means launcher

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-04-10:

If you drag from the left edge and after dragging the Launcher you keep dragging the greeter starts moving but the Dash you reveal beneath is empty. We should either make the greeter not be dragged when dragging the Launcher or show the stuff in the Dash.

review: Needs Fixing

Revision history for this message

Michael Terry (mterry) wrote on 2014-04-10:

> When swiping the greeter the Dash doesn't have the scale animation anymore, is that on purpose?

Yes.

> When initiating a valid unlock drag of the greeter, the panel always makes the hinting animation.
> This is specially weird when you're dragging the greeter to the right, since for a split second
> there's something that follows the greeter and then goes back.
>
> Is this on purpose?

Yes.

> If you drag from the left edge and after dragging the Launcher you keep dragging the greeter
> starts moving but the Dash you reveal beneath is empty. We should either make the greeter not
> be dragged when dragging the Launcher or show the stuff in the Dash.

Fixed, thanks!

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-04-10:

As discussed on IRC there is a weird effect happening when you pull from left, get the launcher out, and finish the "login" movement in the greeter, the darkening of the Dash is jumpy and inconsistent

review: Needs Fixing

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-04-10:

Run make pot_file in the builddir to update the pot file with the new contents of the Swipe label

review: Needs Fixing

Revision history for this message

Michael Terry (mterry) wrote on 2014-04-10:

> As discussed on IRC there is a weird effect happening
> when you pull from left, get the launcher out, and finish
> the "login" movement in the greeter, the darkening of the
> Dash is jumpy and inconsistent

Fixed.

> Run make pot_file in the builddir to update the pot file
> with the new contents of the Swipe label

Done.

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-04-10:

Looks good to me :)

* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

* Did CI run pass? If not, please explain why.
No, seems otto got upset with something else, but besides that everything passed.

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-10:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-10:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-04-14:

Please strip tags, you can use the script:

http://people.canonical.com/~msawicz/unity8/strip-u8-tags.sh

Pass lp:~mterry/unity8/greeter-ux-fixes as an argument.

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-04-16:

Two issues reported by QA: bug #1308475, bug #1308477

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-04-16:

One more issue: on tablet, short-swipe from the left does not give you the launcher.

review: Needs Fixing

lp:~mterry/unity8/greeter-ux-fixes updated on 2014-04-16

782. By Michael Terry on 2014-04-16: After finishing hiding, put the greeter back on the left for reliably showing

Revision history for this message

Michael Terry (mterry) wrote on 2014-04-16:

OK, fixed the "greeter warps from right to left" which as an effect, I kind of loved. But obviously a bug.

The "shouldn't tease launcher on swipe" issue is known and how design wanted it last time I talked to them. I've assigned the bug to Jouni for comment.

The can't-open-launcher-in-tablet issue is actually in trunk, not this branch. Will look at it and maybe can fix in this branch while I'm here.

lp:~mterry/unity8/greeter-ux-fixes updated on 2014-04-16

783. By Michael Terry on 2014-04-16: Re-enable launcher in tablet greeter

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-16:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-16:

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/greeter-ux-fixes updated on 2014-04-17

784. By Michael Terry on 2014-04-17: Merge from trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-17:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-21:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Terry (mterry) wrote on 2014-04-23:

So this is ready btw. The only open question is bug 1308477, assigned to Jouni. But the current behavior I had already confirmed with him when design gave me the spec for this stuff. So I'm not sure if you all want that to be a blocker for this merge or just a follow-up issue for the future.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-23:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-04-24:

Design confirmed this is the current wanted behaviour.

review: Abstain

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-04-25:

Yup.

* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

* Did CI run pass? If not, please explain why.
Known qml test failures.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Michael Terry

Mohammad Rakibul Hasan

Unity Team

 === modified file 'po/unity8.pot'
 --- po/unity8.pot	2014-03-25 15:49:30 +0000
 +++ po/unity8.pot	2014-04-17 15:43:48 +0000
@@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: unity8\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2014-03-25 16:48+0100\n"
++"POT-Creation-Date: 2014-04-10 11:13-0400\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -84,7 +84,7 @@
  msgid "See less"
  msgstr ""
--#: qml/Dash/DashApps.qml:38
++#: qml/Dash/DashApps.qml:37
  msgid "Recent"
  msgstr ""
@@ -113,6 +113,10 @@
  msgid "Send"
  msgstr ""
++#: qml/Greeter/Greeter.qml:151
++msgid "Swipe to unlock"
++msgstr ""
++
  #: qml/Greeter/Lockscreen.qml:149
  msgid "Emergency Call"
  msgstr ""
@@ -158,7 +162,7 @@
  msgid "Search"
  msgstr ""
--#: qml/Shell.qml:417
++#: qml/Shell.qml:348
  #, qt-format
  msgid "Please enter %1"
  msgstr ""
 === modified file 'qml/Greeter/Greeter.qml'
 --- qml/Greeter/Greeter.qml	2014-03-05 08:06:19 +0000
 +++ qml/Greeter/Greeter.qml	2014-04-17 15:43:48 +0000
@@ -28,10 +28,10 @@
      property url defaultBackground
      // 1 when fully shown and 0 when fully hidden
--    property real showProgress: MathUtils.clamp((width + x) / width, 0, 1)
++    property real showProgress: MathUtils.clamp((width - Math.abs(x)) / width, 0, 1)
      showAnimation: StandardAnimation { property: "x"; to: 0 }
--    hideAnimation: StandardAnimation { property: "x"; to: -width }
++    hideAnimation: __leftHideAnimation
      property alias dragHandleWidth: dragHandle.width
      property alias model: greeterContentLoader.model
@@ -40,19 +40,81 @@
      readonly property bool narrowMode: !multiUser && height > width
      readonly property bool multiUser: LightDM.Users.count > 1
--    readonly property bool leftTeaserPressed: greeterContentLoader.status == Loader.Ready &&
--                                              greeterContentLoader.item.leftTeaserPressed
--    readonly property bool rightTeaserPressed: greeterContentLoader.status == Loader.Ready &&
--                                               greeterContentLoader.item.rightTeaserPressed
--
      readonly property int currentIndex: greeterContentLoader.currentIndex
++    property var __leftHideAnimation: StandardAnimation { property: "x"; to: -width }
++    property var __rightHideAnimation: StandardAnimation { property: "x"; to: width }
++
      signal selected(int uid)
      signal unlocked(int uid)
--
--    onRightTeaserPressedChanged: {
--        if (rightTeaserPressed && (!locked || narrowMode) && x == 0) {
--            teasingTimer.start();
++    signal tease()
++
++    function hideRight() {
++        if (shown) {
++            hideAnimation = __rightHideAnimation
++            hide()
++        }
++    }
++
++    onRequiredChanged: {
++        // Reset hide animation to default once we're finished with it
++        if (!required) {
++            // Put back on left for reliable show direction and so that
++            // if normal hide() is called, we don't animate from right.
++            x = -width
++            hideAnimation = __leftHideAnimation
++        }
++    }
++
++    // Bi-directional revealer
++    DraggingArea {
++        id: dragHandle
++        anchors.fill: parent
++        enabled: greeter.narrowMode || !greeter.locked
++        orientation: Qt.Horizontal
++        propagateComposedEvents: true
++
++        Component.onCompleted: {
++            // set evaluators to baseline of dragValue == 0
++            leftEvaluator.reset()
++            rightEvaluator.reset()
++        }
++
++        function maybeTease() {
++            if (!greeter.locked || greeter.narrowMode)
++                greeter.tease();
++        }
++
++        onClicked: maybeTease()
++        onDragStart: maybeTease()
++        onPressAndHold: {} // eat event, but no need to tease, as drag will cover it
++
++        onDragEnd: {
++            if (rightEvaluator.shouldAutoComplete())
++                greeter.hideRight()
++            else if (leftEvaluator.shouldAutoComplete())
++                greeter.hide();
++            else
++                greeter.show(); // undo drag
++        }
++
++        onDragValueChanged: {
++            // dragValue is kept as a "step" value since we do this x adjusting on the fly
++            greeter.x += dragValue
++        }
++
++        EdgeDragEvaluator {
++            id: rightEvaluator
++            trackedPosition: dragHandle.dragValue + greeter.x
++            maxDragDistance: parent.width
++            direction: Direction.Rightwards
++        }
++
++        EdgeDragEvaluator {
++            id: leftEvaluator
++            trackedPosition: dragHandle.dragValue + greeter.x
++            maxDragDistance: parent.width
++            direction: Direction.Leftwards
+         }
+     }
@@ -82,45 +144,56 @@
+         }
+     }
--    Timer {
--        id: teasingTimer
--        interval: 200
--    }
--
--    states: [
--        State {
--            name: "teasing"
--            when: teasingTimer.running
--            PropertyChanges {
--                target: greeter
--                x: -dragHandle.hintDisplacement
--            }
--        }
--    ]
--    transitions: [
--        Transition {
--            from: "*"
--            to: "*"
--            NumberAnimation {
--                target: greeter
--                property: "x"
--                duration: 300
--                easing.type: Easing.OutCubic
--            }
--        }
--    ]
--
--    DragHandle {
--        id: dragHandle
--
--        anchors.top: parent.top
--        anchors.bottom: parent.bottom
--        anchors.right: parent.right
--
--        hintDisplacement: units.gu(2)
--
--        enabled: greeter.narrowMode || !greeter.locked
--
--        direction: Direction.Leftwards
++    onTease: showLabelAnimation.start()
++
++    Label {
++        id: swipeHint
++        visible: greeter.shown
++        property real baseOpacity: 0.5
++        opacity: 0.0
++        anchors.horizontalCenter: parent.horizontalCenter
++        anchors.bottom: parent.bottom
++        anchors.bottomMargin: units.gu(5)
++        text: i18n.tr("Swipe to unlock")
++        color: "white"
++        font.weight: Font.Light
++
++        SequentialAnimation on opacity {
++            id: showLabelAnimation
++            running: false
++            loops: 2
++
++            StandardAnimation {
++                from: 0.0
++                to: swipeHint.baseOpacity
++                duration: UbuntuAnimation.SleepyDuration
++            }
++            PauseAnimation { duration: UbuntuAnimation.BriskDuration }
++            StandardAnimation {
++                from: swipeHint.baseOpacity
++                to: 0.0
++                duration: UbuntuAnimation.SleepyDuration
++            }
++        }
++    }
++
++    // right side shadow
++    Image {
++        anchors.left: parent.right
++        anchors.top: parent.top
++        anchors.bottom: parent.bottom
++        visible: parent.required
++        fillMode: Image.Tile
++        source: "../graphics/dropshadow_right.png"
++    }
++
++    // left side shadow
++    Image {
++        anchors.right: parent.left
++        anchors.top: parent.top
++        anchors.bottom: parent.bottom
++        visible: parent.required
++        fillMode: Image.Tile
++        source: "../graphics/dropshadow_left.png"
+     }
+ }
 === modified file 'qml/Greeter/GreeterContent.qml'
 --- qml/Greeter/GreeterContent.qml	2014-04-14 16:29:30 +0000
 +++ qml/Greeter/GreeterContent.qml	2014-04-17 15:43:48 +0000
@@ -20,15 +20,11 @@
  import LightDM 0.1 as LightDM
  import "../Components"
--MouseArea {
++Item {
      id: root
      anchors.fill: parent
      property bool ready: background.source == "" || background.status == Image.Ready || background.status == Image.Error
--    property bool leftTeaserPressed: teasingMouseArea.pressed &&
--                                     teasingMouseArea.mouseX < teasingMouseArea.width / 2
--    property bool rightTeaserPressed: teasingMouseArea.pressed &&
--                                     teasingMouseArea.mouseX > teasingMouseArea.width / 2
      signal selected(int uid)
      signal unlocked(int uid)
@@ -74,11 +70,6 @@
          opacity: 0.4
+     }
--    MouseArea {
--        id: teasingMouseArea
--        anchors.fill: parent
--    }
--
      Loader {
          id: loginLoader
          objectName: "loginLoader"
 === modified file 'qml/Greeter/Infographics.qml'
 --- qml/Greeter/Infographics.qml	2013-10-11 16:17:18 +0000
 +++ qml/Greeter/Infographics.qml	2014-04-17 15:43:48 +0000
@@ -457,5 +457,8 @@
                      !circleGrowAnimTimer.running)
                  infographic.model.nextDataSource()
+         }
++
++        onClicked: mouse.accepted = false
++        onPressed: mouse.accepted = false
+     }
+ }
 === modified file 'qml/Hud/Hud.qml'
 --- qml/Hud/Hud.qml	2013-06-05 22:03:08 +0000
 +++ qml/Hud/Hud.qml	2014-04-17 15:43:48 +0000
@@ -491,6 +491,6 @@
          anchors.top: hudContentClipper.top
          anchors.bottom: hudContentClipper.bottom
          fillMode: Image.Tile
--        source: "graphics/dropshadow_right.png"
++        source: "../graphics/dropshadow_right.png"
+     }
+ }
 === modified file 'qml/Shell.qml'
 --- qml/Shell.qml	2014-04-08 16:06:14 +0000
 +++ qml/Shell.qml	2014-04-17 15:43:48 +0000
@@ -148,8 +148,8 @@
                  available: !greeter.shown && !lockscreen.shown
                  hides: [stages, launcher, panel.indicators]
--                shown: disappearingAnimationProgress !== 1.0
--                enabled: disappearingAnimationProgress === 0.0 && edgeDemo.dashEnabled
++                shown: disappearingAnimationProgress !== 1.0 && greeterWrapper.showProgress !== 1.0
++                enabled: disappearingAnimationProgress === 0.0 && greeterWrapper.showProgress === 0.0 && edgeDemo.dashEnabled
                  anchors {
                      fill: parent
@@ -159,18 +159,14 @@
                  contentScale: 1.0 - 0.2 * disappearingAnimationProgress
                  opacity: 1.0 - disappearingAnimationProgress
                  property real disappearingAnimationProgress: {
--                    if (greeter.shown) {
--                        return greeter.showProgress;
++                    if (stages.overlayMode) {
++                        return 0;
                      } else {
--                        if (stages.overlayMode) {
--                            return 0;
--                        }
                          return stages.showProgress
+                     }
+                 }
--                // FIXME: only necessary because stages.showProgress and
--                // greeterRevealer.animatedProgress are not animated
++                // FIXME: only necessary because stages.showProgress is not animated
                  Behavior on disappearingAnimationProgress { SmoothedAnimation { velocity: 5 }}
+             }
+         }
@@ -362,52 +358,66 @@
+         }
+     }
--    Greeter {
--        id: greeter
--        objectName: "greeter"
--
--        available: true
--        hides: [launcher, panel.indicators, hud]
--        shown: true
--
--        defaultBackground: shell.background
--
++    Rectangle {
++        anchors.fill: parent
++        color: "black"
++        opacity: greeterWrapper.showProgress * 0.8
++    }
++
++    Item {
++        // Just a tiny wrapper to adjust greeter's x without messing with its own dragging
++        id: greeterWrapper
++        x: launcher.progress
          y: panel.panelHeight
          width: parent.width
          height: parent.height - panel.panelHeight
--        dragHandleWidth: shell.edgeSize
--
--        onShownChanged: {
--            if (shown) {
--                lockscreen.reset();
--                // If there is only one user, we start authenticating with that one here.
--                // If there are more users, the Greeter will handle that
--                if (LightDM.Users.count == 1) {
--                    LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
++        Behavior on x {SmoothedAnimation{velocity: 600}}
++
++        readonly property real showProgress: MathUtils.clamp((1 - x/width) + greeter.showProgress - 1, 0, 1)
++
++        Greeter {
++            id: greeter
++            objectName: "greeter"
++
++            available: true
++            hides: [launcher, panel.indicators, hud]
++            shown: true
++
++            defaultBackground: shell.background
++
++            width: parent.width
++            height: parent.height
++
++            dragHandleWidth: shell.edgeSize
++
++            onShownChanged: {
++                if (shown) {
++                    lockscreen.reset();
++                    // If there is only one user, we start authenticating with that one here.
++                    // If there are more users, the Greeter will handle that
++                    if (LightDM.Users.count == 1) {
++                        LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
++                    }
++                    greeter.forceActiveFocus();
+                 }
--                greeter.forceActiveFocus();
--            }
--        }
--
--        onUnlocked: greeter.hide()
--        onSelected: {
--            // Update launcher items for new user
--            var user = LightDM.Users.data(uid, LightDM.UserRoles.NameRole);
--            AccountsService.user = user;
--            LauncherModel.setUser(user);
--        }
--
--        onLeftTeaserPressedChanged: {
--            if (leftTeaserPressed) {
--                launcher.tease();
--            }
--        }
--
--        Binding {
--            target: ApplicationManager
--            property: "suspended"
--            value: greeter.shown && greeter.showProgress == 1
++            }
++
++            onUnlocked: greeter.hide()
++            onSelected: {
++                // Update launcher items for new user
++                var user = LightDM.Users.data(uid, LightDM.UserRoles.NameRole);
++                AccountsService.user = user;
++                LauncherModel.setUser(user);
++            }
++
++            onTease: launcher.tease()
++
++            Binding {
++                target: ApplicationManager
++                property: "suspended"
++                value: greeter.shown && greeterWrapper.showProgress == 1
++            }
+         }
+     }
@@ -538,7 +548,7 @@
              anchors.bottom: parent.bottom
              width: parent.width
              dragAreaWidth: shell.edgeSize
--            available: (!greeter.shown || greeter.narrowMode) && edgeDemo.launcherEnabled
++            available: edgeDemo.launcherEnabled
              onShowDashHome: {
                  if (edgeDemo.running)
@@ -553,6 +563,10 @@
                          launcher.hide();
+                     }
+                 }
++                if (greeter.shown) {
++                    greeter.hideRight();
++                    launcher.hide();
++                }
+             }
              onDashSwipeChanged: if (dashSwipe && stages.shown) dash.setCurrentScope("clickscope", false, true)
              onLauncherApplicationSelected: {
 === added file 'qml/graphics/dropshadow_left@20.png'
 Binary files qml/graphics/dropshadow_left@20.png	1970-01-01 00:00:00 +0000 and qml/graphics/dropshadow_left@20.png	2014-04-17 15:43:48 +0000 differ
 === renamed file 'qml/Hud/graphics/dropshadow_right@20.png' => 'qml/graphics/dropshadow_right@20.png'
 === modified file 'tests/qmltests/Greeter/tst_Phone.qml'
 --- tests/qmltests/Greeter/tst_Phone.qml	2014-02-20 20:14:40 +0000
 +++ tests/qmltests/Greeter/tst_Phone.qml	2014-04-17 15:43:48 +0000
@@ -61,6 +61,12 @@
          signalName: "unlocked"
+     }
++    SignalSpy {
++        id: teaseSpy
++        target: greeter
++        signalName: "tease"
++    }
++
      UT.UnityTestCase {
          name: "Greeter"
          when: windowShown
@@ -82,56 +88,10 @@
+         }
          function test_teasingArea(data) {
--            tryCompare(greeter, "leftTeaserPressed", false)
--            tryCompare(greeter, "rightTeaserPressed", false)
--            mousePress(greeter, data.posX, greeter.height - units.gu(1))
--            tryCompare(greeter, "leftTeaserPressed", data.leftPressed)
--            tryCompare(greeter, "rightTeaserPressed", data.rightPressed)
--            mouseRelease(greeter, data.posX, greeter.height - units.gu(1))
--            tryCompare(greeter, "leftTeaserPressed", false)
--            tryCompare(greeter, "rightTeaserPressed", false)
--        }
--
--        function test_teaseLockedUnlocked_data() {
--            return [
--                {tag: "unlocked", locked: false, moved: false},
--                {tag: "locked", locked: true, moved: false},
--                {tag: "moved", locked: false, moved: true}
--            ];
--        }
--
--        function test_teaseLockedUnlocked(data) {
--            tryCompare(greeter, "rightTeaserPressed", false);
--            tryCompare(greeter, "x", 0);
--            greeter.locked = data.locked;
--
--            // simulate greeter being in the middle of a swipe
--            if (data.moved) {
--                greeter.x = -units.gu(4);
--                tryCompare(greeter, "x", -units.gu(4));
--            }
--
--            mouseClick(greeter, greeter.width - units.gu(5), greeter.height - units.gu(1));
--            greeter.minX = 0; // This is needed because the transition actually makes x jump once before animating
--
--            if (!data.moved) {
--                // Check if it has been moved over by 2 GUs. Give it a 2 pixel grace area
--                // because animation duration and teaseTimer are the same duration and
--                // might cause slight offsets
--                tryCompareFunction(function() { return greeter.minX <= -units.gu(2) + 2}, true);
--            } else {
--                // waiting 100ms to make sure nothing moves
--                wait(100);
--                compare(greeter.minX, 0, "Greeter teasing not disabled even though it's locked or moving.");
--            }
--
--            // Restore position in case we moved it for the test
--            if (data.moved) {
--                greeter.x = 0;
--            }
--
--            // Wait until we're back to 0
--            tryCompareFunction(function() { return greeter.x;}, 0);
++            teaseSpy.clear()
++            mouseClick(greeter, data.posX, greeter.height - units.gu(1))
++            teaseSpy.wait()
++            tryCompare(teaseSpy, "count", 1)
+         }
          function test_statsWelcomeScreen() {
 === modified file 'tests/qmltests/Greeter/tst_Tablet.qml'
 --- tests/qmltests/Greeter/tst_Tablet.qml	2014-02-20 20:14:40 +0000
 +++ tests/qmltests/Greeter/tst_Tablet.qml	2014-04-17 15:43:48 +0000
@@ -54,6 +54,12 @@
          signalName: "selected"
+     }
++    SignalSpy {
++        id: teaseSpy
++        target: greeter
++        signalName: "tease"
++    }
++
      UT.UnityTestCase {
          name: "Greeter"
          when: windowShown
@@ -325,14 +331,36 @@
+         }
          function test_teasingArea(data) {
--            tryCompare(greeter, "leftTeaserPressed", false)
--            tryCompare(greeter, "rightTeaserPressed", false)
--            mousePress(greeter, data.posX, greeter.height - units.gu(1))
--            tryCompare(greeter, "leftTeaserPressed", data.leftPressed)
--            tryCompare(greeter, "rightTeaserPressed", data.rightPressed)
--            mouseRelease(greeter, data.posX, greeter.height - units.gu(1))
--            tryCompare(greeter, "leftTeaserPressed", false)
--            tryCompare(greeter, "rightTeaserPressed", false)
++            teaseSpy.clear()
++            mouseClick(greeter, data.posX, greeter.height - units.gu(1))
++            teaseSpy.wait()
++            tryCompare(teaseSpy, "count", 1)
++        }
++
++        function test_teaseLockedUnlocked_data() {
++            return [
++                {tag: "unlocked", locked: false, narrow: false},
++                {tag: "locked", locked: true, narrow: false},
++            ];
++        }
++
++        function test_teaseLockedUnlocked(data) {
++            teaseSpy.clear()
++            greeter.locked = data.locked;
++
++            mouseClick(greeter, greeter.width - units.gu(5), greeter.height - units.gu(1));
++
++            if (!data.locked || data.narrow) {
++                teaseSpy.wait()
++                tryCompare(teaseSpy, "count", 1);
++            } else {
++                // waiting 100ms to make sure nothing happens
++                wait(100);
++                compare(teaseSpy.count, 0, "Greeter teasing not disabled even though it's locked.");
++            }
++
++            // Reset value
++            greeter.locked = false;
+         }
          function test_dbus_set_active_entry() {