Merge lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-ubuntushape-fragment-shader-cleanup into lp:ubuntu-ui-toolkit

[Loïc Molinari]

[UbuntShape] Cleaned up fragment shaders.

Moved distance* variables to main scope and removed useless abs() calls.

[UbuntShape] Cleaned up fragment shaders.

Moved distance* variables to main scope and removed useless abs() calls.

Unmerged revisions

1725. By Loïc Molinari on 2015-11-24

Moved distance* variables to main scope and removed useless abs().

=== modified file 'components.api'
--- components.api	2015-10-15 14:17:25 +0000
+++ components.api	2015-11-24 12:22:14 +0000
@@ -31,7 +31,7 @@
     Real
     String
 Ubuntu.Components.ActionBar 1.3: StyledItem
-    readonly property Action actions
+    property list<Action> actions
     property Component delegate
     property int numberOfSlots
 Ubuntu.Components.Styles.ActionBarStyle 1.3: Item
@@ -41,7 +41,7 @@
     property url overflowIconSource
     property string overflowText
 Ubuntu.Components.ActionContext 1.0 0.1: QtObject
-    default readonly property Action actions
+    default property list<Action> actions
     property bool active
     function addAction(Action action)
     function removeAction(Action action)
@@ -54,15 +54,15 @@
     function trigger()
     property string text
 Ubuntu.Components.ActionList 1.0 0.1: QtObject
-    readonly property Action actions
-    default readonly property Action children
+    property list<Action> actions
+    default property list<Action> children
 Ubuntu.Components.ActionList 1.3: QtObject
-    readonly property Action actions
-    default readonly property Action children
+    property list<Action> actions
+    default property list<Action> children
 Ubuntu.Components.ActionManager 1.0 0.1: QtObject
-    default readonly property Action actions
+    default property list<Action> actions
     readonly property ActionContext globalContext
-    readonly property ActionContext localContexts
+    property list<ActionContext> localContexts
     signal quit()
     function addAction(Action action)
     function removeAction(Action action)
@@ -84,7 +84,7 @@
     property bool running
 Ubuntu.Components.AdaptivePageLayout 1.3: PageTreeNode
     readonly property int columns
-    readonly property PageColumnsLayout layouts
+    property list<PageColumnsLayou> layouts
     function var addPageToCurrentColumn(var sourcePage, var page, var properties)
     function var addPageToNextColumn(var sourcePage, var page, var properties)
     function var removePages(var page)
@@ -155,7 +155,7 @@
     property bool required
     property QStringList valueNames
 Ubuntu.Components.Arguments 1.0 0.1: QtObject
-    default readonly property Argument arguments
+    default property list<Argument> arguments
     property Argument defaultArgument
     readonly property bool error
     readonly property string errorMessage
@@ -175,11 +175,17 @@
     property var icon
     property bool iconFrame
     property bool progression
-Ubuntu.Components.BottomEdgeHint 1.3: Item
-    property string iconName
-    property url iconSource
+Ubuntu.Components.BottomEdgeHint 1.3: ActionItem
+    property int deactivateTimeout
+    property Flickable flickable
     signal clicked()
-    property string text
+    property Status status
+    readonly property SwipeArea swipeArea
+Ubuntu.Components.BottomEdgeHint.Status: Enum
+    Active
+    Hidden
+    Inactive
+    Locked
 Ubuntu.Components.Button 1.0 0.1: AbstractButton
     property color color
     property QFont font
@@ -221,14 +227,14 @@
 Ubuntu.Components.ColorUtils 0.1 1.0
 Ubuntu.Components.ComboButton 1.1: Button
     property double collapsedHeight
-    default readonly property QtObject comboList
+    default property list<QtObject> comboList
     readonly property double comboListHeight
     property color dropdownColor
     property bool expanded
     property double expandedHeight
 Ubuntu.Components.ComboButton 1.3: Button
     property double collapsedHeight
-    default readonly property QtObject comboList
+    default property list<QtObject> comboList
     readonly property double comboListHeight
     property color dropdownColor
     property bool expanded
@@ -318,7 +324,7 @@
     signal closeClicked()
     signal doneClicked()
 Ubuntu.Components.Pickers.Dialer 1.0 0.1: StyledItem
-    readonly property QtObject centerContent
+    property list<QtObject> centerContent
     readonly property Item centerItem
     property double handSpace
     readonly property var hands
@@ -327,7 +333,7 @@
     property double minimumValue
     property double size
 Ubuntu.Components.Pickers.Dialer 1.3: StyledItem
-    readonly property QtObject centerContent
+    property list<QtObject> centerContent
     readonly property Item centerItem
     property double handSpace
     readonly property var hands
@@ -339,18 +345,18 @@
     readonly property Dialer dialer
     property DialerHandGroup hand
     readonly property int index
-    default readonly property QtObject overlay
+    default property list<QtObject> overlay
     property double value
 Ubuntu.Components.Pickers.DialerHand 1.3: StyledItem
     readonly property Dialer dialer
     property DialerHandGroup hand
     readonly property int index
-    default readonly property QtObject overlay
+    default property list<QtObject> overlay
     property double value
 Ubuntu.Components.Popups.Dialog 1.0 0.1: PopupBase
     property Item caller
     property double callerMargin
-    default readonly property QtObject contents
+    default property list<QtObject> contents
     property double edgeMargins
     property bool modal
     property Item pointerTarget
@@ -359,34 +365,16 @@
 Ubuntu.Components.Popups.Dialog 1.3: PopupBase
     property Item caller
     property double callerMargin
-    default readonly property QtObject contents
+    default property list<QtObject> contents
     property double edgeMargins
     property bool modal
     property Item pointerTarget
     property string text
     property string title
 Ubuntu.Components.ListItems.Divider 1.0 0.1: QQuickImageBase
-    property FillMode fillMode
-    property HAlignment horizontalAlignment
-    signal horizontalAlignmentChanged(HAlignment alignment)
-    signal verticalAlignmentChanged(VAlignment alignment)
-    signal mipmapChanged(bool )
-    property bool mipmap
-    readonly property double paintedHeight
-    readonly property double paintedWidth
-    property VAlignment verticalAlignment
 Ubuntu.Components.ListItems.Divider 1.3: QQuickImageBase
-    property FillMode fillMode
-    property HAlignment horizontalAlignment
-    signal horizontalAlignmentChanged(HAlignment alignment)
-    signal verticalAlignmentChanged(VAlignment alignment)
-    signal mipmapChanged(bool )
-    property bool mipmap
-    readonly property double paintedHeight
-    readonly property double paintedWidth
-    property VAlignment verticalAlignment
 Ubuntu.Components.ListItems.Empty 1.0 0.1: AbstractButton
-    readonly property Item backgroundIndicator
+    property list<Item> backgroundIndicator
     property bool confirmRemoval
     readonly property ThinDivider divider
     property bool highlightWhenPressed
@@ -398,7 +386,7 @@
     readonly property string swipingState
     readonly property bool waitingConfirmationForRemoval
 Ubuntu.Components.ListItems.Empty 1.3: AbstractButton
-    readonly property Item backgroundIndicator
+    property list<Item> backgroundIndicator
     property bool confirmRemoval
     readonly property ThinDivider divider
     property bool highlightWhenPressed
@@ -510,7 +498,7 @@
     XxSmall
 Ubuntu.Layouts.Layouts 1.0 0.1: Item
     readonly property string currentLayout
-    readonly property ConditionalLayout layouts
+    property list<ConditionalLayout> layouts
 Ubuntu.Components.ListItem 1.3 1.2: StyledItem
     property Action action
     property color color
@@ -523,18 +511,19 @@
     property color highlightColor
     readonly property bool highlighted
     property ListItemActions leadingActions
-    readonly property Item listItemChildren
-    default readonly property QtObject listItemData
+    property list<Item> listItemChildren
+    default property list<QtObject> listItemData
     signal clicked()
     signal pressAndHold()
     signal contentMovementStarted()
     signal contentMovementEnded()
     property bool selectMode
     property bool selected
+    property bool swipeEnabled 1.3
     property ListItemActions trailingActions
 Ubuntu.Components.ListItemActions 1.2: QtObject
-    readonly property Action actions
-    default readonly property QtObject data
+    property list<Action> actions
+    default property list<QtObject> data
     property Component delegate
 Ubuntu.Components.ListItemDrag 1.2: QtObject
     property bool accept
@@ -572,27 +561,31 @@
     Second
 Ubuntu.Components.MainView 1.0 0.1: MainViewBase
     property bool automaticOrientation
-    default readonly property QtObject contentsItem
+    default property list<QtObject> contentsItem
     property bool useDeprecatedToolbar
 Ubuntu.Components.MainView 1.2: MainViewBase
     property bool automaticOrientation
-    default readonly property QtObject contentsItem
+    default property list<QtObject> contentsItem
 Ubuntu.Components.MainView 1.3: MainViewBase
     property bool automaticOrientation
-    default readonly property QtObject contentsItem
-Ubuntu.Components.MathUtils 0.1 1.0 1.3
+    default property list<QtObject> contentsItem
+Ubuntu.Components.MathUtils 1.0 0.1: QtObject singleton
+    function double clamp(double x, double min, double max)
+    function double lerp(double delta, double from, double to)
+    function double projectValue(double x, double xmin, double xmax, double ymin, double ymax)
+    function double clampAndProject(double x, double xmin, double xmax, double ymin, double ymax)
 Ubuntu.Components.MimeData 1.0 0.1: QtObject
     property color color
     property var data
     readonly property QStringList formats
     property string html
     property string text
-    property QList<QUrl> urls
+    property list<url> urls
 Ubuntu.Components.Mouse 1.0 0.1: QtObject
     readonly property Qt.MouseButtons acceptedButtons
     property int clickAndHoldThreshold
     property bool enabled
-    readonly property Item forwardTo
+    property list<Item> forwardTo
     readonly property bool hoverEnabled
     signal pressed(QQuickMouseEvent mouse, Item host)
     signal released(QQuickMouseEvent mouse, Item host)
@@ -606,12 +599,15 @@
 Ubuntu.Components.Mouse.Priority: Enum
     AfterItem
     BeforeItem
+Ubuntu.Test.MouseTouchAdaptor 1.0: QtObject singleton
+    property bool enabled
+    signal enabledChanged(bool value)
 Ubuntu.Components.ListItems.MultiValue 1.0 0.1: Base
     property var values
 Ubuntu.Components.ListItems.MultiValue 1.3: Base
     property var values
 Ubuntu.Components.Object 1.0 0.1: QtObject
-    default readonly property QtObject children
+    default property list<QtObject> children
 Ubuntu.Components.OptionSelector 1.0 0.1: Empty
     property bool colourImage
     property double containerHeight
@@ -665,11 +661,11 @@
     readonly property bool rotating
     property bool transitionEnabled
 Ubuntu.Components.Page 1.0 0.1: PageTreeNode
-    readonly property Action actions
+    property list<Action> actions
     property Flickable flickable
     property string title
     property Item tools
-Ubuntu.Components.Page 1.1: Page
+Ubuntu.Components.Page 1.1: Page10
     readonly property PageHeadConfiguration head
 Ubuntu.Components.Page 1.3: PageTreeNode
     property Flickable flickable
@@ -682,17 +678,17 @@
     property double minimumWidth
     property double preferredWidth
 Ubuntu.Components.PageColumnsLayout 1.3: QtObject
-    default readonly property PageColumn data
+    default property list<PageColum> data
     property bool when
 Ubuntu.Components.PageHeadConfiguration 1.1: Object
-    readonly property Action actions
+    property list<Action> actions
     property Action backAction
     property Item contents
     property color foregroundColor
     property string preset
     readonly property PageHeadSections sections
 Ubuntu.Components.PageHeadConfiguration 1.3: Object
-    readonly property Action actions
+    property list<Action> actions
     property Action backAction
     property Item contents
     property Flickable flickable
@@ -707,17 +703,17 @@
     property var model
     property int selectedIndex
 Ubuntu.Components.PageHeadSections 1.3: QtObject
-    readonly property Action actions
+    property list<Action> actions
     property bool enabled
     property var model
     property int selectedIndex
 Ubuntu.Components.PageHeadState 1.1: State
-    readonly property Action actions
+    property list<Action> actions
     property Action backAction
     property Item contents
     property PageHeadConfiguration head
 Ubuntu.Components.PageHeadState 1.3: State
-    readonly property Action actions
+    property list<Action> actions
     property Action backAction
     property Item contents
     property PageHeadConfiguration head
@@ -743,6 +739,7 @@
 Ubuntu.Components.PageHeader 1.3: Header
     property Item contents
     readonly property ActionBar leadingActionBar
+    property list<Action> navigationActions
     readonly property Sections sections
     property string title
     readonly property ActionBar trailingActionBar
@@ -799,7 +796,7 @@
     property int align
     property bool animate
     readonly property bool animating
-    default readonly property QtObject contents
+    default property list<QtObject> contents
     property int hideTimeout
     property double hintSize
     property bool locked
@@ -813,7 +810,7 @@
     property int align
     property bool animate
     readonly property bool animating
-    default readonly property QtObject contents
+    default property list<QtObject> contents
     property int hideTimeout
     property double hintSize
     property bool locked
@@ -854,7 +851,7 @@
     property bool autoClose
     property Item caller
     property double callerMargin
-    default readonly property QtObject container
+    default property list<QtObject> container
     property double contentHeight
     property double contentWidth
     property double edgeMargins
@@ -866,7 +863,7 @@
     property bool autoClose
     property Item caller
     property double callerMargin
-    default readonly property QtObject container
+    default property list<QtObject> container
     property double contentHeight
     property double contentWidth
     property double edgeMargins
@@ -935,9 +932,8 @@
 Ubuntu.Components.Scrollbar 1.3: StyledItem
     property int align
     property Flickable flickableItem
-Ubuntu.Components.ScrollbarUtils 0.1 1.0
 Ubuntu.Components.Sections 1.3: StyledItem
-    readonly property Action actions
+    property list<Action> actions
     property var model
     property int selectedIndex
 Ubuntu.Components.ServiceProperties 1.1: QtObject
@@ -958,13 +954,13 @@
     Inactive
     Synchronizing
 Ubuntu.Components.Popups.SheetBase 1.0 0.1: PopupBase
-    default readonly property QtObject container
+    default property list<QtObject> container
     property double contentsHeight
     property double contentsWidth
     property bool modal
     property string title
 Ubuntu.Components.Popups.SheetBase 1.3: PopupBase
-    default readonly property QtObject container
+    default property list<QtObject> container
     property double contentsHeight
     property double contentsWidth
     property bool modal
@@ -1049,6 +1045,26 @@
     property string subText
 Ubuntu.Components.ListItems.Subtitled 1.3: Base
     property string subText
+Ubuntu.Components.SwipeArea 1.3: Item
+    property Direction direction
+    readonly property double distance
+    readonly property bool dragging
+    property bool immediateRecognition
+    signal directionChanged(Direction direction)
+    signal draggingChanged(bool dragging)
+    signal pressedChanged(bool pressed)
+    signal distanceChanged(double distance)
+    signal touchPositionChanged(QPointF position)
+    signal immediateRecognitionChanged(bool immediateRecognition)
+    readonly property bool pressed
+    readonly property QPointF touchPosition
+Ubuntu.Components.SwipeArea.Direction: Enum
+    Downwards
+    Horizontal
+    Leftwards
+    Rightwards
+    Upwards
+    Vertical
 Ubuntu.Components.SwipeEvent 1.2: QtObject
     property QPointF content
     readonly property QPointF from
@@ -1094,14 +1110,14 @@
     readonly property Tab selectedTab
     property int selectedTabIndex
     property TabBar tabBar
-    default readonly property QtObject tabChildren
+    default property list<QtObject> tabChildren
 Ubuntu.Components.Tabs 1.3: PageTreeNode
     readonly property int count
     readonly property Item currentPage
     readonly property Tab selectedTab
     property int selectedTabIndex
     property TabBar tabBar
-    default readonly property QtObject tabChildren
+    default property list<QtObject> tabChildren
 Ubuntu.Test.TestExtras 1.0: QtObject singleton
     function string openGLflavor()
     function string cpuArchitecture()
@@ -1284,10 +1300,10 @@
     property bool persistentSelection
     property string placeholderText
     property var popover
-    readonly property QtObject primaryItem
+    property list<QtObject> primaryItem
     property bool readOnly
     property int renderType
-    readonly property QtObject secondaryItem
+    property list<QtObject> secondaryItem
     property bool selectByMouse
     readonly property string selectedText
     property color selectedTextColor
@@ -1345,10 +1361,10 @@
     property bool persistentSelection
     property string placeholderText
     property var popover
-    readonly property QtObject primaryItem
+    property list<QtObject> primaryItem
     property bool readOnly
     property int renderType
-    readonly property QtObject secondaryItem
+    property list<QtObject> secondaryItem
     property bool selectByMouse
     readonly property string selectedText
     property color selectedTextColor
@@ -1363,7 +1379,6 @@
     property string name
     property QtObject palette
     readonly property ThemeSettings parentTheme
-    property ushort version
 Ubuntu.Components.ListItems.ThinDivider 1.0 0.1: Rectangle
 Ubuntu.Components.ListItems.ThinDivider 1.3: Rectangle
 Ubuntu.Components.ToolbarButton 1.0 0.1: StyledItem
@@ -1384,13 +1399,13 @@
     property string text
 Ubuntu.Components.ToolbarItems 1.0 0.1: Item
     property Item back
-    default readonly property QtObject contents
+    default property list<QtObject> contents
     property bool locked
     property bool opened
     property Item pageStack
 Ubuntu.Components.ToolbarItems 1.3: Item
     property Item back
-    default readonly property QtObject contents
+    default property list<QtObject> contents
     property bool locked
     property bool opened
     property Item pageStack
@@ -1400,7 +1415,6 @@
 Ubuntu.Components.UCFontUtils 1.0 0.1: QtObject
     function double sizeToPixels(string size)
     function double modularScale(string size)
-UCItemAttached: QtObject
 UCListItemDivider: Item
     property color colorFrom
     property color colorTo
@@ -1531,6 +1545,7 @@
     function var typeString(var string)
     function var warningFormat(var line, var column, var message)
     function var waitForHeaderAnimation(var mainView)
+    readonly property QuickTestUtil testUtil
 Ubuntu.Components.UriHandler 1.0 0.1: QtObject singleton
     signal opened(QStringList uris)
 Ubuntu.Components.ListItems.ValueSelector 1.0 0.1: Empty
@@ -1551,12 +1566,12 @@
     property var values
 Ubuntu.Components.ViewItems 1.2: QtObject
     property bool dragMode
-    property QList<int> expandedIndices
+    property list<int> expandedIndices
     property int expansionFlags
     signal dragUpdated(ListItemDrag event)
-    signal expandedIndicesChanged(QList<int> indices)
+    signal expandedIndicesChanged(list<int> indices)
     property bool selectMode
-    property QList<int> selectedIndices
+    property list<int> selectedIndices
 Ubuntu.Components.ViewItems.ExpansionFlag: Enum
     CollapseOnOutsidePress
     Exclusive
 
=== modified file 'debian/control'
--- debian/control	2015-10-09 08:23:09 +0000
+++ debian/control	2015-11-24 12:22:14 +0000
@@ -9,6 +9,7 @@
                python3:any,
                qml-module-qtgraphicaleffects | libqt5qml-graphicaleffects,
                libinput-dev,
+               libxkbcommon-dev,
                qtbase5-dev,
                qtbase5-private-dev,
                qttools5-dev-tools,
@@ -73,6 +74,7 @@
          suru-icon-theme,
          ttf-ubuntu-font-family,
          ubuntu-ui-toolkit-theme (= ${binary:Version}),
