Merge lp:~tpeeters/ubuntu-ui-toolkit/noViewReference into lp:ubuntu-ui-toolkit

[Tim Peeters]

Fix reference error in PullToRefreshStyle.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1980
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2327/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/150
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/151/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2327/rebuild

review: Needs Fixing (continuous-integration)

[lp:~tpeeters/ubuntu-ui-toolkit/noViewReference]

1981. By Tim Peeters on 2016-05-18

rename view to flickable

Unmerged revisions

=== modified file 'components.api'
--- components.api	2016-04-25 10:45:41 +0000
+++ components.api	2016-05-18 10:22:28 +0000
@@ -872,6 +872,7 @@
     property PaletteValues selected
 Ubuntu.Components.Themes.Palette 1.3: QtObject
     property PaletteValues disabled
+    property PaletteValues focused
     property PaletteValues highlighted
     property PaletteValues normal
     property PaletteValues selected
@@ -908,6 +909,8 @@
     property color overlay
     property color overlaySecondaryText
     property color overlayText
+    property color position
+    property color positionText
     property color positive
     property color positiveText
     property color raised
 
=== modified file 'debian/control.gles'
--- debian/control.gles	2016-04-21 13:10:34 +0000
+++ debian/control.gles	2016-05-18 10:22:28 +0000
@@ -32,8 +32,8 @@
                libxkbcommon-dev,
                libxrender-dev,
                locales,
+               pep8,
                python-autopilot (>= 1.4),
-               pep8,
                python3-sphinx,
                python3:any,
                python:any,
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/Colors.qml'
--- examples/ubuntu-ui-toolkit-gallery/Colors.qml	2016-03-01 15:08:08 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Colors.qml	2016-05-18 10:22:28 +0000
@@ -29,7 +29,7 @@
         className: "Palette"
         documentation: "qml-palette.html"
 
-        property var palettes: ["normal", "disabled", "selected", "selectedDisabled", "highlighted"]
+        property var palettes: ["normal", "disabled", "selected", "selectedDisabled", "highlighted", "focused"]
         property var paletteValues: [["background", ["backgroundText", "backgroundSecondaryText", "backgroundTertiaryText"]],
             ["base", ["baseText"]],
             ["foreground", ["foregroundText"]],
@@ -40,7 +40,9 @@
             ["overlay", ["overlayText", "overlaySecondaryText"]],
             ["positive", ["positiveText"]],
             ["raised", ["raisedText", "raisedSecondaryText"]],
-            ["selection", ["selectionText"]]]
+            ["selection", ["selectionText"]],
+            ["position", ["positionText"]],
+        ]
 
         Flow {
             id: paletteFlow
@@ -75,7 +77,7 @@
                                 property string mainColor: modelData[0]
                                 property var textColors: modelData[1]
                                 property bool previewed: paletteFlow.previewed == paletteColor
-                                width: units.gu(4)
+                                width: units.gu(8)
                                 height: units.gu(5)
                                 z: previewed ? 10 : 0
 
@@ -106,7 +108,7 @@
 
                                     Rectangle {
                                         anchors.fill: parent
-                                        color: palette[mainColor]
+                                        color: palette ? palette[mainColor] : "transparent"
                                         border.width: color == theme.palette.normal.background ? units.dp(1) : 0
                                         border.color: theme.palette.normal.backgroundText
                                     }
@@ -124,8 +126,8 @@
                                             model: textColors
                                             Label {
                                                 width: previewed ? implicitWidth : parent.width
-                                                text: previewed ? modelData : modelData.slice(0, 4)
-                                                color: palette[modelData]
+                                                text: previewed ? modelData : modelData.slice(0, 10)
+                                                color: palette ? palette[modelData] : "transparent"
                                                 textSize: previewed ? Label.Medium : Label.XSmall
                                                 elide: Text.ElideRight
                                             }
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/PageHeaders.qml'
--- examples/ubuntu-ui-toolkit-gallery/PageHeaders.qml	2016-02-17 14:45:09 +0000
+++ examples/ubuntu-ui-toolkit-gallery/PageHeaders.qml	2016-05-18 10:22:28 +0000
@@ -26,7 +26,47 @@
         className: "PageHeader"
 
         Label {
-            text: "Use the icons in the header."
+            text: "Use the icons in the header for search and edit header."
+        }
+
+        Grid {
+            id: switchGrid
+            columns: 2
+            spacing: units.gu(1)
+            anchors {
+                left: parent.left
+                leftMargin: units.gu(5)
+            }
+
+            Switch {
+                id: lockedSwitch
+                checked: standardHeader.extension
+                onTriggered: {
+                    if (standardHeader.extension) {
+                        standardHeader.extension = null;
+                    } else {
+                        standardHeader.extension = sections;
+                    }
+                }
+            }
+            Label {
+                text: "Sections"
+            }
+
+            Switch {
+                id: subtitleSwitch
+                checked: standardHeader.subtitle
+                onTriggered: {
+                    if (standardHeader.subtitle) {
+                        standardHeader.subtitle = "";
+                    } else {
+                        standardHeader.subtitle = "Hello, this is your subtitle";
+                    }
+                }
+            }
+            Label {
+                text: "Subtitle"
+            }
         }
     }
 
@@ -44,19 +84,6 @@
                 iconName: "edit"
                 text: "Edit"
                 onTriggered: page.header = editHeader
