Merge lp:~zsombi/ubuntu-ui-toolkit/bottomEdge into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

BottomEdge component

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1739
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2524/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1252
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1254
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1254/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1251

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

review: Approve (continuous-integration)

[Tim Peeters (tpeeters)]

In the gallery, I can over-drag the bottom edge a bit, which puts the app in a weird state until it pops back to a closed bottom edge in about 500ms. See https://www.dropbox.com/s/f1n2cthukzl4e31/Screenshot%202015-11-23%2021.14.55.png?dl=0

I think instead of this, the contents should snap to open fully instead of being able to drag it too far.

review: Needs Fixing

[Tim Peeters (tpeeters)]

qml: WARNING! Do not put Page/Tabs/PageStack inside another Page because that causes confusion which is the active page that sets the title and actions.

This is a bit annoying. I think we can remove this warning now. With the new header, it is no longer a problem to define a Page inside another Page.

[Tim Peeters (tpeeters)]

> qml: WARNING! Do not put Page/Tabs/PageStack inside another Page because that
> causes confusion which is the active page that sets the title and actions.
>
> This is a bit annoying. I think we can remove this warning now. With the new
> header, it is no longer a problem to define a Page inside another Page.

better to do that in another MR, so just leave it here.

[Tim Peeters (tpeeters)]

I find the line on top of the bottom edge when it is open ugly.

https://www.dropbox.com/s/mvexgb66nt5nr3n/Screenshot%202015-11-23%2021.27.24.png?dl=0

Also, see the comments I added to the API doc, and one diff comment below (more to follow).

[Tim Peeters (tpeeters)]

I don't understand what "push content into the layout" does, and why when I open the bottom edge with that checkbox checked, it says state: hidden in the header: https://www.dropbox.com/s/dns1zeuivsdfn49/Screenshot%202015-11-23%2021.29.50.png?dl=0

[Tim Peeters (tpeeters)]

See more inline comments.

Since the BottomEdgeRegions are (at the moment) mainly used in the browser, perhaps we should ask the browser guys to test this MR (ideally to have a prototype browser that uses this) to see if it fulfills all their requirements.

[Zsombor Egri (zsombi)]

> See more inline comments.
>
>
> Since the BottomEdgeRegions are (at the moment) mainly used in the browser,
> perhaps we should ask the browser guys to test this MR (ideally to have a
> prototype browser that uses this) to see if it fulfills all their
> requirements.

It is not only in the Browser, there can be many other use cases for it. And then the whole logic is implemented using that. We talked about this in Berlin with mzanetti while going to the hotel from airport that he'd need such a functionality in his apps. And honestly I would not spend time to add it later when we have it right away.

[Zsombor Egri (zsombi)]

Replied to the inline comments, and pushed the changes I had so far. Revisions starting 1740 are for tests, please check them one by one to see the progress.

There are more tests to come. Will keep you posted.

[lp:~zsombi/ubuntu-ui-toolkit/bottomEdge]

1740. By Zsombor Egri on 2015-11-23

implicit height fix

1741. By Zsombor Egri on 2015-11-23

implicit height fix

1742. By Zsombor Egri on 2015-11-23

complete default check

1743. By Zsombor Egri on 2015-11-23

fix reparenting

1744. By Zsombor Egri on 2015-11-23

adding remaining test skeletons

1745. By Zsombor Egri on 2015-11-24

test that BottomEdgeStyle instance is always the last child

1746. By Zsombor Egri on 2015-11-24

test commit on click

1747. By Zsombor Egri on 2015-11-24

touch-click commits

1748. By Zsombor Egri on 2015-11-24

rename state into status, content into contentUrl

1749. By Zsombor Egri on 2015-11-24

verifying state transition when the bottom edge is swiped for a short time

1750. By Zsombor Egri on 2015-11-24

verifying state transition when the bottom edge is swiped for a short time

1751. By Zsombor Egri on 2015-11-24

add some threshold and extra steps especially for touch to properly produce a swipe

1752. By Zsombor Egri on 2015-11-24

drag downwards after dragged upwards collapses

1753. By Zsombor Egri on 2015-11-25

bottomedge height is less than the parent's height

1754. By Zsombor Egri on 2015-11-25

do not overshoot; API fix

1755. By Zsombor Egri on 2015-11-25

commit signals test

1756. By Zsombor Egri on 2015-11-25

collapse signals test

1757. By Zsombor Egri on 2015-11-25

collapse signals test

1758. By Zsombor Egri on 2015-11-25

fixing doc for contentUrl and contentComponent

1759. By Zsombor Egri on 2015-11-25

wording fix

1760. By Zsombor Egri on 2015-11-25

wording fix

1761. By Zsombor Egri on 2015-11-25

typo fix

1762. By Zsombor Egri on 2015-11-25

property fix

1763. By Zsombor Egri on 2015-11-25

qdoc tag fix

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1763
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2531/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1259
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1261
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1261/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1258

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

review: Approve (continuous-integration)

[Tim Peeters (tpeeters)]

The hint text is not centered any more (in gallery), see https://www.dropbox.com/s/uvwzak5eumwcgnp/Screenshot%202015-11-26%2011.04.38.png?dl=0

[Tim Peeters (tpeeters)]

> > 304 - // we need to clip because the header does not have a background
> > 305 - clip: true
> > we shouldn't just remove this. It is no longer needed with the new PageHeader,
> > but apps may still > use the old AppHeader (by configuring Page.head, instead of
> > using Page.header).

> If we have this clip set, the bottom edge content header will always be clipped. I am open
> for solutions.

Removing it will break current apps. The solution for UITK 1.4/2.0 will come easy, because there we will remove the old AppHeader.

For now, we could add a solid background to the AppHeader that is the same color as the MainView.headerColor. However, if the app has a background texture or gradient (old designs), the header does not match any more, so it may mess up existing apps. An alternative is to force people to switch to the new header when they use APL.

[lp:~zsombi/ubuntu-ui-toolkit/bottomEdge]

1764. By Zsombor Egri on 2015-11-25

commit on collapse test case

1765. By Zsombor Egri on 2015-11-26

region operation tests

1766. By Zsombor Egri on 2015-11-26

alternate default region content

1767. By Zsombor Egri on 2015-11-26

rest order reshufled, covered tests removed

1768. By Zsombor Egri on 2015-11-26

dragEnded test

1769. By Zsombor Egri on 2015-11-26

end drag in region commits to teh region top

1770. By Zsombor Egri on 2015-11-26

collapse when the drag ends in an area that is not covered by any region

1771. By Zsombor Egri on 2015-11-26

remove tests covered by default check

1772. By Zsombor Egri on 2015-11-26

validate and warn on overlapping regions

1773. By Zsombor Egri on 2015-11-26

refining region validation

1774. By Zsombor Egri on 2015-11-26

auto-collapse added if content has PageHeader; remove warning about nesting page

1775. By Zsombor Egri on 2015-11-26

remove style specific test

1776. By Zsombor Egri on 2015-11-26

remove fill reset as it destroys the style overriden one, causing the nint to be mislocated

1777. By Zsombor Egri on 2015-11-26

change default region limits in gallery

1778. By Zsombor Egri on 2015-11-26

redo validation to validate runtime too

1779. By Zsombor Egri on 2015-11-26

remove comments, tweaking done meantime seemed to help

1780. By Zsombor Egri on 2015-11-26

staging sync

[Zsombor Egri (zsombi)]

> > > 304 - // we need to clip because the header does not have a background
> > > 305 - clip: true
> > > we shouldn't just remove this. It is no longer needed with the new
> PageHeader,
> > > but apps may still > use the old AppHeader (by configuring Page.head,
> instead of
> > > using Page.header).
>
> > If we have this clip set, the bottom edge content header will always be
> clipped. I am open
> > for solutions.
>
> Removing it will break current apps. The solution for UITK 1.4/2.0 will come
> easy, because there we will remove the old AppHeader.

No, we cannot. That's the problem. We announce the deprecation 1.3, which means we have to keep it one more version and then remove it. So as long as 1.4 will have the AppHeader, it will cause trouble, because people will still use it.

>
> For now, we could add a solid background to the AppHeader that is the same
> color as the MainView.headerColor. However, if the app has a background
> texture or gradient (old designs), the header does not match any more, so it
> may mess up existing apps. An alternative is to force people to switch to the
> new header when they use APL.

What if we do it in a separate MR? Like immediately after this...

[Zsombor Egri (zsombi)]

> The hint text is not centered any more (in gallery), see https://www.dropbox.c
> om/s/uvwzak5eumwcgnp/Screenshot%202015-11-26%2011.04.38.png?dl=0

Fixed, it was the anchor.fill introduced by the style overridden by the cpp resetFill() :/

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1780
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2537/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1265
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1267
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1267/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1264

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

review: Approve (continuous-integration)

[lp:~zsombi/ubuntu-ui-toolkit/bottomEdge]

1781. By Zsombor Egri on 2015-11-27

activeRegion changes optimized

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1781
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2539/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1267
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1269
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1269/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1266/console

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

review: Needs Fixing (continuous-integration)

[Tim Peeters (tpeeters)]

> > > > 304 - // we need to clip because the header does not have a background
> > > > 305 - clip: true
> > > > we shouldn't just remove this. It is no longer needed with the new
> > PageHeader,
> > > > but apps may still > use the old AppHeader (by configuring Page.head,
> > instead of
> > > > using Page.header).
> >
> > > If we have this clip set, the bottom edge content header will always be
> > clipped. I am open
> > > for solutions.
> >
> > Removing it will break current apps. The solution for UITK 1.4/2.0 will come
> > easy, because there we will remove the old AppHeader.
>
> No, we cannot. That's the problem. We announce the deprecation 1.3, which
> means we have to keep it one more version and then remove it. So as long as
> 1.4 will have the AppHeader, it will cause trouble, because people will still
> use it.
>
> >
> > For now, we could add a solid background to the AppHeader that is the same
> > color as the MainView.headerColor. However, if the app has a background
> > texture or gradient (old designs), the header does not match any more, so it
> > may mess up existing apps. An alternative is to force people to switch to
> the
> > new header when they use APL.
>
> What if we do it in a separate MR? Like immediately after this...

If we do it *after*, then we have the header+APL broken until that next MR lands...

[Tim Peeters (tpeeters)]

looks good. But we MUST give the AppHeader a background in a separate MR before landing this in trunk.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[Tim Peeters (tpeeters)]

The desire to give the AppHeader a background as stated above, was reported in this bug: https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1531457

=== modified file 'components.api'
--- components.api	2015-11-20 07:47:08 +0000
+++ components.api	2015-11-27 10:36:32 +0000
@@ -175,6 +175,36 @@
     property var icon
     property bool iconFrame
     property bool progression
+Ubuntu.Components.BottomEdge 1.3: StyledItem
+    readonly property BottomEdgeRegion activeRegion
+    property Component contentComponent
+    readonly property Item contentItem
+    property url contentUrl
+    readonly property DragDirection dragDirection
+    readonly property double dragProgress
+    readonly property BottomEdgeHint hint
+    signal dragProgressChanged(double dragProgress)
+    signal dragDirectionChanged(BottomEdge.DragDirection direction)
+    signal statusChanged(BottomEdge.Status status)
+    signal contentChanged(url url)
+    signal contentComponentChanged(Component component)
+    signal activeRegionChanged(BottomEdgeRegion activeRegion)
+    signal commitStarted()
+    signal commitCompleted()
+    signal collapseStarted()
+    signal collapseCompleted()
+    function commit()
+    function collapse()
+    property list<BottomEdgeRegion> regions
+    readonly property Status status
+Ubuntu.Components.BottomEdge.DragDirection: Enum
+    Downwards
+    Undefined
+    Upwards
+Ubuntu.Components.BottomEdge.Status: Enum
+    Committed
+    Hidden
+    Revealed
 Ubuntu.Components.BottomEdgeHint 1.3: ActionItem
     property int deactivateTimeout
     property Flickable flickable
@@ -186,6 +216,20 @@
     Hidden
     Inactive
     Locked
+Ubuntu.Components.BottomEdgeRegion 1.3: QtObject
+    property Component contentComponent
+    property url contentUrl
+    property bool enabled
+    property double from
+    signal entered()
+    signal exited()
+    signal dragEnded()
+    property double to
+Ubuntu.Components.Styles.BottomEdgeStyle 1.3: Item
+    property Item contentItem
+    property Item panel
+    property Animation panelAnimation
+    property double revealThreshold
 Ubuntu.Components.Button 1.0 0.1: AbstractButton
     property color color
     property QFont font
@@ -1131,6 +1175,10 @@
     function touchMove(int touchId, Item item, Qt.point point)
     function touchDrag(int touchId, Item item, Qt.point from, Qt.point delta, int steps)
     function touchDrag(int touchId, Item item, Qt.point from, Qt.point delta)
+    function mouseDrag(Item item, Qt.point from, Qt.point delta, Qt.MouseButton button, Qt.KeyboardModifiers stateKey, int steps, int delay)
+    function mouseDrag(Item item, Qt.point from, Qt.point delta, Qt.MouseButton button, Qt.KeyboardModifiers stateKey, int steps)
+    function mouseDrag(Item item, Qt.point from, Qt.point delta, Qt.MouseButton button, Qt.KeyboardModifiers stateKey)
+    function mouseDrag(Item item, Qt.point from, Qt.point delta, Qt.MouseButton button)
     readonly property bool touchPresent
 Ubuntu.Components.TextArea 1.0 0.1: StyledItem
     property bool autoExpand