+         libubuntugestures (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
 Conflicts: qt-components-ubuntu
@@ -84,6 +86,28 @@
  .
  This package contains the Ubuntu Components QML plugin.
 
+
+Package: libubuntugestures
+Architecture: any
+Multi-Arch: same
+Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: Ubuntu gestures library - SwipeArea
+ Ubuntu gestures library with SwipeArea
+
+Package: libubuntugestures-dev
+Architecture: any
+Multi-Arch: same
+Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: Ubuntu gestures library development files
+ This package contains the development files for 
+ Ubuntu gestures library with SwipeArea
+
+
+
 Package: ubuntu-ui-toolkit-theme
 Architecture: any
 Multi-Arch: foreign
 
=== added file 'debian/libubuntugestures-dev.install'
--- debian/libubuntugestures-dev.install	1970-01-01 00:00:00 +0000
+++ debian/libubuntugestures-dev.install	2015-11-24 12:22:14 +0000
@@ -0,0 +1,28 @@
+usr/include/*/qt5/UbuntuGestures/ubuntugesturesglobal.h 
+usr/include/*/qt5/UbuntuGestures/CandidateInactivityTimer 
+usr/include/*/qt5/UbuntuGestures/TouchOwnershipEvent 
+usr/include/*/qt5/UbuntuGestures/UbuntuGestures 
+usr/include/*/qt5/UbuntuGestures/pool.h 
+usr/include/*/qt5/UbuntuGestures/unownedtouchevent.h 
+usr/include/*/qt5/UbuntuGestures/DebugHelpers 
+usr/include/*/qt5/UbuntuGestures/debughelpers.h 
+usr/include/*/qt5/UbuntuGestures/touchownershipevent.h 
+usr/include/*/qt5/UbuntuGestures/touchregistry.h 
+usr/include/*/qt5/UbuntuGestures/UbuntuGesturesDepends 
+usr/include/*/qt5/UbuntuGestures/timesource.h 
+usr/include/*/qt5/UbuntuGestures/TimeSource 
+usr/include/*/qt5/UbuntuGestures/timer.h 
+usr/include/*/qt5/UbuntuGestures/UnownedTouchEvent 
+usr/include/*/qt5/UbuntuGestures/TouchRegistry 
+usr/include/*/qt5/UbuntuGestures/Pool 
+usr/include/*/qt5/UbuntuGestures/ubuntugesturesversion.h 
+usr/include/*/qt5/UbuntuGestures/Timer 
+usr/include/*/qt5/UbuntuGestures/candidateinactivitytimer.h 
+usr/include/*/qt5/UbuntuGestures/UbuntuGesturesVersion 
+usr/lib/*/libUbuntuGestures.prl
+usr/lib/*/libUbuntuGestures.la
+usr/lib/*/libUbuntuGestures.so
+usr/lib/*/pkgconfig/UbuntuGestures.pc
+usr/lib/*/qt5/mkspecs/modules/qt_lib_UbuntuGestures.pri
+usr/lib/*/qt5/mkspecs/modules/qt_lib_UbuntuGestures_private.pri
+
 
=== added file 'debian/libubuntugestures.install'
--- debian/libubuntugestures.install	1970-01-01 00:00:00 +0000
+++ debian/libubuntugestures.install	2015-11-24 12:22:14 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/libUbuntuGestures.so.*
 
=== modified file 'documentation/overview.qdoc'
--- documentation/overview.qdoc	2015-04-15 06:40:40 +0000
+++ documentation/overview.qdoc	2015-11-24 12:22:14 +0000
@@ -37,6 +37,13 @@
      \endcode
      \annotatedlist ubuntu
 
+     \part Gestures
+     Available through:
+     \code
+         import Ubuntu.Components 1.3
+     \endcode
+     \annotatedlist ubuntu-gestures
+
      \part List views, list items
      Components with standardized view items, with conditional actions, multiselect
      and reordering support on scrollable views. Replaces the Ubuntu.Components.ListItems
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/About.qml'
--- examples/ubuntu-ui-toolkit-gallery/About.qml	2015-09-24 19:36:36 +0000
+++ examples/ubuntu-ui-toolkit-gallery/About.qml	2015-11-24 12:22:14 +0000
@@ -30,9 +30,8 @@
         anchors.fill: parent
         color: theme.palette.normal.background
     }
-    head {
-        title: i18n.tr('About...')
-        foregroundColor: theme.palette.selected.foregroundText
+    header: PageHeader {
+        title: i18n.tr("About...")
     }
 
     Column {
 
=== renamed file 'examples/ubuntu-ui-toolkit-gallery/BottomEdgeHint.qml' => 'examples/ubuntu-ui-toolkit-gallery/BottomEdgePage.qml'
=== modified file 'examples/ubuntu-ui-toolkit-gallery/ListItemLayouts.qml'
--- examples/ubuntu-ui-toolkit-gallery/ListItemLayouts.qml	2015-09-30 21:14:25 +0000
+++ examples/ubuntu-ui-toolkit-gallery/ListItemLayouts.qml	2015-11-24 12:22:14 +0000
@@ -28,7 +28,7 @@
 
         ListItem {
             id: addressbookListItem
-            height: addressbookLayout.height
+            height: addressbookLayout.height + (divider.visible ? divider.height : 0)
 
             ListItemLayout {
                 id: addressbookLayout
@@ -48,7 +48,7 @@
 
         ListItem {
             id: addressbookDetailsListItem
-            height: addressbookDetailsLayout.height + divider.height
+            height: addressbookDetailsLayout.height + (divider.visible ? divider.height : 0)
             ListItemLayout {
                 id: addressbookDetailsLayout
 
@@ -73,7 +73,7 @@
         ListItem {
             id: telegramContactsListItem
 
-            height: telegramContactsLayout.height
+            height: telegramContactsLayout.height + (divider.visible ? divider.height : 0)
 
             ListItemLayout {
                 id: telegramContactsLayout
@@ -92,7 +92,7 @@
 
         ListItem {
             id: systemSettings1
-            height: systemSettings1_layout.height
+            height: systemSettings1_layout.height + (divider.visible ? divider.height : 0)
 
             ListItemLayout {
                 id: systemSettings1_layout
@@ -110,7 +110,7 @@
 
         ListItem {
             id: systemSettings2
-            height: systemSettings2_layout.height
+            height: systemSettings2_layout.height + (divider.visible ? divider.height : 0)
 
             ListItemLayout {
                 id: systemSettings2_layout
@@ -129,7 +129,7 @@
 
         ListItem {
             id: systemSettings3
-            height: systemSettings3_layout.height
+            height: systemSettings3_layout.height + (divider.visible ? divider.height : 0)
 
             ListItemLayout {
                 id: systemSettings3_layout
@@ -157,7 +157,7 @@
         spacing: 0
 
         ListItem {
-            height: customLabelsLayout.height
+            height: customLabelsLayout.height + (divider.visible ? divider.height : 0)
 
             ListItemLayout {
                 id: customLabelsLayout
@@ -220,7 +220,7 @@
 
         ListItem {
             id: dialerHistoryListItem
-            height: dialerHistoryLayout.height
+            height: dialerHistoryLayout.height + (divider.visible ? divider.height : 0)
 
             ListItemLayout {
                 id: dialerHistoryLayout
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/ListItemWithLabel.qml'
--- examples/ubuntu-ui-toolkit-gallery/ListItemWithLabel.qml	2015-09-28 12:26:13 +0000
+++ examples/ubuntu-ui-toolkit-gallery/ListItemWithLabel.qml	2015-11-24 12:22:14 +0000
@@ -20,7 +20,7 @@
 ListItem {
     property alias title: layout.title
 
-    height: layout.height
+    height: layout.height + (divider.visible ? divider.height : 0)
     onPressAndHold: selectMode = !selectMode
 
     ListItemLayout { id: layout }
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/MainPage.qml'
--- examples/ubuntu-ui-toolkit-gallery/MainPage.qml	2015-09-30 05:59:49 +0000
+++ examples/ubuntu-ui-toolkit-gallery/MainPage.qml	2015-11-24 12:22:14 +0000
@@ -21,37 +21,54 @@
     id: mainPage
     title: "Ubuntu UI Toolkit"
 
-    head.actions: [
-        Action {
-            text: i18n.tr('Right to Left')
-            iconName: 'flash-on'
-            visible: !gallery.rtl
-            onTriggered: gallery.rtl = !gallery.rtl
-        },
-        Action {
-            text: i18n.tr('Left to Right')
-            iconName: 'flash-off'
-            visible: gallery.rtl
-            onTriggered: gallery.rtl = !gallery.rtl
-        },
-        Action {
-            text: i18n.tr('Use dark theme')
-            iconName: 'torch-on'
-            visible: gallery.theme.name == 'Ubuntu.Components.Themes.Ambiance'
-            onTriggered: gallery.theme.name = 'Ubuntu.Components.Themes.SuruDark'
-        },
-        Action {
-            text: i18n.tr('Use light theme')
-            iconName: 'torch-off'
-            visible: gallery.theme.name == 'Ubuntu.Components.Themes.SuruDark'
-            onTriggered: gallery.theme.name = 'Ubuntu.Components.Themes.Ambiance'
-        },
-        Action {
-            text: i18n.tr('About')
-            iconName: "info"
-            onTriggered: mainPage.pageStack.addPageToCurrentColumn(mainPage, Qt.resolvedUrl("About.qml"))
-        }
-    ]
+    header: PageHeader {
+        title: mainPage.title
+        flickable: layout.columns === 1 ? widgetList : null
+        trailingActionBar.actions: [
+            Action {
+                text: i18n.tr('Right to Left')
+                iconName: 'flash-on'
+                visible: !gallery.rtl
+                onTriggered: gallery.rtl = !gallery.rtl
+            },
+            Action {
+                text: i18n.tr('Left to Right')
+                iconName: 'flash-off'
+                visible: gallery.rtl
+                onTriggered: gallery.rtl = !gallery.rtl
+            },
+            Action {
+                text: i18n.tr('Use dark theme')
+                iconName: 'torch-on'
+                visible: gallery.theme.name == 'Ubuntu.Components.Themes.Ambiance'
+                onTriggered: gallery.theme.name = 'Ubuntu.Components.Themes.SuruDark'
+            },
+            Action {
+                text: i18n.tr('Use light theme')
+                iconName: 'torch-off'
+                visible: gallery.theme.name == 'Ubuntu.Components.Themes.SuruDark'
+                onTriggered: gallery.theme.name = 'Ubuntu.Components.Themes.Ambiance'
+            },
+            Action {
+                id: aboutAction
+                text: i18n.tr('About')
+                iconName: "info"
+                onTriggered: mainPage.pageStack.addPageToCurrentColumn(mainPage, Qt.resolvedUrl("About.qml"))
+            },
+            Action {
+                text: i18n.tr("Deactivate mouse")
+                iconName: "non-starred"
+                visible: QuickUtils.mouseAttached
+                onTriggered: QuickUtils.mouseAttached = false
+            },
+            Action {
+                text: i18n.tr("Activate mouse")
+                iconName: "starred"
+                visible: !QuickUtils.mouseAttached
+                onTriggered: QuickUtils.mouseAttached = true
+            }
+        ]
+    }
 
     onActiveChanged: {
         if (layout.columns < 2) {
@@ -62,59 +79,63 @@
         }
     }
 
-    Rectangle {
-        color: Qt.rgba(0.0, 0.0, 0.0, 0.01)
-        anchors.fill: parent
-
-        UbuntuListView {
-            id: widgetList
-            objectName: "widgetList"
-            anchors.fill: parent
-            model: WidgetsModel {}
-            currentIndex: -1
-
-            onCurrentIndexChanged: openPage()
-
-            function openPage() {
-                if (!mainPage.active || currentIndex < 0) return;
-                var modelData = model.get(currentIndex);
-                var source = Qt.resolvedUrl(modelData.source);
-                mainPage.pageStack.addPageToNextColumn(mainPage, source, {title: modelData.label});
-            }
-
-            delegate: ListItem {
-                objectName: model.objectName
-                contentItem {
-                    anchors.leftMargin: units.gu(2)
-                    anchors.rightMargin: units.gu(2)
-                }
-                enabled: source != ""
-                // Used by Autopilot
-                property string text: label
-                onClicked: widgetList.currentIndex = index
-                Label {
-                    id: labelItem
-                    anchors {
-                        fill: parent
-                        rightMargin: units.gu(4)
-                    }
-                    text: label
-                    verticalAlignment: Text.AlignVCenter
-                }
-                Icon {
-                    name: "next"
-                    width: units.gu(2)
-                    height: units.gu(2)
-                    anchors {
-                        verticalCenter: parent.verticalCenter
-                        right: parent.right
-                    }
-                }
-            }
-            highlight: Rectangle {
-                color: theme.palette.selected.background
-            }
-            highlightMoveDuration: 0
-        }
+    UbuntuListView {
+        id: widgetList
+        objectName: "widgetList"
+        anchors {
+            fill: parent
+            topMargin: mainPage.header.flickable ? 0 : mainPage.header.height
+        }
+
+        model: WidgetsModel {}
+        currentIndex: -1
+
+        onCurrentIndexChanged: openPage()
+
+        function openPage() {
+            if (!mainPage.active || currentIndex < 0) return;
+            var modelData = model.get(currentIndex);
+            var source = Qt.resolvedUrl(modelData.source);
+            mainPage.pageStack.addPageToNextColumn(mainPage, source, {title: modelData.label});
+        }
+
+        delegate: ListItem {
+            objectName: model.objectName
+            contentItem {
+                anchors.leftMargin: units.gu(2)
+                anchors.rightMargin: units.gu(2)
+            }
+            enabled: source != ""
+            // Used by Autopilot
+            property string text: label
+            onClicked: widgetList.currentIndex = index
+            Label {
+                id: labelItem
+                anchors {
+                    fill: parent
+                    rightMargin: units.gu(4)
+                }
+                text: label
+                verticalAlignment: Text.AlignVCenter
+            }
+            Icon {
+                name: "next"
+                width: units.gu(2)
+                height: units.gu(2)
+                anchors {
+                    verticalCenter: parent.verticalCenter
+                    right: parent.right
+                }
+            }
+        }
+        highlight: Rectangle {
+            color: theme.palette.selected.background
+        }
+        highlightMoveDuration: 0
+    }
+
+    BottomEdgeHint {
+        flickable: widgetList
+        action: aboutAction
     }
 }
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/Sections.qml'
--- examples/ubuntu-ui-toolkit-gallery/Sections.qml	2015-07-03 16:19:59 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Sections.qml	2015-11-24 12:22:14 +0000
@@ -19,7 +19,13 @@
 
 Template {
     objectName: "sectionsTemplate"
-    head.sections.model: ["first", "second", "third"]
+    id: sectionsTemplate
+
+    header: PageHeader {
+        title: sectionsTemplate.title
+        sections.model: ["first", "second", "third"]
+    }
+
     TemplateSection {
         title: "Sections"
         className: "Sections"
 
=== added file 'examples/ubuntu-ui-toolkit-gallery/SwipeAreaPage.qml'
--- examples/ubuntu-ui-toolkit-gallery/SwipeAreaPage.qml	1970-01-01 00:00:00 +0000
+++ examples/ubuntu-ui-toolkit-gallery/SwipeAreaPage.qml	2015-11-24 12:22:14 +0000
@@ -0,0 +1,144 @@
+/*
+ * 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
+
+Template {
+    objectName: "SwipeAreaTemplate"
+    scrollable: !(upwards.dragging | downwards.dragging |
+                rightwards.dragging | leftwards.dragging)
+
+    TemplateSection {
+        className: "SwipeArea"
+
+        TemplateRow {
+            title: i18n.tr("Upwards")
+            Rectangle {
+                width: units.gu(40)
+                height: units.gu(20)
+                color: theme.palette.normal.foreground
+
+                SwipeArea {
+                    id: upwards
+                    direction: SwipeArea.Upwards
+                    anchors {
+                        left: parent.left
+                        right: parent.right
+                        bottom: parent.bottom
+                    }
+                    height: units.gu(4)
+                    Label {
+                        text: i18n.tr("Upwards")
+                        color: theme.palette.normal.foregroundText
+                        anchors {
+                            centerIn: parent
+                            verticalCenterOffset: parent.dragging ? -parent.distance : 0
+                        }
+                    }
+                }
+            }
+        }
+
+        TemplateRow {
+            title: i18n.tr("Downwards")
+            Rectangle {
+                width: units.gu(40)
+                height: units.gu(20)
+                color: theme.palette.normal.foreground
+
+                SwipeArea {
+                    id: downwards
+                    direction: SwipeArea.Downwards
+                    anchors {
+                        left: parent.left
+                        right: parent.right
+                        top: parent.top
+                    }
+                    height: units.gu(5)
+                    Label {
+                        text: i18n.tr("Downwards")
+                        color: theme.palette.normal.foregroundText
+                        anchors {
+                            centerIn: parent
+                            verticalCenterOffset: parent.dragging ? parent.distance : 0
+                        }
+                    }
+                }
+            }
+        }
+
+        TemplateRow {
+            title: i18n.tr("Rightwards")
+            Rectangle {
+                width: units.gu(40)
+                height: units.gu(20)
+                color: theme.palette.normal.foreground
+
+                SwipeArea {
+                    id: rightwards
+                    direction: SwipeArea.Rightwards
+                    anchors {
+                        left: parent.left
+                        top: parent.top
+                        bottom: parent.bottom
+                    }
+                    width: units.gu(5)
+
+                    Label {
+                        text: i18n.tr("Rightwards")
+                        rotation: -90
+                        color: theme.palette.normal.foregroundText
+                        anchors {
+                            centerIn: parent
+                            horizontalCenterOffset: parent.dragging ? parent.distance : 0
+                        }
+                    }
+                }
+            }
+        }
+
+        TemplateRow {
+            title: i18n.tr("Leftwards")
+            Rectangle {
+                width: units.gu(40)
+                height: units.gu(20)
+                color: theme.palette.normal.foreground
+
+                SwipeArea {
+                    id: leftwards
+                    direction: SwipeArea.Leftwards
+                    anchors {
+                        right: parent.right
+                        top: parent.top
+                        bottom: parent.bottom
+                    }
+                    width: units.gu(5)
+
+                    Label {
+                        text: i18n.tr("Leftwards")
+                        rotation: 90
+                        color: theme.palette.normal.foregroundText
+                        anchors {
+                            centerIn: parent
+                            horizontalCenterOffset: parent.dragging ? -parent.distance : 0
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/Template.qml'
--- examples/ubuntu-ui-toolkit-gallery/Template.qml	2015-07-16 09:12:55 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Template.qml	2015-11-24 12:22:14 +0000
@@ -20,20 +20,30 @@
 Page {
     id: template
 
-    default property alias content: layout.children
-    property alias spacing: layout.spacing
+    default property alias content: column.children
+    property alias spacing: column.spacing
+    property alias scrollable: flickable.interactive
+
+    header: PageHeader {
+        title: template.title
+        flickable: layout.columns === 1 ? flickable : null
+        onFlickableChanged: exposed = true;
+    }
 
     Flickable {
         id: flickable
         objectName: "TemplateFlickable"
-        anchors.fill: parent
-        anchors.topMargin: units.gu(2)
-        anchors.bottomMargin: units.gu(2)
-        contentHeight: layout.height
+        anchors {
+            fill: parent
+            topMargin: template.header.flickable ? units.gu(2) :
+                                                   units.gu(2) + template.header.height
+            bottomMargin: units.gu(2)
+        }
+        contentHeight: column.height
         interactive: contentHeight > height
 
         Column {
-            id: layout
+            id: column
             spacing: units.gu(6)
             anchors.left: parent.left
             anchors.right: parent.right
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml'
--- examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml	2015-09-25 17:05:53 +0000
+++ examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml	2015-11-24 12:22:14 +0000
@@ -102,9 +102,14 @@
         source: "CrossFadeImage.qml"
     }
     ListElement {
+        objectName: "swipeAreaElement"
+        label: "SwipeArea"
+        source: "SwipeAreaPage.qml"
+    }
+    ListElement {
         objectName: "bottomEdgeHintElement"
-        label: "Bottom Edge Hint"
-        source: "BottomEdgeHint.qml"
+        label: "Bottom Edge"
+        source: "BottomEdgePage.qml"
     }
 
     ListElement {
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/gallery'
--- examples/ubuntu-ui-toolkit-gallery/gallery	2015-09-14 14:10:37 +0000
+++ examples/ubuntu-ui-toolkit-gallery/gallery	2015-11-24 12:22:14 +0000
@@ -3,4 +3,4 @@
 . `dirname $0`/../../build_paths.inc
 
 SCRIPT_DIRECTORY=`dirname $0`
-$BUILD_DIR/ubuntu-ui-toolkit-launcher/ubuntu-ui-toolkit-launcher $@ $SCRIPT_DIRECTORY/ubuntu-ui-toolkit-gallery.qml
+QT_LOGGING_CONF=$SCRIPT_DIRECTORY/gallery-logging.config $BUILD_DIR/ubuntu-ui-toolkit-launcher/ubuntu-ui-toolkit-launcher $@ $SCRIPT_DIRECTORY/ubuntu-ui-toolkit-gallery.qml
 
=== added file 'examples/ubuntu-ui-toolkit-gallery/gallery-logging.config'
--- examples/ubuntu-ui-toolkit-gallery/gallery-logging.config	1970-01-01 00:00:00 +0000
+++ examples/ubuntu-ui-toolkit-gallery/gallery-logging.config	2015-11-24 12:22:14 +0000
@@ -0,0 +1,4 @@
+[Rules]
+libubuntugestures.TouchRegistry.debug=false
+ubuntu.components.SwipeArea.debug=false
+ubuntu.components.SwipeArea.ActiveTouchInfo.debug=false
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.pro'
--- examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.pro	2015-06-15 08:53:40 +0000
+++ examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.pro	2015-11-24 12:22:14 +0000
@@ -10,7 +10,8 @@
   OTHER_FILES += *.$$filetype
 }
 
-OTHER_FILES += gallery
+OTHER_FILES += gallery \
+               gallery-logging.config
 
 desktop_files.path = $$[QT_INSTALL_EXAMPLES]/ubuntu-ui-toolkit/examples/ubuntu-ui-toolkit-gallery
 desktop_files.files = ubuntu-ui-toolkit-gallery.desktop
 
=== modified file 'export_modules_dir.sh'
--- export_modules_dir.sh	2015-05-19 07:55:27 +0000
+++ export_modules_dir.sh	2015-11-24 12:22:14 +0000
@@ -19,6 +19,8 @@
 export QML_IMPORT_PATH=$BUILD_DIR/qml
 export QML2_IMPORT_PATH=$BUILD_DIR/qml
 export UBUNTU_UI_TOOLKIT_THEMES_PATH=$BUILD_DIR/qml
+export LD_LIBRARY_PATH=$BUILD_DIR/lib
 /sbin/initctl set-env --global QML_IMPORT_PATH=$BUILD_DIR/qml
 /sbin/initctl set-env --global QML2_IMPORT_PATH=$BUILD_DIR/qml
 /sbin/initctl set-env --global UBUNTU_UI_TOOLKIT_THEMES_PATH=$BUILD_DIR/qml
+/sbin/initctl set-env --global LD_LIBRARY_PATH=$BUILD_DIR/lib
 
=== modified file 'features/ubuntu_qml_plugin.prf'
--- features/ubuntu_qml_plugin.prf	2015-08-13 09:40:00 +0000
+++ features/ubuntu_qml_plugin.prf	2015-11-24 12:22:14 +0000
@@ -36,8 +36,19 @@
     membackend.name = ALARM_BACKEND
     membackend.value = memory
 
+    #make sure qmlplugindump finds all libs
+    ld_lib_path.name  = LD_LIBRARY_PATH
+    ld_lib_path.value =
+    for(qmod, QTREPOS) {
+        qmod = $$qmod/lib
+        exists($$qmod): ld_lib_path.value += $$shell_path($$qmod)
+    }
+    ld_lib_path.value += $$shell_path($$ROOT_BUILD_DIR/lib)
+    ld_lib_path.value = $$unique(ld_lib_path.value)
+
     qtAddToolEnv(QMLPLUGINDUMP, importpath)
     qtAddToolEnv(QMLPLUGINDUMP, membackend)
+    qtAddToolEnv(QMLPLUGINDUMP, ld_lib_path)
 
     TARGETPATHBASE = $$replace(TARGETPATH, \\.\\d+\$, )
 
 
=== added file 'features/ubuntu_qt_module.prf'
--- features/ubuntu_qt_module.prf	1970-01-01 00:00:00 +0000
+++ features/ubuntu_qt_module.prf	2015-11-24 12:22:14 +0000
@@ -0,0 +1,19 @@
+!build_with_qt: {
+    #enable autocreation of include directory
+    CONFIG += git_build
+}
+
+load(qt_module)
+
+CONFIG -= create_cmake
+
+# when building against the system Qt we pick up the CXX_FLAGS for a release build
+# reset them to the default debug build flags
+!build_with_qt: {
+    CONFIG(debug, debug|release)  {
+        QMAKE_CFLAGS = $$QMAKE_CFLAGS_DEBUG
+        QMAKE_CXXFLAGS = $$QMAKE_CXXFLAGS_DEBUG
+    }
+}
+
+QMAKE_CXXFLAGS += -Werror
 
=== modified file 'src/Ubuntu/Components/1.2/DraggingArea.qml'
--- src/Ubuntu/Components/1.2/DraggingArea.qml	2015-04-30 08:32:44 +0000
+++ src/Ubuntu/Components/1.2/DraggingArea.qml	2015-11-24 12:22:14 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import "mathUtils.js" as MathLocal
+import Ubuntu.Components 1.2
 
 MouseArea {
     id: draggingArea
@@ -25,7 +25,7 @@
     property real dragVelocity: 0
     property real dragValue: (orientation == Qt.Vertical ? (mouseY - __pressedPosition.y)
                                                             : (mouseX - __pressedPosition.x))
-    property real lateralPosition: orientation == Qt.Horizontal ? MathLocal.clamp(mouseY, 0, height) : MathLocal.clamp(mouseX, 0, width)
+    property real lateralPosition: orientation == Qt.Horizontal ? MathUtils.clamp(mouseY, 0, height) : MathUtils.clamp(mouseX, 0, width)
     property point __pressedPosition: Qt.point(0, 0)
     property var __dragEvents: []
     property bool clickValidated: true
 
=== modified file 'src/Ubuntu/Components/1.2/MainViewBase.qml'
--- src/Ubuntu/Components/1.2/MainViewBase.qml	2015-04-30 08:32:44 +0000
+++ src/Ubuntu/Components/1.2/MainViewBase.qml	2015-11-24 12:22:14 +0000
@@ -48,12 +48,12 @@
 
           Qt bug: https://bugreports.qt-project.org/browse/QTBUG-11712
          */
-        property string theme: (ColorUtils.luminance(backgroundColor) >= 0.85) ?
+        property string themeName: (ColorUtils.luminance(backgroundColor) >= 0.85) ?
                                    "Ambiance" : "SuruDark"
-        onThemeChanged: {
+        onThemeNameChanged: {
             // only change the theme if the current one is a system one.
-            if (theme !== "" && (Theme.name.search("Ubuntu.Components.Themes") >= 0)) {
-                Theme.name = "Ubuntu.Components.Themes.%1".arg(theme);
+            if (themeName !== "" && (Theme.name.search("Ubuntu.Components.Themes") >= 0)) {
+                Theme.name = "Ubuntu.Components.Themes.%1".arg(themeName);
             }
         }
     }
 
=== modified file 'src/Ubuntu/Components/1.2/Slider.qml'
--- src/Ubuntu/Components/1.2/Slider.qml	2015-04-30 08:32:44 +0000
+++ src/Ubuntu/Components/1.2/Slider.qml	2015-11-24 12:22:14 +0000
@@ -17,7 +17,6 @@
 // FIXME(loicm) Add support for keyboard shortcuts (basically left/right).
 
 import QtQuick 2.4
-import "mathUtils.js" as MathUtils
 import Ubuntu.Components 1.2
 
 /*!
 
=== modified file 'src/Ubuntu/Components/1.2/TextArea.qml'
--- src/Ubuntu/Components/1.2/TextArea.qml	2015-04-30 08:32:44 +0000
+++ src/Ubuntu/Components/1.2/TextArea.qml	2015-11-24 12:22:14 +0000
@@ -17,7 +17,6 @@
 import QtQuick 2.4
 import Ubuntu.Components 1.2 as Ubuntu
 import Ubuntu.Components.Popups 1.0
-import "mathUtils.js" as MathUtils
 
 /*!
     \qmltype TextArea
@@ -767,7 +766,7 @@
                 var max = (control.maximumLineCount <= 0) ?
                             control.lineCount :
                             Math.min(control.maximumLineCount, control.lineCount);
-                control.height = linesHeight(MathUtils.clamp(control.lineCount, 1, max));
+                control.height = linesHeight(Ubuntu.MathUtils.clamp(control.lineCount, 1, max));
             }
         }
     }
 
=== removed file 'src/Ubuntu/Components/1.2/mathUtils.js'
--- src/Ubuntu/Components/1.2/mathUtils.js	2015-07-17 14:42:26 +0000
+++ src/Ubuntu/Components/1.2/mathUtils.js	1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-/*
- * Copyright 2012 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/>.
- */
-
-/*!
-  \qmltype mathUtils
-  \inqmlmodule Ubuntu.Components 1.2
-  \ingroup ubuntu
-  \brief Various mathematical utility functions.
- */
-
-.pragma library
-
-/*!
-  \qmlmethod clamp(x, min, max)
-  Ensure the value x is between min and max
- */
-function clamp(x, min, max) {
-    if (min <= max) {
-        return Math.max(min, Math.min(x, max));
-    } else {
-        // swap min/max if min > max
-        return clamp(x, max, min);
-    }
-}
-
-/*!
-  \qmlmethod lerp(delta, from, to)
-  Get the linear interpolation
- */
-function lerp(delta, from, to) {
-    return ((1.0 - delta) * from) + (delta * to);
-}
-
-/*!
-  \qmlmethod getFlickableChild(item)
-  Linearly project a value x from [xmin, xmax] into [ymin, ymax]
- */
-function projectValue(x, xmin, xmax, ymin, ymax) {
-    return ((x - xmin) * ymax - (x - xmax) * ymin) / (xmax - xmin)
-}
-
-/*!
-  \qmlmethod clampAndProject(x, xmin, xmax, ymin, ymax)
-  Linearly project a value x, but in addition to projectValue it's clamped to xmin/xmax first
- */
-function clampAndProject(x, xmin, xmax, ymin, ymax) {
-    return projectValue(clamp(x, xmin, xmax), xmin, xmax, ymin, ymax)
-}
 
=== removed file 'src/Ubuntu/Components/1.2/scrollbarUtils.js'
--- src/Ubuntu/Components/1.2/scrollbarUtils.js	2015-04-30 08:32:44 +0000
+++ src/Ubuntu/Components/1.2/scrollbarUtils.js	1970-01-01 00:00:00 +0000
@@ -1,129 +0,0 @@
-/*
- * Copyright 2012 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/>.
- */
-
-.pragma library
-
-Qt.include("mathUtils.js")
-
-/*!
-  \internal
-  Object storing property names used in calculations.
-  */
-var _obj = {
-    scrollbar: null,
-    vertical: false,
-    propOrigin: "",
-    propContent: "",
-    propPosRatio: "",
-    propSizeRatio: "",
-    propCoordinate: "",
-    propSize: "",
-    refresh: function () {
-        _obj.vertical = (_obj.scrollbar.align === Qt.AlignLeading) || (_obj.scrollbar.align === Qt.AlignTrailing)
-        _obj.propOrigin = (_obj.vertical) ? "originY" : "originX";
-        _obj.propContent = (_obj.vertical) ? "contentY" : "contentX";
-        _obj.propPosRatio = (_obj.vertical) ? "yPosition" : "xPosition";
-        _obj.propSizeRatio = (_obj.vertical) ? "heightRatio" : "widthRatio";
-        _obj.propCoordinate = (_obj.vertical) ? "y" : "x";
-        _obj.propSize = (_obj.vertical) ? "height" : "width";
-    }
-}
-
-/*!
-  \internal
-  Checks whether the _obj is valid or not. Must be called in every function
-  as those can be invoked prior to the host (style) component completion.
-  */
-function __check(sb) {
-    if (sb !== null && (_obj.scrollbar !== sb)) {
-        _obj.scrollbar = sb;
-        sb.flickableItemChanged.connect(_obj.refresh);
-        sb.alignChanged.connect(_obj.refresh);
-        _obj.refresh();
-    }
-
-    return _obj.scrollbar;
-}
-
-/*!
-  Returns whether the scrollbar is vertical or horizontal.
-  */
-function isVertical(scrollbar) {
-    if (!__check(scrollbar)) return 0;
-    return _obj.vertical;
-}
-
-/*!
-  Calculates the slider position based on the visible area's ratios.
-  */
-function sliderPos(scrollbar, min, max) {
-    if (!__check(scrollbar)) return 0;
-    return clamp(scrollbar.flickableItem.visibleArea[_obj.propPosRatio] * scrollbar.flickableItem[_obj.propSize], min, max);
-}
-
-/*!
-  Calculates the slider size for ListViews based on the visible area's position
-  and size ratios, clamping it between min and max.
-
-  The function can be used in Scrollbar styles to calculate the size of the slider.
-  */
-function sliderSize(scrollbar, min, max) {
-    if (!__check(scrollbar)) return 0;
-    var sizeRatio = scrollbar.flickableItem.visibleArea[_obj.propSizeRatio];
-    var posRatio = scrollbar.flickableItem.visibleArea[_obj.propPosRatio];
-    var sizeUnderflow = (sizeRatio * max) < min ? min - (sizeRatio * max) : 0
-    var startPos = posRatio * (max - sizeUnderflow)
-    var endPos = (posRatio + sizeRatio) * (max - sizeUnderflow) + sizeUnderflow
-    var overshootStart = startPos < 0 ? -startPos : 0
-    var overshootEnd = endPos > max ? endPos - max : 0
-
-    // overshoot adjusted start and end
-    var adjustedStartPos = startPos + overshootStart
-    var adjustedEndPos = endPos - overshootStart - overshootEnd
-
-    // final position and size of thumb
-    var position = adjustedStartPos + min > max ? max - min : adjustedStartPos
-    var result = (adjustedEndPos - position) < min ? min : (adjustedEndPos - position)
-
-    return result;
-}
-
-/*!
-  The function calculates and clamps the position to be scrolled to the minimum
-  and maximum values.
-
-  The scroll and drag functions require a slider that does not have any minimum
-  size set (meaning the minimum is set to 0.0). Implementations should consider
-  using an invisible cursor to drag the slider and the ListView position.
-  */
-function scrollAndClamp(scrollbar, amount, min, max) {
-    if (!__check(scrollbar)) return 0;
-    return scrollbar.flickableItem[_obj.propOrigin] +
-            clamp(scrollbar.flickableItem[_obj.propContent] - scrollbar.flickableItem[_obj.propOrigin] + amount,
-                  min, max);
-}
-
-/*!
-  The function calculates the new position of the dragged slider. The amount is
-  relative to the contentSize, which is either the flickable's contentHeight or
-  contentWidth or other calculated value, depending on its orientation. The pageSize
-  specifies the visibleArea, and it is usually the heigtht/width of the scrolling area.
-  */
-function dragAndClamp(scrollbar, cursor, contentSize, pageSize) {
-    if (!__check(scrollbar)) return 0;
-    scrollbar.flickableItem[_obj.propContent] =
-            scrollbar.flickableItem[_obj.propOrigin] + cursor[_obj.propCoordinate] * contentSize / pageSize;
-}
 
=== modified file 'src/Ubuntu/Components/1.3/AdaptivePageLayout.qml'
--- src/Ubuntu/Components/1.3/AdaptivePageLayout.qml	2015-10-14 15:44:15 +0000
+++ src/Ubuntu/Components/1.3/AdaptivePageLayout.qml	2015-11-24 12:22:14 +0000
@@ -166,6 +166,11 @@
   and the preferred width is set to 40 grid units. This width is set every time
   the layout is activated.
 
+  When a \l Page with the \l Page::header property set is added to an
+  AdaptivePageLayout, the AdaptivePageLayout will synchronize the height of that
+  header with the height of the headers in other columns, i.e., the height of
+  each of the headers will be set to the maximum implicitHeight of all the headers.
+
   \sa PageStack, PageColumnsLayout, PageColumn
 */
 
@@ -452,7 +457,17 @@
             // replace page holder's child
             var holder = body.children[targetColumn];
             holder.detachCurrentPage();
-            holder.attachPage(pageWrapper);
+            holder.attachPage(pageWrapper); // sets pageWrapper.pageHolder
+
+            // set the back action for Page.header:
+            var page = pageWrapper.object;
+            if (page && page.hasOwnProperty("header") && page.header &&
+                    page.header.hasOwnProperty("navigationActions")) {
+                // Page.header is an instance of PageHeader.
+                var backAction = backActionComponent.createObject(
+                            pageWrapper, { 'wrapper': pageWrapper } );
+                page.header.navigationActions = [ backAction ] ;
+            }
         }
 
         function getWrapper(page) {
@@ -644,6 +659,42 @@
         }
     }
 