-            },
-            Action {
-                iconName: standardHeader.extension === sections
-                          ? "media-playback-stop"
-                          : "filters"
-                text: "Sections"
-                onTriggered: {
-                    if (standardHeader.extension) {
-                        standardHeader.extension = null;
-                    } else {
-                        standardHeader.extension = sections;
-                    }
-                }
             }
         ]
 
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/SwipeAreaPage.qml'
--- examples/ubuntu-ui-toolkit-gallery/SwipeAreaPage.qml	2015-11-09 14:46:02 +0000
+++ examples/ubuntu-ui-toolkit-gallery/SwipeAreaPage.qml	2016-05-18 10:22:28 +0000
@@ -28,8 +28,8 @@
         TemplateRow {
             title: i18n.tr("Upwards")
             Rectangle {
-                width: units.gu(40)
-                height: units.gu(20)
+                width: parent.width / 1.5
+                height: width / 2
                 color: theme.palette.normal.foreground
 
                 SwipeArea {
@@ -56,8 +56,8 @@
         TemplateRow {
             title: i18n.tr("Downwards")
             Rectangle {
-                width: units.gu(40)
-                height: units.gu(20)
+                width: parent.width / 1.5
+                height: width / 2
                 color: theme.palette.normal.foreground
 
                 SwipeArea {
@@ -84,8 +84,8 @@
         TemplateRow {
             title: i18n.tr("Rightwards")
             Rectangle {
-                width: units.gu(40)
-                height: units.gu(20)
+                width: parent.width / 1.5
+                height: width / 2
                 color: theme.palette.normal.foreground
 
                 SwipeArea {
@@ -114,8 +114,8 @@
         TemplateRow {
             title: i18n.tr("Leftwards")
             Rectangle {
-                width: units.gu(40)
-                height: units.gu(20)
+                width: parent.width / 1.5
+                height: width / 2
                 color: theme.palette.normal.foreground
 
                 SwipeArea {
 
=== modified file 'src/Ubuntu/Components/1.3/AdaptivePageLayout.qml'
--- src/Ubuntu/Components/1.3/AdaptivePageLayout.qml	2016-03-16 09:15:39 +0000
+++ src/Ubuntu/Components/1.3/AdaptivePageLayout.qml	2016-05-18 10:22:28 +0000
@@ -788,7 +788,7 @@
                     bottom: parent.bottom
                     left: parent.left
                     right: parent.right
-                    rightMargin: dividerThickness
+                    rightMargin: dividerThickness + verticalDivider.width
                 }
                 Item {
                     id: hiddenItem
@@ -806,6 +806,7 @@
                     left: parent.left
                     top: parent.top
                     right: parent.right
+                    rightMargin: dividerThickness + verticalDivider.width
                 }
                 height: body.headerHeight
 
@@ -856,7 +857,7 @@
                     right: parent.right
                     rightMargin: dividerThickness
                 }
-                width: (column == (d.columns - 1)) || !pageWrapper ? 0 : units.dp(1)
+                width: (column == (d.columns - 1)) ? 0 : units.dp(1)
                 color: theme.palette.normal.base
                 MouseArea {
                     id: resizerSensing
@@ -923,7 +924,7 @@
                 wrapper.active = false;
                 subHeader.config = null;
                 pageWrapper = null;
-                wrapper.parent = hiddenPool;
+                wrapper.parent = hiddenItem;
                 wrapper.pageHolder = null;
                 return wrapper;
             }
 
=== modified file 'src/Ubuntu/Components/1.3/Tabs.qml'
--- src/Ubuntu/Components/1.3/Tabs.qml	2015-12-08 18:34:40 +0000
+++ src/Ubuntu/Components/1.3/Tabs.qml	2016-05-18 10:22:28 +0000
@@ -49,12 +49,6 @@
                             anchors.centerIn: parent
                             text: "A centered label"
                         }
-                        tools: ToolbarItems {
-                            ToolbarButton {
-                                text: "action"
-                                onTriggered: print("action triggered")
-                            }
-                        }
                     }
                 }
                 Tab {
 
=== modified file 'src/Ubuntu/Components/1.3/TextArea.qml'
--- src/Ubuntu/Components/1.3/TextArea.qml	2016-04-26 05:33:41 +0000
+++ src/Ubuntu/Components/1.3/TextArea.qml	2016-05-18 10:22:28 +0000
@@ -769,6 +769,7 @@
         property string displayText: editor.getText(0, editor.length)
         property real frameSpacing: control.__styleInstance.frameSpacing
         property real minimumSize: units.gu(4)
+        property real scrollbarSpacing: rightScrollbar.__interactive ? units.gu(2) : 0
 
         function linesHeight(lines)
         {
@@ -824,15 +825,6 @@
     }
 
     //scrollbars and flickable
-    Scrollbar {
-        id: rightScrollbar
-        flickableItem: flicker
-    }
-    Scrollbar {
-        id: bottomScrollbar
-        flickableItem: flicker
-        align: Qt.AlignBottom
-    }
     Flickable {
         id: flicker
         objectName: "input_scroller"
@@ -853,7 +845,7 @@
             objectName: "text_input"
             readOnly: false
             id: editor
-            width: control.contentWidth
+            width: control.contentWidth - internal.scrollbarSpacing
             height: Math.max(control.contentHeight, editor.contentHeight)
             wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere
             mouseSelectionMode: TextEdit.SelectWords
@@ -883,6 +875,20 @@
             }
         }
     }
+    Scrollbar {
+        id: rightScrollbar
+        flickableItem: flicker
+        // Attach right inside the frame
+        // Flickable uses anchors.margins relative to the frame
+        // rather than *Margin which would scroll with the content
+        anchors.topMargin: -internal.frameSpacing
+        anchors.rightMargin: -internal.frameSpacing
+        anchors.bottomMargin: -internal.frameSpacing
+        Ubuntu.StyleHints {
+            // No background color
+            troughColorSteppersStyle: Qt.rgba(0, 0, 0, 0)
+        }
+    }
 
     styleName: "TextAreaStyle"
 }
 
=== modified file 'src/Ubuntu/Components/1.3/TextField.qml'
--- src/Ubuntu/Components/1.3/TextField.qml	2016-04-26 05:33:41 +0000
+++ src/Ubuntu/Components/1.3/TextField.qml	2016-05-18 10:22:28 +0000
@@ -995,11 +995,11 @@
         anchors {
             left: leftPane.right
             right: clearButton.left
-            top: parent.top
-            bottom: parent.bottom
             margins: internal.spacing
+            verticalCenter: parent.verticalCenter
         }
         topMargin: internal.spacing
+        bottomMargin: internal.spacing
         // do not allow rebounding
         boundsBehavior: Flickable.StopAtBounds
         // need to forward events as events occurred on topMargin area are not grabbed by the MouseArea.
@@ -1008,13 +1008,12 @@
         clip: true
         contentWidth: editor.contentWidth
         contentHeight: editor.contentHeight
+        height: editor.contentHeight
 
         TextInput {
             id: editor
             objectName: "text_input"
             // FocusScope will forward focus to this component
-            anchors.verticalCenter: parent.verticalCenter
-            verticalAlignment: TextInput.AlignVCenter
             width: flicker.width
             height: flicker.height
             cursorDelegate: TextCursor {
 
=== modified file 'src/Ubuntu/Components/1.3/ToolbarButton.qml'
--- src/Ubuntu/Components/1.3/ToolbarButton.qml	2015-09-28 14:36:54 +0000
+++ src/Ubuntu/Components/1.3/ToolbarButton.qml	2016-05-18 10:22:28 +0000
@@ -29,7 +29,7 @@
         Example of different ways to define the toolbar button:
         \qml
         import QtQuick 2.4
-        import Ubuntu.Components 1.3
+        import Ubuntu.Components 1.2
 
         MainView {
             width: units.gu(50)
 
=== modified file 'src/Ubuntu/Components/1.3/UbuntuListView.qml'
--- src/Ubuntu/Components/1.3/UbuntuListView.qml	2016-03-01 14:53:44 +0000
+++ src/Ubuntu/Components/1.3/UbuntuListView.qml	2016-05-18 10:22:28 +0000
@@ -196,7 +196,9 @@
 
     // highlight current item
     highlight: Rectangle {
-        color: theme.palette.selected.background
+        color: root.activeFocus
+               ? theme.palette.focused.background
+               : theme.palette.selected.background
     }
     highlightMoveDuration: 0
 }
 
=== modified file 'src/Ubuntu/Components/Themes/1.3/Palette.qml'
--- src/Ubuntu/Components/Themes/1.3/Palette.qml	2016-03-01 15:06:38 +0000
+++ src/Ubuntu/Components/Themes/1.3/Palette.qml	2016-05-18 10:22:28 +0000
@@ -60,6 +60,11 @@
     property PaletteValues disabled: PaletteValues{}
 
     /*!
+       Color palette to use when the widget is focused.
+    */
+    property PaletteValues focused: PaletteValues{}
+
+    /*!
        Color palette to use when the widget is selected, for example when
        a tab is the current one.
     */
 
=== modified file 'src/Ubuntu/Components/Themes/1.3/PaletteValues.qml'
--- src/Ubuntu/Components/Themes/1.3/PaletteValues.qml	2016-04-26 05:33:41 +0000
+++ src/Ubuntu/Components/Themes/1.3/PaletteValues.qml	2016-05-18 10:22:28 +0000
@@ -140,7 +140,7 @@
     property color activityText
 
     /*!
-       Color applied to selected text in editable components.
+       Color applied to selected text background in editable components.
     */
     property color selection
     /*!
@@ -159,4 +159,14 @@
       Color applied to elements placed on top of the \l focus color.
       */
     property color focusText
+
+    /*!
+     Color applied to navigation elements' background.
+     */
+    property color position
+
+    /*!
+     Color applied to navigation elements to indicate current position.
+     */
+    property color positionText
 }
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/AmbianceNormal.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/AmbianceNormal.qml	2016-04-26 05:33:41 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/AmbianceNormal.qml	2016-05-18 10:22:28 +0000
@@ -24,7 +24,7 @@
     backgroundSecondaryText: UbuntuColors.slate
     backgroundTertiaryText: UbuntuColors.ash
     base: UbuntuColors.silk
-    baseText: UbuntuColors.ash
+    baseText: UbuntuColors.graphite
     foreground: UbuntuColors.porcelain
     foregroundText: UbuntuColors.jet
     raised: "#FFFFFF"
@@ -45,4 +45,6 @@
     negativeText: "#FFFFFF"
     activity: UbuntuColors.blue
     activityText: "#FFFFFF"
+    position: "#00000000"
+    positionText: UbuntuColors.blue
 }
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/AmbianceSelected.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/AmbianceSelected.qml	2016-03-01 15:06:38 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/AmbianceSelected.qml	2016-05-18 10:22:28 +0000
@@ -19,9 +19,8 @@
 
 AmbianceNormal {
     background: UbuntuColors.porcelain
-    backgroundText: UbuntuColors.blue
-    backgroundTertiaryText: UbuntuColors.blue
     base: UbuntuColors.ash
-    baseText: UbuntuColors.blue
+    baseText: UbuntuColors.inkstone
     foreground: UbuntuColors.ash
+    overlay: UbuntuColors.porcelain
 }
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/FocusShape.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/FocusShape.qml	2016-01-28 11:54:29 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/FocusShape.qml	2016-05-18 10:22:28 +0000
@@ -26,7 +26,7 @@
     color: styledItem.enabled
                 ? theme.palette.normal.focus
                 : theme.palette.disabled.focus
-    thickness: units.gu(0.21)
+    thickness: units.dp(1)
     radius: units.gu(1.7)
     visible: styledItem.keyNavigationFocus
 
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml	2016-04-26 05:33:41 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml	2016-05-18 10:22:28 +0000
@@ -26,15 +26,18 @@
             // specific disabled colors
             var diff = {
                 field: UbuntuColors.porcelain,
-                positiveText: normal.positiveText,
-                negativeText: normal.negativeText,
+                selection: Qt.rgba(UbuntuColors.blue.r, UbuntuColors.blue.g, UbuntuColors.blue.b, 0.1),
+                positiveText: "#FFFFFF",
+                negativeText: "#FFFFFF",
+                activityText: "#FFFFFF",
+                focusText: "#FFFFFF"
             };
             for (var p in normal) {
                 // skip objectName and all change signals
                 if (p === "objectName" || p.indexOf("Changed") > 0) continue;
                 disabled[p] = diff[p] || (
                     // if not specific, colors are 30% opaque normal
-                    Qt.rgba(normal[p].r, normal[p].g, normal[p].b, 0.3)
+                    Qt.rgba(normal[p].r, normal[p].g, normal[p].b, normal[p].a * 0.5)
                 );
             }
         }
@@ -51,13 +54,18 @@
                 background: UbuntuColors.porcelain,
                 base: UbuntuColors.porcelain,
                 foreground: UbuntuColors.porcelain,
+                selection: Qt.rgba(UbuntuColors.blue.r, UbuntuColors.blue.g, UbuntuColors.blue.b, 0.1),
+                positiveText: "#FFFFFF",
+                negativeText: "#FFFFFF",
+                activityText: "#FFFFFF",
+                focusText: "#FFFFFF"
             };
             for (var p in selected) {
                 // skip objectName and all change signals
                 if (p === "objectName" || p.indexOf("Changed") > 0) continue;
                 selectedDisabled[p] = diff[p] || (
                     // if not specific, colors are 30% opaque normal
-                    Qt.rgba(selected[p].r, selected[p].g, selected[p].b, 0.3)
+                    Qt.rgba(selected[p].r, selected[p].g, selected[p].b, normal[p].a * 0.5)
                 );
             }
         }
@@ -65,7 +73,15 @@
 
     highlighted: AmbianceNormal {
         background: UbuntuColors.silk
-        base: UbuntuColors.jet
+        base: UbuntuColors.ash
+        baseText: UbuntuColors.inkstone
         foreground: UbuntuColors.silk
+        raised: UbuntuColors.silk
+        raisedText: UbuntuColors.inkstone
+        raisedSecondaryText: UbuntuColors.ash
+    }
+
+    focused: AmbianceNormal {
+        background: Qt.rgba(UbuntuColors.blue.r, UbuntuColors.blue.g, UbuntuColors.blue.b, 0.2)
     }
 }
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml	2015-12-16 11:53:01 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml	2016-05-18 10:22:28 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2016 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
@@ -56,16 +56,22 @@
       Local properties
       */
     readonly property PullToRefresh control: styledItem
-    // property to store Flickable's toipMargin at the time the pull or auto-refresh is started
-    property real flickableTopMargin: 0.0
+    // property to control adding of control.height to the Flickable's topMargin.
+    property bool extendTopMargin: false
+    onExtendTopMarginChanged: {
+        if (extendTopMargin) {
+            control.target.topMargin += control.height;
+        } else {
+            control.target.topMargin -= control.height;
+        }
+    }
+
     // store when the drag has happened at the beginning of the Flickable's content
     property bool wasAtYBeginning: false
     // initial contentY value when pull started
     property real initialContentY: 0.0
     // drives the refreshing state
     property bool refreshing: false
-    // point of release used in rebind animation between the ready-to-refresh and refreshing states
-    property real pointOfRelease
     // specifies the component completion
     property bool ready: false
     // root item
@@ -130,6 +136,17 @@
         anchors.centerIn: parent
     }
 