=== modified file 'examples/ubuntu-ui-toolkit-gallery/BottomEdgePage.qml'
--- examples/ubuntu-ui-toolkit-gallery/BottomEdgePage.qml	2015-11-05 14:28:58 +0000
+++ examples/ubuntu-ui-toolkit-gallery/BottomEdgePage.qml	2015-11-27 10:36:32 +0000
@@ -17,22 +17,185 @@
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 
-Page {
+Template {
+    id: page
+    header: PageHeader {
+        title: i18n.tr("Bottom Edge")
+        trailingActionBar.actions: [
+            bottomEdge.hint.action
+        ]
+    }
+
     TemplateSection {
-        title: "Bottom Edge Hint"
+        title: "BottomEdgeHint"
         className: "BottomEdgeHint"
 
-        anchors {
-            top: parent.top
-            left: parent.left
-            right: parent.right
-            margins: units.gu(2)
-        }
-    }
-
-    BottomEdgeHint {
-        iconName: "stock_message"
-        text: "Compose a new message"
-        onClicked: state = "Hidden"
+        TemplateRow {
+            title: i18n.tr("On clicked")
+            Row {
+                spacing: units.gu(1)
+                CheckBox {
+                    id: contentToLayout
+                    text: i18n.tr("push content into the layout")
+                    enabled: bottomEdge.hint.status >= BottomEdgeHint.Active
+                }
+                Label {
+                    text: contentToLayout.text
+                    anchors.verticalCenter: contentToLayout.verticalCenter
+                }
+            }
+        }
+    }
+
+    TemplateSection {
+        title: "BottomEdge"
+        className: "BottomEdge"
+
+        TemplateRow {
+            title: i18n.tr("Top")
+            Slider {
+                id: bottomEdgeHeight
+                maximumValue: page.height
+                value: bottomEdge.height
+                onValueChanged: bottomEdge.height = value
+            }
+        }
+
+        TemplateRow {
+            title: i18n.tr("Hint")
+            Row {
+                spacing: units.gu(1)
+                CheckBox {
+                    id: attachHintToContent
+                    text: i18n.tr("attach hint to content")
+                }
+                Label {
+                    text: attachHintToContent.text
+                    anchors.verticalCenter: attachHintToContent.verticalCenter
+                }
+            }
+        }
+
+        TemplateRow {
+            title: i18n.tr("Regions")
+            Slider {
+                id: regionCount
+                width: units.gu(20)
+                maximumValue: 3.0
+                live: true
+            }
+        }
+        Repeater {
+            id: regionConfig
+            model: regionCount.value.toFixed(0)
+            TemplateRow {
+                title: i18n.tr("Region #%1").arg(index)
+                property int regionIndex: index
+                Repeater {
+                    model: ["from", "to"]
+                    Row {
+                        spacing: units.gu(2)
+                        Label {
+                            text: i18n.tr(modelData)
+                        }
+                        TextField {
+                            id: regionFrom
+                            text: bottomEdge.regions[regionIndex][modelData]
+                            validator: DoubleValidator {bottom: 0.0; top: 1.0; decimals: 2; locale: "d.d"}
+                            inputMethodHints: Qt.ImhPreferNumbers | Qt.ImhFormattedNumbersOnly
+                            width: units.gu(7)
+                            hasClearButton: false
+                            errorHighlight: true
+                            onAccepted: bottomEdge.regions[regionIndex][modelData] = text
+                            onTextChanged: {
+                                if (regionFrom.acceptableInput) {
+                                    bottomEdge.regions[regionIndex][modelData] = parseFloat(text);
+                                }
+                            }
+                            onActiveFocusChanged: if (activeFocus) selectAll()
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    BottomEdge {
+        id: bottomEdge
+        // make sure it doesn't land inside the flickable
+        parent: page
+        // hint
+        hint {
+            action: Action {
+                text: "Demo content"
+                iconName: "stock_message"
+                onTriggered: bottomEdge.commit()
+            }
+            flickable: page.flickable
+        }
+        contentComponent: bottomEdgeContent
+
+        StyleHints {
+            attachHintToContent: attachHintToContent.checked
+        }
+
+        onCommitCompleted: {
+            if (contentToLayout.checked && contentToLayout.enabled) {
+                page.pageStack.addPageToCurrentColumn(page, contentComponent);
+                collapse();
+            }
+        }
+
+        regions: [
+            BottomEdgeRegion {
+                objectName: "CustomRegion1"
+                enabled: regionConfig.model >= 1
+                to: 0.3
+                property color baseColor: UbuntuColors.lightGrey
+            },
+            BottomEdgeRegion {
+                objectName: "CustomRegion2"
+                enabled: regionConfig.model >= 2
+                from: 0.3
+                to: 0.6
+            },
+            BottomEdgeRegion {
+                objectName: "CustomRegion3"
+                enabled: regionConfig.model >= 3
+                from: 0.6
+            },
+            // default region, mimics the default setup
+            BottomEdgeRegion {
+                objectName: "DefaultRegion"
+                enabled: regionConfig.model <= 0
+                from: 0.3
+            }
+        ]
+
+        Component {
+            id: bottomEdgeContent
+            Page {
+                height: bottomEdge.height
+                header: PageHeader {
+                    title: {
+                        var state = "UNDEFINED";
+                        switch (bottomEdge.status) {
+                        case BottomEdge.Hidden: state = "Hidden"; break;
+                        case BottomEdge.Revealed: state = "Revealed"; break;
+                        case BottomEdge.Committed: state = "Committed"; break;
+                        }
+                        return bottomEdge.activeRegion
+                          ? i18n.tr("Within region '%1', status: %2").arg(bottomEdge.activeRegion.objectName).arg(state)
+                          : i18n.tr("Not in any active region, status: %1").arg(state);
+                    }
+                }
+                Rectangle {
+                    anchors.fill: parent
+                    anchors.margins: units.gu(1)
+                    color: bottomEdge.activeRegion && bottomEdge.activeRegion.hasOwnProperty("baseColor") ?
+                               bottomEdge.activeRegion.baseColor : Qt.rgba(0.5, 1, bottomEdge.dragProgress, 1)
+                }
+            }
+        }
     }
 }

=== modified file 'examples/ubuntu-ui-toolkit-gallery/Template.qml'
--- examples/ubuntu-ui-toolkit-gallery/Template.qml	2015-11-09 07:35:14 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Template.qml	2015-11-27 10:36:32 +0000
@@ -23,6 +23,7 @@
     default property alias content: column.children
     property alias spacing: column.spacing
     property alias scrollable: flickable.interactive
+    readonly property alias flickable: flickable
 
     header: PageHeader {
         title: template.title

=== modified file 'examples/ubuntu-ui-toolkit-gallery/TemplateRow.qml'
--- examples/ubuntu-ui-toolkit-gallery/TemplateRow.qml	2015-04-25 08:18:45 +0000
+++ examples/ubuntu-ui-toolkit-gallery/TemplateRow.qml	2015-11-27 10:36:32 +0000
@@ -26,7 +26,7 @@
     default property alias content: contentRow.children
 
     height: Math.max(contentRow.height, label.height)
-    width: parent.width
+    width: parent ? parent.width : 0
 
     Label {
         id: label

=== modified file 'examples/ubuntu-ui-toolkit-gallery/gallery-logging.config'
--- examples/ubuntu-ui-toolkit-gallery/gallery-logging.config	2015-11-17 11:48:09 +0000
+++ examples/ubuntu-ui-toolkit-gallery/gallery-logging.config	2015-11-27 10:36:32 +0000
@@ -2,3 +2,4 @@
 libubuntugestures.TouchRegistry.debug=false
 ubuntu.components.SwipeArea.debug=false
 ubuntu.components.SwipeArea.ActiveTouchInfo.debug=false
+ubuntu.components.BottomEdge.debug=false

=== modified file 'src/Ubuntu/Components/1.3/AdaptivePageLayout.qml'
--- src/Ubuntu/Components/1.3/AdaptivePageLayout.qml	2015-10-22 20:09:56 +0000
+++ src/Ubuntu/Components/1.3/AdaptivePageLayout.qml	2015-11-27 10:36:32 +0000
@@ -743,8 +743,6 @@
                     right: parent.right
                     rightMargin: dividerThickness
                 }
-                // we need to clip because the header does not have a background
-                clip: true
                 Item {
                     id: hiddenItem
                     anchors.fill: parent

=== modified file 'src/Ubuntu/Components/1.3/PageTreeNode.qml'
--- src/Ubuntu/Components/1.3/PageTreeNode.qml	2015-10-20 11:05:53 +0000
+++ src/Ubuntu/Components/1.3/PageTreeNode.qml	2015-11-27 10:36:32 +0000
@@ -125,10 +125,6 @@
                         if (i.isLeaf) {
                             // children of a leaf are not part of the tree
                             node = null;
-                            print("WARNING! " +
-                                "Do not put Page/Tabs/PageStack inside another "+
-                                "Page because that causes confusion which is the "+
-                                "active page that sets the title and actions.");
                         } else {
                             // current node is part of the tree with i as its parent.
                             node = i;

=== modified file 'src/Ubuntu/Components/ComponentModule.pro'
--- src/Ubuntu/Components/ComponentModule.pro	2015-11-18 15:07:15 +0000
+++ src/Ubuntu/Components/ComponentModule.pro	2015-11-27 10:36:32 +0000
@@ -132,7 +132,7 @@
              1.3/PageColumn.qml \
              1.3/PageColumnsLayout.qml \
              1.3/ProgressionSlot.qml \
-	     1.3/PageHeader.qml \
+             1.3/PageHeader.qml \
 
 OTHER_FILES+= qmldir \
              1.3/CrossFadeImage.qdoc \

=== added file 'src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeStyle.qml	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeStyle.qml	2015-11-27 10:36:32 +0000
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Styles 1.3
+
+BottomEdgeStyle {
+    id: bottomEdgeStyle
+    //setup properties
+    property BottomEdge bottomEdge: styledItem
+    panel: panelItem
+    contentItem: loader.item
+    panelAnimation: panelBehavior
+    revealThreshold: bottomEdge.hint.height + units.gu(2)
+
+    // own styling properties
+    property color backgroundColor: "transparent"
+    property color panelColor: theme.palette.normal.background
+    property color shadowColor: theme.palette.selected.background
+    property bool attachHintToContent: false
+
+    anchors.fill: parent
+
+    Rectangle {
+        id: background
+        anchors.fill: parent
+        color: backgroundColor
+        z: -1
+    }
+
+    states: State {
+        name: "reparentedHint"
+        when: attachHintToContent
+        AnchorChanges {
+            target: bottomEdge.hint
+            anchors.bottom: panelItem.top
+        }
+    }
+
+    Rectangle {
+        id: panelItem
+        objectName: "bottomedge_panel"
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: parent.bottom
+            topMargin: bottomEdge.status >= BottomEdge.Revealed
+                       ? -(bottomEdge.height * bottomEdge.dragProgress)
+                       : 0
+        }
+        height: loader.item ? loader.item.height : 0
+        color: panelColor
+        opacity: bottomEdge.status >= BottomEdge.Revealed ? 1.0 : 0.0
+
+        Behavior on anchors.topMargin { UbuntuNumberAnimation { id: panelBehavior } }
+
+        state: bottomEdge.status > BottomEdge.Hidden ? "lock-hint" : ""
+        states: [
+            State {
+                name: "lock-hint"
+                PropertyChanges {
+                    target: bottomEdge.hint
+                    status: BottomEdgeHint.Locked
+                }
+            }
+        ]
+
+        // shadows
+        Rectangle {
+            id: topShadow
+            anchors {
+                bottom: parent.top
+                left: parent.left
+                right: parent.right
+            }
+            height: units.gu(1)
+            gradient: Gradient {
+                GradientStop { position: 0.0; color: Qt.rgba(shadowColor.r, shadowColor.g, shadowColor.b, 0.0) }
+                GradientStop { position: 1.0; color: Qt.rgba(shadowColor.r, shadowColor.g, shadowColor.b, 0.3) }
+            }
+        }
+        Rectangle {
+            id: bottomShadow
+            anchors {
+                top: parent.bottom
+                left: parent.left
+                right: parent.right
+            }
+            height: units.gu(1)
+            rotation: 180
+            gradient: Gradient {
+                GradientStop { position: 0.0; color: Qt.rgba(shadowColor.r, shadowColor.g, shadowColor.b, 0.0) }
+                GradientStop { position: 1.0; color: Qt.rgba(shadowColor.r, shadowColor.g, shadowColor.b, 0.3) }
+            }
+        }
+
+        // content
+        Loader {
+            id: loader
+            anchors.horizontalCenter: parent.horizontalCenter
+            asynchronous: true
+            source: bottomEdge.status > BottomEdge.Hidden ? bottomEdge.contentUrl : ""
+            sourceComponent: bottomEdge.status > BottomEdge.Hidden ? bottomEdge.contentComponent : null
+            onItemChanged: {
+                if (item) {
+                    item.parent = panelItem;
+                    item.anchors.horizontalCenter = panelItem.horizontalCenter;
+                }
+            }
+        }
+    }
+}

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/Ambiance.pro'
--- src/Ubuntu/Components/Themes/Ambiance/Ambiance.pro	2015-10-23 05:42:14 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/Ambiance.pro	2015-11-27 10:36:32 +0000
@@ -114,7 +114,8 @@
              1.3/IconButtonStyle.qml \
 	     1.3/PageHeaderStyle.qml \
              1.3/BottomEdgeHintStyle.qml \
-    $$ARTWORK_FILES
+             1.3/BottomEdgeStyle.qml \
+             $$ARTWORK_FILES
 
 load(ubuntu_qml_module)
 

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/qmldir'
--- src/Ubuntu/Components/Themes/Ambiance/qmldir	2015-11-18 15:07:15 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/qmldir	2015-11-27 10:36:32 +0000
@@ -84,3 +84,5 @@
 internal SliderUtils 1.3/sliderUtils.js
 internal ColorUtils 1.3/colorUtils.js
 PageHeaderStyle 1.3 ./1.3/PageHeaderStyle.qml
+BottomEdgeHintStyle 1.3 ./1.3/BottomEdgeHintStyle.qml
+BottomEdgeStyle 1.3 ./1.3/BottomEdgeStyle.qml

=== modified file 'src/Ubuntu/Components/plugin/plugin.cpp'
--- src/Ubuntu/Components/plugin/plugin.cpp	2015-11-19 09:05:19 +0000
+++ src/Ubuntu/Components/plugin/plugin.cpp	2015-11-27 10:36:32 +0000
@@ -73,6 +73,9 @@
 #include "ucbottomedgehint.h"
 #include "gestures/ucswipearea.h"
 #include "ucmathutils.h"
+#include "ucbottomedge.h"
+#include "ucbottomedgeregion.h"
+#include "ucbottomedgestyle.h"
 
 #include <sys/types.h>
 #include <unistd.h>
@@ -254,6 +257,8 @@
     qmlRegisterType<UCLabel>(uri, 1, 3, "Label");
     qmlRegisterType<UCBottomEdgeHint>(uri, 1, 3, "BottomEdgeHint");
     qmlRegisterType<UCSwipeArea>(uri, 1, 3, "SwipeArea");
+    qmlRegisterType<UCBottomEdge>(uri, 1, 3, "BottomEdge");
+    qmlRegisterType<UCBottomEdgeRegion>(uri, 1, 3, "BottomEdgeRegion");
 }
 
 void UbuntuComponentsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
@@ -265,6 +270,7 @@
     const char *styleUri = "Ubuntu.Components.Styles";
     qmlRegisterType<UCListItemStyle>(styleUri, 1, 2, "ListItemStyle");
     qmlRegisterType<UCListItemStyle, 1>(styleUri, 1, 3, "ListItemStyle");
+    qmlRegisterType<UCBottomEdgeStyle>(styleUri, 1, 3, "BottomEdgeStyle");
 
     QQmlExtensionPlugin::initializeEngine(engine, uri);
     QQmlContext* context = engine->rootContext();

=== modified file 'src/Ubuntu/Components/plugin/plugin.pri'
--- src/Ubuntu/Components/plugin/plugin.pri	2015-11-20 07:47:08 +0000
+++ src/Ubuntu/Components/plugin/plugin.pri	2015-11-27 10:36:32 +0000
@@ -98,7 +98,11 @@
     $$PWD/gestures/ucswipearea_p.h \
     $$PWD/gestures/damper.h \
     $$PWD/gestures/ubuntugesturesqmlglobal.h \
-    $$PWD/ucmathutils.h
+    $$PWD/ucmathutils.h \
+    $$PWD/ucbottomedge.h \
+    $$PWD/ucbottomedge_p.h \
+    $$PWD/ucbottomedgestyle.h \
+    $$PWD/ucbottomedgeregion.h
 
 SOURCES += $$PWD/plugin.cpp \
     $$PWD/uctheme.cpp \
@@ -164,7 +168,10 @@
     $$PWD/ucimportversionchecker_p.cpp \
     $$PWD/ucbottomedgehint.cpp \
     $$PWD/gestures/ucswipearea.cpp \
-    $$PWD/ucmathutils.cpp
+    $$PWD/ucmathutils.cpp \
+    $$PWD/ucbottomedge.cpp \
+    $$PWD/ucbottomedgestyle.cpp \
+    $$PWD/ucbottomedgeregion.cpp
 
 # adapters
 SOURCES += $$PWD/adapters/alarmsadapter_organizer.cpp

=== modified file 'src/Ubuntu/Components/plugin/ucaction.h'
--- src/Ubuntu/Components/plugin/ucaction.h	2015-09-01 08:44:11 +0000
+++ src/Ubuntu/Components/plugin/ucaction.h	2015-11-27 10:36:32 +0000
@@ -60,6 +60,12 @@
         return m_published;
     }
 
+    void setName(const QString &name);
+    void setIconName(const QString &name);
+    void setIconSource(const QUrl &url);
+    void setItemHint(QQmlComponent *);
+    void setShortcut(const QVariant&);
+
 Q_SIGNALS:
     void nameChanged();
     void textChanged();
@@ -99,11 +105,6 @@
 
     bool isValidType(QVariant::Type valueType);
     void generateName();
-    void setName(const QString &name);
-    void setIconName(const QString &name);
-    void setIconSource(const QUrl &url);
-    void setItemHint(QQmlComponent *);
-    void setShortcut(const QVariant&);
     bool event(QEvent *event);
 };
 

=== added file 'src/Ubuntu/Components/plugin/ucbottomedge.cpp'
--- src/Ubuntu/Components/plugin/ucbottomedge.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedge.cpp	2015-11-27 10:36:32 +0000
@@ -0,0 +1,1059 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Zsombor Egri <[e-mail]>
+ */
+
+#include "ucbottomedge_p.h"
+#include "ucbottomedgestyle.h"
+#include "ucbottomedgeregion.h"
+#include "ucbottomedgehint.h"
+#include "ucstyleditembase_p.h"
+#include <QtQml/QQmlEngine>
+#include <QtGui/QScreen>
+#include <QtQml/QQmlProperty>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QStyleHints>
+#include <QtQuick/private/qquickitem_p.h>
+#include <QtQuick/private/qquickflickable_p.h>
+
+#include "plugin.h"
+#include "ucnamespace.h"
+#include "ucheader.h"
+#include "ucaction.h"
+#include "quickutils.h"
+#include "gestures/ucswipearea.h"
+#include <QtQuick/private/qquickanimation_p.h>
+
+Q_LOGGING_CATEGORY(ucBottomEdge, "ubuntu.components.BottomEdge", QtMsgType::QtWarningMsg)
+
+#define LOG     qCDebug(ucBottomEdge) << "[BottomEdge]"
+
+UCBottomEdgePrivate::UCBottomEdgePrivate()
+    : UCStyledItemBasePrivate()
+    , activeRegion(Q_NULLPTR)
+    , hint(new UCBottomEdgeHint)
+    , contentComponent(Q_NULLPTR)
+    , bottomPanel(Q_NULLPTR)
+    , previousDistance(0.0)
+    , dragProgress(0.)
+    , status(UCBottomEdge::Hidden)
+    , operationStatus(Idle)
+    , dragDirection(UCBottomEdge::Undefined)
+    , defaultRegionsReset(false)
+    , mousePressed(false)
+{
+}
+
+void UCBottomEdgePrivate::init()
+{
+    Q_Q(UCBottomEdge);
+    // initialize hint
+    QQml_setParent_noEvent(hint, q);
+    hint->setParentItem(q);
+
+    // create default regions
+    createDefaultRegions();
+
+    // set the style name
+    styleDocument = QStringLiteral("BottomEdgeStyle");
+}
+
+// overload default data property so we can filter out the regions declared
+// in the body of the component as resources
+QQmlListProperty<QObject> UCBottomEdgePrivate::data()
+{
+    return QQmlListProperty<QObject>(q_func(), 0, UCBottomEdgePrivate::overload_data_append,
+                                             QQuickItemPrivate::data_count,
+                                             QQuickItemPrivate::data_at,
+                                             UCBottomEdgePrivate::overload_data_clear);
+}
+
+void UCBottomEdgePrivate::overload_data_append(QQmlListProperty<QObject> *data, QObject *object)
+{
+    QQuickItemPrivate::data_append(data, object);
+    // if the object is a region, add to the regions as well
+    UCBottomEdgeRegion *region = qobject_cast<UCBottomEdgeRegion*>(object);
+    if (region) {
+        UCBottomEdgePrivate *bottomEdge = UCBottomEdgePrivate::get(static_cast<UCBottomEdge*>(data->object));
+        bottomEdge->appendRegion(region);
+    }
+}
+
+void UCBottomEdgePrivate::overload_data_clear(QQmlListProperty<QObject> *data)
+{
+    // clear regions as well
+    UCBottomEdgePrivate *bottomEdge = UCBottomEdgePrivate::get(static_cast<UCBottomEdge*>(data->object));
+    bottomEdge->clearRegions(false);
+    QQuickItemPrivate::data_clear(data);
+}
+
+// appends a BottomEdgeRegion to the list; clears the default regions before appending the
+// custom ones
+void UCBottomEdgePrivate::appendRegion(UCBottomEdgeRegion *region)
+{
+    Q_Q(UCBottomEdge);
+    Q_ASSERT(region);
+    // the region must be owned by other non-BottomEdge component,
+    // otherwise we cannot "reuse" the region
+    if (region->parent() != q && qobject_cast<UCBottomEdge*>(region->parent())) {
+        qmlInfo(q) << "Cannot reuse region owned by other BottomEdge components";
+        return;
+    }
+
+    // make sure we own the region!
+    QQml_setParent_noEvent(region, q);
+    // take ownership!
+    QQmlEngine::setObjectOwnership(region, QQmlEngine::CppOwnership);
+    region->attachToBottomEdge(q);
+
+    if (!defaultRegionsReset) {
+        defaultRegionsReset = true;
+        qDeleteAll(regions);
+        regions.clear();
+    }
+
+    // validate the region before we append
+    validateRegion(region);
+
+    // append region definition
+    regions.append(region);
+}
+
+// clears the custom regions list and restores the default ones
+void UCBottomEdgePrivate::clearRegions(bool destroy)
+{
+    if (!defaultRegionsReset) {
+        return;
+    }
+    if (destroy) {
+        qDeleteAll(regions);
+    }
+    regions.clear();
+    defaultRegionsReset = false;
+    createDefaultRegions();
+}
+
+// validates an added region
+void UCBottomEdgePrivate::validateRegion(UCBottomEdgeRegion *region, int regionsSize)
+{
+    // we should not validate unti the bottom edge is not completed,
+    // property changes may invalidate the result of the validation
+    // also leave if the region is disabled
+    if (!componentComplete || !region->m_enabled) {
+        return;
+    }
+    Q_Q(UCBottomEdge);
+    // use QRectF to help on finding the intersection
+    QRectF boundingRect = q->boundingRect();
+    if (boundingRect.isNull()) {
+        boundingRect = QRectF(0, 0, 1, 1);
+    }
+    if (regionsSize < 0 || regionsSize > regions.size()) {
+        regionsSize = regions.size();
+    }
+    const QRectF regionRect(region->rect(boundingRect));
+    for (int i = 0; i < regionsSize; ++i) {
+        UCBottomEdgeRegion *stackedRegion = regions[i];
+        if (region == stackedRegion || !stackedRegion->m_enabled) {
+            continue;
+        }
+        QRectF rect(stackedRegion->rect(boundingRect));
+        if (rect.contains(regionRect)) {
+            qmlInfo(region) << QString("Region at index %1 contains this region. This region will never activate.").arg(i);
+        } else {
+            QRectF intersect = regionRect.intersected(stackedRegion->rect(boundingRect));
+            if (!intersect.isNull()) {
+                qmlInfo(region) << QString("Region intersects the one from index %1 having from: %2 and to: %3")
+                                   .arg(i).arg(stackedRegion->m_from).arg(stackedRegion->m_to);
+            }
+        }
+    }
+}
+
+// creates the default region(s)
+void UCBottomEdgePrivate::createDefaultRegions()
+{
+    Q_Q(UCBottomEdge);
+    // add the default stages
+    UCBottomEdgeRegion *commitRegion = new UCBottomEdgeRegion(q);
+    // for testing purposes
+    commitRegion->setObjectName("default_BottomEdgeRegion");
+    // enters in this stage when drag ratio reaches 30% of the area
+    commitRegion->m_from = 0.33;
+    commitRegion->m_to = 1.0;
+
+    regions.append(commitRegion);
+}
+
+// update status, drag direction and activeRegion during drag
+void UCBottomEdgePrivate::updateProgressionStates(qreal distance)
+{
+    Q_Q(UCBottomEdge);
+
+    // refresh drag progress
+    setDragProgress(distance / q->height());
+
+    detectDirection(distance);
+    if (isLocked()) {
+        // there is an operation ongoing, do not update drag and activeRegion
+        return;
+    }
+    if (distance >= bottomPanel->m_revealThreshold) {
+        // the content can be revealed
+        setStatus(UCBottomEdge::Revealed);
+    }
+
+    // go through the regions and spot the active region
+    UCBottomEdgeRegion *newActive = Q_NULLPTR;
+    Q_FOREACH(UCBottomEdgeRegion *region, regions) {
+        if (region->contains(dragProgress)) {
+            newActive = region;
+            break;
+        }
+    }
+    if (newActive != activeRegion) {
+        setActiveRegion(newActive);
+    }
+}
+
+// set the active region
+bool UCBottomEdgePrivate::setActiveRegion(UCBottomEdgeRegion *region)
+{
+    if (activeRegion == region) {
+        return false;
+    }
+    if (activeRegion) {
+        activeRegion->exit();
+    }
+    activeRegion = region;
+    if (activeRegion) {
+        activeRegion->enter();
+    }
+    Q_EMIT q_func()->activeRegionChanged(activeRegion);
+    return true;
+}
+
+// updates the dragDirection property
+void UCBottomEdgePrivate::detectDirection(qreal currentDistance)
+{
+    if (!previousDistance) {
+        previousDistance = currentDistance;
+    }
+
+    UCBottomEdge::DragDirection newDirection = dragDirection;
+    qreal delta = previousDistance - currentDistance;
+    bool deltaPassed = abs(delta) >= qApp->styleHints()->startDragDistance();
+    if (!deltaPassed) {
+        return;
+    }
+
+    previousDistance = currentDistance;
+    newDirection = (delta < 0) ? UCBottomEdge::Upwards : UCBottomEdge::Downwards;
+    setDragDirection(newDirection);
+}
+
+// internal dragDirection property setter
+void UCBottomEdgePrivate::setDragDirection(UCBottomEdge::DragDirection direction)
+{
+    if (dragDirection != direction) {
+        dragDirection = direction;
+        switch (dragDirection) {
+        case UCBottomEdge::Undefined: LOG << "direction: Undefined"; break;
+        case UCBottomEdge::Upwards: LOG << "direction: Upwards"; break;
+        case UCBottomEdge::Downwards: LOG << "direction: Downwards"; break;
+        }
+        Q_EMIT q_func()->dragDirectionChanged(dragDirection);
+    }
+}
+
+// proceed with drag completion action
+void UCBottomEdgePrivate::onDragEnded()
+{
+    if (!activeRegion || (dragDirection == UCBottomEdge::Downwards)) {
+        q_func()->collapse();
+    } else {
+        // emit region's dragEnded first
+        Q_EMIT activeRegion->dragEnded();
+        commit(activeRegion->m_to);
+    }
+}
+
+void UCBottomEdgePrivate::commit(qreal to)
+{
+    if (operationStatus == CommitToTop
+            || operationStatus == CommitToRegion
+            || status == UCBottomEdge::Committed) {
+        LOG << "redundant commit call";
+        return;
+    }
+    Q_Q(UCBottomEdge);
+    setOperationStatus(qFuzzyCompare(to, 1.0) ? CommitToTop : CommitToRegion);
+    if (operationStatus == CommitToTop) {
+        LOG << "emit commitStarted()";
+        Q_EMIT q->commitStarted();
+    }
+    // make sure the status is set to revealed first
+    bool animated = bottomPanel && bottomPanel->m_panelAnimation;
+    if (animated) {
+        QObject::connect(bottomPanel->m_panelAnimation, &QQuickAbstractAnimation::runningChanged,
+                q, &UCBottomEdge::unlockOperation, Qt::UniqueConnection);
+    }
+    // make sure the setStatus is set to Revealed first
+    if (status == UCBottomEdge::Hidden) {
+        setStatus(UCBottomEdge::Revealed);
+    }
+    setDragProgress(to);
+    if (!animated) {
+        q->unlockOperation(false);
+    }
+}
+
+// common handler to complete the operations
+void UCBottomEdge::unlockOperation(bool running)
+{
+    if (running) {
+        return;
+    }
+    Q_D(UCBottomEdge);
+    if (d->bottomPanel && d->bottomPanel->m_panelAnimation) {
+        disconnect(d->bottomPanel->m_panelAnimation, &QQuickAbstractAnimation::runningChanged,
+                   0, 0);
+    }
+
+    UCBottomEdgePrivate::OperationStatus oldStatus = d->operationStatus;
+    switch (d->operationStatus) {
+    case UCBottomEdgePrivate::CommitToTop:
+    case UCBottomEdgePrivate::CommitToRegion:
+        d->setStatus(UCBottomEdge::Committed);
+        d->patchContentItemHeader();
+        if (d->operationStatus == UCBottomEdgePrivate::CommitToTop) {
+            LOG << "emit commitCompleted()";
+            Q_EMIT commitCompleted();
+        }
+        break;
+    case UCBottomEdgePrivate::Collapsing:
+        d->setStatus(UCBottomEdge::Hidden);
+        Q_EMIT collapseCompleted();
+        break;
+    default: break;
+    }
+
+    // the operation status may got changed due to a new operation being
+    // initiated from the previosu one (e.g.collapse from commitCompleted, etc
+    if (oldStatus == d->operationStatus) {
+        d->setDragDirection(Undefined);
+        d->setOperationStatus(UCBottomEdgePrivate::Idle);
+    }
+}
+
+// positions the bottom edge panel holding the content to the given height percentage
+void UCBottomEdgePrivate::setDragProgress(qreal position)
+{
+    if (dragProgress == position || (position < 0.0) || position > 1.0) {
+        return;
+    }
+    dragProgress = position;
+    Q_EMIT q_func()->dragProgressChanged(dragProgress);
+}
+
+// separated in a derived class to ease testing
+UCCollapseAction::UCCollapseAction(QObject *parent)
+    : UCAction(parent)
+{
+    QQmlEngine::setObjectOwnership(this, QQmlEngine::objectOwnership(parent));
+    setIconName("down");
+}
+
+// inject collapse action into the content if the content has a PageHeader
+void UCBottomEdgePrivate::patchContentItemHeader()
+{
+    // ugly, as it can be, as we don't have the PageHeader in cpp to detect the type
+    UCHeader *header = bottomPanel->m_contentItem ? bottomPanel->m_contentItem->findChild<UCHeader*>() : Q_NULLPTR;
+    if (!header || !QuickUtils::inherits(header, "PageHeader") || status != UCBottomEdge::Committed) {
+        return;
+    }
+
+    // get the navigationActions and inject an action there
+    QVariant list(header->property("navigationActions"));
+    QQmlListProperty<UCAction> actions = list.value< QQmlListProperty<UCAction> >();
+    QList<UCAction*> *navigationActions = reinterpret_cast<QList<UCAction*>*>(actions.data);
+
+    // clear the actions first
+    navigationActions->clear();
+
+    // inject the action
+    UCAction *collapse = new UCCollapseAction(header);
+    QObject::connect(collapse, &UCAction::triggered, q_func(), &UCBottomEdge::collapse, Qt::DirectConnection);
+    navigationActions->append(collapse);
+
+    // invoke PageHeader.navigationActionsChanged signal
+    int signal = header->metaObject()->indexOfSignal("navigationActionsChanged()");
+    if (signal >= 0) {
+        header->metaObject()->invokeMethod(header, "navigationActionsChanged");
+    }
+}
+
+bool UCBottomEdgePrivate::loadStyleItem(bool animated)
+{
+    // fix styleVersion
+    Q_Q(UCBottomEdge);
+    if (!styleVersion) {
+        styleVersion = BUILD_VERSION(1, 3);
+    }
+    bool result = UCStyledItemBasePrivate::loadStyleItem(animated);
+    bottomPanel = qobject_cast<UCBottomEdgeStyle*>(styleItem);
+    if (bottomPanel) {
+        // reparent style item to the BottomEdge's parent
+        bottomPanel->setParentItem(parentItem);
+        // bring style item in front
+        bottomPanel->setZ(std::numeric_limits<qreal>::max());
+        // anchor to the bottom of the BottomEdge
+        QQuickAnchors *styleAnchors = QQuickItemPrivate::get(bottomPanel)->anchors();
+        styleAnchors->setBottom(anchors()->bottom());
+
+        // move hint under the panel
+        hint->setParentItem(bottomPanel);
+        // and stack it before the panel, so it is covered by the panel when revealed
+        hint->stackBefore(bottomPanel->m_panel);
+
+        // connect style stuff
+        QObject::connect(bottomPanel, &UCBottomEdgeStyle::contentItemChanged,
+                         q, &UCBottomEdge::contentItemChanged, Qt::DirectConnection);
+        // follow contentItem change to patch the header
+        QObject::connect(bottomPanel, &UCBottomEdgeStyle::contentItemChanged, [=]() {
+            patchContentItemHeader();
+        });
+    }
+    return result;
+}
+
+// make sure the bottom edge panel is always the last one
+void UCBottomEdgePrivate::itemChildAdded(QQuickItem *item, QQuickItem *)
+{
+    // make sure the BottomEdge's panel is the last one
+    QQuickItem *last = item->childItems().last();
+    if (bottomPanel && last != bottomPanel) {
+        bottomPanel->stackAfter(last);
+    }
+}
+
+// remove this to be change listener from the previous parent
+void UCBottomEdgePrivate::itemChildRemoved(QQuickItem *item, QQuickItem *child)
+{
+    Q_Q(UCBottomEdge);
+    if (child == q) {
+        QQuickItemPrivate::get(item)->removeItemChangeListener(this, QQuickItemPrivate::Children);
+    }
+}
+
+void UCBottomEdgePrivate::setOperationStatus(OperationStatus s)
+{
+    operationStatus = s;
+    switch (s) {
+    case Idle: LOG << "OP" << "Idle"; break;
+    case CommitToTop: LOG << "OP" << "CommitToTop"; break;
+    case CommitToRegion: LOG << "OP" << "CommitToRegion"; break;
+    case Collapsing: LOG << "OP" << "Collapsing"; break;
+    }
+}
+
+/*!
+ * \qmltype BottomEdge
+ * \instantiates UCBottomEdge
+ * \inqmlmodule Ubuntu.Components 1.3
+ * \inherits StyledItem
+ * \ingroup ubuntu
+ * \since Ubuntu.Components 1.3
+ * \brief A component to handle bottom edge gesture and content.
+ *
+ * The component provides bottom edge content handling. The bottom egde feature
+ * is typically composed of a hint and some content. The contentUrl is committed
+ * (i.e. fully shown) when the drag is completed after it has been dragged for
+ * a certain amount, that is 30% of the height of the BottomEdge. The contentUrl
+ * can be anything, defined by \l contentUrl or \l contentComponent.
+ *
+ * As the name suggests, the component automatically anchors to the bottom of its
+ * parent and takes the width of the parent. The drag is detected within the parent
+ * area, and the height drives till what extent the bottom edge content should be
+ * exposed on \l commit call. The content is centered into a panel which is dragged from
+ * the bottom of the BottomEdge. The content must specify its width and height.
+ * \qml
+ * import QtQuick 2.4
+ * import Ubuntu.Components 1.3
+ *
+ * MainView {
+ *     width: units.gu(40)
+ *     height: units.gu(70)
+ *
+ *     Page {
+ *         id: page
+ *         title: "BottomEdge"
+ *
+ *         BottomEdge {
+ *             height: parent.height - units.gu(20)
+ *             hint.text: "My bottom edge"
+ *             contentComponent: Rectangle {
+ *                 width: page.width
+ *                 height: page.height
+ *                 color: UbuntuColors.green
+ *             }
+ *         }
+ *     }
+ * }
+ * \endqml
+ *
+ * \note The content is specified either through \l contentUrl or \l contentComponent,
+ * where \l contentComponent has precedence over \l contentUrl.
+ *
+ * There can be situations when the content depends on the progress of the drag.
+ * There are two possibilities to follow this, depending on the use case. The
+ * \l dragProgress provides live updates about the fraction of the drag.
+ * \qml
+ * BottomEdge {
+ *     id: bottomEdge
+ *     height: parent.height
+ *     hint.text: "progression"
+ *     contentComponent: Rectangle {
+ *         width: bottomEdge.width
+ *         height: bottomEdge.height
+ *         color: Qt.rgba(0.5, 1, bottomEdge.dragProgress, 1);
+ *     }
+ * }
+ * \endqml
+ *
+ * The other use case is when the content needs to be completely different in certain
+ * regions of the area. These regions can be defined through BottomEdgeRegion elements
+ * listed in the \l regions property.
+ * \qml
+ * import QtQuick 2.4
+ * import Ubuntu.Components 1.3
+ *
+ * MainView {
+ *     width: units.gu(40)
+ *     height: units.gu(70)
+ *
+ *     Page {
+ *         title: "BottomEdge"
+ *
+ *         BottomEdge {
+ *             id: bottomEdge
+ *             height: parent.height - units.gu(20)
+ *             hint.text: "My bottom edge"
+ *             contentComponent: Rectangle {
+ *                 width: bottomEdge.width
+ *                 height: bottomEdge.height
+ *                 color: bottomEdge.activeRegion ?
+ *                          bottomEdge.activeRegion.color : UbuntuColors.green
+ *             }
+ *             regions: [
+ *                 BottomEdgeRegion {
+ *                     from: 0.4
+ *                     to: 0.6
+ *                     property color color: UbuntuColors.red
+ *                 },
+ *                 BottomEdgeRegion {
+ *                     from: 0.6
+ *                     to: 1.0
+ *                     property color color: UbuntuColors.lightGrey
+ *                 }
+ *             ]
+ *         }
+ *     }
+ * }
+ * \endqml
+ * \note Custom regions override the default declared ones. Therefore there must
+ * be one region which has its \l {BottomEdgeRegion::to}{to} limit set to 1.0
+ * otherwise the content will not be committed at all.
+ * \note Regions can also be declared as child elements the same way as resources.
+ *
+ * The BottomEdge takes ownership over the custom BottomEdgeRegions, therefore
+ * we cannot 'reuse' regions declared in other BottomEdge components, as those
+ * will be destroyed together with the reusing BottomEdge component. The following
+ * scenario only works if the \e customRegion is not used in any other regions.
+ * \qml
+ * Page {
+ *     BottomEdge {
+ *         id: bottomEdge
+ *         hint.text: "reusing regions"
+ *         // put your content and setup here
+ *
+ *         regions: [customRegion]
+ *     }
+ *
+ *     BottomEdgeRegion {
+ *         id: customRegion
+ *         from: 0.2
+ *     }
+ * }
+ * \endqml
+ * \sa BottomEdgeRegion
+ *
+ * \section2 Page As Content
+ * BottomEdge accepts any component to be set as content. Also it can detect
+ * whether the content has a PageHeader component declared, and will inject a
+ * collapse navigation action automatically. In case the content has no header,
+ * the collapse must be provided by the content itself by calling the \l collapse
+ * function.
+ * \qml
+ * BottomEdge {
+ *     id: bottomEdge
+ *     height: parent.height
+ *     hint.text: "Sample collapse"
+ *     contentComponent: Rectangle {
+ *         width: bottomEdge.width
+ *         height: bottomEdge.height
+ *         color: Qt.rgba(0.5, 1, bottomEdge.dragProgress, 1);
+ *         Button {
+ *             text: "Collapse"
+ *             onClicked: bottomEdge.collapse()
+ *         }
+ *     }
+ * }
+ * \endqml
+ * Alternatively you can put a PageHeader component in your custom content
+ * as follows:
+ * \qml
+ * BottomEdge {
+ *     id: bottomEdge
+ *     height: parent.height
+ *     hint.text: "Injected collapse"
+ *     contentComponent: Rectangle {
+ *         width: bottomEdge.width
+ *         height: bottomEdge.height
+ *         color: Qt.rgba(0.5, 1, bottomEdge.dragProgress, 1);
+ *         PageHeader {
+ *             title: "Fancy content"
+ *         }
+ *     }
+ * }
+ * \endqml
+ *
+ * \section2 Styling
+ * Similar to the other components the default style is expected to be defined
+ * in the theme's \e BottomEdgeStyle. However the style is not parented to the
+ * BottomEdge itself, but to the BottomEdge's parent item. When loaded, the style
+ * does not fill the parent but its bottom anchor is set to the bottom of the
+ * BottomEdge. Beside this the hint is also parented to the style instance. Custom
+ * styles are expected to implement the BottomEgdeStyle API.
+ */
+
+/*!
+ * \qmlsignal BottomEdge::commitStarted()
+ * Signal emitted when the content commit is started.
+ */
+
+/*!
+ * \qmlsignal BottomEdge::commitCompleted()
+ * Signal emitted when the content commit is completed.
+ */
+
+/*!
+ * \qmlsignal BottomEdge::collapseStarted()
+ * Signal emitted when the content collapse is started.
+ */
+
+/*!
+ * \qmlsignal BottomEdge::collapseCompleted()
+ * Signal emitted when the content collapse is completed.
+ */
+
+UCBottomEdge::UCBottomEdge(QQuickItem *parent)
+    : UCStyledItemBase(*(new UCBottomEdgePrivate), parent)
+{
+    Q_D(UCBottomEdge);
+    d->init();
+}
+UCBottomEdge::~UCBottomEdge()
+{
+}
+
+void UCBottomEdge::initializeComponent()
+{
+    Q_D(UCBottomEdge);
+    // initialize hint
+    d->hint->init();
+
+    // hint click() always commits
+    connect(d->hint, SIGNAL(clicked()), this, SLOT(commit()), Qt::DirectConnection);
+
+    // follow drag progress
+    connect(d->hint->swipeArea(), &UCSwipeArea::distanceChanged, [=](qreal distance) {
+        d->updateProgressionStates(distance);
+    });
+
+    // follow swipe end
+    connect(d->hint->swipeArea(), &UCSwipeArea::draggingChanged, [=](bool dragging) {
+        if (!dragging) {
+            d->onDragEnded();
+        }
+    });
+
+    // filter hint for mouse events
+    d->hint->installEventFilter(this);
+}
+
+void UCBottomEdge::onParentHeightChanged()
+{
+    Q_D(UCBottomEdge);
+    if (d->parentItem) {
+        setImplicitHeight(d->parentItem->height());
+    }
+}
+
+void UCBottomEdge::classBegin()
+{
+    UCStyledItemBase::classBegin();
+    initializeComponent();
+}
+
+void UCBottomEdge::componentComplete()
+{
+    UCStyledItemBase::componentComplete();
+    Q_D(UCBottomEdge);
+    // fix the hint's style version as that has no qmlContext of its own
+    // and thus import version check will fail; setting the context for
+    // the hint using this component's hint won't work either as this
+    // component's context does not contain the properties from the hint.
+    UCStyledItemBasePrivate *hintPrivate = UCStyledItemBasePrivate::get(d->hint);
+    hintPrivate->styleVersion = d->styleVersion;
+    // also set the qml data as hitn does not have that either
+    QQmlData::get(d->hint, true);
+    QQmlEngine::setContextForObject(d->hint, new QQmlContext(qmlContext(this), d->hint));
+    // finally complete hint creation
+    hintPrivate->completeStyledItem();
+    // and validate regions, leave out the first one as that supposed to be added first
+    // mimic the top limit of the regions list like we would add them one by one
+    for (int i = 1; i < d->regions.size(); ++i) {
+        UCBottomEdgeRegion *region = d->regions[i];
+        d->validateRegion(region, i);
+    }
+}
+
+void UCBottomEdge::itemChange(ItemChange change, const ItemChangeData &data)
+{
+    if (change == ItemParentHasChanged) {
+        Q_D(UCBottomEdge);
+        // disconnect from old parent
+        if (d->oldParentItem) {
+            disconnect(d->oldParentItem, &QQuickItem::heightChanged,
+                       this, &UCBottomEdge::onParentHeightChanged);
+        }
+        QQuickAnchors *anchors = QQuickItemPrivate::get(this)->anchors();
+        if (data.item) {
+            const QQuickAnchorLine left = QQuickItemPrivate::get(data.item)->left();
+            const QQuickAnchorLine right = QQuickItemPrivate::get(data.item)->right();
+            const QQuickAnchorLine bottom = QQuickItemPrivate::get(data.item)->bottom();
+            anchors->setLeft(left);
+            anchors->setRight(right);
+            anchors->setBottom(bottom);
+            QQuickItemPrivate::get(data.item)->addItemChangeListener(d, QQuickItemPrivate::Children);
+            // follow implicitHeight
+            connect(data.item, &QQuickItem::heightChanged,
+                    this, &UCBottomEdge::onParentHeightChanged);
+            onParentHeightChanged();
+        } else {
+            anchors->resetLeft();
+            anchors->resetRight();
+            anchors->resetBottom();
+        }
+        if (d->bottomPanel) {
+            d->bottomPanel->setParentItem(data.item);
+        }
+    }
+    UCStyledItemBase::itemChange(change, data);
+}
+
+bool UCBottomEdge::eventFilter(QObject *target, QEvent *event)
+{
+    Q_D(UCBottomEdge);
+
+    switch (event->type()) {
+    case QEvent::MouseButtonPress:
+    {
+        QMouseEvent *mouse = static_cast<QMouseEvent*>(event);
+        d->mousePressed = d->hint->contains(mouse->localPos());
+        LOG << "drag with mouse";
+        break;
+    }
+    case QEvent::MouseButtonRelease:
+        if (d->mousePressed) {
+            d->onDragEnded();
+        }
+        d->mousePressed = false;
+        break;
+    case QEvent::MouseMove:
+    {
+        if (d->mousePressed) {
+            QMouseEvent *mouse = static_cast<QMouseEvent*>(event);
+            qreal mouseItemY = mapFromScene(mouse->windowPos()).y();
+            qreal distance = abs(height() - mouseItemY);
+            d->updateProgressionStates(distance);
+        }
+        break;
+    }
+    default: break;
+    }
+    return UCStyledItemBase::eventFilter(target, event);
+}
+
+/*!
+ * \qmlproperty BottomEdgeHint BottomEdge::hint
+ * The property holds the component to display the hint for the bottom edge element.
+ */
+UCBottomEdgeHint *UCBottomEdge::hint() const
+{
+    Q_D(const UCBottomEdge);
+    return d->hint;
+}
+
+/*!
+ * \qmlproperty real BottomEdge::dragProgress
+ * \readonly
+ * The property specifies the proggress of the drag within [0..1] interval.
+ */
+qreal UCBottomEdge::dragProgress()
+{
+    Q_D(UCBottomEdge);
+    return d->dragProgress;
+}
+
+/*!
+ * \qmlproperty DragDirection BottomEdge::dragDirection
+ * \readonly
+ * The property reports the current direction of the drag. The direction is flipped
+ * when the drag passes the drag threshold.
+ * \table
+ * \header
+ *  \li DragDirection
+ *  \li Description
+ * \row
+ *  \li Undefined
+ *  \li Default. The drag is not performed or the direction is not detected.
+ * \row
+ *  \li Upwards
+ *  \li The drag is performed from bottom up or it passed the drag threshold from
+ *      from the last point the drag was going downwards.
+ * \row
+ *  \li Downwards
+ *  \li The drag is performed from up to bottom or it passed the drag threshold from
+ *      from the last point the drag was going upwards.
+ * \endtable
+ *
+ * Defaults to \e Undefined
+ */
+UCBottomEdge::DragDirection UCBottomEdge::dragDirection() const
+{
+    Q_D(const UCBottomEdge);
+    return d->dragDirection;
+}
+
+/*!
+ * \qmlproperty Status BottomEdge::status
+ * \readonly
+ * The property reports the actual state of the bottom edge. It can have the
+ * following values:
+ * \table
+ * \header
+ *  \li Status
+ *  \li Description
+ * \row
+ *  \li Hidden
+ *  \li The bottom edge is hidden. This does not contain the hint states.
+ * \row
+ *  \li Revealed
+ *  \li The Bottom edge content is revealed. The state can be reached only if the
+ *      \l hint is in "Active" state.
+ * \row
+ *  \li Committed
+ *  \li The bottom edge content is fully exposed.
+ * \endtable
+ * \note Once \e Commited status is set, no further draging is possible on the content.
+ */
+UCBottomEdge::Status UCBottomEdge::status() const
+{
+    Q_D(const UCBottomEdge);
+    return d->status;
+}
+void UCBottomEdgePrivate::setStatus(UCBottomEdge::Status status)
+{
+    if (status == this->status) {
+        return;
+    }
+    this->status = status;
+    // logging
+    switch (status) {
+        case UCBottomEdge::Hidden: LOG << "STATUS" << "Hidden"; break;
+        case UCBottomEdge::Revealed: LOG << "STATUS" << "Revealed"; break;
+        case UCBottomEdge::Committed: LOG << "STATUS" << "Committed"; break;
+    }
+
+    if (bottomPanel) {
+        bottomPanel->setConsumeMouse(status > UCBottomEdge::Hidden);
+    }
+
+    Q_EMIT q_func()->statusChanged(this->status);
+}
+
+/*!
+ * \qmlproperty url BottomEdge::contentUrl
+ * The property holds the url to the document defining the content of the bottom
+ * edge. The property behaves the same way as Loader's \e source property.
+ */
+QUrl UCBottomEdge::contentUrl() const
+{
+    Q_D(const UCBottomEdge);
+    return d->contentUrl;
+}
+void UCBottomEdge::setContent(const QUrl &url)
+{
+    Q_D(UCBottomEdge);
+    if (d->contentUrl == url) {
+        return;
+    }
+
+    d->contentUrl = url;
+    Q_EMIT contentChanged(d->contentUrl);
+}
+
+/*!
+ * \qmlproperty Component BottomEdge::contentComponent
+ * The property holds the component defining the content of the bottom edge. The
+ * property behaves the same way as Loader's \e sourceComponent property.
+ */
+QQmlComponent *UCBottomEdge::contentComponent() const
+{
+    Q_D(const UCBottomEdge);
+    return d->contentComponent;
+}
+void UCBottomEdge::setContentComponent(QQmlComponent *component)
+{
+    Q_D(UCBottomEdge);
+    if (d->contentComponent == component) {
+        return;
+    }
+    d->contentComponent = component;
+    Q_EMIT contentComponentChanged(d->contentComponent);
+}
+
+/*!
+ * \qmlproperty Item BottomEdge::contentItem
+ * \readonly
+ * The property holds the item created either from \l contentUrl or \l contentComponent
+ * properties.
+ */
+QQuickItem *UCBottomEdge::contentItem() const
+{
+    Q_D(const UCBottomEdge);
+    return d->bottomPanel ? d->bottomPanel->m_contentItem : Q_NULLPTR;
+}
+
+/*!
+ * \qmlmethod void BottomEdge::commit()
+ * The function forces the bottom edge content to be fully exposed. Emits
+ * \l commitStarted and \l commitCompleted signals to notify the start and the
+ * completion of the commit operation. It is safe to call commit() multiple times.
+ */
+void UCBottomEdge::commit()
+{
+    Q_D(UCBottomEdge);
+    d->commit(1.0);
+}
+
+/*!
+ * \qmlmethod void BottomEdge::collapse()
+ * The function forces the bottom edge content to be hidden. Emits \l collapseStarted
+ * and \l collapseCompleted signals to notify the start and the completion of the
+ * collapse operation.
+ */
+void UCBottomEdge::collapse()
+{
+    Q_D(UCBottomEdge);
+    if (d->operationStatus == UCBottomEdgePrivate::Collapsing || d->status == UCBottomEdge::Hidden) {
+        LOG << "redundant collapse call";
+        return;
+    }
+    d->setOperationStatus(UCBottomEdgePrivate::Collapsing);
+    Q_EMIT collapseStarted();
+    bool animated = d->bottomPanel && d->bottomPanel->m_panelAnimation;
+    if (animated) {
+        connect(d->bottomPanel->m_panelAnimation, &QQuickAbstractAnimation::runningChanged,
+                this, &UCBottomEdge::unlockOperation, Qt::UniqueConnection);
+    }
+    // set the setStatus first to Revealed
+    if (d->status == UCBottomEdge::Committed) {
+        d->setStatus(Revealed);
+    }
+    d->setDragProgress(0.0);
+    if (!animated) {
+        unlockOperation(false);
+    }
+}
+
+/*!
+ * \qmlproperty list<BottomEdgeRegion> BottomEdge::regions
+ * The property holds the custom regions configured for the BottomEdge. The default
+ * configuration contains one region, which commits the content when reached. The
+ * defaults can be restored by setting an empty list to the property or by
+ * calling regions.clear().
+ * See \l BottomEdgeRegion.
+ */
+QQmlListProperty<UCBottomEdgeRegion> UCBottomEdge::regions()
+{
+    Q_D(UCBottomEdge);
+    return QQmlListProperty<UCBottomEdgeRegion>(this, &d->regions,
+                                                 regions_append,
+                                                 regions_count,
+                                                 regions_at,
+                                                 regions_clear);
+}
+
+void UCBottomEdge::regions_append(QQmlListProperty<UCBottomEdgeRegion> *regions, UCBottomEdgeRegion *region)
+{
+    UCBottomEdgePrivate *bottomEdge = UCBottomEdgePrivate::get(static_cast<UCBottomEdge*>(regions->object));
+    bottomEdge->appendRegion(region);
+}
+
+int UCBottomEdge::regions_count(QQmlListProperty<UCBottomEdgeRegion> *regions)
+{
+    UCBottomEdgePrivate *bottomEdge = UCBottomEdgePrivate::get(static_cast<UCBottomEdge*>(regions->object));
+    return bottomEdge->regions.size();
+}
+
+UCBottomEdgeRegion *UCBottomEdge::regions_at(QQmlListProperty<UCBottomEdgeRegion> *regions, int index)
+{
+    UCBottomEdgePrivate *bottomEdge = UCBottomEdgePrivate::get(static_cast<UCBottomEdge*>(regions->object));
+    Q_ASSERT((index >= 0) && (index < bottomEdge->regions.size()));
+    return bottomEdge->regions.at(index);
+}
+
+void UCBottomEdge::regions_clear(QQmlListProperty<UCBottomEdgeRegion> *regions)
+{
+    UCBottomEdgePrivate *bottomEdge = UCBottomEdgePrivate::get(static_cast<UCBottomEdge*>(regions->object));
+    bottomEdge->clearRegions(true);
+}
+
+/*!
+ * \qmlproperty BottomEdgeRegion BottomEdge::activeRegion
+ * \readonly
+ * Specifies the current active region.
+ */
+UCBottomEdgeRegion *UCBottomEdge::activeRegion()
+{
+    Q_D(UCBottomEdge);
+    return d->activeRegion;
+}
+
+#include "moc_ucbottomedge.cpp"

=== added file 'src/Ubuntu/Components/plugin/ucbottomedge.h'
--- src/Ubuntu/Components/plugin/ucbottomedge.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedge.h	2015-11-27 10:36:32 +0000
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Zsombor Egri <[e-mail]>
+ */
+
+#ifndef UCBOTTOMEDGE_H
+#define UCBOTTOMEDGE_H
+
+#include "ucstyleditembase.h"
+#include <QtCore/QPointer>
+#include <QtQuick/private/qquickitemchangelistener_p.h>
+#include <QtCore/QLoggingCategory>
+
+class UCBottomEdgeHint;
+class UCBottomEdgeRegion;
+class QQuickAbstractAnimation;
+class UCBottomEdgePrivate;
+class UCBottomEdge : public UCStyledItemBase
+{
+    Q_OBJECT
+    Q_ENUMS(Status DragDirection)
+
+    Q_PROPERTY(UCBottomEdgeHint* hint READ hint CONSTANT FINAL)
+    Q_PROPERTY(qreal dragProgress READ dragProgress NOTIFY dragProgressChanged FINAL)
+    Q_PROPERTY(DragDirection dragDirection READ dragDirection NOTIFY dragDirectionChanged FINAL)
+    Q_PROPERTY(Status status READ status NOTIFY statusChanged FINAL)
+    Q_PROPERTY(QUrl contentUrl READ contentUrl WRITE setContent NOTIFY contentChanged FINAL)
+    Q_PROPERTY(QQmlComponent *contentComponent READ contentComponent WRITE setContentComponent NOTIFY contentComponentChanged FINAL)
+    Q_PROPERTY(QQuickItem* contentItem READ contentItem NOTIFY contentItemChanged FINAL)
+    Q_PROPERTY(QQmlListProperty<UCBottomEdgeRegion> regions READ regions NOTIFY regionsChanged FINAL)
+    Q_PROPERTY(UCBottomEdgeRegion* activeRegion READ activeRegion NOTIFY activeRegionChanged FINAL)
+
+    // overloaded data property to catch regions
+    Q_PRIVATE_PROPERTY(UCBottomEdge::d_func(), QQmlListProperty<QObject> data READ data DESIGNABLE false)
+    Q_CLASSINFO("DefaultProperty", "data")
+public:
+    enum Status {
+        Hidden,
+        Revealed,
+        Committed
+    };
+    enum DragDirection {
+        Undefined,
+        Upwards,
+        Downwards
+    };
+
+    explicit UCBottomEdge(QQuickItem *parent = 0);
+    virtual ~UCBottomEdge();
+
+    UCBottomEdgeHint *hint() const;
+    qreal dragProgress();
+    DragDirection dragDirection() const;
+    Status status() const;
+    QUrl contentUrl() const;
+    void setContent(const QUrl &url);
+    QQmlComponent *contentComponent() const;
+    void setContentComponent(QQmlComponent *component);
+    QQuickItem *contentItem() const;
+    void setFillWindow(bool fill);
+    QQmlListProperty<UCBottomEdgeRegion> regions();
+    UCBottomEdgeRegion *activeRegion();
+
+Q_SIGNALS:
+    void dragProgressChanged(qreal dragProgress);
+    void dragDirectionChanged(UCBottomEdge::DragDirection direction);
+    void statusChanged(UCBottomEdge::Status status);
+    void contentChanged(const QUrl url);
+    void contentComponentChanged(QQmlComponent *component);
+    void contentItemChanged();
+    void regionsChanged();
+    void activeRegionChanged(UCBottomEdgeRegion *activeRegion);
+
+    void commitStarted();
+    void commitCompleted();
+    void collapseStarted();
+    void collapseCompleted();
+
+public Q_SLOTS:
+    void commit();
+    void collapse();
+
+protected:
+    static void regions_append(QQmlListProperty<UCBottomEdgeRegion> *sections, UCBottomEdgeRegion *section);
+    static int regions_count(QQmlListProperty<UCBottomEdgeRegion> *sections);
+    static UCBottomEdgeRegion *regions_at(QQmlListProperty<UCBottomEdgeRegion> *sections, int index);
+    static void regions_clear(QQmlListProperty<UCBottomEdgeRegion> *sections);
+
+    void initializeComponent();
+    void classBegin();
+    void componentComplete();
+    void itemChange(ItemChange change, const ItemChangeData &data);
+    bool eventFilter(QObject *target, QEvent *event) override;
+
+    void unlockOperation(bool running);
+    void onParentHeightChanged();
+
+    Q_DECLARE_PRIVATE(UCBottomEdge)
+
+    friend class tst_BottomEdge;
+};
+Q_DECLARE_METATYPE(UCBottomEdge::Status)
+Q_DECLARE_METATYPE(UCBottomEdge::DragDirection)
+
+Q_DECLARE_LOGGING_CATEGORY(ucBottomEdge)
+
+#endif // UCBOTTOMEDGE_H

=== added file 'src/Ubuntu/Components/plugin/ucbottomedge_p.h'
--- src/Ubuntu/Components/plugin/ucbottomedge_p.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedge_p.h	2015-11-27 10:36:32 +0000
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Zsombor Egri <[e-mail]>
+ */
+
+#ifndef UCBOTTOMEDGE_P_H
+#define UCBOTTOMEDGE_P_H
+
+#include "ucbottomedge.h"
+#include "ucstyleditembase_p.h"
+#include "ucaction.h"
+
+class UCBottomEdgeStyle;
+class UCBottomEdgePrivate : public UCStyledItemBasePrivate, protected QQuickItemChangeListener
+{
+    Q_DECLARE_PUBLIC(UCBottomEdge)
+
+public:
+    UCBottomEdgePrivate();
+
+    static UCBottomEdgePrivate *get(UCBottomEdge *item)
+    {
+        return item->d_func();
+    }
+    void init();
+
+    // data property
+    QQmlListProperty<QObject> data();
+    static void overload_data_append(QQmlListProperty<QObject> *, QObject *);
+    static void overload_data_clear(QQmlListProperty<QObject> *);
+
+    // range funcs
+    void appendRegion(UCBottomEdgeRegion *range);
+    void clearRegions(bool destroy);
+    void validateRegion(UCBottomEdgeRegion *region, int regionsSize = -1);
+
+    // page header manipulation
+    void patchContentItemHeader();
+    void createDefaultRegions();
+    void updateProgressionStates(qreal distance);
+    bool setActiveRegion(UCBottomEdgeRegion *range);
+    void detectDirection(qreal currentDistance);
+    void setDragDirection(UCBottomEdge::DragDirection direction);
+    void onDragEnded();
+    void commit(qreal to);
+
+    // panel positioning
+    void setDragProgress(qreal position);
+    // internal setters
+    void setStatus(UCBottomEdge::Status status);
+
+    // from UCStyledItemBase
+    bool loadStyleItem(bool animated = true) override;
+    // from QQuickItemChangeListener
+    void itemChildAdded(QQuickItem *item, QQuickItem *child);
+    void itemChildRemoved(QQuickItem *item, QQuickItem *child);
+
+    // members
+    QUrl contentUrl;
+    QList<UCBottomEdgeRegion*> regions;
+    UCBottomEdgeRegion *activeRegion;
+    UCBottomEdgeHint *hint;
+    QQmlComponent *contentComponent;
+    UCBottomEdgeStyle *bottomPanel;
+
+    qreal previousDistance;
+    qreal dragProgress;
+    UCBottomEdge::Status status;
+
+    enum OperationStatus {
+        Idle,
+        CommitToTop,
+        CommitToRegion,
+        Collapsing
+    };
+    OperationStatus operationStatus;
+    UCBottomEdge::DragDirection dragDirection;
+
+    bool defaultRegionsReset:1;
+    bool mousePressed:1;
+
+    // status management
+    void setOperationStatus(OperationStatus s);
+    bool isLocked()
+    {
+        return operationStatus > Idle;
+    }
+};
+
+class UCCollapseAction : public UCAction
+{
+    Q_OBJECT
+public:
+    UCCollapseAction(QObject *parent = 0);
+};
+Q_DECLARE_METATYPE(QQmlListProperty<UCAction>)
+
+#endif // UCBOTTOMEDGE_P_H

=== modified file 'src/Ubuntu/Components/plugin/ucbottomedgehint.cpp'
--- src/Ubuntu/Components/plugin/ucbottomedgehint.cpp	2015-11-19 10:04:28 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedgehint.cpp	2015-11-27 10:36:32 +0000
@@ -169,7 +169,7 @@
 }
 void UCBottomEdgeHint::mouseReleaseEvent(QMouseEvent *event)
 {
-    if (m_pressed && (m_status >= Active)) {
+    if (m_pressed && (m_status >= Active) && contains(event->localPos())) {
         Q_EMIT clicked();
         event->accept();
     } else {

=== modified file 'src/Ubuntu/Components/plugin/ucbottomedgehint.h'
--- src/Ubuntu/Components/plugin/ucbottomedgehint.h	2015-11-17 13:45:25 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedgehint.h	2015-11-27 10:36:32 +0000
@@ -87,6 +87,8 @@
     int m_deactivateTimeout;
     Status m_status;
     bool m_pressed:1;
+
+    friend class UCBottomEdge;
 };
 
 #endif // UCBOTTOMEDGEHINT_H

=== added file 'src/Ubuntu/Components/plugin/ucbottomedgeregion.cpp'
--- src/Ubuntu/Components/plugin/ucbottomedgeregion.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedgeregion.cpp	2015-11-27 10:36:32 +0000
@@ -0,0 +1,253 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Zsombor Egri <[e-mail]>
+ */
+
+#include "ucbottomedge.h"
+#include "ucbottomedge_p.h"
+#include "ucbottomedgeregion.h"
+#include "propertychange_p.h"
+#include <QtQml/private/qqmlproperty_p.h>
+
+/*!
+ * \qmltype BottomEdgeRegion
+ * \instantiates UCBottomEdgeRegion
+ * \inherits QtObject
+ * \inmodule Ubuntu.Components 1.3
+ * \since Ubuntu.Components 1.3
+ * \ingroup ubuntu
+ * \brief Defines an active region within the BottomEdge component.
+ *
+ * Bottom edge regions are portions within the bottom edge area which can define
+ * different content or action whenever the drag enters in the area. The area is
+ * defined by \l from and \l to properties vertically, whereas horizontally is
+ * stretched across bottom edge width. Custom content can be defined through
+ * \l contentUrl or \l contentComponent properties, which will override the
+ * \l BottomEdge::contentUrl and \l BottomEdge::contentComponent properties for the
+ * time the gesture is in the section area.
+ * \qml
+ * import QtQuick 2.4
+ * import Ubuntu.Components 1.3
+ *
+ * MainView {
+ *     width: units.gu(40)
+ *     height: units.gu(70)
+ *
+ *     Page {
+ *         header: PageHeader {
+ *             title: "BottomEdge regions"
+ *         }
+ *
+ *         BottomEdge {
+ *             id: bottomEdge
+ *             height: parent.height - units.gu(20)
+ *             hint: BottomEdgeHint {
+ *                 text: "My bottom edge"
+ *             }
+ *             // a fake content till we reach the committable area
+ *             contentComponent: Rectangle {
+ *                 width: bottomEdge.width
+ *                 height: bottomEdge.height
+ *                 color: UbuntuColors.green
+ *             }
+ *             // override bottom edge sections to switch to real content
+ *             BottomEdgeRegion {
+ *                 from: 0.33
+ *                 contentComponent: Page {
+ *                     width: bottomEdge.width
+ *                     height: bottomEdge.height
+ *                     header: PageHeader {
+ *                         title: "BottomEdge Content"
+ *                     }
+ *                 }
+ *             }
+ *         }
+ *     }
+ * }
+ * \endqml
+ *
+ * Entering into the section area is signalled by the \l entered signal and when
+ * drag leaves the area the \l exited signal is emitted. If the drag ends within
+ * the section area, the \l dragEnded signal is emitted. In case the section's
+ * \l to property is less than 1.0, the bottom edge content will only be exposed
+ * to that value, and the \l BottomEdge::status will get the \e Committed value.
+ * No further drag is possible after reaching \e Commited state.
+ *
+ * \note Whereas there is no restriction on making overlapping sections, beware that
+ * overlapping sections changing the content through the \l contentUrl or \l contentComponent
+ * properties will cause unpredictable results.
+ */
+
+UCBottomEdgeRegion::UCBottomEdgeRegion(QObject *parent)
+    : QObject(parent)
+    , m_bottomEdge(qobject_cast<UCBottomEdge*>(parent))
+    , m_component(Q_NULLPTR)
+    , m_urlBackup(Q_NULLPTR)
+    , m_componentBackup(Q_NULLPTR)
+    , m_from(0.0)
+    , m_to(-1.0)
+    , m_enabled(true)
+{
+}
+
+void UCBottomEdgeRegion::attachToBottomEdge(UCBottomEdge *bottomEdge)
+{
+    QQml_setParent_noEvent(this, bottomEdge);
+    m_bottomEdge = bottomEdge;
+    // adjust to property value if not set yet
+    if (m_to <= 0.0) {
+        m_to = 1.0;
+        Q_EMIT toChanged();
+    }
+}
+
+bool UCBottomEdgeRegion::contains(qreal dragRatio)
+{
+    return (m_enabled && (m_from < m_to) && dragRatio >= m_from && dragRatio <= m_to);
+}
+
+void UCBottomEdgeRegion::enter()
+{
+    Q_EMIT entered();
+    // backup url
+    if (m_url.isValid()) {
+        m_urlBackup = new PropertyChange(m_bottomEdge, "contentUrl");
+        QQmlProperty property(this, "contentUrl", qmlContext(this));
+        QQmlAbstractBinding *binding = QQmlPropertyPrivate::binding(property);
+        if (binding) {
+            PropertyChange::setBinding(m_urlBackup, binding);
+        } else {
+            PropertyChange::setValue(m_urlBackup, m_url);
+        }
+    }
+    if (m_component) {
+        m_componentBackup = new PropertyChange(m_bottomEdge, "contentComponent");
+        QQmlProperty property(this, "contentComponent", qmlContext(this));
+        QQmlAbstractBinding *binding = QQmlPropertyPrivate::binding(property);
+        if (binding) {
+            PropertyChange::setBinding(m_componentBackup, binding);
+        } else {
+            PropertyChange::setValue(m_componentBackup, QVariant::fromValue<QQmlComponent*>(m_component));
+        }
+    }
+}
+
+void UCBottomEdgeRegion::exit()
+{
+    if (m_componentBackup) {
+        delete m_componentBackup;
+        m_componentBackup = Q_NULLPTR;
+    }
+    if (m_urlBackup) {
+        delete m_urlBackup;
+        m_urlBackup = Q_NULLPTR;
+    }
+    Q_EMIT exited();
+}
+
+const QRectF UCBottomEdgeRegion::rect(const QRectF &bottomEdgeRect)
+{
+    QRectF regionRect(
+                bottomEdgeRect.topLeft() + QPointF(0, bottomEdgeRect.height() * (1.0 - m_to)),
+                QSizeF(bottomEdgeRect.width(), bottomEdgeRect.height() * (m_to - m_from)));
+    return regionRect;
+}
+
+/*!
+ * \qmlproperty bool BottomEdgeRegion::enabled
+ * Enables the section. Disabled sections do not trigger nor change the BottomEdge
+ * content. Defaults to false.
+ */
+void UCBottomEdgeRegion::setEnabled(bool enabled)
+{
+    if (enabled == m_enabled) {
+        return;
+    }
+    m_enabled = enabled;
+    if (m_bottomEdge) {
+        UCBottomEdgePrivate::get(m_bottomEdge)->validateRegion(this);
+    }
+    Q_EMIT enabledChanged();
+}
+
+/*!
+ * \qmlproperty real BottomEdgeRegion::from
+ * Specifies the starting ratio of the bottom erge area. The value must be bigger
+ * or equal to 0 but strictly smaller than \l to. Defaults to 0.0.
+ */
+void UCBottomEdgeRegion::setFrom(qreal from)
+{
+    if (from == m_from) {
+        return;
+    }
+    m_from = from;
+    if (m_bottomEdge) {
+        UCBottomEdgePrivate::get(m_bottomEdge)->validateRegion(this);
+    }
+    Q_EMIT fromChanged();
+}
+
+/*!
+ * \qmlproperty real BottomEdgeRegion::to
+ * Specifies the ending ratio of the bottom edge area. The value must be bigger
+ * than \l from and smaller or equal to 1.0.
+ * \note If the end point is less than 1.0, ending the drag within the section
+ * will result in exposing the bottom edge content only till the ration specified
+ * by this property.
+ */
+void UCBottomEdgeRegion::setTo(qreal to)
+{
+    if (to == m_to) {
+        return;
+    }
+    m_to = to;
+    if (m_bottomEdge) {
+        UCBottomEdgePrivate::get(m_bottomEdge)->validateRegion(this);
+    }
+    Q_EMIT toChanged();
+}
+
+/*!
+ * \qmlproperty url BottomEdgeRegion::contentUrl
+ * Specifies the url to the document defining the section specific content. This
+ * propery will temporarily override the \l BottomEdge::contentUrl property value
+ * when the drag gesture enters the section area. The orginal value will be restored
+ * once the gesture leaves the section area.
+ */
+
+/*!
+ * \qmlproperty Component BottomEdgeRegion::contentComponent
+ * Specifies the component defining the section specific content. This propery
+ * will temporarily override the \l BottomEdge::contentComponent property value
+ * when the drag gesture enters the section area. The orginal value will be restored
+ * once the gesture leaves the section area.
+ */
+
+/*!
+ * \qmlsignal void BottomEdgeRegion::entered()
+ * Signal triggered when the drag enters into the area defined by the bottom edge
+ * section.
+ */
+
+/*!
+ * \qmlsignal void BottomEdgeRegion::exited()
+ * Signal triggered when the drag leaves the area defined by the bottom edge section.
+ */
+
+/*!
+ * \qmlsignal void BottomEdgeRegion::dragEnded()
+ * Signal triggered when the drag ends within the active bottom edge section area.
+ */

=== added file 'src/Ubuntu/Components/plugin/ucbottomedgeregion.h'
--- src/Ubuntu/Components/plugin/ucbottomedgeregion.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedgeregion.h	2015-11-27 10:36:32 +0000
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Zsombor Egri <[e-mail]>
+ */
+
+#ifndef UCBOTTOMEDGEREGION_H
+#define UCBOTTOMEDGEREGION_H
+
+#include <QtCore/QObject>
+#include <QtQml/QQmlParserStatus>
+#include <QtCore/QUrl>
+#include <QtCore/QPointer>
+
+class UCBottomEdge;
+class QQmlComponent;
+class PropertyChange;
+class UCBottomEdgeRegion : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(bool enabled MEMBER m_enabled WRITE setEnabled NOTIFY enabledChanged FINAL)
+    Q_PROPERTY(qreal from MEMBER m_from WRITE setFrom NOTIFY fromChanged FINAL)
+    Q_PROPERTY(qreal to MEMBER m_to WRITE setTo NOTIFY toChanged FINAL)
+    Q_PROPERTY(QUrl contentUrl MEMBER m_url NOTIFY contentChanged FINAL)
+    Q_PROPERTY(QQmlComponent* contentComponent MEMBER m_component NOTIFY contentComponentChanged FINAL)
+public:
+    explicit UCBottomEdgeRegion(QObject *parent = 0);
+    void attachToBottomEdge(UCBottomEdge *bottomEdge);
+
+    // used internally
+    void setFrom(qreal from);
+    void setTo(qreal to);
+    void setEnabled(bool enabled);
+    bool contains(qreal dragRatio);
+    void enter();
+    void exit();
+    const QRectF rect(const QRectF &bottomEdgeRect);
+
+Q_SIGNALS:
+    void enabledChanged();
+    void fromChanged();
+    void toChanged();
+    void contentChanged();
+    void contentComponentChanged();
+
+    void entered();
+    void exited();
+    void dragEnded();
+
+protected:
+    QUrl m_url;
+    QPointer<UCBottomEdge> m_bottomEdge;
+    QQmlComponent *m_component;
+    PropertyChange *m_urlBackup;
+    PropertyChange *m_componentBackup;
+    qreal m_from;
+    qreal m_to;
+    bool m_enabled:1;
+
+    friend class UCBottomEdge;
+    friend class UCBottomEdgePrivate;
+    friend class tst_BottomEdge;
+};
+
+#endif // UCBOTTOMEDGEREGION_H

=== added file 'src/Ubuntu/Components/plugin/ucbottomedgestyle.cpp'
--- src/Ubuntu/Components/plugin/ucbottomedgestyle.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedgestyle.cpp	2015-11-27 10:36:32 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Zsombor Egri <[e-mail]>
+ */
+
+#include "ucbottomedgestyle.h"
+#include "ucbottomedge_p.h"
+
+/*!
+ * \qmltype BottomEdgeStyle
+ * \instantiates UCBottomEdgeStyle
+ * \inqmlmodule Ubuntu.Components.Styles 1.3
+ * \since Ubuntu.Components.Styles 1.3
+ * \ingroup style-api
+ * \brief Style API for BottomEdge content holder panel.
+ */
+
+void UCBottomEdgeStyle::setConsumeMouse(bool consume)
+{
+    if (consume) {
+        setAcceptedMouseButtons(Qt::AllButtons);
+    } else {
+        setAcceptedMouseButtons(Qt::NoButton);
+    }
+}
+
+void UCBottomEdgeStyle::mousePressEvent(QMouseEvent *event)
+{
+    event->accept();
+}
+
+/*!
+ * \qmlproperty Item BottomEdgeStyle::panel
+ * Represents the item holding the bottom edge content.
+ */
+
+/*!
+ * \qmlproperty Item BottomEdgeStyle::contentItem
+ * Holds the current content item created from \l BottomEdge::contentUrl or \l BottomEdge::contentComponent.
+ */
+
+/*!
+ * \qmlproperty Animation BottomEdgeStyle::panelAnimation
+ * Holds the animation of the panel. BottomEdge requires this property to know
+ * when the bottom edge is fully committed or collapsed.
+ */
+
+/*!
+ * \qmlproperty real BottomEdgeStyle::revealThreshold
+ * Holds the style configured value which drives when the bottom edge content
+ * should be exposed.
+ */

=== added file 'src/Ubuntu/Components/plugin/ucbottomedgestyle.h'
--- src/Ubuntu/Components/plugin/ucbottomedgestyle.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedgestyle.h	2015-11-27 10:36:32 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Zsombor Egri <[e-mail]>
+ */
+
+#ifndef UCBOTTOMEDGESTYLE_H
+#define UCBOTTOMEDGESTYLE_H
+
+#include <QtQuick/QQuickItem>
+
+class QQuickItem;
+class QQuickAbstractAnimation;
+class UCBottomEdge;
+class UCBottomEdgeStyle : public QQuickItem
+{
+    Q_OBJECT
+    Q_PROPERTY(QQuickItem* panel MEMBER m_panel NOTIFY panelChanged FINAL)
+    Q_PROPERTY(QQuickItem* contentItem MEMBER m_contentItem NOTIFY contentItemChanged FINAL)
+    Q_PROPERTY(QQuickAbstractAnimation *panelAnimation MEMBER m_panelAnimation NOTIFY panelAnimationChanged FINAL)
+    Q_PROPERTY(qreal revealThreshold MEMBER m_revealThreshold NOTIFY revealThresholdChanged FINAL)
+public:
+    explicit UCBottomEdgeStyle(QQuickItem *parent = 0)
+        : QQuickItem(parent)
+    {}
+
+    void setConsumeMouse(bool consume);
+
+Q_SIGNALS:
+    void panelChanged();
+    void contentItemChanged();
+    void panelAnimationChanged();
+    void revealThresholdChanged();
+
+protected:
+    void mousePressEvent(QMouseEvent *event);
+
+private:
+    QQuickItem *m_panel = nullptr;
+    QQuickItem *m_contentItem = nullptr;
+    QQuickAbstractAnimation *m_panelAnimation = nullptr;
+    qreal m_revealThreshold = 0.;
+
+    friend class UCBottomEdge;
+    friend class UCBottomEdgePrivate;
+};
+
+#endif // UCBOTTOMEDGESTYLE_H

=== modified file 'src/Ubuntu/Components/plugin/ucstyleditembase.cpp'
--- src/Ubuntu/Components/plugin/ucstyleditembase.cpp	2015-10-20 11:32:09 +0000
+++ src/Ubuntu/Components/plugin/ucstyleditembase.cpp	2015-11-27 10:36:32 +0000
@@ -26,7 +26,8 @@
 #include <QtQuick/private/qquickanchors_p.h>
 
 UCStyledItemBasePrivate::UCStyledItemBasePrivate()
-    : styleComponent(Q_NULLPTR)
+    : oldParentItem(Q_NULLPTR)
+    , styleComponent(Q_NULLPTR)
     , styleItem(Q_NULLPTR)
     , styleVersion(0)
     , activeFocusOnPress(false)
@@ -469,6 +470,15 @@
     }
 }
 
+void UCStyledItemBasePrivate::completeStyledItem()
+{
+    Q_Q(UCStyledItemBase);
+    // no animation at this time
+    // prepare style context if not been done yet
+    postStyleChanged();
+    loadStyleItem(false);
+}
+
 void UCStyledItemBase::componentComplete()
 {
     QQuickItem::componentComplete();
@@ -476,10 +486,16 @@
     // make sure the theme version is up to date
     d->styleVersion = d->importVersion(this);
     UCTheme::checkMixedVersionImports(this, d->styleVersion);
-    // no animation at this time
-    // prepare style context if not been done yet
-    d->postStyleChanged();
-    d->loadStyleItem(false);
+    d->completeStyledItem();
+}
+
+void UCStyledItemBase::itemChange(ItemChange change, const ItemChangeData &data)
+{
+    QQuickItem::itemChange(change, data);
+    if (change == ItemParentHasChanged) {
+        // update parentItem
+        d_func()->oldParentItem = data.item;
+    }
 }
 
 // grab pressed state and focus if it can be

=== modified file 'src/Ubuntu/Components/plugin/ucstyleditembase.h'
--- src/Ubuntu/Components/plugin/ucstyleditembase.h	2015-10-20 10:19:10 +0000
+++ src/Ubuntu/Components/plugin/ucstyleditembase.h	2015-11-27 10:36:32 +0000
@@ -60,6 +60,7 @@
     virtual void postThemeChanged();
 
     void componentComplete();
+    void itemChange(ItemChange change, const ItemChangeData &data);
     void mousePressEvent(QMouseEvent *event);
     bool childMouseEventFilter(QQuickItem *child, QEvent *event);
 

=== modified file 'src/Ubuntu/Components/plugin/ucstyleditembase_p.h'
--- src/Ubuntu/Components/plugin/ucstyleditembase_p.h	2015-10-20 11:05:53 +0000
+++ src/Ubuntu/Components/plugin/ucstyleditembase_p.h	2015-11-27 10:36:32 +0000
@@ -56,6 +56,7 @@
     virtual void preStyleChanged();
     virtual void postStyleChanged() {}
     virtual bool loadStyleItem(bool animated = true);
+    virtual void completeStyledItem();
 
     // from UCImportVersionChecker
     virtual QString propertyForVersion(quint16 version) const;
@@ -64,6 +65,7 @@
 
     QPointer<QQmlContext> styleItemContext;
     QString styleDocument;
+    QQuickItem *oldParentItem;
     QQmlComponent *styleComponent;
     QQuickItem *styleItem;
     quint16 styleVersion;

=== modified file 'src/Ubuntu/Test/plugin/uctestextras.cpp'
--- src/Ubuntu/Test/plugin/uctestextras.cpp	2015-11-04 10:56:03 +0000
+++ src/Ubuntu/Test/plugin/uctestextras.cpp	2015-11-27 10:36:32 +0000
@@ -227,18 +227,151 @@
         steps = 5;
     }
     touchPress(touchId, item, from);
-    QTest::qWait(10);
+    QTest::qWait(20);
     touchMove(touchId, item, from);
     QPoint movePoint(from);
     qreal stepDx = delta.x() / steps;
     qreal stepDy = delta.y() / steps;
     if (!delta.isNull()) {
         for (int i = 0; i < steps - 1; i++) {
-            QTest::qWait(10);
+            QTest::qWait(20);
             movePoint += QPoint(stepDx, stepDy);
             touchMove(touchId, item, movePoint);
         }
     }
-    QTest::qWait(10);
+    QTest::qWait(20);
     touchRelease(touchId, item, from + delta);
 }
+
+/*!
+ * \qmlmethod void TestExtras::mouseDrag(touchId, item, from, delta, button, stateKey, steps = 5, delay = 20)
+ * The function performs a drag with a mouse over an \a item from the starting
+ * point \a from with a \a delta. The gesture is realized with a mouse press,
+ * \a step moves and a release event, with a \e delay in between each mouse event.
+ *
+ * By default the function uses 5 steps to produce the drag. This value can be any
+ * positive number, driving the gesture appliance to be faster (less than 5 moves) or
+ * slower (more than 5 moves). If a negative or 0 value is given, the function will
+ * use the default 5 steps to produce the gesture.
+ */
+
+void UCTestExtras::mouseDrag(QQuickItem *item, const QPoint &from, const QPoint &delta, Qt::MouseButton button, Qt::KeyboardModifiers stateKey, int steps, int delay)
+{
+    if (delta.isNull()) {
+        qWarning() << "delta point is invalid";
+        return;
+    }
+    if (steps <= 0) {
+        steps = 5;
+    }
+    if (delay < 20) {
+        delay = 20;
+    }
+    QTest::mousePress(item->window(), button, stateKey, from, delay);
+    QPoint movePoint(from);
+    qreal stepDx = delta.x() / steps;
+    qreal stepDy = delta.y() / steps;
+    if (!delta.isNull()) {
+        for (int i = 0; i < steps; i++) {
+            QTest::mouseMove(item->window(), movePoint, delay);
+            movePoint += QPoint(stepDx, stepDy);
+        }
+    }
+    QTest::mouseRelease(item->window(), button, stateKey, movePoint, delay);
+}
+
+/*
+ * void TestExtras::touchDragWithPoints(touchId, item, list<point> ponts, delay = 20)
+ * Similar to \l touchDrag function, but here the points must be specified in \e points property.
+ * The first point is expected to be the starting position, after which each point is a relative
+ * point defining the move. A minimum of 5 points are needed to properly produce a drag.
+ * \qml
+ * import Qt.Test 1.0
+ * import Ubuntu.Test 1.0
+ * Item {
+ *     id: testItem
+ *     UbuntuTestCase {
+ *
+ *         function test_vertical_drag_upwards() {
+ *             var points = [];
+ *             points.push(centerOf(testItem));
+ *             points.push(Qt.point(0, -1));
+ *             points.push(Qt.point(0, -3));
+ *             points.push(Qt.point(0, -6));
+ *             points.push(Qt.point(0, -5));
+ *             points.push(Qt.point(0, -2));
+ *             TestExtras.touchDragWithPoints(0, testItem, points);
+ *         }
+ *     }
+ * }
+ * \endqml
+ * The delay must be a minimum of 20 milliseconds.
+ */
+void UCTestExtras::touchDragWithPoints(int touchId, QQuickItem *item, QList<QPoint> points, int delay)
+{
+    if (points.size() < 5) {
+        qWarning() << "minimum 5 points are needed.";
+        return;
+    }
+    if (delay < 20) {
+        delay = 20;
+    }
+
+    QPoint movePoint(points[0]);
+    touchPress(touchId, item, movePoint);
+    QTest::qWait(delay);
+    touchMove(touchId, item, movePoint);
+    for (int i = 1; i < points.size(); ++i) {
+        QTest::qWait(delay);
+        movePoint += points[i];
+        touchMove(touchId, item, movePoint);
+    }
+    QTest::qWait(delay);
+    touchRelease(touchId, item, movePoint);
+}
+
+/*
+ * void TestExtras::mouseDragWithPoints(item, button, list<point> ponts, stateKey = 0, delay = 20)
+ * Similar to \l mouseDrag function, but here the points must be specified in \e points property.
+ * The first point is expected to be the starting position, after which each point is a relative
+ * point defining the move. A minimum of 5 points are needed to properly produce a drag.
+ * \qml
+ * import Qt.Test 1.0
+ * import Ubuntu.Test 1.0
+ * Item {
+ *     id: testItem
+ *     UbuntuTestCase {
+ *
+ *         function test_vertical_drag_upwards() {
+ *             var points = [];
+ *             points.push(centerOf(testItem));
+ *             points.push(Qt.point(0, -1));
+ *             points.push(Qt.point(0, -3));
+ *             points.push(Qt.point(0, -6));
+ *             points.push(Qt.point(0, -5));
+ *             points.push(Qt.point(0, -2));
+ *             TestExtras.mouseDragWithPoints(testItem, Qt.LeftButton, points);
+ *         }
+ *     }
+ * }
+ * \endqml
+ * The delay must be a minimum of 20 milliseconds.
+ */
+void UCTestExtras::mouseDragWithPoints(QQuickItem *item, QList<QPoint> points, Qt::MouseButton button, Qt::KeyboardModifiers stateKey, int delay)
+{
+    if (points.size() < 5) {
+        qWarning() << "minimum 5 points are needed.";
+        return;
+    }
+    if (delay < 20) {
+        delay = 20;
+    }
+    QTest::mousePress(item->window(), button, stateKey, item->mapToScene(points[0]).toPoint(), delay);
+    QPoint movePoint(item->mapToScene(points[0]).toPoint());
+    QTest::mouseMove(item->window(), movePoint, delay);
+    for (int i = 1; i < points.size(); ++i) {
+        movePoint += points[i];
+        QTest::mouseMove(item->window(), movePoint, delay);
+    }
+    QTest::mouseRelease(item->window(), button, stateKey, movePoint, delay);
+}

=== modified file 'src/Ubuntu/Test/plugin/uctestextras.h'
--- src/Ubuntu/Test/plugin/uctestextras.h	2015-11-10 14:42:20 +0000
+++ src/Ubuntu/Test/plugin/uctestextras.h	2015-11-27 10:36:32 +0000
@@ -44,6 +44,12 @@
     static void touchMove(int touchId, QQuickItem *item, const QPoint &point);
     static void touchDrag(int touchId, QQuickItem *item, const QPoint &from, const QPoint &delta, int steps = 5);
 
+    static void mouseDrag(QQuickItem *item, const QPoint &from, const QPoint &delta, Qt::MouseButton button, Qt::KeyboardModifiers stateKey = 0, int steps = -1, int delay = -1);
+
+public: // yet for cpp use
+    static void touchDragWithPoints(int touchId, QQuickItem *item, QList<QPoint> points, int delay = -1);
+    static void mouseDragWithPoints(QQuickItem *item, QList<QPoint> points, Qt::MouseButton button, Qt::KeyboardModifiers stateKey = 0, int delay = -1);
+
 private:
     static QTouchDevice *m_touchDevice;
     static UCTestExtras *m_testExtras;

=== added directory 'tests/unit_x11/tst_bottomedge'
=== added file 'tests/unit_x11/tst_bottomedge/AddCustomRegionOnCompleted.qml'
--- tests/unit_x11/tst_bottomedge/AddCustomRegionOnCompleted.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_bottomedge/AddCustomRegionOnCompleted.qml	2015-11-27 10:36:32 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Item {
+    id: holder
+    width: units.gu(40)
+    height: units.gu(71)
+
+    BottomEdge {
+        hint.text: "Test"
+        objectName: "testItem"
+
+        Component.onCompleted: {
+            var v = [];
+            v.push(customRegion);
+            regions = v;
+        }
+    }
+    BottomEdgeRegion {
+        id: customRegion
+        objectName: "customRegion"
+    }
+}
+

=== added file 'tests/unit_x11/tst_bottomedge/AddCustomRegionOwnedByOtherBottomEdge.qml'
--- tests/unit_x11/tst_bottomedge/AddCustomRegionOwnedByOtherBottomEdge.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_bottomedge/AddCustomRegionOwnedByOtherBottomEdge.qml	2015-11-27 10:36:32 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Item {
+    id: holder
+    width: units.gu(40)
+    height: units.gu(71)
+
+    BottomEdge {
+        hint.text: "Test"
+        objectName: "testItem"
+        regions: [customRegion]
+    }
+    BottomEdge {
+        hint.text: "Other"
+        BottomEdgeRegion {
+            id: customRegion
+            objectName: "customRegion"
+        }
+    }
+}
+

=== added file 'tests/unit_x11/tst_bottomedge/AddCustomRegionUsingDataProperty.qml'
--- tests/unit_x11/tst_bottomedge/AddCustomRegionUsingDataProperty.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_bottomedge/AddCustomRegionUsingDataProperty.qml	2015-11-27 10:36:32 +0000
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Item {
+    id: holder
+    width: units.gu(40)
+    height: units.gu(71)
+
+    BottomEdge {
+        hint.text: "Test"
+        objectName: "testItem"
+
+        BottomEdgeRegion { objectName: "customRegion" }
+    }
+}
+

=== added file 'tests/unit_x11/tst_bottomedge/AddCustomRegionUsingRegionsProperty.qml'
--- tests/unit_x11/tst_bottomedge/AddCustomRegionUsingRegionsProperty.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_bottomedge/AddCustomRegionUsingRegionsProperty.qml	2015-11-27 10:36:32 +0000
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Item {
+    id: holder
+    width: units.gu(40)
+    height: units.gu(71)
+
+    BottomEdge {
+        hint.text: "Test"
+        objectName: "testItem"
+
+        regions: BottomEdgeRegion { objectName: "customRegion" }
+    }
+}
+

=== added file 'tests/unit_x11/tst_bottomedge/AlternateDefaultRegionContent.qml'
--- tests/unit_x11/tst_bottomedge/AlternateDefaultRegionContent.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_bottomedge/AlternateDefaultRegionContent.qml	2015-11-27 10:36:32 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Item {
+    id: holder
+    width: units.gu(40)
+    height: units.gu(71)
+
+    BottomEdge {
+        id: bottomEdge
+        hint.text: "Test"
+        objectName: "testItem"
+        contentComponent: Rectangle {
+            objectName: "defaultContent"
+            width: holder.width
+            height: holder.height
+            color: UbuntuColors.green
+        }
+
+        Component {
+            id: altContent
+            Rectangle {
+                objectName: "regionContent"
+                width: holder.width - units.gu(20)
+                height: holder.height
+                color: UbuntuColors.red
+            }
+        }
+    }
+
+    Component.onCompleted: {
+        var defaultRegion = bottomEdge.regions[0];
+        defaultRegion.contentComponent = altContent;
+    }
+}
+

=== added file 'tests/unit_x11/tst_bottomedge/AlternateRegionContent.qml'
--- tests/unit_x11/tst_bottomedge/AlternateRegionContent.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_bottomedge/AlternateRegionContent.qml	2015-11-27 10:36:32 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Item {
+    id: holder
+    width: units.gu(40)
+    height: units.gu(71)
+
+    BottomEdge {
+        hint.text: "Test"
+        objectName: "testItem"
+        contentComponent: Rectangle {
+            objectName: "defaultContent"
+            width: holder.width
+            height: holder.height
+            color: UbuntuColors.green
+        }
+
+        regions: BottomEdgeRegion {
+            from: 0.2
+            contentComponent: Rectangle {
+                objectName: "regionContent"
+                width: holder.width - units.gu(20)
+                height: holder.height
+                color: UbuntuColors.red
+            }
+        }
+    }
+}
+

=== added file 'tests/unit_x11/tst_bottomedge/AutoCollapseInPageHeader.qml'
--- tests/unit_x11/tst_bottomedge/AutoCollapseInPageHeader.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_bottomedge/AutoCollapseInPageHeader.qml	2015-11-27 10:36:32 +0000
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+MainView {
+    width: units.gu(40)
+    height: units.gu(71)
+
+    Page {
+        title: "Main page"
+
+        BottomEdge {
+            id: bottomEdge
+            objectName: "testItem"
+            hint.text: "Bottom edge"
+
+            contentComponent: Rectangle {
+                width: bottomEdge.width
+                height: bottomEdge.height
+                color: UbuntuColors.green
+                PageHeader {
+                    title: "Bottom edge content"
+                    objectName: "bottomEdgeHeader"
+                }
+            }
+        }
+    }
+}
+

=== added file 'tests/unit_x11/tst_bottomedge/AutoCollapseInPageWithPageHeader.qml'
--- tests/unit_x11/tst_bottomedge/AutoCollapseInPageWithPageHeader.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_bottomedge/AutoCollapseInPageWithPageHeader.qml	2015-11-27 10:36:32 +0000
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+MainView {
+    width: units.gu(40)
+    height: units.gu(71)
+
+    Page {
+        title: "Main page"
+
+        BottomEdge {
+            id: bottomEdge
+            objectName: "testItem"
+            hint.text: "Bottom edge"
+
+            contentComponent: Page {
+                width: bottomEdge.width
+                height: bottomEdge.height
+                header: PageHeader {
+                    title: "Bottom edge content"
+                    objectName: "bottomEdgeHeader"
+                }
+            }
+        }
+    }
+}
+

=== added file 'tests/unit_x11/tst_bottomedge/BottomEdgeInItem.qml'
--- tests/unit_x11/tst_bottomedge/BottomEdgeInItem.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_bottomedge/BottomEdgeInItem.qml	2015-11-27 10:36:32 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Item {
+    id: holder
+    width: units.gu(40)
+    height: units.gu(71)
+
+    BottomEdge {
+        hint.text: "Test"
+        objectName: "testItem"
+        contentComponent: Rectangle {
+            width: holder.width
+            height: holder.height
+            color: UbuntuColors.green
+        }
+    }
+}
+

=== added file 'tests/unit_x11/tst_bottomedge/ClearCustomRegions.qml'
--- tests/unit_x11/tst_bottomedge/ClearCustomRegions.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_bottomedge/ClearCustomRegions.qml	2015-11-27 10:36:32 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Item {
+    id: holder
+    width: units.gu(40)
+    height: units.gu(71)
+
+    BottomEdge {
+        hint.text: "Test"
+        objectName: "testItem"
+
+        BottomEdgeRegion {
+            to: 0.5
+        }
+        BottomEdgeRegion {
+            from: 0.5
+        }
+
+        Component.onCompleted: {
+            regions = [];
+        }
+    }
+}
+

=== added file 'tests/unit_x11/tst_bottomedge/Defaults.qml'
--- tests/unit_x11/tst_bottomedge/Defaults.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_bottomedge/Defaults.qml	2015-11-27 10:36:32 +0000
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Item {
+    width: 100
+    height: 100
+    BottomEdge {
+        objectName: "testItem"
+    }
+}
+

=== added file 'tests/unit_x11/tst_bottomedge/DifferentSizes.qml'
--- tests/unit_x11/tst_bottomedge/DifferentSizes.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_bottomedge/DifferentSizes.qml	2015-11-27 10:36:32 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Item {
+    width: 100
+    height: 100
+
+    Item {
+        objectName: "oldParent"
+        width: 100
+        height: 50
+        BottomEdge {
+            objectName: "testItem"
+        }
+    }
+}
+

=== added file 'tests/unit_x11/tst_bottomedge/LastItem.qml'
--- tests/unit_x11/tst_bottomedge/LastItem.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_bottomedge/LastItem.qml	2015-11-27 10:36:32 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Item {
+    width: 100
+    height: 100
+
+    Item {
+        id: holder
+        width: 100
+        height: 50
+        BottomEdge {
+            objectName: "testItem"
+            contentComponent: Item {
+                width: holder.width
+                height: holder.height
+            }
+        }
+
+        Item {
+            anchors.fill: parent
+        }
+    }
+    Item {
+        objectName: "dynamicItem"
+        anchors.fill: parent
+    }
+}
+

=== added file 'tests/unit_x11/tst_bottomedge/LeanActiveRegionChange.qml'
--- tests/unit_x11/tst_bottomedge/LeanActiveRegionChange.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_bottomedge/LeanActiveRegionChange.qml	2015-11-27 10:36:32 +0000
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Item {
+    id: holder
+    width: units.gu(40)
+    height: units.gu(71)
+
+    BottomEdge {
+        id: bottomEdge
+        hint.text: "Test"
+        objectName: "testItem"
+        contentComponent: Rectangle {
+            width: bottomEdge.width
+            height: bottomEdge.height
+            color: UbuntuColors.lightGrey
+        }
+
+        BottomEdgeRegion {
+            from: 0.2
+            to: 0.5
+        }
+        BottomEdgeRegion {
+            from: 0.5
+            to: 0.7
+        }
+    }
+}

=== added file 'tests/unit_x11/tst_bottomedge/OverlappingRegions.qml'
--- tests/unit_x11/tst_bottomedge/OverlappingRegions.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_bottomedge/OverlappingRegions.qml	2015-11-27 10:36:32 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Item {
+    id: holder
+    width: units.gu(40)
+    height: units.gu(71)
+
+    BottomEdge {
+        hint.text: "Test"
+        objectName: "testItem"
+
+        BottomEdgeRegion {
+            from: 0.2
+            to: 0.5
+        }
+        BottomEdgeRegion {
+            from: 0.4
+        }
+        BottomEdgeRegion {
+            from: 0.4
+            to: 0.6
+        }
+        BottomEdgeRegion {
+            from: 0.6
+        }
+    }
+}
+

=== added file 'tests/unit_x11/tst_bottomedge/ShorterBottomEdge.qml'
--- tests/unit_x11/tst_bottomedge/ShorterBottomEdge.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_bottomedge/ShorterBottomEdge.qml	2015-11-27 10:36:32 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Item {
+    id: holder
+    width: units.gu(40)
+    height: units.gu(71)
+
+    BottomEdge {
+        id: bottomEdge
+        objectName: "testItem"
+        hint.text: "Test"
+        height: holder.height - units.gu(20)
+
+        contentComponent: Rectangle {
+            width: holder.width
+            height: bottomEdge.height
+            color: UbuntuColors.green
+        }
+    }
+}
+

=== added file 'tests/unit_x11/tst_bottomedge/tst_bottomedge.cpp'
--- tests/unit_x11/tst_bottomedge/tst_bottomedge.cpp	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_bottomedge/tst_bottomedge.cpp	2015-11-27 10:36:32 +0000
@@ -0,0 +1,856 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <QtTest/QtTest>
+#include "ucbottomedge.h"
+#include "ucbottomedgeregion.h"
+#include "ucbottomedge_p.h"
+#include "ucbottomedgehint.h"
+#include "gestures/ucswipearea.h"
+#include "ucunits.h"
+#include "ucheader.h"
+#include "ucaction.h"
+#include "uctestcase.h"
+#include "uctestextras.h"
+#define private public
+#include "quickutils.h"
+#include "ucbottomedgestyle.h"
+#undef private
+
+#define QVERIFY_RETURN(statement, returnValue) \
+do {\
+    if (!QTest::qVerify((statement), #statement, "", __FILE__, __LINE__))\
+        return returnValue;\
+} while (0)
+
+class BottomEdgeTestCase : public UbuntuTestCase
+{
+    Q_OBJECT
+public:
+    BottomEdgeTestCase(const QString& file, ResizeMode resize = SizeViewToRootObject, bool assertOnFailure = true, QWindow* parent = 0)
+        : UbuntuTestCase(file, resize, assertOnFailure, parent)
+    {
+        // patch all BottomEdges' SwipeArea gesture recognition timer
+        QList<UCBottomEdge*> list = findChildren<UCBottomEdge*>();
+        for (int i = 0; i < list.size(); ++i) {
+            UCBottomEdge *bottomEdge = list[i];
+            UCSwipeArea *swipeArea = bottomEdge->hint()->swipeArea();
+            swipeArea->setImmediateRecognition(true);
+        }
+    }
+    ~BottomEdgeTestCase()
+    {
+        // add a small timeout after each run to have a proper cleanup
+        QTest::qWait(400);
+    }
+
+    UCBottomEdge *testItem(const QString &objectName = "testItem")
+    {
+        return findItem<UCBottomEdge*>(objectName);
+    }
+
+    typedef QList<UCBottomEdgeRegion*> RegionList;
+    RegionList *regions(const QString &testItem)
+    {
+        QQmlListProperty<UCBottomEdgeRegion> qmlRegions(this->testItem(testItem)->regions());
+        return reinterpret_cast<RegionList*>(qmlRegions.data);
+    }
+
+    UCBottomEdgeRegion *regionAt(const QString &testItem, int index)
+    {
+        QVERIFY_RETURN(regions(testItem), nullptr);
+        QVERIFY_RETURN(regions(testItem)->size() > index, nullptr);
+        return regions(testItem)->at(index);
+    }
+
+    bool hasContentAutoCollapse(const QString &testItem = "testItem")
+    {
+        UCBottomEdge *bottomEdge = this->testItem(testItem);
+        QQuickItem *contentItem = bottomEdge->contentItem();
+        if (!contentItem) {
+            return false;
+        }
+        // we do not have the PageHeader in cpp, therefore we need the same workaround we have in the code
+        UCHeader *header = contentItem->findChild<UCHeader*>();
+        if (!QuickUtils::inherits(header, "PageHeader")) {
+            return false;
+        }
+
+        QVariant list(header->property("navigationActions"));
+        QQmlListProperty<UCAction> actions = list.value< QQmlListProperty<UCAction> >();
+        QList<UCAction*> *navigationActions = reinterpret_cast<QList<UCAction*>*>(actions.data);
+        if (navigationActions->size() <= 0) {
+            return false;
+        }
+        return (qobject_cast<UCCollapseAction*>(navigationActions->at(0)) != Q_NULLPTR);
+    }
+};
+
+
+class tst_BottomEdge : public QObject
+{
+    Q_OBJECT
+private Q_SLOTS:
+
+    void initTestCase()
+    {
+        UCTestExtras::registerTouchDevice();
+        // make sure we disable the mouse
+        QuickUtils::instance().m_mouseAttached = false;
+    }
+
+    void test_defaults()
+    {
+        QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase("Defaults.qml"));
+        QCOMPARE(test->testItem()->height(), test->rootObject()->height());
+        QCOMPARE(test->testItem()->dragProgress(), 0.0);
+        QCOMPARE(test->testItem()->dragDirection(), UCBottomEdge::Undefined);
+        QCOMPARE(test->testItem()->status(), UCBottomEdge::Hidden);
+        QCOMPARE(test->testItem()->contentUrl(), QUrl());
+        QVERIFY(!test->testItem()->contentComponent());
+        QVERIFY(!test->testItem()->contentItem());
+        QVERIFY(test->regions("testItem"));
+        QCOMPARE(test->regions("testItem")->size(), 1);
+        QCOMPARE(test->regionAt("testItem", 0)->objectName(), QString("default_BottomEdgeRegion"));
+        QCOMPARE(test->regionAt("testItem", 0)->m_from, 0.33);
+        QCOMPARE(test->regionAt("testItem", 0)->m_to, 1.0);
+        QVERIFY(!test->testItem()->activeRegion());
+    }
+
+    void test_height_moves_when_reparented()
+    {
+        QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase("DifferentSizes.qml"));
+        QQuickItem *newParent = test->rootObject();
+        QQuickItem *oldParent = test->findItem<QQuickItem*>("oldParent");
+        UCBottomEdge *testItem = test->testItem();
+
+        QSignalSpy spy(testItem, SIGNAL(implicitHeightChanged()));
+        testItem->setParentItem(newParent);
+        UbuntuTestCase::waitForSignal(&spy);
+
+        // change the implicit height so we are sure we don't get the height change triggered
+        testItem->setImplicitHeight(0);
+        spy.clear();
+        oldParent->setHeight(20);
+        QEXPECT_FAIL(0, "no implicitHeight change is expected", Continue);
+        QVERIFY(spy.wait(400));
+    }
+
+    void test_panel_is_last_item_of_parent()
+    {
+        QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase("LastItem.qml"));
+        QQuickItem *bottomEdgeParent = test->testItem()->parentItem();
+        UCBottomEdgePrivate *privateTestItem = UCBottomEdgePrivate::get(test->testItem());
+        QCOMPARE(bottomEdgeParent->childItems().last(), privateTestItem->styleItem);
+
+        QQuickItem *dynamicItem = test->findItem<QQuickItem*>("dynamicItem");
+        dynamicItem->setParentItem(bottomEdgeParent);
+        // still the last one
+        QCOMPARE(bottomEdgeParent->childItems().last(), privateTestItem->styleItem);
+    }
+
+    void test_commit_when_clicked()
+    {
+        QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase("BottomEdgeInItem.qml"));
+        test->testItem()->hint()->setStatus(UCBottomEdgeHint::Locked);
+        UCBottomEdgeHint *hint = test->testItem()->hint();
+        QTest::mouseClick(test->testItem()->hint()->window(), Qt::LeftButton, 0, UbuntuTestCase::centerOf(hint, true).toPoint());
+        QTRY_COMPARE_WITH_TIMEOUT(test->testItem()->status(), UCBottomEdge::Committed, 1000);
+    }
+
+    void test_commit_when_touch_clicked()
+    {
+        QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase("BottomEdgeInItem.qml"));
+        UCBottomEdgeHint *hint = test->testItem()->hint();
+        // swipe a bit to reveal
+
+        UCTestExtras::touchDrag(0, hint, QPoint(hint->width() / 2, hint->height()), QPoint(0, -hint->height()));
+        QTRY_COMPARE_WITH_TIMEOUT(hint->status(), UCBottomEdgeHint::Active, 1000);
+
+        UCTestExtras::touchClick(0, hint, UbuntuTestCase::centerOf(hint).toPoint());
+        QTRY_COMPARE_WITH_TIMEOUT(test->testItem()->status(), UCBottomEdge::Committed, 1000);
+    }
+
+    void test_revealed_when_hint_threshold_passed_data()
+    {
+        QTest::addColumn<bool>("withMouse");
+        QTest::addColumn<bool>("lockHint");
+        QTest::addColumn<bool>("xfail");
+
+        QTest::newRow("drag with mouse, unlocked hint") << true << false << true;
+        QTest::newRow("drag with mouse, locked hint") << true << true << false;
+        QTest::newRow("drag with touch, unlocked hint") << false << false << false;
+        QTest::newRow("drag with touch, locked hint") << false << true << false;
+    }
+    void test_revealed_when_hint_threshold_passed()
+    {
+        QFETCH(bool, withMouse);
+        QFETCH(bool, lockHint);
+        QFETCH(bool, xfail);
+
+        QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase("BottomEdgeInItem.qml"));
+        UCBottomEdge *bottomEdge = test->testItem();
+        UCBottomEdgeStyle *style = UCBottomEdgePrivate::get(bottomEdge)->bottomPanel;
+        QSignalSpy spy(bottomEdge, SIGNAL(statusChanged(UCBottomEdge::Status)));
+
+        // swipe till we reveal it
+        QPoint from(bottomEdge->width() / 2.0f, bottomEdge->height() - 1);
+        QPoint delta(0, -(2 * style->m_revealThreshold));
+        if (lockHint) {
+            bottomEdge->hint()->setStatus(UCBottomEdgeHint::Locked);
+        }
+        if (withMouse) {
+            UCTestExtras::mouseDrag(bottomEdge, from, delta, Qt::LeftButton);
+        } else {
+            UCTestExtras::touchDrag(0, bottomEdge, from, delta, 8);
+        }
+        if (xfail) {
+            QEXPECT_FAIL(0, "failure expected", Continue);
+        }
+        QVERIFY(spy.wait(500));
+        if (xfail) {
+            QCOMPARE(spy.count(), 0);
+        } else {
+            // there must be two state changes here, one Hidden->Revealed, and one Revealed->Hidden
+            QCOMPARE(spy.count(), 2);
+            QList<QVariant> state1 = spy.at(0);
+            QCOMPARE(state1[0].value<int>(), (int)UCBottomEdge::Revealed);
+            QList<QVariant> state2 = spy.at(1);
+            QCOMPARE(state2[0].value<int>(), (int)UCBottomEdge::Hidden);
+        }
+    }
+
+    void test_commit_when_onethird_passed_data()
+    {
+        QTest::addColumn<bool>("withMouse");
+
+        QTest::newRow("with mouse") << true;
+        QTest::newRow("with touch") << false;
+    }
+    void test_commit_when_onethird_passed()
+    {
+        QFETCH(bool, withMouse);
+
+        QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase("BottomEdgeInItem.qml"));
+        UCBottomEdge *bottomEdge = test->testItem();
+
+        QPoint from(bottomEdge->width() / 2.0f, bottomEdge->height() - 1);
+        // add some extra space for the touch
+        QPoint delta(0, -(bottomEdge->height() / 3 + UCUnits::instance().gu(6)));
+
+        if (withMouse) {
+            bottomEdge->hint()->setStatus(UCBottomEdgeHint::Locked);
+        }
+        // we need to do the swipe in more steps
+        if (withMouse) {
+            UCTestExtras::mouseDrag(bottomEdge, from, delta, Qt::LeftButton, 0, 20);
+        } else {
+            UCTestExtras::touchDrag(0, bottomEdge, from, delta, 20);
+        }
+        QTRY_COMPARE_WITH_TIMEOUT(bottomEdge->status(), UCBottomEdge::Committed, 1000);
+    }
+
+    void test_collapse_before_onethird_data()
+    {
+        QTest::addColumn<bool>("withMouse");
+
+        QTest::newRow("with mouse") << true;
+        QTest::newRow("with touch") << false;
+    }
+    void test_collapse_before_onethird()
+    {
+        QFETCH(bool, withMouse);
+
+        QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase("BottomEdgeInItem.qml"));
+        UCBottomEdge *bottomEdge = test->testItem();
+
+        QPoint from(bottomEdge->width() / 2.0f, bottomEdge->height() - 1);
+        QPoint delta(0, -(bottomEdge->height() / 4));
+
+        if (withMouse) {
+            bottomEdge->hint()->setStatus(UCBottomEdgeHint::Locked);
+        }
+        // we need to do the swipe in more steps
+        if (withMouse) {
+            UCTestExtras::mouseDrag(bottomEdge, from, delta, Qt::LeftButton, 0, 20);
+        } else {
+            UCTestExtras::touchDrag(0, bottomEdge, from, delta, 20);
+        }
+        QTRY_COMPARE_WITH_TIMEOUT(bottomEdge->status(), UCBottomEdge::Hidden, 1000);
+    }
+
+    void test_collapse_when_dragged_downwards_data()
+    {
+        // when onethird not passed
+        // when onethird was passed
+        QTest::addColumn<bool>("withMouse");
+        QTest::addColumn< QList<QPoint> >("moves");
+
+        QList<QPoint> shortPath, longPath;
+        // upwards
+        for (int i = 0; i < 10; i++) {
+            shortPath << QPointF(0, -UCUnits::instance().gu(3)).toPoint();
+            longPath << QPointF(0, -UCUnits::instance().gu(7)).toPoint();
+        }
+        // downwards
+        for (int i = 0; i < 5; i++) {
+            shortPath << QPointF(0, UCUnits::instance().gu(2)).toPoint();
+            longPath << QPointF(0, UCUnits::instance().gu(2)).toPoint();
+        }
+
+        QTest::newRow("with mouse, onethird not passed")
+                << true << shortPath;
+        QTest::newRow("with touch, onethird not passed")
+                << false << shortPath;
+        QTest::newRow("with mouse, onethird passed")
+                << true << longPath;
+        QTest::newRow("with touch, onethird passed")
+                << false << longPath;
+    }
+    void test_collapse_when_dragged_downwards()
+    {
+        QFETCH(bool, withMouse);
+        QFETCH(QList<QPoint>, moves);
+
+        QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase("BottomEdgeInItem.qml"));
+        UCBottomEdge *bottomEdge = test->testItem();
+
+        QPoint from(bottomEdge->width() / 2.0f, bottomEdge->height() - 1);
+        moves.prepend(from);
+
+        if (withMouse) {
+            bottomEdge->hint()->setStatus(UCBottomEdgeHint::Locked);
+        }
+        if (withMouse) {
+            UCTestExtras::mouseDragWithPoints(bottomEdge, moves, Qt::LeftButton);
+        } else {
+            UCTestExtras::touchDragWithPoints(0, bottomEdge, moves);
+        }
+        QTRY_COMPARE_WITH_TIMEOUT(bottomEdge->status(), UCBottomEdge::Hidden, 1000);
+    }
+
+    void test_height_less_than_parent()
+    {
+        QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase("ShorterBottomEdge.qml"));
+        UCBottomEdge *bottomEdge = test->testItem();
+        UCBottomEdgeStyle *style = UCBottomEdgePrivate::get(bottomEdge)->bottomPanel;
+        bottomEdge->commit();
+        QTRY_COMPARE_WITH_TIMEOUT(bottomEdge->status(), UCBottomEdge::Committed, 1000);
+        QCOMPARE(style->m_panel->y(), bottomEdge->y());
+    }
+
+    void test_do_not_overshoot_data()
+    {
+        QTest::addColumn<bool>("withMouse");
+
+        QTest::newRow("with touch") << false;
+        QTest::newRow("with mouse") << true;
+    }
+    void test_do_not_overshoot()
+    {
+        QFETCH(bool, withMouse);
+
+        QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase("ShorterBottomEdge.qml"));
+        UCBottomEdge *bottomEdge = test->testItem();
+        UCBottomEdgeStyle *style = UCBottomEdgePrivate::get(bottomEdge)->bottomPanel;
+
+        QPoint from(bottomEdge->width() / 2.0f, bottomEdge->height() - 1);
+        QPoint to = from + QPoint(0, -(bottomEdge->parentItem()->height() - 1));
+
+        if (withMouse) {
+            bottomEdge->hint()->setStatus(UCBottomEdgeHint::Locked);
+            from = bottomEdge->mapToScene(from).toPoint();
+            to = bottomEdge->mapToScene(to).toPoint();
+            QTest::mousePress(bottomEdge->window(), Qt::LeftButton, 0, from, 20);
+            QPoint movePos(from);
+            while (movePos.y() > to.y()) {
+                QTest::mouseMove(bottomEdge->window(), movePos, 20);
+                movePos += QPoint(0, -10);
+                QVERIFY(style->m_panel->y() >= bottomEdge->y());
+            }
+            QTest::mouseRelease(bottomEdge->window(),Qt::LeftButton, 0, movePos, 20);
+        } else {
+            UCTestExtras::touchPress(0, bottomEdge, from);
+            QPoint movePos(from);
+            while (movePos.y() > to.y()) {
+                QTest::qWait(20);
+                UCTestExtras::touchMove(0, bottomEdge, movePos);
+                movePos += QPoint(0, -10);
+                QVERIFY(style->m_panel->y() >= bottomEdge->y());
+            }
+            QTest::qWait(20);
+            UCTestExtras::touchRelease(0, bottomEdge, movePos);
+        }
+    }
+
+    void test_commitStarted_commitCompleted_emitted()
+    {
+        QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase("BottomEdgeInItem.qml"));
+        UCBottomEdge *bottomEdge = test->testItem();
+
+        QSignalSpy commitStartedSpy(bottomEdge, SIGNAL(commitStarted()));
+        QSignalSpy commitCompletedSpy(bottomEdge, SIGNAL(commitCompleted()));
+        bottomEdge->commit();
+        QTRY_COMPARE_WITH_TIMEOUT(commitStartedSpy.count(), 1, 1000);
+        QTRY_COMPARE_WITH_TIMEOUT(commitCompletedSpy.count(), 1, 1000);
+    }
+
+    void test_collapseStarted_collapseCompleted_emitted()
+    {
+        QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase("BottomEdgeInItem.qml"));
+        UCBottomEdge *bottomEdge = test->testItem();
+        bottomEdge->commit();
+        QTRY_COMPARE_WITH_TIMEOUT(bottomEdge->status(), UCBottomEdge::Committed, 1000);
+        // wait few milliseconds before we initiate collapse
+        QTest::qWait(200);
+
+        QSignalSpy collapseStartedSpy(bottomEdge, SIGNAL(collapseStarted()));
+        QSignalSpy collapseCompletedSpy(bottomEdge, SIGNAL(collapseCompleted()));
+        bottomEdge->collapse();
+        QTRY_COMPARE_WITH_TIMEOUT(collapseStartedSpy.count(), 1, 1000);
+        QTRY_COMPARE_WITH_TIMEOUT(collapseCompletedSpy.count(), 1, 1000);
+    }
+
+    void test_collapse_during_commit()
+    {
+        QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase("BottomEdgeInItem.qml"));
+        UCBottomEdge *bottomEdge = test->testItem();
+
+        QSignalSpy commitStartedSpy(bottomEdge, SIGNAL(commitStarted()));
+        QSignalSpy commitCompletedSpy(bottomEdge, SIGNAL(commitCompleted()));
+        QSignalSpy collapseStartedSpy(bottomEdge, SIGNAL(collapseStarted()));
+        QSignalSpy collapseCompletedSpy(bottomEdge, SIGNAL(collapseCompleted()));
+
+        connect(bottomEdge, SIGNAL(commitStarted()), bottomEdge, SLOT(collapse()), Qt::QueuedConnection);
+
+        bottomEdge->commit();
+
+        QTRY_COMPARE_WITH_TIMEOUT(commitStartedSpy.count(), 1, 1000);
+        QTRY_COMPARE_WITH_TIMEOUT(commitCompletedSpy.count(), 0, 1000);
+        QTRY_COMPARE_WITH_TIMEOUT(collapseStartedSpy.count(), 1, 1000);
+        QTRY_COMPARE_WITH_TIMEOUT(collapseCompletedSpy.count(), 1, 1000);
+    }
+
+    void test_commit_during_collapse()
+    {
+        QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase("BottomEdgeInItem.qml"));
+        UCBottomEdge *bottomEdge = test->testItem();
+        bottomEdge->commit();
+
+        QSignalSpy commitStartedSpy(bottomEdge, SIGNAL(commitStarted()));
+        QSignalSpy commitCompletedSpy(bottomEdge, SIGNAL(commitCompleted()));
+        QSignalSpy collapseStartedSpy(bottomEdge, SIGNAL(collapseStarted()));
+        QSignalSpy collapseCompletedSpy(bottomEdge, SIGNAL(collapseCompleted()));
+
+        connect(bottomEdge, SIGNAL(collapseStarted()), bottomEdge, SLOT(commit()), Qt::QueuedConnection);
+
+        bottomEdge->collapse();
+        QTRY_COMPARE_WITH_TIMEOUT(collapseStartedSpy.count(), 1, 1000);
+        QTRY_COMPARE_WITH_TIMEOUT(collapseCompletedSpy.count(), 0, 1000);
+        QTRY_COMPARE_WITH_TIMEOUT(commitStartedSpy.count(), 1, 1000);
+        QTRY_COMPARE_WITH_TIMEOUT(commitCompletedSpy.count(), 1, 1000);
+    }
+
+    // region tests
+
+    void test_region_operations_data()
+    {
+        QTest::addColumn<QString>("document");
+        QTest::addColumn<QString>("warning");
+        QTest::addColumn<qreal>("xFrom");
+        QTest::addColumn<qreal>("xTo");
+        QTest::addColumn<QString>("xName");
+
+        QTest::newRow("add through regions property")
+                << "AddCustomRegionUsingRegionsProperty.qml"
+                << QString()
+                << 0.0 << 1.0 << QString("customRegion");
+        QTest::newRow("add through data property")
+                << "AddCustomRegionUsingDataProperty.qml"
+                << QString()
+                << 0.0 << 1.0 << QString("customRegion");
+        QTest::newRow("add through Component.onCompleted")
+                << "AddCustomRegionOnCompleted.qml"
+                << QString()
+                << 0.0 << 1.0 << QString("customRegion");
+        QTest::newRow("add owned by other BottomEdge")
+                << "AddCustomRegionOwnedByOtherBottomEdge.qml"
+                << "QML BottomEdge: Cannot reuse region owned by other BottomEdge components"
+                   // we should have the default region still
+                << 0.33 << 1.0 << "default_BottomEdgeRegion";
+        QTest::newRow("clear")
+                << "ClearCustomRegions.qml"
+                << QString()
+                   // we should have the default region back
+                << 0.33 << 1.0 << "default_BottomEdgeRegion";
+    }
+
+    void test_region_operations()
+    {
+        QFETCH(QString, document);
+        QFETCH(QString, warning);
+        QFETCH(qreal, xFrom);
+        QFETCH(qreal, xTo);
+        QFETCH(QString, xName);
+
+        if (!warning.isEmpty()) {
+            UbuntuTestCase::ignoreWarning(document, 26, 5, warning, 1);
+        }
+        QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase(document));
+        UCBottomEdge *bottomEdge = test->testItem();
+        UCBottomEdgePrivate *privateBottomEdge = UCBottomEdgePrivate::get(bottomEdge);
+
+        // the regions has the custom one
+        QCOMPARE(privateBottomEdge->regions.size(), 1);
+        UCBottomEdgeRegion *region = privateBottomEdge->regions[0];
+        QVERIFY(region);
+        QCOMPARE(region->m_from, xFrom);
+        QCOMPARE(region->m_to, xTo);
+        QCOMPARE(region->objectName(), xName);
+    }
+
+    void test_active_region_changes()
+    {
+        QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase("LeanActiveRegionChange.qml"));
+        UCBottomEdge *bottomEdge = test->testItem();
+
+        QPoint from(bottomEdge->width() / 2.0f, bottomEdge->height() - 5);
+        QPoint to = from + QPoint(0, -(bottomEdge->parentItem()->height() - 1));
+        QSignalSpy spy(bottomEdge, SIGNAL(activeRegionChanged(UCBottomEdgeRegion*)));
+
+        UCTestExtras::touchPress(0, bottomEdge, from);
+        QPoint movePos(from);
+        while (movePos.y() > to.y()) {
+            QTest::qWait(20);
+            UCTestExtras::touchMove(0, bottomEdge, movePos);
+            movePos += QPoint(0, -10);
+        }
+        QTest::qWait(20);
+        UCTestExtras::touchRelease(0, bottomEdge, movePos);
+        // we should have had 3 active region changes by now
+        // null -> region #0 -> region #1 -> null
+        QCOMPARE(spy.count(), 3);
+    }
+
+    void test_region_signals_emitted_data()
+    {
+        QTest::addColumn<bool>("withMouse");
+
+        QTest::newRow("with mouse") << true;
+        QTest::newRow("with touch") << false;
+    }
+    void test_region_signals_emitted()
+    {
+        QFETCH(bool, withMouse);
+
+        QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase("BottomEdgeInItem.qml"));
+        UCBottomEdge *bottomEdge = test->testItem();
+        UCBottomEdgePrivate *privateBottomEdge = UCBottomEdgePrivate::get(bottomEdge);
+        UCBottomEdgeRegion *region = privateBottomEdge->regions[0];
+
+        // change the region so we can get the signals while dragged
+        region->m_from = 0.1;
+        region->m_to = 0.2;
+
+        QPoint from(bottomEdge->width() / 2.0f, bottomEdge->height() - 5);
+        QPoint delta(0, -(bottomEdge->height() / 3 + UCUnits::instance().gu(6)));
+        QSignalSpy entered(region, SIGNAL(entered()));
+        QSignalSpy exited(region, SIGNAL(exited()));
+
+        if (withMouse) {
+            bottomEdge->hint()->setStatus(UCBottomEdgeHint::Locked);
+        }
+        if (withMouse) {
+            UCTestExtras::mouseDrag(bottomEdge, from, delta, Qt::LeftButton, 0);
+        } else {
+            UCTestExtras::touchDrag(0, bottomEdge, from, delta);
+        }
+        QTRY_COMPARE_WITH_TIMEOUT(entered.count(), 1, 500);
+        QTRY_COMPARE_WITH_TIMEOUT(exited.count(), 1, 500);
+    }
+
+    void test_region_dragEnded_emitted_data()
+    {
+        QTest::addColumn<bool>("withMouse");
+
+        QTest::newRow("with mouse") << true;
+        QTest::newRow("with touch") << false;
+    }
+    void test_region_dragEnded_emitted()
+    {
+        QFETCH(bool, withMouse);
+
+        QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase("BottomEdgeInItem.qml"));
+        UCBottomEdge *bottomEdge = test->testItem();
+        UCBottomEdgePrivate *privateBottomEdge = UCBottomEdgePrivate::get(bottomEdge);
+        UCBottomEdgeRegion *region = privateBottomEdge->regions[0];
+
+        QSignalSpy dragEnded(region, SIGNAL(dragEnded()));
+        QPoint from(bottomEdge->width() / 2.0f, bottomEdge->height() - 5);
+        QPoint delta(0, -(bottomEdge->height() / 2.0f));
+        if (withMouse) {
+            bottomEdge->hint()->setStatus(UCBottomEdgeHint::Locked);
+            UCTestExtras::mouseDrag(bottomEdge, from, delta, Qt::LeftButton, 0);
+        } else {
+            UCTestExtras::touchDrag(0, bottomEdge, from, delta);
+        }
+        UbuntuTestCase::waitForSignal(&dragEnded);
+    }
+
+    void test_alternative_content_for_default_commit_region()
+    {
+        QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase("AlternateDefaultRegionContent.qml"));
+        UCBottomEdge *bottomEdge = test->testItem();
+
+        QPoint from(bottomEdge->width() / 2.0f, bottomEdge->height() - 5);
+        QPoint delta(0, -(bottomEdge->height() / 2));
+
+        UCTestExtras::touchDrag(0, bottomEdge, from, delta, 20);
+        QTRY_COMPARE_WITH_TIMEOUT(bottomEdge->status(), UCBottomEdge::Committed, 1000);
+        QCOMPARE(bottomEdge->contentItem()->objectName(), QString("regionContent"));
+    }
+
+    void test_end_drag_in_region_commits_to_the_region_data()
+    {
+        QTest::addColumn<bool>("withMouse");
+
+        QTest::newRow("with mouse") << true;
+        QTest::newRow("with touch") << false;
+    }
+    void test_end_drag_in_region_commits_to_the_region()
+    {
+        QFETCH(bool, withMouse);
+
+        QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase("AlternateDefaultRegionContent.qml"));
+        UCBottomEdge *bottomEdge = test->testItem();
+        UCBottomEdgePrivate *privateBottomEdge = UCBottomEdgePrivate::get(bottomEdge);
+        UCBottomEdgeRegion *region = privateBottomEdge->regions[0];
+        UCBottomEdgeStyle *style = UCBottomEdgePrivate::get(bottomEdge)->bottomPanel;
+
+        // alter default region for testing
+        region->m_from = 0.1;
+        region->m_to = 0.8;
+
+        QPoint from(bottomEdge->width() / 2.0f, bottomEdge->height() - 5);
+        QPoint to = from + QPoint(0, -(bottomEdge->parentItem()->height() - 1));
+
+        if (withMouse) {
+            bottomEdge->hint()->setStatus(UCBottomEdgeHint::Locked);
+            from = bottomEdge->mapToScene(from).toPoint();
+            to = bottomEdge->mapToScene(to).toPoint();
+            QTest::mousePress(bottomEdge->window(), Qt::LeftButton, 0, from, 20);
+            QPoint movePos(from);
+            while (movePos.y() > to.y() && !bottomEdge->activeRegion()) {
+                QTest::mouseMove(bottomEdge->window(), movePos, 20);
+                movePos += QPoint(0, -10);
+            }
+            QTest::mouseRelease(bottomEdge->window(),Qt::LeftButton, 0, movePos, 20);
+        } else {
+            UCTestExtras::touchPress(0, bottomEdge, from);
+            QPoint movePos(from);
+            while (movePos.y() > to.y() && !bottomEdge->activeRegion()) {
+                QTest::qWait(20);
+                UCTestExtras::touchMove(0, bottomEdge, movePos);
+                movePos += QPoint(0, -10);
+            }
+            QTest::qWait(20);
+            UCTestExtras::touchRelease(0, bottomEdge, movePos);
+        }
+
+        QVERIFY(bottomEdge->activeRegion());
+        // the top of the committed content should not be the top of the bottom edge
+        QVERIFY(style->m_panel->y() > bottomEdge->y());
+        QCOMPARE(bottomEdge->status(), UCBottomEdge::Revealed);
+    }
+
+    void test_drag_ends_in_uncovered_region_collapses_data()
+    {
+        QTest::addColumn<bool>("withMouse");
+
+        QTest::newRow("with mouse") << true;
+        QTest::newRow("with touch") << false;
+    }
+    void test_drag_ends_in_uncovered_region_collapses()
+    {
+        QFETCH(bool, withMouse);
+
+        QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase("AlternateDefaultRegionContent.qml"));
+        UCBottomEdge *bottomEdge = test->testItem();
+        UCBottomEdgePrivate *privateBottomEdge = UCBottomEdgePrivate::get(bottomEdge);
+        UCBottomEdgeRegion *region = privateBottomEdge->regions[0];
+
+        // alter region values to adjust to the test
+        region->m_from = 0.1;
+        region->m_to = 0.5;
+
+        QPoint from(bottomEdge->width() / 2.0f, bottomEdge->height() - 5);
+        QPoint to = from + QPoint(0, -(bottomEdge->parentItem()->height() - 1));
+        // let us know when we are out of the region
+        QSignalSpy exitRegion(region, SIGNAL(exited()));
+
+        if (withMouse) {
+            bottomEdge->hint()->setStatus(UCBottomEdgeHint::Locked);
+            from = bottomEdge->mapToScene(from).toPoint();
+            to = bottomEdge->mapToScene(to).toPoint();
+            QTest::mousePress(bottomEdge->window(), Qt::LeftButton, 0, from, 20);
+            QPoint movePos(from);
+            while (movePos.y() > to.y() && !exitRegion.count()) {
+                QTest::mouseMove(bottomEdge->window(), movePos, 20);
+                movePos += QPoint(0, -10);
+            }
+            QTest::mouseRelease(bottomEdge->window(),Qt::LeftButton, 0, movePos, 20);
+        } else {
+            UCTestExtras::touchPress(0, bottomEdge, from);
+            QPoint movePos(from);
+            while (movePos.y() > to.y() && !exitRegion.count()) {
+                QTest::qWait(20);
+                UCTestExtras::touchMove(0, bottomEdge, movePos);
+                movePos += QPoint(0, -10);
+            }
+            QTest::qWait(20);
+            UCTestExtras::touchRelease(0, bottomEdge, movePos);
+        }
+
+        QVERIFY(!bottomEdge->activeRegion());
+        // we should be collapsing!
+        QTRY_COMPARE_WITH_TIMEOUT(bottomEdge->status(), UCBottomEdge::Hidden, 1000);
+    }
+
+    void test_commit_region_content_data()
+    {
+        QTest::addColumn<bool>("withMouse");
+
+        QTest::newRow("with mouse") << true;
+        QTest::newRow("with touch") << false;
+    }
+    void test_commit_region_content()
+    {
+        QFETCH(bool, withMouse);
+
+        QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase("AlternateRegionContent.qml"));
+        UCBottomEdge *bottomEdge = test->testItem();
+        UCBottomEdgePrivate *privateBottomEdge = UCBottomEdgePrivate::get(bottomEdge);
+        UCBottomEdgeRegion *region = privateBottomEdge->regions[0];
+
+        // alter region for testing
+        region->m_from = 0.1;
+        region->m_to = 0.8;
+        // and connect commit to dragEnded
+        connect(region, &UCBottomEdgeRegion::dragEnded, bottomEdge, &UCBottomEdge::commit);
+
+        QPoint from(bottomEdge->width() / 2.0f, bottomEdge->height() - 5);
+        QPoint to = from + QPoint(0, -(bottomEdge->parentItem()->height() - 1));
+
+        if (withMouse) {
+            bottomEdge->hint()->setStatus(UCBottomEdgeHint::Locked);
+            from = bottomEdge->mapToScene(from).toPoint();
+            to = bottomEdge->mapToScene(to).toPoint();
+            QTest::mousePress(bottomEdge->window(), Qt::LeftButton, 0, from, 20);
+            QPoint movePos(from);
+            while (movePos.y() > to.y() && !bottomEdge->activeRegion()) {
+                QTest::mouseMove(bottomEdge->window(), movePos, 20);
+                movePos += QPoint(0, -10);
+            }
+            QTest::mouseRelease(bottomEdge->window(),Qt::LeftButton, 0, movePos, 20);
+        } else {
+            UCTestExtras::touchPress(0, bottomEdge, from);
+            QPoint movePos(from);
+            while (movePos.y() > to.y() && !bottomEdge->activeRegion()) {
+                QTest::qWait(20);
+                UCTestExtras::touchMove(0, bottomEdge, movePos);
+                movePos += QPoint(0, -10);
+            }
+            QTest::qWait(20);
+            UCTestExtras::touchRelease(0, bottomEdge, movePos);
+        }
+        QTRY_COMPARE_WITH_TIMEOUT(bottomEdge->status(), UCBottomEdge::Committed, 1000);
+        QCOMPARE(bottomEdge->contentItem()->objectName(), QString("regionContent"));
+    }
+
+    void test_overlapping_regions()
+    {
+        QString document("OverlappingRegions.qml");
+        UbuntuTestCase::ignoreWarning(document, 34, 9, "QML BottomEdgeRegion: Region intersects the one from index 0 having from: 0.2 and to: 0.5", 1);
+        UbuntuTestCase::ignoreWarning(document, 37, 9, "QML BottomEdgeRegion: Region intersects the one from index 0 having from: 0.2 and to: 0.5", 1);
+        UbuntuTestCase::ignoreWarning(document, 37, 9, "QML BottomEdgeRegion: Region at index 1 contains this region. This region will never activate.", 1);
+        UbuntuTestCase::ignoreWarning(document, 41, 9, "QML BottomEdgeRegion: Region at index 1 contains this region. This region will never activate.", 1);
+        QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase(document));
+    }
+
+    void test_region_does_not_activate_when_from_greater_than_to_data()
+    {
+        QTest::addColumn<bool>("withMouse");
+
+        QTest::newRow("with mouse") << true;
+        QTest::newRow("with touch") << false;
+    }
+    void test_region_does_not_activate_when_from_greater_than_to()
+    {
+        QFETCH(bool, withMouse);
+
+        QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase("AlternateRegionContent.qml"));
+        UCBottomEdge *bottomEdge = test->testItem();
+        UCBottomEdgePrivate *privateBottomEdge = UCBottomEdgePrivate::get(bottomEdge);
+        UCBottomEdgeRegion *region = privateBottomEdge->regions[0];
+
+        // adjust region data for the test
+        region->m_from = 0.4;
+        region->m_to = 0.2;
+        QPoint from(bottomEdge->width() / 2.0f, bottomEdge->height() - 5);
+        QPoint delta(0, -(bottomEdge->height() / 2.0f));
+        QSignalSpy activeRegion(bottomEdge, SIGNAL(activeRegionChanged(UCBottomEdgeRegion*)));
+        if (withMouse) {
+            bottomEdge->hint()->setStatus(UCBottomEdgeHint::Locked);
+            UCTestExtras::mouseDrag(bottomEdge, from, delta, Qt::LeftButton, 0, 10);
+        } else {
+            UCTestExtras::touchDrag(0, bottomEdge, from, delta, 10);
+        }
+        QEXPECT_FAIL(0, "region should not activate", Continue);
+        QVERIFY(activeRegion.wait(400));
+    }
+
+    void test_autocollapse_navigation_action_on_commit_completed_data()
+    {
+        QTest::addColumn<QString>("document");
+
+        QTest::newRow("content has PageHeader") << "AutoCollapseInPageHeader.qml";
+        QTest::newRow("content is Page with PageHeader") << "AutoCollapseInPageWithPageHeader.qml";
+    }
+    void test_autocollapse_navigation_action_on_commit_completed()
+    {
+        QFETCH(QString, document);
+
+        QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase(document));
+        UCBottomEdge *bottomEdge = test->testItem();
+
+        BottomEdgeTestCase *testCase = test.data();
+        connect(bottomEdge, &UCBottomEdge::contentItemChanged, [=]() {
+            QVERIFY(!testCase->hasContentAutoCollapse());
+        });
+        connect(bottomEdge, &UCBottomEdge::commitCompleted, [=]() {
+            QVERIFY(testCase->hasContentAutoCollapse());
+        });
+        // drag slowly
+        QPoint from(bottomEdge->width() / 2.0f, bottomEdge->height() - 5);
+        QPoint delta(0, -bottomEdge->height());
+        UCTestExtras::touchDrag(0, bottomEdge, from, delta, 20);
+    }
+};
+
+QTEST_MAIN(tst_BottomEdge)
+
+#include "tst_bottomedge.moc"