+    // An instance will be added to each Page with
+    Component {
+        id: backActionComponent
+
+        Action {
+            // used when the Page has a Page.header property set.
+            id: backAction
+            objectName: "apl_back_action"
+            iconName: "back"
+            text: "Back"
+
+            // set when backAction is created.
+            property PageWrapper wrapper
+            onTriggered: layout.removePages(wrapper.object)
+
+            visible: {
+                var parentWrapper;
+                try {
+                    parentWrapper = d.tree.parent(wrapper);
+                } catch(err) {
+                    // Root node has no parent node.
+                    return false;
+                }
+                if (!wrapper.pageHolder) {
+                    // columns are being re-arranged.
+                    return false;
+                }
+                // wrapper.column is the virtual column, pageHolder.column the actual column.
+                var column = wrapper.pageHolder.column;
+                var nextInColumn = d.tree.top(column, column < d.columns - 1, 1);
+                return parentWrapper === nextInColumn;
+            }
+        }
+    }
+
+
     // Page holder component, can have only one Page as child at a time, all stacked pages
     // will be parented into hiddenPool
     Component {
@@ -670,6 +721,15 @@
             property var page: pageWrapper ? pageWrapper.object : null
             property bool customHeader: page && page.hasOwnProperty("header") &&
                                         page.header
+            onPageChanged: body.updateHeaderHeight(0)
+            Connections {
+                target: page
+                onHeaderChanged: body.updateHeaderHeight(0)
+            }
+            Connections {
+                target: page ? page.header : null
+                onImplicitHeightChanged: body.updateHeaderHeight(page.header.implicitHeight)
+            }
 
             // prevent the pages from taking the app header height into account.
             __propagated: null
@@ -692,6 +752,8 @@
                 }
             }
 
+            // subHeader is to be deprecated in UITK 1.4 and will be replaced
+            //  by the Page.header property (introduced in 1.3).
             property alias head: subHeader
             StyledItem {
                 id: subHeader
@@ -703,7 +765,6 @@
                 height: body.headerHeight
 
                 styleName: "PageHeadStyle"
-                theme.version: Ubuntu.toolkitVersion
                 objectName: "Header" + column
 
                 property real preferredHeight: subHeader.__styleInstance ?
@@ -795,8 +856,8 @@
                 onXChanged: holder.Layout.preferredWidth = x
             }
 
-            function attachPage(page) {
-                pageWrapper = page;
+            function attachPage(wrapper) {
+                pageWrapper = wrapper;
                 pageWrapper.parent = holderBody;
                 pageWrapper.pageHolder = holder;
                 pageWrapper.active = true;
@@ -854,17 +915,32 @@
         property real headerHeight: 0
 
         function updateHeaderHeight(newHeight) {
+            var page;
+            var i;
             if (newHeight > body.headerHeight) {
                 body.headerHeight = newHeight;
             } else {
                 var h = 0;
                 var subHeight = 0;
-                for (var i = 0; i < children.length; i++) {
-                    subHeight = children[i].head.preferredHeight;
+                for (i = 0; i < children.length; i++) {
+                    page = children[i].page;
+                    if (page && page.hasOwnProperty("header") && page.header) {
+                        subHeight = page.header.implicitHeight;
+                    } else {
+                        subHeight = children[i].head.preferredHeight;
+                    }
                     if (subHeight > h) h = subHeight;
                 }
                 body.headerHeight = h;
             }
+
+            // Update all the Page.header heights.
+            for (i = 0; i < body.children.length; i++) {
+                page = body.children[i].page;
+                if (page && page.hasOwnProperty("header") && page.header) {
+                    page.header.height = headerHeight;
+                }
+            }
         }
 
         onChildrenChanged: {
 
=== modified file 'src/Ubuntu/Components/1.3/AnimatedItem.qml'
--- src/Ubuntu/Components/1.3/AnimatedItem.qml	2015-04-25 08:54:58 +0000
+++ src/Ubuntu/Components/1.3/AnimatedItem.qml	2015-11-24 12:22:14 +0000
@@ -25,14 +25,13 @@
 */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.3 as Toolkit
+import Ubuntu.Components 1.3
 
-Toolkit.StyledItem {
+StyledItem {
     id: root
     /*!
       \deprecated
       Specifies whether the component is on the visible area of the Flickable or not.
     */
-    theme.version: Toolkit.Ubuntu.toolkitVersion
     property bool onScreen: true
 }
 
=== modified file 'src/Ubuntu/Components/1.3/AppHeader.qml'
--- src/Ubuntu/Components/1.3/AppHeader.qml	2015-10-01 21:23:04 +0000
+++ src/Ubuntu/Components/1.3/AppHeader.qml	2015-11-24 12:22:14 +0000
@@ -151,6 +151,5 @@
         }
     }
 
-    theme.version: Components.Ubuntu.toolkitVersion
     styleName: "PageHeadStyle"
 }
 
=== removed file 'src/Ubuntu/Components/1.3/BottomEdgeHint.qml'
--- src/Ubuntu/Components/1.3/BottomEdgeHint.qml	2015-09-21 14:44:13 +0000
+++ src/Ubuntu/Components/1.3/BottomEdgeHint.qml	1970-01-01 00:00:00 +0000
@@ -1,155 +0,0 @@
-/*
- * 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
-
-/*!
-    \qmlabstract BottomEdgeHint
-    \inqmlmodule Ubuntu.Components 1.3
-    \ingroup ubuntu
-    \brief The BottomEdgeHint shows the availability of extra features
-    available from the bottom edge of the application.
-
-    It displays either a label or an icon at the bottom of the application.
-
-    It has 2 states: hidden or visible. When hidden, part of it is still visible
-    to hint at the existence of the bottom edge.
-
-    When used with a mouse it acts like a button. The typical action associated
-    with clicking on it should be revealing the extra features provided by the
-    bottom edge.
-
-    Example:
-    \qml
-    BottomEdgeHint {
-        id: bottomEdgeHint
-        text: i18n.tr("Favorites")
-        onClicked: revealBottomEdge()
-    }
-    \endqml
-
-*/
-Item {
-    id: bottomEdgeHint
-
-    anchors {
-        bottom: parent.bottom
-        bottomMargin: bottomEdgeHint.state == "Hidden" ? -bottomEdgeHint.height + units.gu(1.5) : 0
-        horizontalCenter: parent.horizontalCenter
-        Behavior on bottomMargin { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }
-    }
-
-    width: label.paintedWidth + units.gu(7)
-    height: units.gu(4)
-
-    /*!
-       This handler is called when there is a mouse click on the BottomEdgeHint
-       and the BottomEdgeHint is not disabled.
-    */
-    signal clicked()
-
-    Keys.onEnterPressed: clicked()
-    Keys.onReturnPressed: clicked()
-
-    /*!
-      The label displayed by the BottomEdgeHint.
-     */
-    property string text
-
-    /*!
-      The icon displayed by the BottomEdgeHint.
-
-      This is the URL of any image file.
-      If both iconSource and iconName are defined, iconName will be ignored.
-     */
-    property url iconSource: iconName ? "image://theme/" + iconName : ""
-
-    /*!
-      The icon associated with the BottomEdgeHint in the icon theme.
-
-      If both iconSource and iconName are defined, iconName will be ignored.
-     */
-    property string iconName
-
-    /*!
-      BottomEdgeHint can take 2 states of visibility: "Hidden" and "Visible".
-
-      When "Visible", the full hint with its content is shown.
-
-      When "Hidden", only part of the hint is visible leaving more space for application content.
-     */
-    property string state: "Visible"
-
-    MouseArea {
-        id: mouseArea
-        anchors.fill: parent
-        hoverEnabled: true
-        onEntered: bottomEdgeHint.state = "Visible"
-        onClicked: {
-            Haptics.play();
-            bottomEdgeHint.clicked();
-            mouse.accepted = false;
-        }
-    }
-
-    clip: true
-
-    UbuntuShape {
-        id: background
-
-        anchors {
-            bottom: parent.bottom
-            horizontalCenter: bottomEdgeHint.horizontalCenter
-            bottomMargin: -units.gu(1)
-        }
-
-        width: bottomEdgeHint.width - 2 * hoverExpansion
-        height: bottomEdgeHint.height + units.gu(1) - hoverExpansion
-
-        property real hoverExpansion: mouseArea.containsMouse ? 0 : units.gu(0.5)
-        Behavior on hoverExpansion { UbuntuNumberAnimation { duration: UbuntuAnimation.FastDuration } }
-
-        backgroundColor: theme.palette.normal.overlay
-    }
-
-    Label {
-        id: label
-
-        anchors {
-            top: parent.top
-            horizontalCenter: parent.horizontalCenter
-        }
-        text: icon.name ? "" : bottomEdgeHint.text
-        textSize: Label.Medium
-        height: bottomEdgeHint.height
-        verticalAlignment: Text.AlignVCenter
-        horizontalAlignment: Text.AlignHCenter
-    }
-
-    Icon {
-        id: icon
-
-        name: bottomEdgeHint.iconName
-        anchors {
-            bottom: parent.bottom
-            bottomMargin: units.gu(0.5)
-            horizontalCenter: parent.horizontalCenter
-        }
-        width: height
-        height: units.gu(2)
-    }
-}
 
=== modified file 'src/Ubuntu/Components/1.3/Button.qml'
--- src/Ubuntu/Components/1.3/Button.qml	2015-08-20 06:56:44 +0000
+++ src/Ubuntu/Components/1.3/Button.qml	2015-11-24 12:22:14 +0000
@@ -121,6 +121,5 @@
     */
     property string iconPosition: "left"
 
-    theme.version: Ubuntu.toolkitVersion
     styleName: "ButtonStyle"
 }
 
=== modified file 'src/Ubuntu/Components/1.3/CheckBox.qml'
--- src/Ubuntu/Components/1.3/CheckBox.qml	2015-09-16 16:58:51 +0000
+++ src/Ubuntu/Components/1.3/CheckBox.qml	2015-11-24 12:22:14 +0000
@@ -49,6 +49,5 @@
      */
     onTriggered: checked = !checked
 
-    theme.version: Ubuntu.toolkitVersion
     styleName: "CheckBoxStyle"
 }
 