+    onVisibleChanged: {
+        // Updates to contentY may be interrupted if the flickable becomes
+        //  invisible (for example when a new Page is pushed on a stack
+        //  while PullToRefresh is in refreshing state. See bug #1578619.
+        if (visible) {
+            // Make sure the flickable is back inside its bounds when
+            //  the Page becomes visible again:
+            control.target.returnToBounds();
+        }
+    }
+
     // state and content controlling
     Connections {
         target: control
@@ -138,8 +155,7 @@
                 return;
             }
             if (!style.releaseToRefresh && target.refreshing) {
-                // not a manual refresh, update flickable's starting topMargin
-                style.flickableTopMargin = control.target.topMargin;
+                // not a manual refresh
                 style.wasAtYBeginning = control.target.atYBeginning;
             }
             /*
@@ -162,13 +178,13 @@
             style.refreshing = false;
             style.releaseToRefresh = false;
         }
-        onMovementEnded: style.wasAtYBeginning = control.target.atYBeginning
+        onMovementEnded: {
+            style.wasAtYBeginning = control.target.atYBeginning;
+        }
 
         // catch when to initiate refresh
         onDraggingChanged: {
             if (!control.parent.dragging && style.releaseToRefresh) {
-                pointOfRelease = -(control.target.contentY - control.target.originY)
-                style.flickableTopMargin = control.target.topMargin;
                 style.refreshing = true;
                 style.releaseToRefresh = false;
             }
@@ -213,8 +229,8 @@
                 running: true
             }
             PropertyChanges {
-                target: control.target
-                topMargin: style.flickableTopMargin + control.height
+                target: style
+                extendTopMargin: true
             }
         }
     ]
@@ -226,9 +242,8 @@
             SequentialAnimation {
                 UbuntuNumberAnimation {
                     target: control.target
-                    property: "topMargin"
-                    from: style.pointOfRelease
-                    to: style.flickableTopMargin + control.height
+                    property: "contentY"
+                    to: style.initialContentY - control.height
                 }
                 ScriptAction {
                     script: control.refresh()
@@ -242,8 +257,7 @@
             UbuntuNumberAnimation {
                 target: control.target
                 property: "contentY"
-                from: -style.flickableTopMargin
-                to: -style.flickableTopMargin - control.height
+                to: style.initialContentY - control.height
             }
         },
         Transition {
@@ -253,6 +267,11 @@
                 target: control.target
                 property: "topMargin"
             }
+            UbuntuNumberAnimation {
+                target: control.target
+                property: "contentY"
+                to: style.initialContentY
+            }
         }
     ]
 }
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/SectionsForPageHeadStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/SectionsForPageHeadStyle.qml	2016-02-19 11:18:51 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/SectionsForPageHeadStyle.qml	2016-05-18 10:22:28 +0000
@@ -35,8 +35,8 @@
       The foreground color of the selected section.
      */
     property color selectedSectionColor: enabled