=== added file 'tests/unit_x11/tst_bottomedge/tst_bottomedge.pro'
--- tests/unit_x11/tst_bottomedge/tst_bottomedge.pro	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_bottomedge/tst_bottomedge.pro	2015-11-27 10:36:32 +0000
@@ -0,0 +1,23 @@
+include(../test-include.pri)
+QT += core-private qml-private quick-private gui-private UbuntuGestures
+
+SOURCES += \
+    tst_bottomedge.cpp
+
+DISTFILES += \
+    Defaults.qml \
+    DifferentSizes.qml \
+    LastItem.qml \
+    BottomEdgeInItem.qml \
+    ShorterBottomEdge.qml \
+    AlternateRegionContent.qml \
+    AddCustomRegionUsingRegionsProperty.qml \
+    AddCustomRegionUsingDataProperty.qml \
+    AddCustomRegionOnCompleted.qml \
+    AddCustomRegionOwnedByOtherBottomEdge.qml \
+    ClearCustomRegions.qml \
+    AlternateDefaultRegionContent.qml \
+    OverlappingRegions.qml \
+    AutoCollapseInPageHeader.qml \
+    AutoCollapseInPageWithPageHeader.qml \
+    LeanActiveRegionChange.qml

=== modified file 'tests/unit_x11/unit_x11.pro'
--- tests/unit_x11/unit_x11.pro	2015-11-09 15:46:45 +0000
+++ tests/unit_x11/unit_x11.pro	2015-11-27 10:36:32 +0000
@@ -16,4 +16,5 @@
     tst_serviceproperties \
     tst_subtheming \
     tst_swipearea \
-    tst_touchregistry
+    tst_touchregistry \
+    tst_bottomedge