=== modified file 'src/Ubuntu/Components/1.3/OptionSelector.qml'
--- src/Ubuntu/Components/1.3/OptionSelector.qml	2015-09-07 10:05:58 +0000
+++ src/Ubuntu/Components/1.3/OptionSelector.qml	2015-11-24 12:22:14 +0000
@@ -225,7 +225,6 @@
                 right: parent.right
             }
             state: optionSelector.expanded ? "expanded" : "collapsed"
-            theme.version: Toolkit.Ubuntu.toolkitVersion
             styleName: "OptionSelectorStyle"
             states: [ State {
                     name: "expanded"
 
=== removed file 'src/Ubuntu/Components/1.3/Page.qdoc'
--- src/Ubuntu/Components/1.3/Page.qdoc	2015-04-25 08:54:58 +0000
+++ src/Ubuntu/Components/1.3/Page.qdoc	1970-01-01 00:00:00 +0000
@@ -1,132 +0,0 @@
-/*
- * Copyright 2014 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/>.
- */
-
-/*!
-    \qmltype Page
-    \inqmlmodule Ubuntu.Components 1.1
-    \ingroup ubuntu
-    \brief A page is the basic Item that must be used inside the \l MainView,
-        \l PageStack and \l Tabs.
-        Anchors and height of a Page are automatically determined to align with
-        the header of the \l MainView, but can be overridden.
-
-    \l MainView provides a header for Pages it includes.
-    The text and actions of the header are determined by the \l title
-    and \l head properties of the page:
-
-    \qml
-        import QtQuick 2.4
-        import Ubuntu.Components 1.2
-
-        MainView {
-            width: units.gu(48)
-            height: units.gu(60)
-
-            Page {
-                title: i18n.tr("Example page")
-
-                Label {
-                    anchors.centerIn: parent
-                    text: i18n.tr("Hello world!")
-                }
-
-                head.actions: [
-                    Action {
-                        iconName: "search"
-                        text: i18n.tr("Search")
-                    },
-                    Action {
-                        iconName: "contacts"
-                        text: i18n.tr("Contacts")
-                    }
-                ]
-            }
-        }
-    \endqml
-    See \l MainView for more examples on how to use the header.
-    Advanced navigation structures can be created by adding Pages to a \l PageStack or \l Tabs.
-
-    The Page automatically anchors to the left and bottom of its parent. The width of the Page
-    will be the full width of its parent \l MainView or \l PageStack or \l Tab,
-    and the height will adapt to leave space for the header when needed. It is possible to
-    use a Page inside a Loader, but in that case do not set the anchors or size of the Loader
-    so that the Page can control its width and height.
-*/
-
-/*!
-    \qmlproperty string Page::title
-    The title of the page. Will be shown in the header of the \l MainView.
-    If the page is used inside a \l Tab, the default title is the \l Tab title.
-    For a Page not inside a \l Tab, the default title is an empty string.
- */
-
-/*!
-    \qmlproperty Item Page::tools
-    \deprecated
-    The toolbar items associated with this Page.
-    DEPRECATED. Use \b head.actions instead.
- */
-
-/*!
-  \qmlproperty PageHeadConfiguration Page::head
-  \readonly
-  Configuration of the header for this page.
- */
-
-/*!
-    \qmlproperty Flickable Page::flickable
-    Optional flickable that controls the header. This property
-    is automatically set to the first child of the page that is Flickable
-    and anchors to the top of the page or fills the page. For example:
-    \qml
-        import QtQuick 2.4
-        import Ubuntu.Components 1.2
-
-        MainView {
-            width: units.gu(30)
-            height: units.gu(50)
-            Page {
-                id: page
-                title: "example"
-                //flickable: null // uncomment for a fixed header
-                Flickable {
-                    id: content
-                    anchors.fill: parent
-                    contentHeight: units.gu(70)
-                    Label {
-                        text: "hello"
-                        anchors.centerIn: parent
-                    }
-                }
-            }
-        }
-    \endqml
-    In this example, page.flickable will automatically be set to content because it is
-    a Flickable and it fills its parent. Thus, scrolling down in the Flickable will automatically
-    hide the header.
-
-    Set this property to null to avoid automatic flickable detection, which disables hiding
-    of the header by scrolling in the Flickable. In cases where a flickable should control the header,
-    but it is not automatically detected, the flickable property can be set.
- */
-
-/*!
-    \qmlproperty list<Action> Page::actions
-    Local actions. These actions will be made available outside the application
-    (for example, to HUD) when the Page is active. For actions that are always available
-    when the application is running, use the actions property of \l MainView.
-    For actions in the header, see \l head.
-*/
 
=== modified file 'src/Ubuntu/Components/1.3/Page.qml'
--- src/Ubuntu/Components/1.3/Page.qml	2015-10-15 10:07:59 +0000
+++ src/Ubuntu/Components/1.3/Page.qml	2015-11-24 12:22:14 +0000
@@ -19,8 +19,55 @@
 import "pageUtils.js" as Utils
 
 /*!
-  \internal
-  Documentation is in Page.qdoc
+    \qmltype Page
+    \inqmlmodule Ubuntu.Components 1.1
+    \ingroup ubuntu
+    \brief A page is the basic Item that must be used inside the \l MainView,
+        \l PageStack and \l Tabs.
+        Anchors and height of a Page are automatically determined to align with
+        the header of the \l MainView, but can be overridden.
+
+
+    \l MainView provides a header for Pages it includes if no
+    \l header property was set.
+    The text and actions of the header are determined by the \l title
+    and \l head properties of the page:
+
+    \qml
+        import QtQuick 2.4
+        import Ubuntu.Components 1.2
+
+        MainView {
+            width: units.gu(48)
+            height: units.gu(60)
+
+            Page {
+                title: i18n.tr("Example page")
+
+                Label {
+                    anchors.centerIn: parent
+                    text: i18n.tr("Hello world!")
+                }
+
+                head.actions: [
+                    Action {
+                        iconName: "search"
+                        text: i18n.tr("Search")
+                    },
+                    Action {
+                        iconName: "contacts"
+                        text: i18n.tr("Contacts")
+                    }
+                ]
+            }
+        }
+    \endqml
+
+    The Page automatically anchors to the left and bottom of its parent. The width of the Page
+    will be the full width of its parent \l MainView or \l PageStack or \l Tab,
+    and the height will adapt to leave space for the header when needed. It is possible to
+    use a Page inside a Loader, but in that case do not set the anchors or size of the Loader
+    so that the Page can control its width and height.
 */
 PageTreeNode {
     id: page
@@ -35,13 +82,13 @@
 
     /*!
       The header property for this page. Setting this property will reparent the
-      header to the page and disable the \l Mainview's application header.
+      header to the page and disable the \l MainView's application header.
       \qml
         Page {
             id: page
             title: "Page with header"
             header: PageHeader {
-                title: page.header
+                title: page.title
                 trailingActionBar.actions: [
                     Action { iconName: "settings" },
                     Action { iconName: "info" }
@@ -49,17 +96,65 @@
             }
         }
       \endqml
+      \sa PageHeader
      */
     property Item header
     onHeaderChanged: internal.updateHeader()
     Component.onCompleted: internal.updateHeader()
 
+    /*! \internal */
     isLeaf: true
+
+    /*!
+      The title of the page. Will be shown in the header of the \l MainView.
+      If the page is used inside a \l Tab, the default title is the \l Tab title.
+      For a Page not inside a \l Tab, the default title is an empty string.
+     */
     property string title: parentNode && parentNode.hasOwnProperty("title") ? parentNode.title : ""
+
+    /*!
+      Optional flickable that controls the MainView header. This property
+      is automatically set to the first child of the page that is Flickable
+      and anchors to the top of the page or fills the page. For example:
+      \qml
+          import QtQuick 2.4
+          import Ubuntu.Components 1.2
+
+          MainView {
+              width: units.gu(30)
+              height: units.gu(50)
+              Page {
+                  id: page
+                  title: "example"
+                  //flickable: null // uncomment for a fixed header
+                  Flickable {
+                      id: content
+                      anchors.fill: parent
+                      contentHeight: units.gu(70)
+                      Label {
+                          text: "hello"
+                          anchors.centerIn: parent
+                      }
+                  }
+              }
+          }
+      \endqml
+      In this example, page.flickable will automatically be set to content because it is
+      a Flickable and it fills its parent. Thus, scrolling down in the Flickable will automatically
+      hide the header.
+
+      Set this property to null to avoid automatic flickable detection, which disables hiding
+      of the header by scrolling in the Flickable. In cases where a flickable should control the header,
+      but it is not automatically detected, the flickable property can be set.
+     */
     property Flickable flickable: Utils.getFlickableChild(page)
 
     /*!
-      \qmlproperty PageHeadConfiguration head
+      \qmlproperty PageHeadConfiguration Page::head
+      \readonly
+      \deprecated
+      Configuration of the header for this page.
+      Deprecated: This configuration will be replaced by setting the \l header property.
      */
     readonly property alias head: headerConfig
     Toolkit13.PageHeadConfiguration {
 
=== modified file 'src/Ubuntu/Components/1.3/PageHeader.qml'
--- src/Ubuntu/Components/1.3/PageHeader.qml	2015-10-15 14:17:25 +0000
+++ src/Ubuntu/Components/1.3/PageHeader.qml	2015-11-24 12:22:14 +0000
@@ -40,8 +40,8 @@
 Header {
     id: header
     anchors {
-        left: parent.left
-        right: parent.right
+        left: parent ? parent.left : undefined
+        right: parent ? parent.right : undefined
     }
 
     /*!
@@ -109,9 +109,25 @@
                 titleLoader.sourceComponent = __styleInstance.titleComponent;
             }
         }
+
+        // When the style changes, make sure that the titleLoader loads
+        //  the new titleComponent.
+        property Item styleInstance: __styleInstance
+        onStyleInstanceChanged: updateContents()
     }
 
     /*!
+      The actions to be shown in the leading action bar.
+      This property is automatically set by the
+      \l AdaptivePageLayout and other navigation components to configure the
+      back action for the \l Page.
+      Application developers should not set this property, because the
+      value may be overridden by Ubuntu components that have navigation.
+      Instead, set \l leadingActionBar's actions property.
+     */
+    property list<Action> navigationActions
+
+    /*!
       \qmlproperty ActionBar leadingActionBar
       The \l ActionBar for the leading navigation actions.
       Example:
@@ -125,6 +141,9 @@
           ]
       }
       \endqml
+      The default value of \l leadingActionBar actions is
+      \l navigationActions, but that value can be changed to show
+      different actions in front of the title.
       See \l ActionBar.
      */
     readonly property alias leadingActionBar: leading
@@ -138,7 +157,8 @@
         height: header.__styleInstance.contentHeight
         numberOfSlots: 1
         delegate: header.__styleInstance.defaultActionDelegate
-        visible: actions.length > 0
+        actions: header.navigationActions
+        visible: leading.width > 0 // at least 1 visible action
         StyleHints {
             overflowIconName: "navigation-menu"
         }
@@ -182,7 +202,7 @@
         height: header.__styleInstance.contentHeight
         numberOfSlots: 3
         delegate: header.__styleInstance.defaultActionDelegate
-        visible: actions.length > 0
+        visible: trailing.width > 0 // at least 1 visible action
     }
 
     /*!
@@ -203,6 +223,5 @@
         height: visible ? implicitHeight : 0
     }
 
-    theme.version: Ubuntu.toolkitVersion
     styleName: "PageHeaderStyle"
 }
 
=== modified file 'src/Ubuntu/Components/1.3/PageStack.qml'
--- src/Ubuntu/Components/1.3/PageStack.qml	2015-07-10 07:42:38 +0000
+++ src/Ubuntu/Components/1.3/PageStack.qml	2015-11-24 12:22:14 +0000
@@ -16,6 +16,7 @@
 
 import QtQuick 2.4
 import "../1.2/stack.js" as Stack
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype PageStack
@@ -171,6 +172,13 @@
         } else {
             internal.pushWrapperObject();
         }
+        // set the back action for Page.header:
+        if (pageObject && pageObject.hasOwnProperty("header") && pageObject.header &&
+                pageObject.header.hasOwnProperty("navigationActions")) {
+            // Page.header is an instance of PageHeader.
+            pageObject.header.navigationActions = [ backAction ];
+        }
+
         return pageObject;
     }
 
@@ -206,6 +214,16 @@
         internal.stackUpdated();
     }
 
+    Action {
+        // used when the Page has a Page.header property set.
+        id: backAction
+        visible: pageStack.depth > 0
+        iconName: "back"
+        text: "Back"
+        onTriggered: pageStack.pop()
+        objectName: "pagestack_back_action"
+    }
+
     QtObject {
         id: internal
         property Item headStyle: (pageStack.__propagated
 
=== modified file 'src/Ubuntu/Components/1.3/PageTreeNode.qml'
--- src/Ubuntu/Components/1.3/PageTreeNode.qml	2015-10-14 19:18:58 +0000
+++ src/Ubuntu/Components/1.3/PageTreeNode.qml	2015-11-24 12:22:14 +0000
@@ -148,6 +148,4 @@
             node.parentNode = internal.getParentPageTreeNode(node);
         }
     }
-
-    theme.version: Toolkit.Ubuntu.toolkitVersion
 }
 
=== modified file 'src/Ubuntu/Components/1.3/PageWrapper.qml'
--- src/Ubuntu/Components/1.3/PageWrapper.qml	2015-09-24 15:28:58 +0000
+++ src/Ubuntu/Components/1.3/PageWrapper.qml	2015-11-24 12:22:14 +0000
@@ -46,7 +46,7 @@
     property bool canDestroy: false
 
     /*!
-      Column number in MultiColumnView.
+      Column number in AdaptivePageLayout.
       */
     property int column: 0
 
@@ -61,7 +61,7 @@
     property Item parentWrapper
 
     /*!
-      Page holder in MultiColumnView
+      Page holder in AdaptivePageLayout.
       */
     property Item pageHolder
 
 
=== modified file 'src/Ubuntu/Components/1.3/ProgressBar.qml'
--- src/Ubuntu/Components/1.3/ProgressBar.qml	2015-05-21 10:50:35 +0000
+++ src/Ubuntu/Components/1.3/ProgressBar.qml	2015-11-24 12:22:14 +0000
@@ -70,6 +70,5 @@
     */
     property bool showProgressPercentage: true
 
-    theme.version: Ubuntu.toolkitVersion
     styleName: "ProgressBarStyle"
 }
 
=== modified file 'src/Ubuntu/Components/1.3/PullToRefresh.qml'
--- src/Ubuntu/Components/1.3/PullToRefresh.qml	2015-05-21 10:50:35 +0000
+++ src/Ubuntu/Components/1.3/PullToRefresh.qml	2015-11-24 12:22:14 +0000
@@ -222,7 +222,6 @@
       */
     signal refresh()
 
-    theme.version: Ubuntu.toolkitVersion
     styleName: "PullToRefreshStyle"
     implicitHeight: __styleInstance.implicitHeight
     anchors {
 
=== modified file 'src/Ubuntu/Components/1.3/Scrollbar.qml'
--- src/Ubuntu/Components/1.3/Scrollbar.qml	2015-05-21 10:50:35 +0000
+++ src/Ubuntu/Components/1.3/Scrollbar.qml	2015-11-24 12:22:14 +0000
@@ -146,6 +146,5 @@
         }
     }
 
-    theme.version: Toolkit.Ubuntu.toolkitVersion
     styleName: "ScrollbarStyle"
 }
 
=== modified file 'src/Ubuntu/Components/1.3/Sections.qml'
--- src/Ubuntu/Components/1.3/Sections.qml	2015-07-14 12:49:58 +0000
+++ src/Ubuntu/Components/1.3/Sections.qml	2015-11-24 12:22:14 +0000
@@ -29,7 +29,6 @@
 StyledItem {
     id: sections
     styleName: "SectionsStyle"
-    theme.version: Ubuntu.toolkitVersion
 
     /*!
       List of actions that represent the sections.
 
=== modified file 'src/Ubuntu/Components/1.3/Slider.qml'
--- src/Ubuntu/Components/1.3/Slider.qml	2015-05-21 10:50:35 +0000
+++ src/Ubuntu/Components/1.3/Slider.qml	2015-11-24 12:22:14 +0000
@@ -159,7 +159,7 @@
                 return Toolkit.MathUtils.clampAndProject(value, slider.minimumValue,
                                                  slider.maximumValue, 1.0, 0.0);
             } else {
-                return MathUtils.clampAndProject(value, slider.minimumValue,
+                return Toolkit.MathUtils.clampAndProject(value, slider.minimumValue,
                                                  slider.maximumValue, 0.0, 1.0);
             }
 
@@ -167,10 +167,10 @@
 
         function valueFromNormalizedValue(normalizedValue) {
             if (Qt.application.layoutDirection == Qt.RightToLeft) {
-                return MathUtils.lerp(MathUtils.clamp(normalizedValue, 0.0, 1.0),
+                return Toolkit.MathUtils.lerp(Toolkit.MathUtils.clamp(normalizedValue, 0.0, 1.0),
                                       slider.maximumValue, slider.minimumValue);
             } else {
-                return MathUtils.lerp(MathUtils.clamp(normalizedValue, 0.0, 1.0),
+                return Toolkit.MathUtils.lerp(Toolkit.MathUtils.clamp(normalizedValue, 0.0, 1.0),
                                       slider.minimumValue, slider.maximumValue);
             }
         }
@@ -206,6 +206,5 @@
         onLiveValueChanged: if (isPressed) slider.requestFocus(Qt.MouseFocusReason)
     }
 
-    theme.version: Toolkit.Ubuntu.toolkitVersion
     styleName: "SliderStyle"
 }
 
=== modified file 'src/Ubuntu/Components/1.3/TabBar.qml'
--- src/Ubuntu/Components/1.3/TabBar.qml	2015-05-21 10:50:35 +0000
+++ src/Ubuntu/Components/1.3/TabBar.qml	2015-11-24 12:22:14 +0000
@@ -97,7 +97,6 @@
 
     implicitHeight: units.gu(7.5)
     activeFocusOnPress: true
-    theme.version: Toolkit.Ubuntu.toolkitVersion
     styleName: "TabBarStyle"
 
     QtObject {
 
=== modified file 'src/Ubuntu/Components/1.3/TextArea.qml'
--- src/Ubuntu/Components/1.3/TextArea.qml	2015-09-07 10:05:58 +0000
+++ src/Ubuntu/Components/1.3/TextArea.qml	2015-11-24 12:22:14 +0000
@@ -886,6 +886,5 @@
         }
     }
 
-    theme.version: Ubuntu.Ubuntu.toolkitVersion
     styleName: "TextAreaStyle"
 }
 
=== modified file 'src/Ubuntu/Components/1.3/TextCursor.qml'
--- src/Ubuntu/Components/1.3/TextCursor.qml	2015-10-30 13:38:52 +0000
+++ src/Ubuntu/Components/1.3/TextCursor.qml	2015-11-24 12:22:14 +0000
@@ -41,7 +41,6 @@
                                            handler.main.cursorDelegate :
                                            __styleInstance.cursorDelegate
 
-    theme.version: Ubuntu.Ubuntu.toolkitVersion
     styleName: "TextCursorStyle"
 
     objectName: "textCursor"
 
=== modified file 'src/Ubuntu/Components/1.3/TextField.qml'
--- src/Ubuntu/Components/1.3/TextField.qml	2015-09-07 10:05:58 +0000
+++ src/Ubuntu/Components/1.3/TextField.qml	2015-11-24 12:22:14 +0000
@@ -870,6 +870,7 @@
             for (var i = 0; i < children.length; i++) {
                 children[i].parent = leftPane;
                 children[i].anchors.verticalCenter = verticalCenter;
+                children[i].activeFocusOnPress = false;
             }
         }
     }
@@ -892,6 +893,7 @@
             for (var i = 0; i < children.length; i++) {
                 children[i].parent = rightPane;
                 children[i].anchors.verticalCenter = verticalCenter;
+                children[i].activeFocusOnPress = false;
             }
         }
     }
@@ -1013,6 +1015,5 @@
         cursorPosition = 0;
     }
 
-    theme.version: Ubuntu.Ubuntu.toolkitVersion
     styleName: "TextFieldStyle"
 }
 
=== modified file 'src/Ubuntu/Components/1.3/TextInputPopover.qml'
--- src/Ubuntu/Components/1.3/TextInputPopover.qml	2015-09-16 05:28:29 +0000
+++ src/Ubuntu/Components/1.3/TextInputPopover.qml	2015-11-24 12:22:14 +0000
@@ -86,7 +86,6 @@
                 width: Math.max(units.gu(5), implicitWidth) + units.gu(2)
                 height: units.gu(6)
                 action: actions[modelData]
-                theme.version: Ubuntu.toolkitVersion
                 styleName: "ToolbarButtonStyle"
             }
         }
 
=== modified file 'src/Ubuntu/Components/1.3/Toolbar.qml'
--- src/Ubuntu/Components/1.3/Toolbar.qml	2015-05-21 10:50:35 +0000
+++ src/Ubuntu/Components/1.3/Toolbar.qml	2015-11-24 12:22:14 +0000
@@ -135,7 +135,6 @@
         property bool opened: toolbar.opened
         property bool animating: toolbar.animating
 
-        theme.version: Toolkit.Ubuntu.toolkitVersion
         styleName: "ToolbarStyle"
     }
 
 
=== modified file 'src/Ubuntu/Components/1.3/ToolbarButton.qml'
--- src/Ubuntu/Components/1.3/ToolbarButton.qml	2015-05-21 10:50:35 +0000
+++ src/Ubuntu/Components/1.3/ToolbarButton.qml	2015-11-24 12:22:14 +0000
@@ -84,6 +84,5 @@
     height: parent ? parent.height : undefined
     width: units.gu(5)
 
-    theme.version: Ubuntu.toolkitVersion
     styleName: "ToolbarButtonStyle"
 }
 
=== removed file 'src/Ubuntu/Components/1.3/mathUtils.js'
--- src/Ubuntu/Components/1.3/mathUtils.js	2015-07-24 18:25:07 +0000
+++ src/Ubuntu/Components/1.3/mathUtils.js	1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-/*
- * Copyright 2012-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/>.
- */
-
-/*!
-  \qmltype mathUtils
-  \inqmlmodule Ubuntu.Components 1.3
-  \ingroup ubuntu
-  \brief Various mathematical utility functions.
- */
-
-.pragma library
-
-/*!
-  \qmlmethod mathUtils::clamp(x, min, max)
-  Ensure the value x is between min and max
- */
-function clamp(x, min, max) {
-    if (min <= max) {
-        return Math.max(min, Math.min(x, max));
-    } else {
-        // swap min/max if min > max
-        return clamp(x, max, min);
-    }
-}
-
-/*!
-  \qmlmethod mathUtils::lerp(delta, from, to)
-  Get the linear interpolation
- */
-function lerp(delta, from, to) {
-    return ((1.0 - delta) * from) + (delta * to);
-}
-
-/*!
-  \qmlmethod mathUtils::projectValue(x, xmin, xmax, ymin, ymax)
-  Linearly project a value x from [xmin, xmax] into [ymin, ymax]
- */
-function projectValue(x, xmin, xmax, ymin, ymax) {
-    return ((x - xmin) * ymax - (x - xmax) * ymin) / (xmax - xmin)
-}
-
-/*!
-  \qmlmethod mathUtils::clampAndProject(x, xmin, xmax, ymin, ymax)
-  Linearly project a value x, but in addition to projectValue it's clamped to xmin/xmax first
- */
-function clampAndProject(x, xmin, xmax, ymin, ymax) {
-    return projectValue(clamp(x, xmin, xmax), xmin, xmax, ymin, ymax)
-}
 
=== modified file 'src/Ubuntu/Components/ComponentModule.pro'
--- src/Ubuntu/Components/ComponentModule.pro	2015-10-02 22:48:13 +0000
+++ src/Ubuntu/Components/ComponentModule.pro	2015-11-24 12:22:14 +0000
@@ -43,7 +43,6 @@
              1.2/MainView12.qml \
              1.2/MainViewBase.qml \
              1.2/MainView.qml \
-             1.2/mathUtils.js \
              1.2/Object.qml \
              1.2/OptionSelectorDelegate.qml \
              1.2/OptionSelector.qml \
@@ -60,7 +59,6 @@
              1.2/Panel.qml \
              1.2/PullToRefresh.qml \
              1.2/Scrollbar.qml \
-             1.2/scrollbarUtils.js \
              1.2/Slider.qml \
              1.2/sliderUtils.js \
              1.2/stack.js \
@@ -96,7 +94,6 @@
              1.3/InputHandler.qml \
              1.3/MainViewBase.qml \
              1.3/MainView.qml \
-             1.3/mathUtils.js \
              1.3/OptionSelectorDelegate.qml \
              1.3/OptionSelector.qml \
              1.3/OrientationHelper.qml \
@@ -132,7 +129,6 @@
              1.3/UbuntuListView.qml \
              1.3/UbuntuNumberAnimation.qml \
              1.3/ListItemPopover.qml \
-             1.3/BottomEdgeHint.qml \
              1.3/PageColumn.qml \
              1.3/PageColumnsLayout.qml \
              1.3/ProgressionSlot.qml \
@@ -141,7 +137,6 @@
 OTHER_FILES+= qmldir \
              1.3/CrossFadeImage.qdoc \
              1.3/UbuntuListView11.qdoc \
-             1.3/Page.qdoc \
              1.3/PageHeadConfiguration.qdoc \
              1.3/MainView.qdoc \
              1.3/Icon.qdoc
 
=== modified file 'src/Ubuntu/Components/ListItems/1.3/ItemSelector.qml'
--- src/Ubuntu/Components/ListItems/1.3/ItemSelector.qml	2015-05-22 13:54:38 +0000
+++ src/Ubuntu/Components/ListItems/1.3/ItemSelector.qml	2015-11-24 12:22:14 +0000
@@ -216,7 +216,6 @@
                 right: parent.right
             }
             state: itemSelector.expanded ? "expanded" : "collapsed"
-            theme.version: Ubuntu.toolkitVersion
             styleName: "ListItemOptionSelectorStyle"
 
             states: [ State {
 
=== modified file 'src/Ubuntu/Components/ListItems/1.3/ProgressionVisual.qml'
--- src/Ubuntu/Components/ListItems/1.3/ProgressionVisual.qml	2015-05-22 13:54:38 +0000
+++ src/Ubuntu/Components/ListItems/1.3/ProgressionVisual.qml	2015-11-24 12:22:14 +0000
@@ -25,6 +25,5 @@
     property bool showSplit: false
     property real splitMargin
 
-    theme.version: Ubuntu.toolkitVersion
     styleName: "ProgressionVisualStyle"
 }
 
=== modified file 'src/Ubuntu/Components/Pickers/1.3/DatePicker.qml'
--- src/Ubuntu/Components/Pickers/1.3/DatePicker.qml	2015-05-22 13:54:38 +0000
+++ src/Ubuntu/Components/Pickers/1.3/DatePicker.qml	2015-11-24 12:22:14 +0000
@@ -420,7 +420,6 @@
         }
     }
 