-                                            ? theme.palette.selected.backgroundTertiaryText
-                                            : theme.palette.selectedDisabled.backgroundTertiaryText
+                                            ? theme.palette.selected.positionText
+                                            : theme.palette.selectedDisabled.positionText
 
     /*!
       The background color for the pressed section button.
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/SectionsStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/SectionsStyle.qml	2016-04-25 18:58:29 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/SectionsStyle.qml	2016-05-18 10:22:28 +0000
@@ -41,8 +41,8 @@
       The foreground color of the selected section.
      */
     property color selectedSectionColor: enabled
-                                         ? theme.palette.selected.backgroundTertiaryText
-                                         : theme.palette.selectedDisabled.backgroundTertiaryText
+                                         ? theme.palette.selected.positionText
+                                         : theme.palette.selectedDisabled.positionText
 
     /*!
       The background color for the pressed section button.
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/TextCursorStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/TextCursorStyle.qml	2016-01-26 19:27:50 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/TextCursorStyle.qml	2016-05-18 10:22:28 +0000
@@ -55,8 +55,8 @@
         Rectangle {
             objectName: "text_cursor_style_" + styledItem.positionProperty
             width: cursorWidth
-            // FIXME: check with design whether should it be activity or something else
-            color: theme.palette.normal.activity
+
+            color: theme.palette.normal.positionText
             visible: blinkTimer.timerShowCursor || !blinkTimer.running
             Timer {
                 id: blinkTimer
 
=== modified file 'src/Ubuntu/Components/Themes/SuruDark/1.3/Palette.qml'
--- src/Ubuntu/Components/Themes/SuruDark/1.3/Palette.qml	2016-03-10 08:46:03 +0000
+++ src/Ubuntu/Components/Themes/SuruDark/1.3/Palette.qml	2016-05-18 10:22:28 +0000
@@ -22,14 +22,23 @@
 Palette {
     normal: SuruDarkNormal {}
     disabled: SuruDarkNormal {
-        field: UbuntuColors.inkstone
-        // inactive is 30% transparent normal
         Component.onCompleted: {
+            // specific disabled colors
+            var diff = {
+                foreground: UbuntuColors.inkstone,
+                field: UbuntuColors.inkstone,
+                positiveText: UbuntuColors.porcelain,
+                negativeText: UbuntuColors.porcelain,
+                activityText: UbuntuColors.porcelain,
+                focusText: UbuntuColors.porcelain
+            };
             for (var p in normal) {
                 // skip objectName and all change signals
-                if (p == "objectName"|| p.indexOf("Changed") > 0
-                         || p == "field"  || p == "foreground" ) continue;
-                disabled[p] = Qt.rgba(normal[p].r, normal[p].g, normal[p].b, 0.3);
+                if (p == "objectName"|| p.indexOf("Changed") > 0) continue;
+                disabled[p] = diff[p] || (
+                    // if not specific, colors are 30% opaque normal
+                    Qt.rgba(normal[p].r, normal[p].g, normal[p].b, normal[p].a * 0.5)
+                );
             }
         }
     }
@@ -39,24 +48,39 @@
 
     // selected differs from normal in background, base, foreground
     selectedDisabled: SuruDarkSelected {
-        background: UbuntuColors.inkstone
-        base: UbuntuColors.inkstone
-        foreground: UbuntuColors.inkstone
-        // inactive is 30% transparent normal
         Component.onCompleted: {
+            var diff = {
+                background: UbuntuColors.inkstone,
+                base: UbuntuColors.inkstone,
+                foreground: UbuntuColors.inkstone,
+                positiveText: UbuntuColors.porcelain,
+                negativeText: UbuntuColors.porcelain,
+                activityText: UbuntuColors.porcelain,
+                focusText: UbuntuColors.porcelain
+            };
             for (var p in selected) {
                 // skip objectName and all change signals
-                if (p == "objectName"|| p.indexOf("Changed") > 0
-                         || p == "field"  || p == "foreground" ) continue;
-                selectedDisabled[p] = Qt.rgba(selected[p].r, selected[p].g, selected[p].b, 0.3);
+                if (p == "objectName"|| p.indexOf("Changed") > 0) continue;
+                selectedDisabled[p] = diff[p] || (
+                    // if not specific, colors are 30% opaque normal
+                    Qt.rgba(selected[p].r, selected[p].g, selected[p].b, normal[p].a * 0.5)
+                );
             }
         }
     }
 
     highlighted: SuruDarkNormal {
         background: UbuntuColors.slate
-        base: UbuntuColors.graphite
+        base: UbuntuColors.slate
+        baseText: UbuntuColors.silk
         foreground: UbuntuColors.slate
+        raised: UbuntuColors.silk
+        raisedText: UbuntuColors.inkstone
+        raisedSecondaryText: UbuntuColors.ash
+    }
+
+    focused: SuruDarkNormal {
+        background: Qt.rgba(UbuntuColors.blue.r, UbuntuColors.blue.g, UbuntuColors.blue.b, 0.4)
     }
 }
 //![0]
 
=== modified file 'src/Ubuntu/Components/Themes/SuruDark/1.3/SuruDarkNormal.qml'
--- src/Ubuntu/Components/Themes/SuruDark/1.3/SuruDarkNormal.qml	2016-04-26 05:33:41 +0000
+++ src/Ubuntu/Components/Themes/SuruDark/1.3/SuruDarkNormal.qml	2016-05-18 10:22:28 +0000
@@ -24,7 +24,7 @@
     backgroundSecondaryText: UbuntuColors.silk
     backgroundTertiaryText: UbuntuColors.ash
     base: UbuntuColors.graphite
-    baseText: UbuntuColors.ash
+    baseText: UbuntuColors.silk
     foreground: UbuntuColors.inkstone
     foregroundText: "#FFFFFF"
     raised: "#FFFFFF"
@@ -45,4 +45,6 @@
     negativeText: "#FFFFFF"
     activity: UbuntuColors.blue
     activityText: "#FFFFFF"
+    position: "#00000000"
+    positionText: UbuntuColors.blue
 }
 
=== modified file 'src/Ubuntu/Components/Themes/SuruDark/1.3/SuruDarkSelected.qml'
--- src/Ubuntu/Components/Themes/SuruDark/1.3/SuruDarkSelected.qml	2016-03-01 15:06:38 +0000
+++ src/Ubuntu/Components/Themes/SuruDark/1.3/SuruDarkSelected.qml	2016-05-18 10:22:28 +0000
@@ -20,10 +20,8 @@
 
 SuruDarkNormal {
     background: UbuntuColors.inkstone
-    backgroundText: UbuntuColors.blue
-    backgroundTertiaryText: UbuntuColors.blue
-    base: UbuntuColors.ash
-    baseText:UbuntuColors.blue
+    base: UbuntuColors.inkstone
+    baseText: UbuntuColors.ash
     foreground: UbuntuColors.slate
+    overlay: UbuntuColors.slate
 }
-
 
=== modified file 'src/Ubuntu/Components/plugin/ucheader.cpp'
--- src/Ubuntu/Components/plugin/ucheader.cpp	2016-04-20 15:26:25 +0000
+++ src/Ubuntu/Components/plugin/ucheader.cpp	2016-05-18 10:22:28 +0000
@@ -40,7 +40,7 @@
     import QtQuick 2.4
     import Ubuntu.Components 1.3
 
-    Item {
+    Page {
         width: units.gu(50)
         height: units.gu(70)
 
 
=== modified file 'src/Ubuntu/Components/plugin/uclistitem.cpp'
--- src/Ubuntu/Components/plugin/uclistitem.cpp	2016-04-26 10:21:32 +0000
+++ src/Ubuntu/Components/plugin/uclistitem.cpp	2016-05-18 10:22:28 +0000
@@ -1140,9 +1140,6 @@
         updateNode = true;
     }
     QRectF rect(boundingRect());
-    // FIXME: The 1dp margin is here so that part of the focus frame
-    //  is not hidden by the APL divider. See bug #1575060.
-    rect -= QMarginsF(0, 0, UCUnits::instance()->dp(1), 0);
     d->divider->setOpacity(paintFocus ? 0.0 : 1.0);
     rectNode->setRect(rect);
 
 
=== modified file 'src/Ubuntu/Components/plugin/ucmainviewbase.cpp'
--- src/Ubuntu/Components/plugin/ucmainviewbase.cpp	2016-04-04 04:47:11 +0000
+++ src/Ubuntu/Components/plugin/ucmainviewbase.cpp	2016-05-18 10:22:28 +0000
@@ -53,7 +53,9 @@
 
     m_actionContext->setObjectName(QStringLiteral("RootContext"));
     m_actionContext->setActive(true);
-    q->setActive(true);
+    // setActive(true) is called in componentComplete to wait
+    // until the MainView (and all its children) are complete
+    // to prevent bug #1570886.
 
     QObject::connect(m_actionManager,&UCActionManager::quit, [](){
         // FIXME Wire this up to the application lifecycle management API instead of quit().
@@ -307,6 +309,9 @@
 {
     Q_D(UCMainViewBase);
     UCPageTreeNode::componentComplete();
+    // Do not call setActive() in d->init() but postpone until the
+    // component is complete to avoid bug #1570886.
+    this->setActive(true);
     d->doAutoTheme();
 
     if (d->m_actionContext)
 
=== modified file 'src/Ubuntu/Components/plugin/ucstyleditembase.cpp'
--- src/Ubuntu/Components/plugin/ucstyleditembase.cpp	2016-04-25 10:45:41 +0000
+++ src/Ubuntu/Components/plugin/ucstyleditembase.cpp	2016-05-18 10:22:28 +0000
@@ -37,6 +37,32 @@
 {
 }
 
+/*!
+ * \qmlproperty string StyledItem::keyNavigationFocus
+ * If \l activeFocusOnTab is true and Tab or Shift+Tab is used to focus
+ * the item this property will be true - unlike \l activeFocus which is also
+ * true if the item gained focus by click, tap or programmatically.
+ * Note that only one component at a time has \b keyNavigationFocus. The
+ * parent will have \l activeFocus and usually won't draw a focus ring.
+ *
+ * In case of complex components arrow keys may be the preferred way to move
+ * between children that can take focus. Examples of that are ListView and
+ * ListItem. This currently requires overriding \b keyNavigationFocus in C++.
+ *
+ * The implementation of focus rings as provided by the default Ambiance theme
+ * sets \l activeFocusOnTab in the style of each component and only indicates
+ * focus as long as \b keyNavigationFocus is true, similar to the below example.
+ * \qml
+ * StyledItem {
+ *     id: myItem
+ *     activeFocusOnTab: true
+ *     Rectangle {
+ *         anchors.fill: parent
+ *         color: keyNavigationFocus ? UbuntuColors.orange : UbuntuColors.blue
+ *     }
+ * }
+ * \endqml
+ */
 bool UCStyledItemBase::keyNavigationFocus() const
 {
     Q_D(const UCStyledItemBase);
@@ -44,6 +70,9 @@
 }
 void UCStyledItemBase::setKeyNavigationFocus(bool v)
 {
+    // FIXME: Behavior of nested StyledItem is currently undefined
+    // Docs should be updated once the behavior is sorted out
+    // See https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1575257
     Q_D(UCStyledItemBase);
     if (d->keyNavigationFocus == v)
         return;
 
=== modified file 'tests/packaging-sorting.sh'
--- tests/packaging-sorting.sh	2016-03-07 14:21:53 +0000
+++ tests/packaging-sorting.sh	2016-05-18 10:22:28 +0000
@@ -27,6 +27,8 @@
 cp -a ../debian $tmpdir
 
 wrap-and-sort -a -t -d $tmpdir/debian/
+# Verify control.gles which otherwise isn't picked up
+wrap-and-sort -a -t -d $tmpdir/debian/ -f $tmpdir/debian/control.gles
 
 diff -urN ../debian $tmpdir/debian
 
 
=== added file 'tests/unit_x11/tst_components/logo.png'
 Binary files tests/unit_x11/tst_components/logo.png	1970-01-01 00:00:00 +0000 and tests/unit_x11/tst_components/logo.png	2016-05-18 10:22:28 +0000 differ
=== modified file 'tests/unit_x11/tst_components/tst_pulltorefresh_listview.qml'
--- tests/unit_x11/tst_components/tst_pulltorefresh_listview.qml	2015-03-03 13:20:06 +0000
+++ tests/unit_x11/tst_components/tst_pulltorefresh_listview.qml	2016-05-18 10:22:28 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2016 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
 
=== added file 'tests/unit_x11/tst_components/tst_pulltorefresh_pagestack_topmargin.qml'
--- tests/unit_x11/tst_components/tst_pulltorefresh_pagestack_topmargin.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_components/tst_pulltorefresh_pagestack_topmargin.qml	2016-05-18 10:22:28 +0000
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2016 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
+import QtTest 1.0
+import Ubuntu.Test 1.3
+
+Item {
+    width: units.gu(40)
+    height: units.gu(71)
+
+    MainView {
+        anchors.fill: parent
+        PageStack {
+            id: pageStack
+            Page {
+                id: page0
+                title: "One"
+                visible: false
+
+                ListView {
+                    id: view
+                    anchors.fill: parent
+                    model: 15
+                    delegate: Standard {
+                        width: ListView.view.width
+                        height: units.gu(5)
+                        text: index
+                    }
+                    PullToRefresh {
+                        id: pullMe
+                        onRefresh: {
+                            refreshing = true;
+                            refreshing = false;
+                            pageStack.push(page1)
+                        }
+                    }
+                }
+            }
+            Page {
+                id: page1
+                title: "Two"
+                visible: false
+                Button {
+                    anchors.centerIn: parent
+                    onClicked: pageStack.pop()
+                    text: "back"
+                }
+            }
+            Component.onCompleted: pageStack.push(page0)
+        }
+    }
+
+    UbuntuTestCase {
+        name: "PullToRefreshPageStackPushWhileRefreshing"
+        when: windowShown
+
+        function test_push_while_refreshing_bug1578619() {
+            var initialTopMargin = view.topMargin;
+            var initialContentY = view.contentY;
+            flick(view, view.width/2, units.gu(10), 0, units.gu(40));
+            wait(1000);
+            pageStack.pop();
+            tryCompare(view, "moving", false);
+            tryCompare(view, "topMargin", initialTopMargin, 500,
+                    "Initial topMargin of flickable is not restored after refreshing.");
+            tryCompare(view, "contentY", initialContentY, 500,
+                    "Initial contentY of flickable is not restored after refreshing.")
+        }
+    }
+}
 
=== added file 'tests/unit_x11/tst_components/tst_pulltorefresh_topmargin.qml'
--- tests/unit_x11/tst_components/tst_pulltorefresh_topmargin.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_components/tst_pulltorefresh_topmargin.qml	2016-05-18 10:22:28 +0000
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2016 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 QtTest 1.0
+import Ubuntu.Test 1.3
+
+Item {
+    width: units.gu(40)
+    height: units.gu(71)
+    id: root
+    Flickable {
+        id: view
+        anchors.fill: parent
+        contentHeight: 1.6*view.height
+        Label {
+            anchors.centerIn: parent
+            text: "void"
+        }
+        PullToRefresh {
+            id: pullToRefresh
+            parent: view
+            onRefresh: {
+                refreshing = true;
+                refreshing = false;
+            }
+        }
+    }
+
+    UbuntuTestCase {
+        name: "PullToRefreshTopMargin"
+        when: windowShown
+
+        function test_reposition_after_refresh_bug1578619() {
+            var initialTopMargin = view.topMargin;
+            var initialContentY = view.contentY;
+            flick(view, view.width/2, units.gu(10), 0, units.gu(40));
+            tryCompare(view, "moving", false);
+            tryCompare(view, "topMargin", initialTopMargin, 500,
+                    "Initial topMargin of flickable is not restored after refreshing.");
+            tryCompare(view, "contentY", initialContentY, 500,
+                    "Initial contentY of flickable is not restored after refreshing.")
+        }
+    }
+}
 
=== added file 'tests/unit_x11/tst_components/tst_tabs11.qml'
--- tests/unit_x11/tst_components/tst_tabs11.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_components/tst_tabs11.qml	2016-05-18 10:22:28 +0000
@@ -0,0 +1,198 @@
+/*
+ * Copyright 2012-2016 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.2
+import Ubuntu.Test 1.0
+import Ubuntu.Components 1.1
+
+MainView {
+    id: mainView
+    width: units.gu(50)
+    height: units.gu(80)
+    useDeprecatedToolbar: false
+
+    Tabs {
+        id: tabs
+        Tab {
+            id: tab1
+            title: "tab 1"
+            page: Page {
+                id: page1
+                Button {
+                    id: button
+                    anchors.centerIn: parent
+                    text: "click"
+                }
+            }
+        }
+        Tab {
+            id: tab2
+            title: "tab 2"
+            page: Page {
+                id: page2
+            }
+        }
+        Tab {
+            id: tab3
+            title: "tab 3"
+            page: Page {
+                id: page3
+            }
+        }
+        Tab {
+            id: tabFlick1
+            title: "flick"
+            page: Page {
+                Flickable {
+                    id: flickable1
+                    anchors.fill: parent
+                }
+            }
+        }
+        Tab {
+            id: tabFlick2
+            title: "flick 2"
+            page: Page {
+                Flickable {
+                    id: flickable2
+                    anchors.fill: parent
+                }
+            }
+        }
+        Tab {
+            id: tabFlickLoader
+            title: "load"
+            page: Loader {
+                id: loader
+                sourceComponent: tabs.selectedTabIndex != 5 ? null : pageComponent
+            }
+        }
+        Tab {
+            id: tabNoFlickLoader
+            title: "loadNoFlick"
+            page: Loader {
+                id: loaderNoFlick
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    bottom: parent.bottom
+                }
+                // height compes from the loaded Page
+                sourceComponent: tabs.selectedTabIndex === 6 ? pageComponentNoFlick : null
+            }
+        }
+        Tab {
+            // Test for bug #1570886, see initTestCase().
+            id: tabWithTitleFromPage
+            page: Page {
+                title: "Title from Page"
+            }
+        }
+    }
+    Component {
+        id: pageComponent
+        Page {
+            title: "Loaded page"
+            property Flickable flick: loadedFlickable
+            Flickable {
+                id: loadedFlickable
+                anchors.fill: parent
+                contentHeight: 1000
+            }
+        }
+    }
+    Component {
+        id: pageComponentNoFlick
+        Page {
+            title: "Loaded page without flickable"
+        }
+    }
+
+    UbuntuTestCase {
+        name: "TabsAPINewHeader"
+        when: windowShown
+
+        function initTestCase() {
+            // Test for bug #1570886.
+            compare(mainView.__propagated.header.title, tab1.title,
+                     "Incorrect initial header title.");
+        }
+
+        function test_tabsDefaults() {
+            compare(tabs.selectedTabIndex, 0, "The default selectedTabIndex is 0 when Tabs has contents");
+            compare(tabs.selectedTab, tab1, "The default selectedTab is the first tab");
+            compare(tabs.currentPage, page1, "The default currentPage is the page of the first tab");
+        }
+
+        function test_tabsSetSelectedTab() {
+            var tabArray = [tab1, tab2, tab3];
+            var pageArray = [page1, page2, page3];
+            for (var i=0; i < 3; i++) {
+                tabs.selectedTabIndex = i;
+                compare(tabs.selectedTabIndex, i, "Can set selectedTabIndex");
+                compare(tabs.selectedTab, tabArray[i], "Can update selectedTab by setting selectedTabIndex");
+                compare(tabs.currentPage, pageArray[i], "Can update currentPage by setting selectedTabIndex");
+                for (var j=0; j < 3; j++) {
+                    compare(pageArray[j].active, j===i, "Only the page of the selected tab is active");
+                }
+            }
+        }
+
+        function test_flickable() {
+            // ensure that the flickable of the header is set to the flickable of the selected tab.
+            tabs.selectedTabIndex = 3;
+            compare(mainView.__propagated.header.flickable, flickable1, "Header flickable correctly initialized");
+            tabs.selectedTabIndex = 4;
+            compare(mainView.__propagated.header.flickable, flickable2, "Header flickable correctly updated");
+            tabs.selectedTabIndex = 0;
+        }
+
+        function test_pageLoader() {
+            tabs.selectedTabIndex = 0;
+            compare(loader.item, null, "Page not loaded when tab is not selected");
+            tabs.selectedTabIndex = 5;
+            compare(tabs.currentPage, loader, "Selected loader for current page");
+            compare(loader.item.title, "Loaded page", "Loaded item is a page");
+            tabs.selectedTabIndex = 0;
+            compare(loader.item, null, "Loaded page was properly unloaded");
+        }
+
+        function test_bug1088740() {
+            tabs.selectedTabIndex = 5;
+            compare(mainView.__propagated.header.flickable, loader.item.flick, "Header flickable correctly updated with Loader");
+            compare(loader.item.flick.contentHeight, 1000, "Header flickable is correct flickable");
+            tabs.selectedTabIndex = 0;
+        }
+
+        function test_pageHeightLoaderNoFlick_bug1259917() {
+            tabs.selectedTabIndex = 6;
+            compare(tabs.selectedTab, tabNoFlickLoader, "Tab 6 was selected.");
+            compare(mainView.__propagated.header.flickable, null, "Loaded page without flickable.");
+            compare(loaderNoFlick.item.height, mainView.height - mainView.__propagated.header.height,
+                    "Correct height for loaded Page without flickable.");
+        }
+
+        function test_index() {
+            compare(tab1.index, 0, "tab1 is at 0");
+            compare(tab2.index, 1, "tab2 is at 1");
+            compare(tab3.index, 2, "tab3 is at 2");
+            compare(tabFlick1.index, 3, "tabFlick1 is at 3");
+            compare(tabFlick2.index, 4, "tabFlick2 is at 4");
+            compare(tabFlickLoader.index, 5, "tabFlickLoader is at 5");
+            compare(tabNoFlickLoader.index, 6, "tabNoFlickLoader is at 6");
+        }
+    }
+}
 
=== renamed file 'tests/unit_x11/tst_components/tst_tabs.qml' => 'tests/unit_x11/tst_components/tst_tabs13.qml'
--- tests/unit_x11/tst_components/tst_tabs.qml	2015-09-03 11:44:38 +0000
+++ tests/unit_x11/tst_components/tst_tabs13.qml	2016-05-18 10:22:28 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 Canonical Ltd.
+ * Copyright 2016 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
@@ -14,15 +14,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
+import QtQuick 2.4
 import Ubuntu.Test 1.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 MainView {
     id: mainView
     width: units.gu(50)
     height: units.gu(80)
-    useDeprecatedToolbar: false
 
     Tabs {
         id: tabs
@@ -94,6 +93,13 @@
                 sourceComponent: tabs.selectedTabIndex === 6 ? pageComponentNoFlick : null
             }
         }
+        Tab {
+            // Test for bug #1570886, see initTestCase().
+            id: tabWithTitleFromPage
+            page: Page {
+                title: "Title from Page"
+            }
+        }
     }
     Component {
         id: pageComponent
@@ -118,6 +124,12 @@
         name: "TabsAPINewHeader"
         when: windowShown
 
+        function initTestCase() {
+            // Test for bug #1570886.
+            compare(mainView.__propagated.header.title, tab1.title,
+                     "Incorrect initial header title.");
+        }
+
         function test_tabsDefaults() {
             compare(tabs.selectedTabIndex, 0, "The default selectedTabIndex is 0 when Tabs has contents");
             compare(tabs.selectedTab, tab1, "The default selectedTab is the first tab");