-    theme.version: Ubuntu.toolkitVersion
     styleName: "DatePickerStyle"
     Binding {
         target: __styleInstance
 
=== modified file 'src/Ubuntu/Components/Pickers/1.3/Dialer.qml'
--- src/Ubuntu/Components/Pickers/1.3/Dialer.qml	2015-05-22 13:54:38 +0000
+++ src/Ubuntu/Components/Pickers/1.3/Dialer.qml	2015-11-24 12:22:14 +0000
@@ -145,7 +145,6 @@
     implicitHeight: size
     activeFocusOnPress: true
 
-    theme.version: Ubuntu.toolkitVersion
     styleName: "DialerStyle"
 
     Item {
 
=== modified file 'src/Ubuntu/Components/Pickers/1.3/DialerHand.qml'
--- src/Ubuntu/Components/Pickers/1.3/DialerHand.qml	2015-05-22 13:54:38 +0000
+++ src/Ubuntu/Components/Pickers/1.3/DialerHand.qml	2015-11-24 12:22:14 +0000
@@ -143,7 +143,6 @@
     width: parent.width
     height: parent.height
     activeFocusOnPress: true
-    theme.version: Ubuntu.toolkitVersion
     styleName: "DialerHandStyle"
 
     /*! \internal */
 
=== modified file 'src/Ubuntu/Components/Pickers/1.3/Picker.qml'
--- src/Ubuntu/Components/Pickers/1.3/Picker.qml	2015-09-24 20:05:52 +0000
+++ src/Ubuntu/Components/Pickers/1.3/Picker.qml	2015-11-24 12:22:14 +0000
@@ -165,7 +165,6 @@
 
     activeFocusOnPress: true
 
-    theme.version: Ubuntu.toolkitVersion
     styleName: "PickerStyle"
 
     /*! \internal */
 
=== modified file 'src/Ubuntu/Components/Pickers/1.3/PickerDelegate.qml'
--- src/Ubuntu/Components/Pickers/1.3/PickerDelegate.qml	2015-09-24 20:05:52 +0000
+++ src/Ubuntu/Components/Pickers/1.3/PickerDelegate.qml	2015-11-24 12:22:14 +0000
@@ -45,7 +45,6 @@
         internal.itemList.currentIndex = index;
     }
 
-    theme.version: Ubuntu.toolkitVersion
     styleName: "PickerDelegateStyle"
 
     QtObject {
 
=== modified file 'src/Ubuntu/Components/Popups/1.3/Dialog.qml'
--- src/Ubuntu/Components/Popups/1.3/Dialog.qml	2015-09-21 14:44:13 +0000
+++ src/Ubuntu/Components/Popups/1.3/Dialog.qml	2015-11-24 12:22:14 +0000
@@ -213,7 +213,6 @@
             }
         }
 
-        theme.version: Ubuntu.toolkitVersion
         styleName: "DialogForegroundStyle"
     }
 }
 
=== modified file 'src/Ubuntu/Components/Popups/1.3/Popover.qml'
--- src/Ubuntu/Components/Popups/1.3/Popover.qml	2015-08-12 19:53:20 +0000
+++ src/Ubuntu/Components/Popups/1.3/Popover.qml	2015-11-24 12:22:14 +0000
@@ -241,7 +241,6 @@
         signal showCompleted()
         signal hideCompleted()
 
-        theme.version: Ubuntu.toolkitVersion
         styleName: "PopoverForegroundStyle"
     }
 
 
=== modified file 'src/Ubuntu/Components/Popups/1.3/SheetBase.qml'
--- src/Ubuntu/Components/Popups/1.3/SheetBase.qml	2015-05-22 13:54:38 +0000
+++ src/Ubuntu/Components/Popups/1.3/SheetBase.qml	2015-11-24 12:22:14 +0000
@@ -109,7 +109,6 @@
             }
         }
 
-        theme.version: Ubuntu.toolkitVersion
         styleName: "SheetForegroundStyle"
     }
 }
 
=== modified file 'src/Ubuntu/Components/Styles/Styles.pro'
--- src/Ubuntu/Components/Styles/Styles.pro	2015-10-08 21:19:56 +0000
+++ src/Ubuntu/Components/Styles/Styles.pro	2015-11-24 12:22:14 +0000
@@ -13,7 +13,3 @@
 load(ubuntu_qml_module)
 
 OTHER_FILES+=qmldir
-
-
-
-
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.2/OptionSelectorStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.2/OptionSelectorStyle.qml	2015-04-24 14:52:19 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.2/OptionSelectorStyle.qml	2015-11-24 12:22:14 +0000
@@ -20,6 +20,7 @@
 
 Item {
     id: ambianceStyle
+    objectName: "OptionSelector12"
 
     property url chevron: Qt.resolvedUrl("../artwork/chevron_down.png")
     property url tick: Qt.resolvedUrl("../artwork/tick.png")
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.2/ScrollbarStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.2/ScrollbarStyle.qml	2015-04-24 14:52:19 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.2/ScrollbarStyle.qml	2015-11-24 12:22:14 +0000
@@ -85,7 +85,7 @@
     property Flickable flickableItem: styledItem.flickableItem
     property bool isScrollable: styledItem.__private.scrollable && pageSize > 0.0
                                 && contentSize > 0.0 && contentSize > pageSize
-    property bool isVertical: ScrollbarUtils.isVertical(styledItem)
+    property bool isVertical: (styledItem.align === Qt.AlignLeading) || (styledItem.align === Qt.AlignTrailing)
     property bool frontAligned: (styledItem.align === Qt.AlignLeading)
     property bool rearAligned: (styledItem.align === Qt.AlignTrailing)
     property bool topAligned: (styledItem.align === Qt.AlignTop)
@@ -94,6 +94,83 @@
     property real pageSize: (isVertical) ? styledItem.height : styledItem.width
     property real contentSize: (isVertical) ? styledItem.flickableItem.contentHeight : styledItem.flickableItem.contentWidth
 
+    /*!
+      \internal
+      Object storing property names used in calculations.
+    */
+    QtObject {
+        id: scrollbarUtils
+
+        property string propOrigin: (isVertical) ? "originY" : "originX"
+        property string propContent: (isVertical) ? "contentY" : "contentX"
+        property string propPosRatio: (isVertical) ? "yPosition" : "xPosition"
+        property string propSizeRatio: (isVertical) ? "heightRatio" : "widthRatio"
+        property string propCoordinate: (isVertical) ? "y" : "x"
+        property string propSize: (isVertical) ? "height" : "width"
+
+        /*!
+          \internal
+          Calculates the slider position based on the visible area's ratios.
+          */
+        function sliderPos(min, max) {
+            return MathUtils.clamp(styledItem.flickableItem.visibleArea[propPosRatio] * styledItem.flickableItem[propSize], min, max);
+        }
+
+        /*!
+          \internal
+          Calculates the slider size for ListViews based on the visible area's position
+          and size ratios, clamping it between min and max.
+
+          The function can be used in Scrollbar styles to calculate the size of the slider.
+          */
+        function sliderSize(min, max) {
+            var sizeRatio = styledItem.flickableItem.visibleArea[propSizeRatio];
+            var posRatio = styledItem.flickableItem.visibleArea[propPosRatio];
+            var sizeUnderflow = (sizeRatio * max) < min ? min - (sizeRatio * max) : 0
+            var startPos = posRatio * (max - sizeUnderflow)
+            var endPos = (posRatio + sizeRatio) * (max - sizeUnderflow) + sizeUnderflow
+            var overshootStart = startPos < 0 ? -startPos : 0
+            var overshootEnd = endPos > max ? endPos - max : 0
+
+            // overshoot adjusted start and end
+            var adjustedStartPos = startPos + overshootStart
+            var adjustedEndPos = endPos - overshootStart - overshootEnd
+
+            // final position and size of thumb
+            var position = adjustedStartPos + min > max ? max - min : adjustedStartPos
+            var result = (adjustedEndPos - position) < min ? min : (adjustedEndPos - position)
+
+            return result;
+        }
+
+        /*!
+          \internal
+          The function calculates and clamps the position to be scrolled to the minimum
+          and maximum values.
+
+          The scroll and drag functions require a slider that does not have any minimum
+          size set (meaning the minimum is set to 0.0). Implementations should consider
+          using an invisible cursor to drag the slider and the ListView position.
+          */
+        function scrollAndClamp(amount, min, max) {
+            return styledItem.flickableItem[propOrigin] +
+                    MathUtils.clamp(styledItem.flickableItem[propContent] - styledItem.flickableItem[propOrigin] + amount,
+                          min, max);
+        }
+
+        /*!
+          \internal
+          The function calculates the new position of the dragged slider. The amount is
+          relative to the contentSize, which is either the flickable's contentHeight or
+          contentWidth or other calculated value, depending on its orientation. The pageSize
+          specifies the visibleArea, and it is usually the heigtht/width of the scrolling area.
+          */
+        function dragAndClamp(cursor, contentSize, pageSize) {
+            styledItem.flickableItem[propContent] =
+                    styledItem.flickableItem[propOrigin] + cursor[propCoordinate] * contentSize / pageSize;
+        }
+    }
+
     /*****************************************
       Visuals
      *****************************************/
@@ -231,13 +308,13 @@
     // total size of the flickable.
     Item {
         id: scrollCursor
-        x: (isVertical) ? 0 : ScrollbarUtils.sliderPos(styledItem, 0.0, styledItem.width - scrollCursor.width)
-        y: (!isVertical) ? 0 : ScrollbarUtils.sliderPos(styledItem, 0.0, styledItem.height - scrollCursor.height)
-        width: (isVertical) ? scrollbarArea.thickness : ScrollbarUtils.sliderSize(styledItem, 0.0, flickableItem.width)
-        height: (!isVertical) ? scrollbarArea.thickness : ScrollbarUtils.sliderSize(styledItem, 0.0, flickableItem.height)
+        x: (isVertical) ? 0 : scrollbarUtils.sliderPos(styledItem, 0.0, styledItem.width - scrollCursor.width)
+        y: (!isVertical) ? 0 : scrollbarUtils.sliderPos(styledItem, 0.0, styledItem.height - scrollCursor.height)
+        width: (isVertical) ? scrollbarArea.thickness : scrollbarUtils.sliderSize(styledItem, 0.0, flickableItem.width)
+        height: (!isVertical) ? scrollbarArea.thickness : scrollbarUtils.sliderSize(styledItem, 0.0, flickableItem.height)
 
         function drag() {
-            ScrollbarUtils.dragAndClamp(styledItem, scrollCursor, contentSize, pageSize);
+            scrollbarUtils.dragAndClamp(styledItem, scrollCursor, contentSize, pageSize);
         }
     }
 
@@ -253,10 +330,10 @@
             bottom: (!isVertical) ? scrollbarArea.bottom : undefined
         }
 
-        x: (isVertical) ? 0 : ScrollbarUtils.sliderPos(styledItem, 0.0, styledItem.width - slider.width)
-        y: (!isVertical) ? 0 : ScrollbarUtils.sliderPos(styledItem, 0.0, styledItem.height - slider.height)
-        width: (isVertical) ? scrollbarArea.thickness : ScrollbarUtils.sliderSize(styledItem, minimumSliderSize, flickableItem.width)
-        height: (!isVertical) ? scrollbarArea.thickness : ScrollbarUtils.sliderSize(styledItem, minimumSliderSize, flickableItem.height)
+        x: (isVertical) ? 0 : scrollbarUtils.sliderPos(styledItem, 0.0, styledItem.width - slider.width)
+        y: (!isVertical) ? 0 : scrollbarUtils.sliderPos(styledItem, 0.0, styledItem.height - slider.height)
+        width: (isVertical) ? scrollbarArea.thickness : scrollbarUtils.sliderSize(styledItem, minimumSliderSize, flickableItem.width)
+        height: (!isVertical) ? scrollbarArea.thickness : scrollbarUtils.sliderSize(styledItem, minimumSliderSize, flickableItem.height)
         radius: visuals.sliderRadius
 
         Behavior on width {
@@ -275,7 +352,7 @@
         }
 
         function scroll(amount) {
-            scrollAnimation.to = ScrollbarUtils.scrollAndClamp(styledItem, amount, 0.0, contentSize - pageSize);
+            scrollAnimation.to = scrollbarUtils.scrollAndClamp(styledItem, amount, 0.0, contentSize - pageSize);
             scrollAnimation.restart();
         }
     }
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/ActionBarStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/ActionBarStyle.qml	2015-10-15 14:17:25 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/ActionBarStyle.qml	2015-11-24 12:22:14 +0000
@@ -34,7 +34,7 @@
      */
     defaultDelegate: AbstractButton {
         style: IconButtonStyle { }
-        objectName: action.objectName + "_action_button"
+        objectName: action.objectName + "_button"
         height: parent ? parent.height : undefined
         action: modelData
     }
@@ -88,7 +88,7 @@
             iconSource: actionBarStyle.overflowIconSource
             iconName: actionBarStyle.overflowIconName
             text: actionBarStyle.overflowText
-            objectName: "overflow"
+            objectName: "overflow_action"
             visible: numberOfSlots.requested > numberOfSlots.available
             onTriggered: {
                 var overflowButton = actionsRepeater.itemAt(actionsRepeater.count - 1);
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/ActivityIndicatorStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/ActivityIndicatorStyle.qml	2015-04-25 07:36:13 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/ActivityIndicatorStyle.qml	2015-11-24 12:22:14 +0000
@@ -22,7 +22,7 @@
 
     anchors.fill: parent
     smooth: true
-    visible: styledItem.running
+    visible: styledItem.running && styledItem.visible
     fillMode: Image.PreserveAspectFit
     horizontalAlignment: Image.AlignHCenter
     verticalAlignment: Image.AlignVCenter
 
=== added file 'src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeHintStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeHintStyle.qml	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeHintStyle.qml	2015-11-24 12:22:14 +0000
@@ -0,0 +1,149 @@
+/*
+ * 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
+import Ubuntu.Components.ListItems 1.3
+
+Item {
+    id: bottomEdgeHintStyle
+    implicitWidth: styledItem.parent.width
+    implicitHeight: units.gu(4)
+
+    readonly property BottomEdgeHint hint: styledItem
+
+    // translate hint status into state
+    state: {
+        switch (hint.status) {
+        case BottomEdgeHint.Hidden: return "Hidden";
+        case BottomEdgeHint.Inactive: return "Inactive"
+        case BottomEdgeHint.Active: return "Active"
+        case BottomEdgeHint.Locked: return "Locked"
+        }
+    }
+
+    states: [
+        State {
+            name: "Inactive"
+            extend: ""
+        },
+        State {
+            name: "Active"
+            PropertyChanges {
+                target: h1
+                anchors.verticalCenterOffset: styledItem.height / 2
+            }
+            PropertyChanges {
+                target: h2
+                anchors.topMargin: 0
+            }
+        },
+        State {
+            name: "Hidden"
+            PropertyChanges {
+                target: styledItem
+                opacity: 0.0
+            }
+        },
+        State {
+            name: "Locked"
+            PropertyChanges {
+                target: h1
+                anchors.verticalCenterOffset: styledItem.height / 2
+            }
+            PropertyChanges {
+                target: h2
+                anchors.topMargin: 0
+            }
+        }
+    ]
+    transitions: [
+        Transition {
+            from: "*"
+            to: "Active"
+            reversible: true
+            UbuntuNumberAnimation {
+                targets: [h1, h2]
+                properties: "anchors.verticalCenterOffset, anchors.topMargin"
+            }
+        },
+        Transition {
+            from: "*"
+            to: "Hidden"
+            reversible: true
+            UbuntuNumberAnimation {
+                target: styledItem
+                property: "opacity"
+                duration: UbuntuAnimation.SlowDuration
+            }
+        }
+    ]
+
+    clip: true
+
+    Icon {
+        id: h1
+        width: units.gu(2)
+        height: width
+        anchors {
+            centerIn: parent
+            topMargin: styledItem.height
+        }
+        name: "up"
+    }
+
+    Rectangle {
+        id: h2
+        anchors {
+            top: parent.top
+            left: parent.left
+            right: parent.right
+            topMargin: styledItem.height
+        }
+        height: styledItem.height
+        color: theme.palette.normal.overlay
+        ThinDivider {
+            anchors.top: parent.top
+        }
+
+        Row {
+            anchors {
+                top: parent.top
+                bottom: parent.bottom
+                horizontalCenter: parent.horizontalCenter
+            }
+            spacing: units.gu(1)
+            Icon {
+                id: icon
+                name: styledItem.iconName
+                source: styledItem.iconSource
+                width: height
+                height: units.gu(2)
+                anchors.verticalCenter: parent.verticalCenter
+                color: theme.palette.normal.overlayText
+            }
+            Label {
+                id: label
+                text: styledItem.text
+                textSize: Label.Medium
+                color: theme.palette.normal.overlayText
+                height: styledItem.height
+                anchors.verticalCenter: parent.verticalCenter
+                verticalAlignment: Text.AlignVCenter
+            }
+        }
+    }
+}
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/OptionSelectorStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/OptionSelectorStyle.qml	2015-07-22 13:14:43 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/OptionSelectorStyle.qml	2015-11-24 12:22:14 +0000
@@ -20,6 +20,7 @@
 
 Item {
     id: ambianceStyle
+    objectName: "OptionSelector13"
 
     property url chevron: Qt.resolvedUrl("../artwork/chevron_down.png")
     property url tick: Qt.resolvedUrl("../artwork/tick.png")
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml	2015-11-02 15:27:14 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml	2015-11-24 12:22:14 +0000
@@ -405,6 +405,16 @@
 
             actions: headerStyle.config.actions
             numberOfSlots: 3
+
+            delegate: AbstractButton {
+                style: IconButtonStyle { }
+                objectName: action.objectName + "_button"
+                height: parent ? parent.height : undefined
+                action: modelData
+                StyleHints {
+                    foregroundColor: headerStyle.buttonColor
+                }
+            }
         }
     }
 }
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml	2015-10-13 21:55:11 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml	2015-11-24 12:22:14 +0000
@@ -21,7 +21,7 @@
     id: pageHeaderStyle
 
     foregroundColor: theme.palette.selected.backgroundText
-    backgroundColor: "white"
+    backgroundColor: theme.palette.normal.background
     dividerColor: Qt.rgba(0, 0, 0, 0.1)
     property int fontWeight: Font.Light
     property int textSize: Label.Large
@@ -31,7 +31,7 @@
 
     defaultActionDelegate: AbstractButton {
         style: IconButtonStyle { }
-        objectName: action.objectName + "_action_button"
+        objectName: action.objectName + "_button"
         height: parent ? parent.height : undefined
         action: modelData
         StyleHints {
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/ScrollbarStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/ScrollbarStyle.qml	2015-06-02 15:24:54 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/ScrollbarStyle.qml	2015-11-24 12:22:14 +0000
@@ -85,7 +85,7 @@
     property Flickable flickableItem: styledItem.flickableItem
     property bool isScrollable: styledItem.__private.scrollable && pageSize > 0.0
                                 && contentSize > 0.0 && contentSize > pageSize
-    property bool isVertical: ScrollbarUtils.isVertical(styledItem)
+    property bool isVertical: (styledItem.align === Qt.AlignLeading) || (styledItem.align === Qt.AlignTrailing)
     property bool frontAligned: (styledItem.align === Qt.AlignLeading)
     property bool rearAligned: (styledItem.align === Qt.AlignTrailing)
     property bool topAligned: (styledItem.align === Qt.AlignTop)
@@ -94,6 +94,83 @@
     property real pageSize: (isVertical) ? styledItem.height : styledItem.width
     property real contentSize: (isVertical) ? styledItem.flickableItem.contentHeight : styledItem.flickableItem.contentWidth
 
+    /*!
+      \internal
+      Object storing property names used in calculations.
+    */
+    QtObject {
+        id: scrollbarUtils
+
+        property string propOrigin: (isVertical) ? "originY" : "originX"
+        property string propContent: (isVertical) ? "contentY" : "contentX"
+        property string propPosRatio: (isVertical) ? "yPosition" : "xPosition"
+        property string propSizeRatio: (isVertical) ? "heightRatio" : "widthRatio"
+        property string propCoordinate: (isVertical) ? "y" : "x"
+        property string propSize: (isVertical) ? "height" : "width"
+
+        /*!
+          \internal
+          Calculates the slider position based on the visible area's ratios.
+          */
+        function sliderPos(min, max) {
+            return MathUtils.clamp(styledItem.flickableItem.visibleArea[propPosRatio] * styledItem.flickableItem[propSize], min, max);
+        }
+
+        /*!
+          \internal
+          Calculates the slider size for ListViews based on the visible area's position
+          and size ratios, clamping it between min and max.
+
+          The function can be used in Scrollbar styles to calculate the size of the slider.
+          */
+        function sliderSize(min, max) {
+            var sizeRatio = styledItem.flickableItem.visibleArea[propSizeRatio];
+            var posRatio = styledItem.flickableItem.visibleArea[propPosRatio];
+            var sizeUnderflow = (sizeRatio * max) < min ? min - (sizeRatio * max) : 0
+            var startPos = posRatio * (max - sizeUnderflow)
+            var endPos = (posRatio + sizeRatio) * (max - sizeUnderflow) + sizeUnderflow
+            var overshootStart = startPos < 0 ? -startPos : 0
+            var overshootEnd = endPos > max ? endPos - max : 0
+
+            // overshoot adjusted start and end
+            var adjustedStartPos = startPos + overshootStart
+            var adjustedEndPos = endPos - overshootStart - overshootEnd
+
+            // final position and size of thumb
+            var position = adjustedStartPos + min > max ? max - min : adjustedStartPos
+            var result = (adjustedEndPos - position) < min ? min : (adjustedEndPos - position)
+
+            return result;
+        }
+
+        /*!
+          \internal
+          The function calculates and clamps the position to be scrolled to the minimum
+          and maximum values.
+
+          The scroll and drag functions require a slider that does not have any minimum
+          size set (meaning the minimum is set to 0.0). Implementations should consider
+          using an invisible cursor to drag the slider and the ListView position.
+          */
+        function scrollAndClamp(amount, min, max) {
+            return styledItem.flickableItem[propOrigin] +
+                    MathUtils.clamp(styledItem.flickableItem[propContent] - styledItem.flickableItem[propOrigin] + amount,
+                          min, max);
+        }
+
+        /*!
+          \internal
+          The function calculates the new position of the dragged slider. The amount is
+          relative to the contentSize, which is either the flickable's contentHeight or
+          contentWidth or other calculated value, depending on its orientation. The pageSize
+          specifies the visibleArea, and it is usually the heigtht/width of the scrolling area.
+          */
+        function dragAndClamp(cursor, contentSize, pageSize) {
+            styledItem.flickableItem[propContent] =
+                    styledItem.flickableItem[propOrigin] + cursor[propCoordinate] * contentSize / pageSize;
+        }
+    }
+
     /*****************************************
       Visuals
      *****************************************/
@@ -231,13 +308,13 @@
     // total size of the flickable.
     Item {
         id: scrollCursor
-        x: (isVertical) ? 0 : ScrollbarUtils.sliderPos(styledItem, 0.0, styledItem.width - scrollCursor.width)
-        y: (!isVertical) ? 0 : ScrollbarUtils.sliderPos(styledItem, 0.0, styledItem.height - scrollCursor.height)
-        width: (isVertical) ? scrollbarArea.thickness : ScrollbarUtils.sliderSize(styledItem, 0.0, flickableItem.width)
-        height: (!isVertical) ? scrollbarArea.thickness : ScrollbarUtils.sliderSize(styledItem, 0.0, flickableItem.height)
+        x: (isVertical) ? 0 : scrollbarUtils.sliderPos(styledItem, 0.0, styledItem.width - scrollCursor.width)
+        y: (!isVertical) ? 0 : scrollbarUtils.sliderPos(styledItem, 0.0, styledItem.height - scrollCursor.height)
+        width: (isVertical) ? scrollbarArea.thickness : scrollbarUtils.sliderSize(styledItem, 0.0, flickableItem.width)
+        height: (!isVertical) ? scrollbarArea.thickness : scrollbarUtils.sliderSize(styledItem, 0.0, flickableItem.height)
 
         function drag() {
-            ScrollbarUtils.dragAndClamp(styledItem, scrollCursor, contentSize, pageSize);
+            scrollbarUtils.dragAndClamp(styledItem, scrollCursor, contentSize, pageSize);
         }
     }
 
@@ -253,10 +330,10 @@
             bottom: (!isVertical) ? scrollbarArea.bottom : undefined
         }
 
-        x: (isVertical) ? 0 : ScrollbarUtils.sliderPos(styledItem, 0.0, styledItem.width - slider.width)
-        y: (!isVertical) ? 0 : ScrollbarUtils.sliderPos(styledItem, 0.0, styledItem.height - slider.height)
-        width: (isVertical) ? scrollbarArea.thickness : ScrollbarUtils.sliderSize(styledItem, minimumSliderSize, flickableItem.width)
-        height: (!isVertical) ? scrollbarArea.thickness : ScrollbarUtils.sliderSize(styledItem, minimumSliderSize, flickableItem.height)
+        x: (isVertical) ? 0 : scrollbarUtils.sliderPos(styledItem, 0.0, styledItem.width - slider.width)
+        y: (!isVertical) ? 0 : scrollbarUtils.sliderPos(styledItem, 0.0, styledItem.height - slider.height)
+        width: (isVertical) ? scrollbarArea.thickness : scrollbarUtils.sliderSize(styledItem, minimumSliderSize, flickableItem.width)
+        height: (!isVertical) ? scrollbarArea.thickness : scrollbarUtils.sliderSize(styledItem, minimumSliderSize, flickableItem.height)
         radius: visuals.sliderRadius
 
         Behavior on width {
@@ -275,7 +352,7 @@
         }
 
         function scroll(amount) {
-            scrollAnimation.to = ScrollbarUtils.scrollAndClamp(styledItem, amount, 0.0, contentSize - pageSize);
+            scrollAnimation.to = scrollbarUtils.scrollAndClamp(styledItem, amount, 0.0, contentSize - pageSize);
             scrollAnimation.restart();
         }
     }
 
=== removed file 'src/Ubuntu/Components/Themes/Ambiance/1.3/scrollbarUtils.js'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/scrollbarUtils.js	2015-07-23 22:12:36 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/scrollbarUtils.js	1970-01-01 00:00:00 +0000
@@ -1,139 +0,0 @@
-/*
- * Copyright 2012-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/>.
- */
-
-/*!
-  \qmltype scrollbarUtils
-  \inqmlmodule Ubuntu.Components 1.3
-  \ingroup ubuntu
-  \brief Various scrolling utility functions.
- */
-
-.pragma library
-
-Qt.include("mathUtils.js")
-
-/*
-  Object storing property names used in calculations.
-  */
-var _obj = {
-    scrollbar: null,
-    vertical: false,
-    propOrigin: "",
-    propContent: "",
-    propPosRatio: "",
-    propSizeRatio: "",
-    propCoordinate: "",
-    propSize: "",
-    refresh: function () {
-        _obj.vertical = (_obj.scrollbar.align === Qt.AlignLeading) || (_obj.scrollbar.align === Qt.AlignTrailing)
-        _obj.propOrigin = (_obj.vertical) ? "originY" : "originX";
-        _obj.propContent = (_obj.vertical) ? "contentY" : "contentX";
-        _obj.propPosRatio = (_obj.vertical) ? "yPosition" : "xPosition";
-        _obj.propSizeRatio = (_obj.vertical) ? "heightRatio" : "widthRatio";
-        _obj.propCoordinate = (_obj.vertical) ? "y" : "x";
-        _obj.propSize = (_obj.vertical) ? "height" : "width";
-    }
-}
-
-/*
-  Checks whether the _obj is valid or not. Must be called in every function
-  as those can be invoked prior to the host (style) component completion.
-  */
-function __check(sb) {
-    if (sb !== null && (_obj.scrollbar !== sb)) {
-        _obj.scrollbar = sb;
-        sb.flickableItemChanged.connect(_obj.refresh);
-        sb.alignChanged.connect(_obj.refresh);
-        _obj.refresh();
-    }
-
-    return _obj.scrollbar;
-}
-
-/*!
-  \qmlmethod scrollbarUtils::isVertical(scrollbar)
-  Returns whether the scrollbar is vertical or horizontal.
-  */
-function isVertical(scrollbar) {
-    if (!__check(scrollbar)) return 0;
-    return _obj.vertical;
-}
-
-/*!
-  \qmlmethod scrollbarUtils::sliderPos(scrollbar, min, max)
-  Calculates the slider position based on the visible area's ratios.
-  */
-function sliderPos(scrollbar, min, max) {
-    if (!__check(scrollbar)) return 0;
-    return clamp(scrollbar.flickableItem.visibleArea[_obj.propPosRatio] * scrollbar.flickableItem[_obj.propSize], min, max);
-}
-
-/*!
-  \qmlmethod scrollbarUtils::sliderSize(scrollbar, min, max)
-  Calculates the slider size for ListViews based on the visible area's position
-  and size ratios, clamping it between min and max.
-
-  The function can be used in Scrollbar styles to calculate the size of the slider.
-  */
-function sliderSize(scrollbar, min, max) {
-    if (!__check(scrollbar)) return 0;
-    var sizeRatio = scrollbar.flickableItem.visibleArea[_obj.propSizeRatio];
-    var posRatio = scrollbar.flickableItem.visibleArea[_obj.propPosRatio];
-    var sizeUnderflow = (sizeRatio * max) < min ? min - (sizeRatio * max) : 0
-    var startPos = posRatio * (max - sizeUnderflow)
-    var endPos = (posRatio + sizeRatio) * (max - sizeUnderflow) + sizeUnderflow
-    var overshootStart = startPos < 0 ? -startPos : 0
-    var overshootEnd = endPos > max ? endPos - max : 0
-
-    // overshoot adjusted start and end
-    var adjustedStartPos = startPos + overshootStart
-    var adjustedEndPos = endPos - overshootStart - overshootEnd
-
-    // final position and size of thumb
-    var position = adjustedStartPos + min > max ? max - min : adjustedStartPos
-    var result = (adjustedEndPos - position) < min ? min : (adjustedEndPos - position)
-
-    return result;
-}
-
-/*!
-  \qmlmethod scrollbarUtils::scrollAndClamp(scrollbar, amount, min, max)
-  The function calculates and clamps the position to be scrolled to the minimum
-  and maximum values.
-
-  The scroll and drag functions require a slider that does not have any minimum
-  size set (meaning the minimum is set to 0.0). Implementations should consider
-  using an invisible cursor to drag the slider and the ListView position.
-  */
-function scrollAndClamp(scrollbar, amount, min, max) {
-    if (!__check(scrollbar)) return 0;
-    return scrollbar.flickableItem[_obj.propOrigin] +
-            clamp(scrollbar.flickableItem[_obj.propContent] - scrollbar.flickableItem[_obj.propOrigin] + amount,
-                  min, max);
-}
-
-/*!
-  \qmlmethod scrollbarUtils::dragAndClamp(scrollbar, cursor, contentSize, pageSize)
-  The function calculates the new position of the dragged slider. The amount is
-  relative to the contentSize, which is either the flickable's contentHeight or
-  contentWidth or other calculated value, depending on its orientation. The pageSize
-  specifies the visibleArea, and it is usually the heigtht/width of the scrolling area.
-  */
-function dragAndClamp(scrollbar, cursor, contentSize, pageSize) {
-    if (!__check(scrollbar)) return 0;
-    scrollbar.flickableItem[_obj.propContent] =
-            scrollbar.flickableItem[_obj.propOrigin] + cursor[_obj.propCoordinate] * contentSize / pageSize;
-}
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/Ambiance.pro'
--- src/Ubuntu/Components/Themes/Ambiance/Ambiance.pro	2015-10-02 22:48:13 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/Ambiance.pro	2015-11-24 12:22:14 +0000
@@ -113,6 +113,9 @@
              1.3/ToolbarStyle.qml \
              1.3/IconButtonStyle.qml \
 	     1.3/PageHeaderStyle.qml \
+             1.3/BottomEdgeHintStyle.qml \
     $$ARTWORK_FILES
 
 load(ubuntu_qml_module)
+
+OTHER_FILES+=qmldir
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/qmldir'
--- src/Ubuntu/Components/Themes/Ambiance/qmldir	2015-10-02 22:48:13 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/qmldir	2015-11-24 12:22:14 +0000
@@ -82,6 +82,5 @@
 
 ListItemStyle 1.3 ./1.3/ListItemStyle.qml
 internal SliderUtils 1.3/sliderUtils.js
-internal ScrollbarUtils 1.3/scrollbarUtils.js
 internal ColorUtils 1.3/colorUtils.js
 PageHeaderStyle 1.3 ./1.3/PageHeaderStyle.qml
 
=== added directory 'src/Ubuntu/Components/plugin/gestures'
=== added file 'src/Ubuntu/Components/plugin/gestures/CandidateInactivityTimer.cpp'
--- src/Ubuntu/Components/plugin/gestures/CandidateInactivityTimer.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/gestures/CandidateInactivityTimer.cpp	2015-11-24 12:22:14 +0000
@@ -0,0 +1,46 @@
+/*
+ * 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/>.
+ */
+
+#include "CandidateInactivityTimer.h"
+
+namespace UbuntuGestures {
+
+CandidateInactivityTimer::CandidateInactivityTimer(int touchId, QQuickItem *candidate,
+        AbstractTimer *timer, QObject *parent)
+    : QObject(parent)
+    , m_timer(timer)
+    , m_touchId(touchId)
+    , m_candidate(candidate)
+{
+    connect(m_timer, &AbstractTimer::timeout,
+            this, &CandidateInactivityTimer::onTimeout);
+    m_timer->setInterval(durationMs);
+    m_timer->setSingleShot(true);
+    m_timer->start();
+}
+
+CandidateInactivityTimer::~CandidateInactivityTimer()
+{
+    delete m_timer;
+}
+
+void CandidateInactivityTimer::onTimeout()
+{
+    qWarning("[TouchRegistry] Candidate for touch %d defaulted!", m_touchId);
+    Q_EMIT candidateDefaulted(m_touchId, m_candidate);
+}
+
+} // namespace UbuntuGestures
 
=== added file 'src/Ubuntu/Components/plugin/gestures/CandidateInactivityTimer.h'
--- src/Ubuntu/Components/plugin/gestures/CandidateInactivityTimer.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/gestures/CandidateInactivityTimer.h	2015-11-24 12:22:14 +0000
@@ -0,0 +1,52 @@
+/*
+ * 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/>.
+ *
+ */
+
+#ifndef UBUNTUGESTURES_CANDIDATE_INACTIVITY_TIMER_H
+#define UBUNTUGESTURES_CANDIDATE_INACTIVITY_TIMER_H
+
+#include <QtCore/QObject>
+
+class QQuickItem;
+
+#include "Timer.h"
+
+namespace UbuntuGestures {
+
+class UBUNTUGESTURESQML_EXPORT CandidateInactivityTimer : public QObject {
+    Q_OBJECT
+public:
+    CandidateInactivityTimer(int touchId, QQuickItem *candidate,
+                             AbstractTimer *timer,
+                             QObject *parent = Q_NULLPTR);
+
+    virtual ~CandidateInactivityTimer();
+
+    const int durationMs = 1000;
+
+Q_SIGNALS:
+    void candidateDefaulted(int touchId, QQuickItem *candidate);
+private Q_SLOTS:
+    void onTimeout();
+private:
+    AbstractTimer *m_timer;
+    int m_touchId;
+    QQuickItem *m_candidate;
+};
+
+} // namespace UbuntuGestures
+
+#endif // UBUNTUGESTURES_CANDIDATE_INACTIVITY_TIMER_H
 
=== added file 'src/Ubuntu/Components/plugin/gestures/damper.cpp'
--- src/Ubuntu/Components/plugin/gestures/damper.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/gestures/damper.cpp	2015-11-24 12:22:14 +0000
@@ -0,0 +1,24 @@
+/*
+ * 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/>.
+ */
+
+#include "Damper.h"
+#include <QDebug>
+
+QDebug operator<<(QDebug dbg, const DampedPointF &p)
+{
+    dbg.nospace() << "(" << p.x() << ", " << p.y() << ")";
+    return dbg.space();
+}
 
=== added file 'src/Ubuntu/Components/plugin/gestures/damper.h'
--- src/Ubuntu/Components/plugin/gestures/damper.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/gestures/damper.h	2015-11-24 12:22:14 +0000
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2013 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/>.
+ */
+
+#ifndef UBUNTU_GESTURES_DAMPER_H
+#define UBUNTU_GESTURES_DAMPER_H
+
+#include <QtCore/QPointF>
+
+/*
+  Decreases the oscillations of a value along an axis.
+ */
+template <class Type> class Damper {
+public:
+    Damper() : m_value(0), m_maxDelta(0) { }
+
+    // Maximum delta between the raw value and its dampened counterpart.
+    void setMaxDelta(Type maxDelta) {
+        if (maxDelta < 0) qFatal("Damper::maxDelta must be a positive number.");
+        m_maxDelta = maxDelta;
+    }
+    Type maxDelta() const { return m_maxDelta; }
+
+    void reset(Type value) {
+        m_value = value;
+    }
+
+    Type update(Type value) {
+        Type delta = value - m_value;
+        if (delta > 0 && delta > m_maxDelta) {
+            m_value += delta - m_maxDelta;
+        } else if (delta < 0 && delta < -m_maxDelta) {
+            m_value += delta + m_maxDelta;
+        }
+
+        return m_value;
+    }
+
+    Type value() const { return m_value; }
+
+private:
+    Type m_value;
+    Type m_maxDelta;
+};
+
+/*
+    A point that has its movement dampened.
+ */
+class DampedPointF {
+public:
+    void setMaxDelta(qreal maxDelta) {
+        m_x.setMaxDelta(maxDelta);
+        m_y.setMaxDelta(maxDelta);
+    }
+
+    qreal maxDelta() const { return m_x.maxDelta(); }
+
+    void reset(const QPointF &point) {
+        m_x.reset(point.x());
+        m_y.reset(point.y());
+    }
+
+    void update(const QPointF &point) {
+        m_x.update(point.x());
+        m_y.update(point.y());
+    }
+
+    qreal x() const { return m_x.value(); }
+    qreal y() const { return m_y.value(); }
+private:
+    Damper<qreal> m_x;
+    Damper<qreal> m_y;
+};
+
+QDebug operator<<(QDebug dbg, const DampedPointF &p);
+
+#endif // UBUNTU_GESTURES_DAMPER_H
 
=== added file 'src/Ubuntu/Components/plugin/gestures/ubuntugesturesqmlglobal.h'
--- src/Ubuntu/Components/plugin/gestures/ubuntugesturesqmlglobal.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/gestures/ubuntugesturesqmlglobal.h	2015-11-24 12:22:14 +0000
@@ -0,0 +1,24 @@
+/*
+ * 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 <QtCore/QtGlobal>
+
+#if defined(UBUNTUGESTURESQML_LIBRARY)
+#  define UBUNTUGESTURESQML_EXPORT Q_DECL_EXPORT
+#else
+#  define UBUNTUGESTURESQML_EXPORT Q_DECL_IMPORT
+#endif
 
=== added file 'src/Ubuntu/Components/plugin/gestures/ucswipearea.cpp'
--- src/Ubuntu/Components/plugin/gestures/ucswipearea.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/gestures/ucswipearea.cpp	2015-11-24 12:22:14 +0000
@@ -0,0 +1,958 @@
+/*
+ * 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/>.
+ *
+ */
+
+#include "ucswipearea_p.h"
+
+#include <QQuickWindow>
+#include <QtCore/qmath.h>
+#include <QScreen>
+#include <QDebug>
+
+#include <private/qquickwindow_p.h>
+
+// local
+#include <UbuntuGestures/TouchOwnershipEvent>
+#include <UbuntuGestures/TouchRegistry>
+#include <UbuntuGestures/UnownedTouchEvent>
+
+using namespace UbuntuGestures;
+
+Q_LOGGING_CATEGORY(ucSwipeArea, "ubuntu.components.SwipeArea", QtMsgType::QtWarningMsg)
+Q_LOGGING_CATEGORY(ucActiveTouchInfo, "ubuntu.components.SwipeArea.ActiveTouchInfo", QtMsgType::QtWarningMsg)
+
+#define SA_TRACE(params) qCDebug(ucSwipeArea).nospace() << "[SwipeArea(" << qPrintable(objectName()) << ")] " << params
+#define TI_TRACE(params) qCDebug(ucActiveTouchInfo).nospace() << "[ActiveTouchInfo] " << params
+
+namespace {
+const char *statusToString(UCSwipeAreaPrivate::Status status)
+{
+    if (status == UCSwipeAreaPrivate::WaitingForTouch) {
+        return "WaitingForTouch";
+    } else if (status == UCSwipeAreaPrivate::Undecided) {
+        return "Undecided";
+    } else {
+        return "Recognized";
+    }
+}
+
+QString touchPointStateToString(Qt::TouchPointState state)
+{
+    switch (state) {
+    case Qt::TouchPointPressed:
+        return QStringLiteral("pressed");
+    case Qt::TouchPointMoved:
+        return QStringLiteral("moved");
+    case Qt::TouchPointStationary:
+        return QStringLiteral("stationary");
+    case Qt::TouchPointReleased:
+        return QStringLiteral("released");
+    default:
+        return QStringLiteral("INVALID_STATE");
+    }
+}
+
+QString touchEventToString(const QTouchEvent *ev)
+{
+    QString message;
+
+    switch (ev->type()) {
+    case QEvent::TouchBegin:
+        message.append("TouchBegin ");
+        break;
+    case QEvent::TouchUpdate:
+        message.append("TouchUpdate ");
+        break;
+    case QEvent::TouchEnd:
+        message.append("TouchEnd ");
+        break;
+    case QEvent::TouchCancel:
+        message.append("TouchCancel ");
+        break;
+    default:
+        message.append("INVALID_TOUCH_EVENT_TYPE ");
+    }
+
+    Q_FOREACH(const QTouchEvent::TouchPoint& touchPoint, ev->touchPoints()) {
+        message.append(
+            QStringLiteral("(id:%1, state:%2, scenePos:(%3,%4)) ")
+                .arg(touchPoint.id())
+                .arg(touchPointStateToString(touchPoint.state()))
+                .arg(touchPoint.scenePos().x())
+                .arg(touchPoint.scenePos().y())
+            );
+    }
+
+    return message;
+}
+
+} // namespace {
+
+class Direction
+{
+public:
+    static bool isHorizontal(UCSwipeArea::Direction type)
+    {
+        return type == UCSwipeArea::Leftwards
+            || type == UCSwipeArea::Rightwards
+            || type == UCSwipeArea::Horizontal;
+    }
+
+    static bool isVertical(UCSwipeArea::Direction type)
+    {
+        return type == UCSwipeArea::Upwards
+            || type == UCSwipeArea::Downwards
+            || type == UCSwipeArea::Vertical;
+    }
+
+    static bool isPositive(UCSwipeArea::Direction type)
+    {
+        return type == UCSwipeArea::Rightwards
+            || type == UCSwipeArea::Downwards
+            || type == UCSwipeArea::Horizontal
+            || type == UCSwipeArea::Vertical;
+    }
+};
+/*!
+ * \qmltype SwipeArea
+ * \instantiates UCSwipeArea
+ * \inherits Item
+ * \inqmlmodule Ubuntu.Components 1.3
+ * \since Ubuntu.Components 1.3
+ * \ingroup ubuntu-gestures
+ * \brief An area which detects axis-aligned single-finger drag gestures.
+ *
+ * The component can be used to detect gestures of a certain direction, and can
+ * grab gestures started on a component placed behind of the SwipeArea.
+ * The gesture is detected on the SwipeArea, therefore the size must be
+ * chosen carefully so it can properly detect the gesture.
+ *
+ * The gesture direction is specified by the \l direction property. The recognized
+ * and captured gesture is reported through the \l dragging property, which becomes
+ * \c true when the gesture is detected. If there was a component under the
+ * SwipeArea, the gesture will be cancelled on that component.
+ *
+ * The drag recognition is performed within the component area in the specified
+ * direction. If the drag deviates too much from this, recognition will fail,
+ * as well as if the drag or the flick is too short. Once the drag is
+ * intercepted, the gesture will be followed even after it leaves the detection area.
+ *
+ * Example:
+ * \qml
+ * import QtQuick 2.4
+ * import Ubuntu.Components 1.3
+ *
+ * MainView {
+ *     width: units.gu(40)
+ *     height: units.gu(70)
+ *
+ *     Page {
+ *         title: "SwipeArea sample"
+ *         SwipeArea {
+ *             anchors {
+ *                 left: parent.left
+ *                 right: parent.right
+ *                 bottom: parent.bottom
+ *             }
+ *             height: units.gu(5)
+ *             direction: SwipeArea.Upwards
+ *             Label {
+ *                 text: "Drag upwards"
+ *                 anchors {
+ *                     centerIn: parent
+ *                     verticalOffset: parent.dragging ? parent.distance : 0
+ *                 }
+ *             }
+ *         }
+ *     }
+ * }
+ * \endqml
+ * \note When used with a Flickable (or ListView, GridView) always put the
+ * SwipeArea next to the Flickable as sibling.
+ */
+UCSwipeArea::UCSwipeArea(QQuickItem *parent)
+    : QQuickItem(parent)
+    , d(new UCSwipeAreaPrivate(this))
+{
+    d->setRecognitionTimer(new Timer(this));
+    d->recognitionTimer->setInterval(d->maxTime);
+    d->recognitionTimer->setSingleShot(true);
+
+    connect(this, &QQuickItem::enabledChanged, d, &UCSwipeAreaPrivate::giveUpIfDisabledOrInvisible);
+    connect(this, &QQuickItem::visibleChanged, d, &UCSwipeAreaPrivate::giveUpIfDisabledOrInvisible);
+}
+
+/*!
+ * \qmlproperty enum SwipeArea::direction
+ * The direction in which the gesture should move in order to be recognized.
+ * \table
+ * \header
+ *  \li Direction
+ *  \li Description
+ * \row
+ *  \li Rightwards
+ *  \li Along the positive direction of the X axis
+ * \row
+ *  \li Leftwards
+ *  \li Along the negative direction of the X axis
+ * \row
+ *  \li Downwards
+ *  \li Along the positive direction of the Y axis
+ * \row
+ *  \li Upwards
+ *  \li Along the negative direction of the Y axis
+ * \row
+ *  \li Horizontal
+ *  \li Along the X axis, in any direction
+ * \row
+ *  \li Vertical
+ *  \li Along the Y axis, in any direction
+ * \endtable
+ */
+UCSwipeArea::Direction UCSwipeArea::direction() const
+{
+    return d->direction;
+}
+
+void UCSwipeArea::setDirection(Direction direction)
+{
+    if (direction != d->direction) {
+        d->direction = direction;
+        Q_EMIT directionChanged(d->direction);
+    }
+}
+
+void UCSwipeAreaPrivate::setDistanceThreshold(qreal value)
+{
+    if (distanceThreshold != value) {
+        distanceThreshold = value;
+        distanceThresholdSquared = distanceThreshold * distanceThreshold;
+    }
+}
+
+void UCSwipeAreaPrivate::setMaxTime(int value)
+{
+    if (maxTime != value) {
+        maxTime = value;
+        recognitionTimer->setInterval(maxTime);
+    }
+}
+
+void UCSwipeAreaPrivate::setRecognitionTimer(UbuntuGestures::AbstractTimer *timer)
+{
+    int interval = 0;
+    bool timerWasRunning = false;
+    bool wasSingleShot = false;
+
+    // can be null when called from the constructor
+    if (recognitionTimer) {
+        wasSingleShot = recognitionTimer->isSingleShot();
+        interval = recognitionTimer->interval();
+        timerWasRunning = recognitionTimer->isRunning();
+        if (recognitionTimer->parent() == this) {
+            delete recognitionTimer;
+        }
+    }
+
+    recognitionTimer = timer;
+    timer->setInterval(interval);
+    timer->setSingleShot(wasSingleShot);
+    connect(timer, &UbuntuGestures::AbstractTimer::timeout,
+            this, &UCSwipeAreaPrivate::rejectGesture);
+    if (timerWasRunning) {
+        recognitionTimer->start();
+    }
+}
+
+void UCSwipeAreaPrivate::setTimeSource(const SharedTimeSource &timeSource)
+{
+    this->timeSource = timeSource;
+    activeTouches.m_timeSource = timeSource;
+}
+
+/*!
+ * \qmlproperty real SwipeArea::distance
+ * \readonly
+ * The property holds the distance of the swipe from the beginning of the gesture
+ * recognition to the current touch position.
+ */
+qreal UCSwipeArea::distance() const
+{
+    return d->sceneDistance;
+}
+
+/*!
+ * \qmlproperty point SwipeArea::touchPosition
+ * \readonly
+ * Position of the touch point performing the drag relative to this item.
+ */
+QPointF UCSwipeArea::touchPosition() const
+{
+    return mapFromScene(d->publicScenePos);
+}
+
+/*!
+ * \qmlproperty bool SwipeArea::dragging
+ * \readonly
+ * Reports whether a drag gesture is taking place.
+ */
+bool UCSwipeArea::dragging() const
+{
+    return d->status == UCSwipeAreaPrivate::Recognized;
+}
+
+/*!
+ * \qmlproperty bool SwipeArea::pressed
+ * \readonly
+ * Reports whether the drag area is pressed.
+ */
+bool UCSwipeArea::pressed() const
+{
+    return d->status != UCSwipeAreaPrivate::WaitingForTouch;
+}
+
+/*!
+ * \qmlproperty bool SwipeArea::immediateRecognition
+ * Drives whether the gesture should be recognized as soon as the touch lands on
+ * the area. With this property set it will work the same way as a MultiPointTouchArea,
+ *
+ * Defaults to false. In most cases this should not be set.
+ */
+bool UCSwipeArea::immediateRecognition() const
+{
+    return d->immediateRecognition;
+}
+
+void UCSwipeArea::setImmediateRecognition(bool enabled)
+{
+    if (d->immediateRecognition != enabled) {
+        d->immediateRecognition = enabled;
+        Q_EMIT immediateRecognitionChanged(enabled);
+    }
+}
+
+bool UCSwipeArea::event(QEvent *event)
+{
+    if (event->type() == TouchOwnershipEvent::touchOwnershipEventType()) {
+        d->touchOwnershipEvent(static_cast<TouchOwnershipEvent *>(event));
+        return true;
+    } else if (event->type() == UnownedTouchEvent::unownedTouchEventType()) {
+        d->unownedTouchEvent(static_cast<UnownedTouchEvent *>(event));
+        return true;
+    } else {
+        return QQuickItem::event(event);
+    }
+}
+
+void UCSwipeAreaPrivate::touchOwnershipEvent(TouchOwnershipEvent *event)
+{
+    if (event->gained()) {
+        QVector<int> ids;
+        ids.append(event->touchId());
+        SA_TRACE("grabbing touch");
+        q->grabTouchPoints(ids);
+    } else {
+        // We still wanna know when it ends for keeping the composition time window up-to-date
+        TouchRegistry::instance()->addTouchWatcher(touchId, q);
+
+        setStatus(WaitingForTouch);
+    }
+}
+
+void UCSwipeAreaPrivate::unownedTouchEvent(UnownedTouchEvent *unownedTouchEvent)
+{
+    QTouchEvent *event = unownedTouchEvent->touchEvent();
+
+    Q_ASSERT(!event->touchPointStates().testFlag(Qt::TouchPointPressed));
+
+    SA_TRACE("Unowned " << timeSource->msecsSinceReference() << " " << qPrintable(touchEventToString(event)));
+
+    switch (status) {
+        case WaitingForTouch:
+            // do nothing
+            break;
+        case Undecided:
+            Q_ASSERT(q->isEnabled() && q->isVisible());
+            unownedTouchEvent_undecided(unownedTouchEvent);
+            break;
+        default: // Recognized:
+            // do nothing
+            break;
+    }
+
+    activeTouches.update(event);
+}
+
+void UCSwipeAreaPrivate::unownedTouchEvent_undecided(UnownedTouchEvent *unownedTouchEvent)
+{
+    const QTouchEvent::TouchPoint *touchPoint = fetchTargetTouchPoint(unownedTouchEvent->touchEvent());
+    if (!touchPoint) {
+        qCritical() << "UCSwipeArea[status=Undecided]: touch " << touchId
+            << "missing from UnownedTouchEvent without first reaching state Qt::TouchPointReleased. "
+               "Considering it as released.";
+
+        TouchRegistry::instance()->removeCandidateOwnerForTouch(touchId, q);
+        setStatus(WaitingForTouch);
+        return;
+    }
+
+    const QPointF &touchScenePosition = touchPoint->scenePos();
+
+    if (touchPoint->state() == Qt::TouchPointReleased) {
+        // touch has ended before recognition concluded
+        SA_TRACE("Touch has ended before recognition concluded");
+        TouchRegistry::instance()->removeCandidateOwnerForTouch(touchId, q);
+        setStatus(WaitingForTouch);
+        return;
+    }
+
+    previousDampedScenePos.setX(dampedScenePos.x());
+    previousDampedScenePos.setY(dampedScenePos.y());
+    dampedScenePos.update(touchScenePosition);
+
+    if (!movingInRightDirection()) {
+        SA_TRACE("Rejecting gesture because touch point is moving in the wrong direction.");
+        TouchRegistry::instance()->removeCandidateOwnerForTouch(touchId, q);
+        // We still wanna know when it ends for keeping the composition time window up-to-date
+        TouchRegistry::instance()->addTouchWatcher(touchId, q);
+        setStatus(WaitingForTouch);
+        return;
+    }
+
+    if (isWithinTouchCompositionWindow()) {
+        // There's still time for some new touch to appear and ruin our party as it would be combined
+        // with our touchId one and therefore deny the possibility of a single-finger gesture.
+        SA_TRACE("Sill within composition window. Let's wait more.");
+        return;
+    }
+
+    if (movedFarEnoughAlongGestureAxis()) {
+        TouchRegistry::instance()->requestTouchOwnership(touchId, q);
+        setStatus(Recognized);
+        updatePosition(touchScenePosition);
+    } else if (isPastMaxDistance()) {
+        SA_TRACE("Rejecting gesture because it went farther than maxDistance without getting recognized.");
+        TouchRegistry::instance()->removeCandidateOwnerForTouch(touchId, q);
+        // We still wanna know when it ends for keeping the composition time window up-to-date
+        TouchRegistry::instance()->addTouchWatcher(touchId, q);
+        setStatus(WaitingForTouch);
+    } else {
+        SA_TRACE("Didn't move far enough yet. Let's wait more.");
+    }
+}
+
+void UCSwipeArea::touchEvent(QTouchEvent *event)
+{
+    // FIXME: Consider when more than one touch starts in the same event (although it's not possible
+    //       with Mir's android-input). Have to track them all. Consider it a plus/bonus.
+
+    SA_TRACE(d->timeSource->msecsSinceReference() << " " << qPrintable(touchEventToString(event)));
+
+    if (!isEnabled() || !isVisible()) {
+        QQuickItem::touchEvent(event);
+        return;
+    }
+
+    switch (d->status) {
+        case UCSwipeAreaPrivate::WaitingForTouch:
+            d->touchEvent_absent(event);
+            break;
+        case UCSwipeAreaPrivate::Undecided:
+            d->touchEvent_undecided(event);
+            break;
+        default: // Recognized:
+            d->touchEvent_recognized(event);
+            break;
+    }
+
+    d->activeTouches.update(event);
+}
+
+void UCSwipeAreaPrivate::touchEvent_absent(QTouchEvent *event)
+{
+    // FIXME: accept/reject is for the whole event, not per touch id. See how that affects us.
+
+    if (!event->touchPointStates().testFlag(Qt::TouchPointPressed)) {
+        // Nothing to see here. No touch starting in this event.
+        return;
+    }
+
+    // to be proven wrong, if that's the case
+    bool allGood = true;
+
+    if (isWithinTouchCompositionWindow()) {
+        // too close to the last touch start. So we consider them as starting roughly at the same time.
+        // Can't be a single-touch gesture.
+        SA_TRACE("A new touch point came in but we're still within time composition window. Ignoring it.");
+        allGood = false;
+    }
+
+    const QList<QTouchEvent::TouchPoint> &touchPoints = event->touchPoints();
+
+    const QTouchEvent::TouchPoint *newTouchPoint = nullptr;
+    for (int i = 0; i < touchPoints.count() && allGood; ++i) {
+        const QTouchEvent::TouchPoint &touchPoint = touchPoints.at(i);
+        if (touchPoint.state() == Qt::TouchPointPressed) {
+            if (newTouchPoint) {
+                // more than one touch starting in this QTouchEvent. Can't be a single-touch gesture
+                allGood = false;
+            } else {
+                // that's our candidate
+                newTouchPoint = &touchPoint;
+            }
+        }
+    }
+
+    if (allGood) {
+        allGood = sanityCheckRecognitionProperties();
+        if (!allGood) {
+            qWarning("UCSwipeArea: recognition properties are wrongly set. Gesture recognition"
+                " is impossible");
+        }
+    }
+
+    if (allGood) {
+        Q_ASSERT(newTouchPoint);
+
+        startScenePos = newTouchPoint->scenePos();
+        touchId = newTouchPoint->id();
+        dampedScenePos.reset(startScenePos);
+        updatePosition(startScenePos);
+
+        updateSceneDirectionVector();
+
+        if (recognitionIsDisabled()) {
+            // Behave like a dumb TouchArea
+            SA_TRACE("Gesture recognition is disabled. Requesting touch ownership immediately.");
+            TouchRegistry::instance()->requestTouchOwnership(touchId, q);
+            setStatus(Recognized);
+            event->accept();
+        } else {
+            // just monitor the touch points for now.
+            TouchRegistry::instance()->addCandidateOwnerForTouch(touchId, q);
+
+            setStatus(Undecided);
+            // Let the item below have it. We will monitor it and grab it later if a gesture
+            // gets recognized.
+            event->ignore();
+        }
+    } else {
+        watchPressedTouchPoints(touchPoints);
+        event->ignore();
+    }
+}
+
+void UCSwipeAreaPrivate::touchEvent_undecided(QTouchEvent *event)
+{
+    Q_ASSERT(fetchTargetTouchPoint(event) == nullptr);
+
+    // We're not interested in new touch points. We already have our candidate (touchId).
+    // But we do want to know when those new touches end for keeping the composition time
+    // window up-to-date
+    event->ignore();
+    watchPressedTouchPoints(event->touchPoints());
+
+    if (event->touchPointStates().testFlag(Qt::TouchPointPressed) && isWithinTouchCompositionWindow()) {
+        // multi-finger drags are not accepted
+        SA_TRACE("Multi-finger drags are not accepted");
+
+        TouchRegistry::instance()->removeCandidateOwnerForTouch(touchId, q);
+        // We still wanna know when it ends for keeping the composition time window up-to-date
+        TouchRegistry::instance()->addTouchWatcher(touchId, q);
+
+        setStatus(WaitingForTouch);
+    }
+}
+
+void UCSwipeAreaPrivate::touchEvent_recognized(QTouchEvent *event)
+{
+    const QTouchEvent::TouchPoint *touchPoint = fetchTargetTouchPoint(event);
+
+    if (!touchPoint) {
+        qCritical() << "UCSwipeArea[status=Recognized]: touch " << touchId
+            << "missing from QTouchEvent without first reaching state Qt::TouchPointReleased. "
+               "Considering it as released.";
+        setStatus(WaitingForTouch);
+    } else {
+        updatePosition(touchPoint->scenePos());
+
+        if (touchPoint->state() == Qt::TouchPointReleased) {
+            setStatus(WaitingForTouch);
+        }
+    }
+}
+
+void UCSwipeAreaPrivate::watchPressedTouchPoints(const QList<QTouchEvent::TouchPoint> &touchPoints)
+{
+    for (int i = 0; i < touchPoints.count(); ++i) {
+        const QTouchEvent::TouchPoint &touchPoint = touchPoints.at(i);
+        if (touchPoint.state() == Qt::TouchPointPressed) {
+            TouchRegistry::instance()->addTouchWatcher(touchPoint.id(), q);
+        }
+    }
+}
+
+bool UCSwipeAreaPrivate::recognitionIsDisabled() const
+{
+    return immediateRecognition || (distanceThreshold <= 0 && compositionTime <= 0);
+}
+
+bool UCSwipeAreaPrivate::sanityCheckRecognitionProperties()
+{
+    return recognitionIsDisabled()
+        || (distanceThreshold < maxDistance && compositionTime < maxTime);
+}
+
+const QTouchEvent::TouchPoint *UCSwipeAreaPrivate::fetchTargetTouchPoint(QTouchEvent *event)
+{
+    const QList<QTouchEvent::TouchPoint> &touchPoints = event->touchPoints();
+    const QTouchEvent::TouchPoint *touchPoint = 0;
+    for (int i = 0; i < touchPoints.size(); ++i) {
+        if (touchPoints.at(i).id() == touchId) {
+            touchPoint = &touchPoints.at(i);
+            break;
+        }
+    }
+    return touchPoint;
+}
+
+bool UCSwipeAreaPrivate::movingInRightDirection() const
+{
+    if (direction == UCSwipeArea::Horizontal || direction == UCSwipeArea::Vertical) {
+        return true;
+    } else {
+        QPointF movementVector(dampedScenePos.x() - previousDampedScenePos.x(),
+                               dampedScenePos.y() - previousDampedScenePos.y());
+
+        qreal scalarProjection = projectOntoDirectionVector(movementVector);
+
+        return scalarProjection >= 0.;
+    }
+}
+
+bool UCSwipeAreaPrivate::movedFarEnoughAlongGestureAxis() const
+{
+    if (distanceThreshold <= 0.) {
+        // distance threshold check is disabled
+        return true;
+    } else {
+        QPointF totalMovement(dampedScenePos.x() - startScenePos.x(),
+                              dampedScenePos.y() - startScenePos.y());
+
+        qreal scalarProjection = projectOntoDirectionVector(totalMovement);
+
+        SA_TRACE(" movedFarEnoughAlongGestureAxis: scalarProjection=" << scalarProjection
+            << ", distanceThreshold=" << distanceThreshold);
+
+        if (direction == UCSwipeArea::Horizontal || direction == UCSwipeArea::Vertical) {
+            return qAbs(scalarProjection) > distanceThreshold;
+        } else {
+            return scalarProjection > distanceThreshold;
+        }
+    }
+}
+
+bool UCSwipeAreaPrivate::isPastMaxDistance() const
+{
+    QPointF totalMovement(dampedScenePos.x() - startScenePos.x(),
+                          dampedScenePos.y() - startScenePos.y());
+
+    qreal squaredDistance = totalMovement.x()*totalMovement.x() + totalMovement.y()*totalMovement.y();
+    return squaredDistance > maxDistance*maxDistance;
+}
+
+void UCSwipeAreaPrivate::giveUpIfDisabledOrInvisible()
+{
+    if (!q->isEnabled() || !q->isVisible()) {
+        if (status == Undecided) {
+            TouchRegistry::instance()->removeCandidateOwnerForTouch(touchId, q);
+            // We still wanna know when it ends for keeping the composition time window up-to-date
+            TouchRegistry::instance()->addTouchWatcher(touchId, q);
+        }
+
+        if (status != WaitingForTouch) {
+            SA_TRACE("Resetting status because got disabled or made invisible");
+            setStatus(WaitingForTouch);
+        }
+    }
+}
+
+void UCSwipeAreaPrivate::rejectGesture()
+{
+    if (status == Undecided) {
+        SA_TRACE("Rejecting gesture because it's taking too long to drag beyond the threshold.");
+
+        TouchRegistry::instance()->removeCandidateOwnerForTouch(touchId, q);
+        // We still wanna know when it ends for keeping the composition time window up-to-date
+        TouchRegistry::instance()->addTouchWatcher(touchId, q);
+
+        setStatus(WaitingForTouch);
+    }
+}
+
+void UCSwipeAreaPrivate::setStatus(Status newStatus)
+{
+    if (newStatus == status)
+        return;
+
+    Status oldStatus = status;
+
+    if (oldStatus == Undecided) {
+        recognitionTimer->stop();
+    }
+
+    status = newStatus;
+    Q_EMIT statusChanged(status);
+
+    SA_TRACE(statusToString(oldStatus) << " -> " << statusToString(newStatus));
+
+    switch (newStatus) {
+        case WaitingForTouch:
+            if (oldStatus == Recognized) {
+                Q_EMIT q->draggingChanged(false);
+            }
+            Q_EMIT q->pressedChanged(false);
+            break;
+        case Undecided:
+            recognitionTimer->start();
+            Q_EMIT q->pressedChanged(true);
+            break;
+        case Recognized:
+            Q_EMIT q->draggingChanged(true);
+            break;
+        default:
+            // no-op
+            break;
+    }
+}
+
+void UCSwipeAreaPrivate::updatePosition(const QPointF &point)
+{
+    bool xChanged = publicScenePos.x() != point.x();
+    bool yChanged = publicScenePos.y() != point.y();
+
+    // Public position should not get updated while the gesture is still being recognized
+    // (ie, Undecided status).
+    Q_ASSERT(status == WaitingForTouch || status == Recognized);
+
+    if (status == Recognized && !recognitionIsDisabled()) {
+        // When the gesture finally gets recognized, the finger will likely be
+        // reasonably far from the edge. If we made the contentX immediately
+        // follow the finger position it would be visually unpleasant as it
+        // would appear right next to the user's finger out of nowhere (ie,
+        // it would jump). Instead, we make contentX go towards the user's
+        // finger in several steps. ie., in an animated way.
+        QPointF delta = point - publicScenePos;
+        // the trick is not to go all the way (1.0) as it would cause a sudden jump
+        publicScenePos.rx() += 0.4 * delta.x();
+        publicScenePos.ry() += 0.4 * delta.y();
+    } else {
+        // no smoothing when initializing or if gesture recognition was immediate as there will
+        // be no jump.
+        publicScenePos = point;
+    }
+
+    if (xChanged || yChanged) {
+        Q_EMIT q->touchPositionChanged(q->touchPosition());
+
+        // handle distance change
+        QPointF totalMovement = publicScenePos - startScenePos;
+        sceneDistance = projectOntoDirectionVector(totalMovement);
+
+        Q_EMIT q->distanceChanged(sceneDistance);
+    }
+}
+
+bool UCSwipeAreaPrivate::isWithinTouchCompositionWindow()
+{
+    return
+        compositionTime > 0 &&
+        !activeTouches.isEmpty() &&
+        timeSource->msecsSinceReference() <=
+            activeTouches.mostRecentStartTime() + (qint64)compositionTime;
+}
+
+void UCSwipeArea::itemChange(ItemChange change, const ItemChangeData &value)
+{
+    if (change == QQuickItem::ItemSceneChange) {
+        if (value.window != nullptr) {
+            value.window->installEventFilter(TouchRegistry::instance());
+
+            // FIXME: Handle window->screen() changes (ie window changing screens)
+            qreal pixelsPerMm = value.window->screen()->physicalDotsPerInch() / 25.4;
+            d->setPixelsPerMm(pixelsPerMm);
+        }
+    }
+}
+
+void UCSwipeAreaPrivate::setPixelsPerMm(qreal pixelsPerMm)
+{
+    dampedScenePos.setMaxDelta(1. * pixelsPerMm);
+    setDistanceThreshold(4. * pixelsPerMm);
+    maxDistance = 10. * pixelsPerMm;
+}
+
+//**************************  ActiveTouchesInfo **************************
+
+ActiveTouchesInfo::ActiveTouchesInfo(const SharedTimeSource &timeSource)
+    : m_timeSource(timeSource)
+{
+}
+
+void ActiveTouchesInfo::update(QTouchEvent *event)
+{
+    if (!(event->touchPointStates() & (Qt::TouchPointPressed | Qt::TouchPointReleased))) {
+        // nothing to update
+        TI_TRACE("Nothing to update");
+        return;
+    }
+
+    const QList<QTouchEvent::TouchPoint> &touchPoints = event->touchPoints();
+    for (int i = 0; i < touchPoints.count(); ++i) {
+        const QTouchEvent::TouchPoint &touchPoint = touchPoints.at(i);
+        if (touchPoint.state() == Qt::TouchPointPressed) {
+            addTouchPoint(touchPoint.id());
+        } else if (touchPoint.state() == Qt::TouchPointReleased) {
+            removeTouchPoint(touchPoint.id());
+        }
+    }
+}
+
+QString ActiveTouchesInfo::toString()
+{
+    QString string = "(";
+
+    {
+        QTextStream stream(&string);
+        m_touchInfoPool.forEach([&](Pool<ActiveTouchInfo>::Iterator &touchInfo) {
+            stream << "(id=" << touchInfo->id << ",startTime=" << touchInfo->startTime << ")";
+            return true;
+        });
+    }
+
+    string.append(")");
+
+    return string;
+}
+
+void ActiveTouchesInfo::addTouchPoint(int touchId)
+{
+    ActiveTouchInfo &activeTouchInfo = m_touchInfoPool.getEmptySlot();
+    activeTouchInfo.id = touchId;
+    activeTouchInfo.startTime = m_timeSource->msecsSinceReference();
+
+    TI_TRACE(qPrintable(toString()));
+}
+
+qint64 ActiveTouchesInfo::touchStartTime(int touchId)
+{
+    qint64 result = -1;
+
+    m_touchInfoPool.forEach([&](Pool<ActiveTouchInfo>::Iterator &touchInfo) {
+        if (touchId == touchInfo->id) {
+            result = touchInfo->startTime;
+            return false;
+        } else {
+            return true;
+        }
+    });
+
+    Q_ASSERT(result != -1);
+    return result;
+}
+
+void ActiveTouchesInfo::removeTouchPoint(int touchId)
+{
+    m_touchInfoPool.forEach([&](Pool<ActiveTouchInfo>::Iterator &touchInfo) {
+        if (touchId == touchInfo->id) {
+            m_touchInfoPool.freeSlot(touchInfo);
+            return false;
+        } else {
+            return true;
+        }
+    });
+
+    TI_TRACE(qPrintable(toString()));
+}
+
+qint64 ActiveTouchesInfo::mostRecentStartTime()
+{
+    Q_ASSERT(!m_touchInfoPool.isEmpty());
+
+    qint64 highestStartTime = -1;
+
+    m_touchInfoPool.forEach([&](Pool<ActiveTouchInfo>::Iterator &activeTouchInfo) {
+        if (activeTouchInfo->startTime > highestStartTime) {
+            highestStartTime = activeTouchInfo->startTime;
+        }
+        return true;
+    });
+
+    return highestStartTime;
+}
+
+void UCSwipeAreaPrivate::updateSceneDirectionVector()
+{
+    QPointF localOrigin(0., 0.);
+    QPointF localDirection;
+    switch (direction) {
+        case UCSwipeArea::Upwards:
+            localDirection.rx() = 0.;
+            localDirection.ry() = -1.;
+            break;
+        case UCSwipeArea::Downwards:
+        case UCSwipeArea::Vertical:
+            localDirection.rx() = 0.;
+            localDirection.ry() = 1;
+            break;
+        case UCSwipeArea::Leftwards:
+            localDirection.rx() = -1.;
+            localDirection.ry() = 0.;
+            break;
+        default: // UCSwipeArea::Rightwards || Direction.Horizontal
+            localDirection.rx() = 1.;
+            localDirection.ry() = 0.;
+            break;
+    }
+    QPointF sceneOrigin = q->mapToScene(localOrigin);
+    QPointF sceneDirection = q->mapToScene(localDirection);
+    sceneDirectionVector = sceneDirection - sceneOrigin;
+}
+
+qreal UCSwipeAreaPrivate::projectOntoDirectionVector(const QPointF &sceneVector) const
+{
+    // same as dot product as sceneDirectionVector is a unit vector
+    return  sceneVector.x() * sceneDirectionVector.x() +
+            sceneVector.y() * sceneDirectionVector.y();
+}
+
+UCSwipeAreaPrivate::UCSwipeAreaPrivate(UCSwipeArea *q)
+    : timeSource(new RealTimeSource)
+    , activeTouches(timeSource)
+    , q(q)
+    , recognitionTimer(nullptr)
+    , distanceThreshold(0)
+    , distanceThresholdSquared(0.)
+    , maxDistance(0.)
+    , sceneDistance(0.)
+    , touchId(-1)
+    , maxTime(400)
+    , compositionTime(60)
+    , status(WaitingForTouch)
+    , direction(UCSwipeArea::Rightwards)
+    , immediateRecognition(false)
+{
+}
 
=== added file 'src/Ubuntu/Components/plugin/gestures/ucswipearea.h'
--- src/Ubuntu/Components/plugin/gestures/ucswipearea.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/gestures/ucswipearea.h	2015-11-24 12:22:14 +0000
@@ -0,0 +1,98 @@
+/*
+ * 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/>.
+ *
+ */
+
+#ifndef UCSWIPEAREA_H
+#define UCSWIPEAREA_H
+
+#include <QtQuick/QQuickItem>
+#include "ubuntugesturesqmlglobal.h"
+#include "damper.h"
+
+// lib UbuntuGestures
+#include <UbuntuGestures/Pool>
+#include <UbuntuGestures/Timer>
+
+// logging
+#include <QtCore/QLoggingCategory>
+
+class TouchOwnershipEvent;
+class UnownedTouchEvent;
+class UCSwipeAreaPrivate;
+
+class UBUNTUGESTURESQML_EXPORT UCSwipeArea : public QQuickItem
+{
+    Q_OBJECT
+
+    Q_PROPERTY(Direction direction READ direction WRITE setDirection NOTIFY directionChanged)
+    Q_PROPERTY(qreal distance READ distance NOTIFY distanceChanged)
+    Q_PROPERTY(QPointF touchPosition READ touchPosition NOTIFY touchPositionChanged)
+    Q_PROPERTY(bool dragging READ dragging NOTIFY draggingChanged)
+    Q_PROPERTY(bool pressed READ pressed NOTIFY pressedChanged)
+    Q_PROPERTY(bool immediateRecognition
+            READ immediateRecognition
+            WRITE setImmediateRecognition
+            NOTIFY immediateRecognitionChanged)
+
+    Q_ENUMS(Direction)
+public:
+    enum Direction {
+        Rightwards,
+        Leftwards,
+        Downwards,
+        Upwards,
+        Horizontal,
+        Vertical
+    };
+
+    UCSwipeArea(QQuickItem *parent = 0);
+
+    Direction direction() const;
+    void setDirection(Direction);
+
+    qreal distance() const;
+
+    QPointF touchPosition() const;
+
+    bool dragging() const;
+
+    bool pressed() const;
+
+    bool immediateRecognition() const;
+    void setImmediateRecognition(bool enabled);
+
+Q_SIGNALS:
+    void directionChanged(Direction direction);
+    void draggingChanged(bool dragging);
+    void pressedChanged(bool pressed);
+    void distanceChanged(qreal distance);
+    void touchPositionChanged(const QPointF &position);
+    void immediateRecognitionChanged(bool immediateRecognition);
+
+protected:
+    bool event(QEvent *e) override;
+
+    void touchEvent(QTouchEvent *event) override;
+    void itemChange(ItemChange change, const ItemChangeData &value) override;
+
+public: // so tests can access it
+    UCSwipeAreaPrivate *d;
+};
+
+Q_DECLARE_LOGGING_CATEGORY(ucSwipeArea)
+Q_DECLARE_LOGGING_CATEGORY(ucActiveTouchInfo)
+
+#endif // UCSWIPEAREA_H
 
=== added file 'src/Ubuntu/Components/plugin/gestures/ucswipearea_p.h'
--- src/Ubuntu/Components/plugin/gestures/ucswipearea_p.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/gestures/ucswipearea_p.h	2015-11-24 12:22:14 +0000
@@ -0,0 +1,157 @@
+/*
+ * 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/>.
+ *
+ */
+
+#ifndef UCSWIPEAREAPRIVATE_H
+#define UCSWIPEAREAPRIVATE_H
+
+#include "ucswipearea.h"
+
+// Information about an active touch point
+struct UBUNTUGESTURESQML_EXPORT ActiveTouchInfo {
+    ActiveTouchInfo() : id(-1), startTime(-1) {}
+    bool isValid() const { return id != -1; }
+    void reset() { id = -1; }
+    int id;
+    qint64 startTime;
+};
+class UBUNTUGESTURESQML_EXPORT ActiveTouchesInfo {
+public:
+    ActiveTouchesInfo(const UbuntuGestures::SharedTimeSource &timeSource);
+    void update(QTouchEvent *event);
+    qint64 touchStartTime(int id);
+    bool isEmpty() const { return m_touchInfoPool.isEmpty(); }
+    qint64 mostRecentStartTime();
+    UbuntuGestures::SharedTimeSource m_timeSource;
+private:
+    void addTouchPoint(int touchId);
+    void removeTouchPoint(int touchId);
+    QString toString();
+
+    Pool<ActiveTouchInfo> m_touchInfoPool;
+};
+
+class UBUNTUGESTURESQML_EXPORT UCSwipeAreaPrivate : public QObject
+{
+    Q_OBJECT
+
+    Q_ENUMS(Status)
+public:
+    UCSwipeAreaPrivate(UCSwipeArea *q);
+
+public Q_SLOTS:
+    void giveUpIfDisabledOrInvisible();
+    void rejectGesture();
+
+public:
+    // Describes the state of the directional drag gesture.
+    enum Status {
+        // Waiting for a new touch point to land on this area. No gesture is being processed
+        // or tracked.
+        WaitingForTouch,
+
+        // A touch point has landed on this area but it's not know yet whether it is
+        // performing a drag in the correct direction.
+        // If it's decided that the touch point is not performing a directional drag gesture,
+        // it will be rejected/ignored and status will return to WaitingForTouch.
+        Undecided, //Recognizing,
+
+        // There's a touch point in this area and it performed a drag in the correct
+        // direction.
+        //
+        // Once recognized, the gesture state will move back to WaitingForTouch only once
+        // that touch point ends. The gesture will remain in the Recognized state even if
+        // the touch point starts moving in other directions or halts.
+        Recognized,
+    };
+
+    void touchEvent_absent(QTouchEvent *event);
+    void touchEvent_undecided(QTouchEvent *event);
+    void touchEvent_recognized(QTouchEvent *event);
+    bool movingInRightDirection() const;
+    bool movedFarEnoughAlongGestureAxis() const;
+    bool isPastMaxDistance() const;
+    const QTouchEvent::TouchPoint *fetchTargetTouchPoint(QTouchEvent *event);
+    void setStatus(Status newStatus);
+    void updatePosition(const QPointF &point);
+    void setPublicScenePos(const QPointF &point);
+    bool isWithinTouchCompositionWindow();
+    void updateSceneDirectionVector();
+    // returns the scalar projection between the given vector (in scene coordinates)
+    // and m_sceneDirectionVector
+    qreal projectOntoDirectionVector(const QPointF &sceneVector) const;
+    void touchOwnershipEvent(TouchOwnershipEvent *event);
+    void unownedTouchEvent(UnownedTouchEvent *event);
+    void unownedTouchEvent_undecided(UnownedTouchEvent *unownedTouchEvent);
+    void watchPressedTouchPoints(const QList<QTouchEvent::TouchPoint> &touchPoints);
+    bool recognitionIsDisabled() const;
+    bool sanityCheckRecognitionProperties();
+    void setMaxTime(int value);
+    void setDistanceThreshold(qreal value);
+    void setPixelsPerMm(qreal pixelsPerMm);
+    QString objectName() const { return q->objectName(); }
+
+    // Replaces the existing Timer with the given one.
+    //
+    // Useful for providing a fake timer when testing.
+    void setRecognitionTimer(UbuntuGestures::AbstractTimer *timer);
+
+    // Useful for testing, where a fake time source can be supplied
+    void setTimeSource(const UbuntuGestures::SharedTimeSource &timeSource);
+
+    QPointF startScenePos;
+    // The touch position exposed in the public API.
+    // It only starts to move once the gesture gets recognized.
+    QPointF publicScenePos;
+    // A movement damper is used in some of the gesture recognition calculations
+    // to get rid of noise or small oscillations in the touch position.
+    DampedPointF dampedScenePos;
+    QPointF previousDampedScenePos;
+    // Unit vector in scene coordinates describing the direction of the gesture recognition
+    QPointF sceneDirectionVector;
+    UbuntuGestures::SharedTimeSource timeSource;
+    ActiveTouchesInfo activeTouches;
+
+    UCSwipeArea *q;
+    UbuntuGestures::AbstractTimer *recognitionTimer;
+
+    // How far a touch point has to move from its initial position along the gesture axis in order
+    // for it to be recognized as a directional drag.
+    qreal distanceThreshold;
+    qreal distanceThresholdSquared; // it's pow(distanceThreshold, 2)
+    // Maximum distance the gesture can go without crossing the axis-aligned distance threshold
+    qreal maxDistance;
+    qreal sceneDistance;
+
+    int touchId;
+    // Maximum time (in milliseconds) the gesture can take to go beyond the distance threshold
+    int maxTime;
+    // Maximum time (in milliseconds) after the start of a given touch point where
+    // subsequent touch starts are grouped with the first one into an N-touches gesture
+    // (e.g. a two-fingers tap or drag).
+    int compositionTime;
+
+    // The current status of the directional drag gesture area.
+    Status status;
+    UCSwipeArea::Direction direction;
+
+    bool immediateRecognition;
+
+Q_SIGNALS:
+    void statusChanged(Status value);
+};
+
+#endif // UCSWIPEAREAPRIVATE_H
 
=== modified file 'src/Ubuntu/Components/plugin/plugin.cpp'
--- src/Ubuntu/Components/plugin/plugin.cpp	2015-10-01 12:34:29 +0000
+++ src/Ubuntu/Components/plugin/plugin.cpp	2015-11-24 12:22:14 +0000
@@ -70,6 +70,9 @@
 #include "ucheader.h"
 #include "uclabel.h"
 #include "uclistitemlayout.h"
+#include "ucbottomedgehint.h"
+#include "gestures/ucswipearea.h"
+#include "ucmathutils.h"
 
 #include <sys/types.h>
 #include <unistd.h>
@@ -194,6 +197,7 @@
     qmlRegisterType<UCInverseMouse>(uri, major, minor, "InverseMouse");
     qmlRegisterType<UCActionItem>(uri, major, minor, "ActionItem");
     qmlRegisterSingletonType<UCHaptics>(uri, major, minor, "Haptics", registerHaptics);
+    qmlRegisterSingletonType<UCMathUtils>(uri, major, minor, "MathUtils", UCMathUtils::qmlRegisterTypeCallback);
 }
 
 void UbuntuComponentsPlugin::registerTypes(const char *uri)
@@ -230,7 +234,6 @@