Merge lp:~tpeeters/ubuntu-ui-toolkit/headlock into lp:ubuntu-ui-toolkit/staging

[Tim Peeters]

Add visible and locked properties to Page.head.

Add visible and locked properties to Page.head.

This MR has two pre-requisites that must land first:
1 - https://code.launchpad.net/~tpeeters/ubuntu-ui-toolkit/page13/+merge/253290
2 - https://code.launchpad.net/~tpeeters/ubuntu-ui-toolkit/waitForHeaderAnimation/+merge/253542

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

1478. By Tim Peeters on 2015-03-23

clean

1479. By Tim Peeters on 2015-03-23

use waitForHeaderAnimation(mainView) in tst_page13.qml

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1477
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1584/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1922/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/311/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/314/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/311/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1920/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1479
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1588/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1926/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/315/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/318/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/315/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1924/console

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

review: Needs Fixing (continuous-integration)

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

1480. By Tim Peeters on 2015-03-24

merge staging

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1480
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1596/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1947/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/323/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/326/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/323/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1945/console

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

review: Needs Fixing (continuous-integration)

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

1481. By Tim Peeters on 2015-03-26

merge staging

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1481
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1602/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1988/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/329/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/332/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/329/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1986/console

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

review: Needs Fixing (continuous-integration)

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

1482. By Tim Peeters on 2015-03-27

update components.api

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1482
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1607/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2015
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/334
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/337
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/337/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/334
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1776
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2013
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2013/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19243

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

review: Needs Fixing (continuous-integration)

[Zsombor Egri (zsombi)]

Loosk good

review: Approve

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

1483. By Tim Peeters on 2015-04-02

merge waitForHeaderAnimation prerequisite branch

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1483
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1630/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2102/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/357
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/360
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/360/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/357
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1850/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2100
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2100/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19385

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'components.api'
--- components.api	2015-04-02 11:17:02 +0000
+++ components.api	2015-04-02 11:17:02 +0000
@@ -246,7 +246,7 @@
     property Flickable flickable
     property list<Action> actions
 Page 1.1
-Page10
+Toolkit10.Page
     readonly property PageHeadConfiguration head
 Page 1.3
 PageTreeNode
@@ -261,6 +261,10 @@
     property string preset
     readonly property PageHeadSections sections
     property color foregroundColor
+PageHeadConfiguration 1.3
+Toolkit12.PageHeadConfiguration
+    property bool locked
+    property bool visible
 PageHeadSections 1.1
 QtObject
     property bool enabled

=== modified file 'modules/Ubuntu/Components/AppHeader.qml'
--- modules/Ubuntu/Components/AppHeader.qml	2015-04-02 11:17:02 +0000
+++ modules/Ubuntu/Components/AppHeader.qml	2015-04-02 11:17:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 Canonical Ltd.
+ * Copyright 2013-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
@@ -60,7 +60,8 @@
         internal.movementEnded();
     }
 
-    visible: title || contents || tabsModel
+    // with PageHeadConfiguration 1.2, always be visible.
+    visible: title || contents || tabsModel || internal.newConfig
     onVisibleChanged: {
         internal.checkFlickableMargins();
     }
@@ -69,6 +70,9 @@
       Show the header
      */
     function show() {
+        if (internal.newConfig) {
+            header.config.visible = true;
+        }
         header.y = 0;
     }
 
@@ -76,7 +80,10 @@
       Hide the header
      */
     function hide() {
-        header.y = - header.height;
+        if (internal.newConfig) {
+            header.config.visible = false;
+        }
+        header.y = -header.height;
     }
 
     /*!
@@ -84,7 +91,10 @@
      */
     property string title: ""
     onTitleChanged: {
-        header.show();
+        // deprecated for new versions of PageHeadConfiguration
+        if (!internal.newConfig) {
+            header.show();
+        }
     }
 
     /*!
@@ -93,7 +103,10 @@
      */
     property Item contents: null
     onContentsChanged: {
-        header.show();
+        // deprecated for new versions of PageHeadConfiguration
+        if (!internal.newConfig) {
+            header.show();
+        }
     }
 
     /*!
@@ -152,9 +165,10 @@
      */
     property Flickable flickable: null
     onFlickableChanged: {
-        internal.checkFlickableMargins();
         internal.connectFlickable();
-        header.show();
+        if (!internal.newConfig || !header.config.locked) {
+            header.show();
+        }
     }
 
     /*!
@@ -164,12 +178,68 @@
 
     /*!
       Configuration of the header.
+      FIXME: Must be of type PageHeadConfiguration. Setting that as the property type
+      however will use the latest version (1.3) and a Page that uses an older
+      version (1.1) will no longer work.
      */
-    property PageHeadConfiguration config: null
+    property Object config: null
+    onConfigChanged: {
+        // set internal.newConfig because when we rely on the binding,
+        //  the value of newConfig may be updated after executing the code below.
+        internal.newConfig = config && config.hasOwnProperty("visible") &&
+                config.hasOwnProperty("locked");
+        internal.connectFlickable();
+
+        if (internal.newConfig && header.config.locked &&!header.config.visible) {
+            header.hide();
+        } else {
+            header.show();
+        }
+    }
+    Connections {
+        target: header.config
+        ignoreUnknownSignals: true // PageHeadConfiguration <1.2 lacks the signals below
+        onVisibleChanged: {
+            if (header.config.visible) {
+                header.show();
+            } else {
+                header.hide();
+            }
+            internal.checkFlickableMargins();
+        }
+        onLockedChanged: {
+            internal.connectFlickable();
+            if (!header.config.locked) {
+                internal.movementEnded();
+            }
+        }
+    }
+
+    /*!
+      The header is not fully opened or fully closed.
+
+      This property is true if the header is animating towards a fully
+      opened or fully closed state, or if the header is moving due to user
+      interaction with the flickable.
+
+      The value of moving is always false when using an old version of
+      PageHeadConfiguration (which does not have the visible property).
+
+      Used in tst_header_locked_visible.qml.
+    */
+    readonly property bool moving: internal.newConfig &&
+                                   ((config.visible && header.y !== 0) ||
+                                    (!config.visible && header.y !== -header.height))
 
     QtObject {
         id: internal
 
+        // This property is updated in header.onConfigChanged to ensure it
+        //  is updated before other functions are called in onConfigChanged.
+        property bool newConfig: header.config &&
+                                 header.config.hasOwnProperty("locked") &&
+                                 header.config.hasOwnProperty("visible")
+
         /*!
           Track the y-position inside the flickable.
          */
@@ -184,20 +254,26 @@
           Disconnect previous flickable, and connect the new one.
          */
         function connectFlickable() {
+            // Finish the current header movement in case the current
+            // flickable is disconnected while scrolling:
+            internal.movementEnded();
+
             if (previousFlickable) {
                 previousFlickable.contentYChanged.disconnect(internal.scrollContents);
                 previousFlickable.movementEnded.disconnect(internal.movementEnded);
                 previousFlickable.interactiveChanged.disconnect(internal.interactiveChanged);
+                previousFlickable = null;
             }
-            if (flickable) {
+            if (flickable && !(internal.newConfig && header.config.locked)) {
                 // Connect flicking to movements of the header
                 previousContentY = flickable.contentY;
                 flickable.contentYChanged.connect(internal.scrollContents);
                 flickable.movementEnded.connect(internal.movementEnded);
                 flickable.interactiveChanged.connect(internal.interactiveChanged);
                 flickable.contentHeightChanged.connect(internal.contentHeightChanged);
+                previousFlickable = flickable;
             }
-            previousFlickable = flickable;
+            internal.checkFlickableMargins();
         }
 
         /*!
@@ -217,9 +293,14 @@
           Fully show or hide the header, depending on its current y.
          */
         function movementEnded() {
-            if (flickable && flickable.contentY < 0) header.show();
-            else if (header.y < -header.height/2) header.hide();
-            else header.show();
+            if (!(internal.newConfig && header.config.locked)) {
+                if ( (flickable && flickable.contentY < 0) ||
+                        (header.y > -header.height/2)) {
+                    header.show();
+                } else {
+                    header.hide();
+                }
+            }
         }
 
         /*
@@ -242,13 +323,20 @@
          */
         function checkFlickableMargins() {
             if (header.flickable) {
-                var headerHeight = header.visible ? header.height : 0
+                var headerHeight = 0;
+                if (header.visible && !(internal.newConfig &&
+                                        header.config.locked &&
+                                        !header.config.visible)) {
+                    headerHeight = header.height;
+                }
+
                 if (flickable.topMargin !== headerHeight) {
+                    var oldContentY = flickable.contentY;
                     var previousHeaderHeight = flickable.topMargin;
                     flickable.topMargin = headerHeight;
                     // push down contents when header grows,
                     // pull up contents when header shrinks.
-                    flickable.contentY -= headerHeight - previousHeaderHeight;
+                    flickable.contentY = oldContentY - headerHeight + previousHeaderHeight;
                 }
             }
         }

=== modified file 'modules/Ubuntu/Components/MainView.qml'
--- modules/Ubuntu/Components/MainView.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/MainView.qml	2015-04-02 11:17:02 +0000
@@ -125,6 +125,7 @@
         AppHeader {
             // This objectName is used in the MainView autopilot custom proxy object
             // in order to select the application header.
+            // Also used in tst_header_locked_visible.qml.
             objectName: "MainView_Header"
             id: headerItem
             property real bottomY: headerItem.y + headerItem.height
@@ -136,7 +137,7 @@
             flickable: internal.activePage ? internal.activePage.flickable : null
             pageStack: internal.activePage ? internal.activePage.pageStack : null
 
-            PageHeadConfiguration {
+            Toolkit.PageHeadConfiguration {
                 id: headerConfig
                 // for backwards compatibility with deprecated tools property
                 actions: internal.activePage ?

=== modified file 'modules/Ubuntu/Components/MainView12.qml'
--- modules/Ubuntu/Components/MainView12.qml	2015-04-02 11:17:02 +0000
+++ modules/Ubuntu/Components/MainView12.qml	2015-04-02 11:17:02 +0000
@@ -69,6 +69,7 @@
         AppHeader {
             // This objectName is used in the MainView autopilot custom proxy object
             // in order to select the application header.
+            // Also used in tst_header_locked_visible.qml.
             objectName: "MainView_Header"
             id: headerItem
             property real bottomY: headerItem.y + headerItem.height
@@ -84,7 +85,7 @@
                       internal.activePage.hasOwnProperty("__customHeaderContents") ?
                           internal.activePage.__customHeaderContents : null
 
-            PageHeadConfiguration {
+            Toolkit.PageHeadConfiguration {
                 id: defaultConfig
                 // Used when there is no active Page, or a Page 1.0 is used which
                 // does not have a PageHeadConfiguration.
@@ -115,9 +116,13 @@
             target: Qt.application
             onActiveChanged: {
                 if (Qt.application.active) {
-                    headerItem.animate = false;
-                    headerItem.show();
-                    headerItem.animate = true;
+                    if (!(headerItem.config &&
+                          headerItem.config.hasOwnProperty("locked") &&
+                          headerItem.locked)) {
+                        headerItem.animate = false;
+                        headerItem.show();
+                        headerItem.animate = true;
+                    }
                 }
             }
         }

=== modified file 'modules/Ubuntu/Components/Page10.qml'
--- modules/Ubuntu/Components/Page10.qml	2015-04-02 11:17:02 +0000
+++ modules/Ubuntu/Components/Page10.qml	2015-04-02 11:17:02 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2 as Toolkit
+import Ubuntu.Components 1.0 as Toolkit
 import "pageUtils.js" as Utils
 
 /*!

=== modified file 'modules/Ubuntu/Components/Page11.qml'
--- modules/Ubuntu/Components/Page11.qml	2015-03-03 12:53:42 +0000
+++ modules/Ubuntu/Components/Page11.qml	2015-04-02 11:17:02 +0000
@@ -15,16 +15,18 @@
  */
 
 import QtQuick 2.4
+import Ubuntu.Components 1.0 as Toolkit10
+import Ubuntu.Components 1.1 as Toolkit11
 
 /*! \internal */
 // Documentation in Page.qdoc
-Page10 {
+Toolkit10.Page {
     id: page
     /*!
       \qmlproperty PageHeadConfiguration head
      */
     readonly property alias head: headerConfig
-    PageHeadConfiguration {
+    Toolkit11.PageHeadConfiguration {
         id: headerConfig
     }
 
@@ -32,7 +34,7 @@
         print("Page.tools is a deprecated property. Please use Page.head instead.");
     }
 
-    Object {
+    Toolkit11.Object {
         id: internal
 
         // Note: The bindings below need to check whether headerConfig.contents

=== added file 'modules/Ubuntu/Components/PageHeadConfiguration.qdoc'
--- modules/Ubuntu/Components/PageHeadConfiguration.qdoc	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/PageHeadConfiguration.qdoc	2015-04-02 11:17:02 +0000
@@ -0,0 +1,202 @@
+/*
+ * Copyright 2014-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 PageHeadConfiguration
+    \inqmlmodule Ubuntu.Components 1.1
+    \ingroup ubuntu
+    \since Ubuntu.Components 1.1
+    \brief Page.head is used to configure the header for a \l Page.
+
+    For examples how to use Page.head, see \l Page.
+ */
+
+/*!
+  List of actions to show in the header.
+
+  Example:
+  \qml
+    Page {
+        title: "Custom header actions"
+        head.actions: [
+            Action {
+                iconName: "save"
+                text: i18n.tr("Save")
+            },
+            Action {
+                iconName: "add"
+                text: i18n.tr("Add")
+            }
+        ]
+    }
+  \endqml
+  \qmlproperty list<Action> PageHeadConfiguration::actions
+ */
+
+/*!
+  \qmlproperty Action PageHeadConfiguration::backAction
+  Overrides the default \l PageStack back button and the
+  \l Tabs drawer button in the header.
+
+  Example:
+  \qml
+    Page {
+        title: "Back Action Page"
+        head.backAction: Action {
+            iconName: "close"
+            onTriggered: {
+                console.log("Run custom back action")
+            }
+        }
+    }
+  \endqml
+ */
+
+/*!
+  \qmlproperty Item PageHeadConfiguration::contents
+  Set this property to show this Item in the header instead of
+  the title. Use a \l TextField here for implementing search in header.
+
+  The parent of this Item will be binded while the \l Page is active.
+  The header contents will automatically be anchored to the left and
+  vertically centered inside the header.
+
+  Example:
+  \qml
+    Page {
+        title: "Invisible title"
+        head.contents: Rectangle {
+            color: UbuntuColors.orange
+            height: units.gu(5)
+            width: parent ? parent.width - units.gu(2) : undefined
+        }
+    }
+  \endqml
+
+  See \l PageHeadState for an example that shows how search mode can
+  be implemented.
+ */
+
+// FIXME: The example below can be much simplified using PageHeadState
+//  when bug #1345775 has been fixed.
+/*!
+  \qmlproperty string PageHeadConfiguration::preset
+  Choose a preset for the header visuals and behavior.
+  The default is an empty string "".
+  By setting this to "select", title will be hidden and
+  actions will be represented by icons with a label.
+
+  Example:
+  \qml
+    import QtQuick 2.4
+    import Ubuntu.Components 1.2
+
+    MainView {
+        id: mainView
+        width: units.gu(40)
+        height: units.gu(50)
+
+        Page {
+            id: page
+            title: "Demo"
+
+            state: "default"
+            states: [
+                PageHeadState {
+                    name: "default"
+                    head: page.head
+                    actions: [
+                        Action {
+                            iconName: "contact"
+                            text: "Contact"
+                        }
+                    ]
+                },
+                State {
+                    id: selectState
+                    name: "select"
+
+                    property Action leaveSelect: Action {
+                        iconName: "back"
+                        text: "Back"
+                        onTriggered: page.state = "default"
+                    }
+                    property list<Action> actions: [
+                        Action {
+                            iconName: "select"
+                            text: "Select All"
+                        },
+                        Action {
+                            iconName: "delete"
+                            text: "Delete"
+                        }
+                    ]
+                    PropertyChanges {
+                        target: page.head
+                        backAction: selectState.leaveSelect
+                        actions: selectState.actions
+                        preset: "select"
+                    }
+                }
+            ]
+
+            Label {
+                anchors.centerIn: parent
+                text: "Use back button to leave selection mode."
+                visible: page.state == "select"
+            }
+
+            Button {
+                anchors.centerIn: parent
+                onClicked: page.state = "select"
+                visible: page.state != "select"
+                text: "selection mode"
+            }
+        }
+    }
+  \endqml
+ */
+
+/*!
+  \qmlproperty PageHeadSections PageHeadConfiguration::sections
+  Defines the sections in the page header divider.
+ */
+
+/*!
+  \qmlproperty color PageHeadConfiguration::foregroundColor
+  The color of the text and icons.
+ */
+
+/*!
+  \qmlproperty bool PageHeadConfiguration::locked
+  \since 1.2
+  When the \l Page is active, the locked property controls the behavior
+  of the header. A locked header stays visible or invisible, depending
+  on the value of the \l visible property. An unlocked header automatically
+  shows and hides if the \l Page has a flickable in which the user
+  scrolls up or down.
+  Default value: false
+ */
+
+/*!
+  \qmlproperty bool PageHeadConfiguration::visible
+  \since 1.2
+  Update the value of the visible property to show or hide the header.
+  This works both when the header is \l locked and unlocked. An unlocked
+  header can also become visible or hidden when the user scrolls the
+  active \l Page's flickable. The value of the visible property will be
+  updated at the end of the showing/hiding animation of the header.
+ */

=== renamed file 'modules/Ubuntu/Components/PageHeadConfiguration.qml' => 'modules/Ubuntu/Components/PageHeadConfiguration11.qml'
--- modules/Ubuntu/Components/PageHeadConfiguration.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/PageHeadConfiguration11.qml	2015-04-02 11:17:02 +0000
@@ -15,92 +15,24 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.1
 
 /*!
-    \qmltype PageHeadConfiguration
-    \inqmlmodule Ubuntu.Components 1.1
-    \ingroup ubuntu
-    \since Ubuntu.Components 1.1
-    \brief Page.head is used to configure the header for a \l Page.
-
-    For examples how to use Page.head, see \l Page.
+  \internal
+  Documented in PageHeadConfiguration.qdoc
  */
 Object {
     // To be used inside a Page only.
     id: headerConfig
 
-    /*!
-      List of actions to show in the header.
-
-      Example:
-      \qml
-        Page {
-            title: "Custom header actions"
-            head.actions: [
-                Action {
-                    iconName: "save"
-                    text: i18n.tr("Save")
-                },
-                Action {
-                    iconName: "add"
-                    text: i18n.tr("Add")
-                }
-            ]
-        }
-      \endqml
-     */
     property list<Action> actions
-
-    /*!
-      Overrides the default \l PageStack back button and the
-      \l Tabs drawer button in the header.
-
-      Example:
-      \qml
-        Page {
-            title: "Back Action Page"
-            head.backAction: Action {
-                iconName: "close"
-                onTriggered: {
-                    console.log("Run custom back action")
-                }
-            }
-        }
-     \endqml
-     */
     property Action backAction: null
-
-    /*!
-      Set this property to show this Item in the header instead of
-      the title. Use a \l TextField here for implementing search in header.
-
-      The parent of this Item will be binded while the \l Page is active.
-      The header contents will automatically be anchored to the left and
-      vertically centered inside the header.
-
-      Example:
-      \qml
-        Page {
-            title: "Invisible title"
-            head.contents: Rectangle {
-                color: UbuntuColors.orange
-                height: units.gu(5)
-                width: parent ? parent.width - units.gu(2) : undefined
-            }
-        }
-      \endqml
-
-      See \l PageHeadState for an example that shows how search mode can
-      be implemented.
-     */
     property Item contents: null
 
     QtObject {
         id: internal
         property Item oldContents: null
     }
-
     onContentsChanged: {
         if (internal.oldContents) {
             // FIX: bug #1341814 and #1400297
@@ -111,97 +43,13 @@
         internal.oldContents = contents;
     }
 
-    // FIXME: The example below can be much simplified using PageHeadState
-    //  when bug #1345775 has been fixed.
-    /*!
-      Choose a preset for the header visuals and behavior.
-      The default is an empty string "".
-      By setting this to "select", title will be hidden and
-      actions will be represented by icons with a label.
-
-      Example:
-      \qml
-        import QtQuick 2.4
-        import Ubuntu.Components 1.2
-
-        MainView {
-            id: mainView
-            width: units.gu(40)
-            height: units.gu(50)
-
-            Page {
-                id: page
-                title: "Demo"
-
-                state: "default"
-                states: [
-                    PageHeadState {
-                        name: "default"
-                        head: page.head
-                        actions: [
-                            Action {
-                                iconName: "contact"
-                                text: "Contact"
-                            }
-                        ]
-                    },
-                    State {
-                        id: selectState
-                        name: "select"
-
-                        property Action leaveSelect: Action {
-                            iconName: "back"
-                            text: "Back"
-                            onTriggered: page.state = "default"
-                        }
-                        property list<Action> actions: [
-                            Action {
-                                iconName: "select"
-                                text: "Select All"
-                            },
-                            Action {
-                                iconName: "delete"
-                                text: "Delete"
-                            }
-                        ]
-                        PropertyChanges {
-                            target: page.head
-                            backAction: selectState.leaveSelect
-                            actions: selectState.actions
-                            preset: "select"
-                        }
-                    }
-                ]
-
-                Label {
-                    anchors.centerIn: parent
-                    text: "Use back button to leave selection mode."
-                    visible: page.state == "select"
-                }
-
-                Button {
-                    anchors.centerIn: parent
-                    onClicked: page.state = "select"
-                    visible: page.state != "select"
-                    text: "selection mode"
-                }
-            }
-        }
-      \endqml
-     */
     property string preset: ""
-
     /*!
       \qmlproperty PageHeadSections sections
-      Defines the sections in the page header divider.
      */
     readonly property alias sections: headSections
     PageHeadSections {
         id: headSections
     }
-
-    /*!
-      The color of the text and icons.
-     */
     property color foregroundColor: Theme.palette.selected.backgroundText
 }

=== added file 'modules/Ubuntu/Components/PageHeadConfiguration13.qml'
--- modules/Ubuntu/Components/PageHeadConfiguration13.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/PageHeadConfiguration13.qml	2015-04-02 11:17:02 +0000
@@ -0,0 +1,30 @@
+/*
+ * 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 Ubuntu.Components 1.2 as Toolkit12
+
+/*!
+  \internal
+  documented in PageHeadConfiguration.qdoc
+ */
+Toolkit12.PageHeadConfiguration {
+    id: headerConfig
+
+    property bool locked: false
+
+    // auto-updated by AppHeader, but may be set by the developer
+    property bool visible
+}

=== modified file 'modules/Ubuntu/Components/Tabs.qml'
--- modules/Ubuntu/Components/Tabs.qml	2015-03-05 09:35:06 +0000
+++ modules/Ubuntu/Components/Tabs.qml	2015-04-02 11:17:02 +0000
@@ -310,7 +310,10 @@
             if (tabBar && tabBar.__styleInstance && tabBar.__styleInstance.hasOwnProperty("sync")) {
                 tabBar.__styleInstance.sync();
             }
-            if (tabs.active && internal.header) {
+            if ((tabs.active && internal.header) &&
+                    !(internal.header.config &&
+                      internal.header.config.hasOwnProperty("locked") &&
+                      internal.header.config.locked)) {
                 internal.header.show();
             }
             // deprecated, however use it till we remove it completely

=== modified file 'modules/Ubuntu/Components/qmldir'
--- modules/Ubuntu/Components/qmldir	2015-04-02 11:17:02 +0000
+++ modules/Ubuntu/Components/qmldir	2015-04-02 11:17:02 +0000
@@ -98,7 +98,7 @@
 UbuntuListView 1.1 UbuntuListView11.qml
 internal PageBase Page10.qml
 Page 1.1 Page11.qml
-PageHeadConfiguration 1.1 PageHeadConfiguration.qml
+PageHeadConfiguration 1.1 PageHeadConfiguration11.qml
 PageHeadSections 1.1 PageHeadSections.qml
 PageHeadState 1.1 PageHeadState.qml
 Icon 1.1 Icon11.qml
@@ -114,3 +114,4 @@
 
 #version 1.3
 Page 1.3 Page13.qml
+PageHeadConfiguration 1.3 PageHeadConfiguration13.qml

=== modified file 'modules/Ubuntu/Test/UbuntuTestCase.qml'
--- modules/Ubuntu/Test/UbuntuTestCase.qml	2015-04-02 11:17:02 +0000
+++ modules/Ubuntu/Test/UbuntuTestCase.qml	2015-04-02 11:17:02 +0000
@@ -115,10 +115,10 @@
         var iy = 0;
 
         for (var step=0; step < steps; step++) {
-            if (ix < abs_dx) {
+            if (Math.abs(ix) < abs_dx) {
                 ix += step_dx;
             }
-            if (iy < abs_dy) {
+            if (Math.abs(iy) < abs_dy) {
                 iy += step_dy;
             }
             mouseMove(item, x + ix, y + iy, stepdelay);
@@ -253,7 +253,6 @@
         // Wait for animation of the style inside the header (when pushing/popping):
         tryCompareFunction(function(){ return headerStyle.animating }, false);
         // Wait for the header to finish showing/hiding:
-        // FIXME: Uncomment this in the following MR that adds the header.moving property.
-        //tryCompareFunction(function(){ return header.moving }, false);
+        tryCompareFunction(function(){ return header.moving }, false);
     }
 }

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py	2015-03-04 21:57:25 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py	2015-04-02 11:17:02 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2012, 2013, 2014 Canonical Ltd.
+# Copyright (C) 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
@@ -64,6 +64,9 @@
             # so no need to wait.
             return
 
+        # Wait showing/hiding animation of the header.
+        self.moving.wait_for(False)
+
     @autopilot_logging.log_action(logger.info)
     def switch_to_section_by_index(self, index):
         """Select a section in the header divider

=== removed file 'tests/resources/header/lockedToolbar.deprecated.qml'
--- tests/resources/header/lockedToolbar.deprecated.qml	2015-03-06 12:42:00 +0000
+++ tests/resources/header/lockedToolbar.deprecated.qml	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 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/>.
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 1.1
-
-MainView {
-    width: units.gu(50)
-    height: units.gu(80)
-    id: mainView
-
-    Page {
-        id: page
-        title: "test page"
-        Label {
-            anchors.centerIn: parent
-            text: "testing the toolbar"
-        }
-        tools: ToolbarItems {
-            id: toolbarItems
-            ToolbarButton {
-                text: "action1"
-            }
-        }
-    }
-
-    ToolbarItems {
-        id: lockedTools
-        ToolbarButton {
-            text: "locked"
-        }
-        locked: true
-        opened: true
-    }
-
-    Component.onCompleted: {
-        page.tools = lockedTools;
-    }
-}

=== added file 'tests/unit_x11/tst_components/tst_header_visible.qml'
--- tests/unit_x11/tst_components/tst_header_visible.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_components/tst_header_visible.qml	2015-04-02 11:17:02 +0000
@@ -0,0 +1,288 @@
+/*
+ * Copyright (C) 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.Test 1.0
+
+Item {
+    width: units.gu(50)
+    height: units.gu(70)
+
+    MainView {
+        id: mainView
+        width: units.gu(50)
+        height: units.gu(70)
+
+        PageStack {
+            id: stack
+            Component.onCompleted: stack.push(page)
+
+            Page {
+                id: page
+                title: "Auto-hide"
+                head {
+                    locked: lockedSwitch.checked
+                    onVisibleChanged: {
+                        visibleSwitch.checked = page.head.visible
+                    }
+                }
+                Flickable {
+                    id: flickable
+                    anchors.fill: parent
+                    contentHeight: units.gu(200)
+                    Rectangle {
+                        color: "green"
+                        opacity: 0.3
+                        anchors {
+                            left: parent.left
+                            right: parent.right
+                            top: parent.top
+                        }
+                        height: 1
+                    }
+
+                    Grid {
+                        id: switchGrid
+                        columns: 2
+                        spacing: units.gu(1)
+                        anchors {
+                            top: parent.top
+                            left: parent.left
+                            leftMargin: units.gu(5)
+                            topMargin: units.gu(15)
+                        }
+                        Switch {
+                            id: lockedSwitch
+                            checked: false
+                        }
+                        Label {
+                            text: "header locked"
+                        }
+                        Switch {
+                            id: visibleSwitch
+                            checked: page.head.visible
+                            onClicked: page.head.visible = checked
+                        }
+                        Label {
+                            text: "header visible"
+                        }
+                    }
+                    Label {
+                        id: label
+                        anchors {
+                            horizontalCenter: parent.horizontalCenter
+                            top: switchGrid.bottom
+                            topMargin: units.gu(15)
+                        }
+                        text: "Flick me"
+                    }
+                    Button {
+                        anchors {
+                            horizontalCenter: parent.horizontalCenter
+                            top: label.bottom
+                            topMargin: units.gu(5)
+                        }
+                        text: "Click me"
+                        onTriggered: stack.push(otherPage)
+                    }
+                }
+            }
+            Page {
+                id: otherPage
+                title: "On stack"
+                visible: false
+
+                Label {
+                    anchors.centerIn: parent
+                    text: "Stacked"
+                }
+            }
+            Page {
+                id: titleLessPage
+                visible: false
+            }
+        }
+    }
+
+    UbuntuTestCase {
+        name: "HeaderLockedVisible"
+        when: windowShown
+        id: testCase
+
+        property var header
+        function initTestCase() {
+            testCase.header = findChild(mainView, "MainView_Header");
+        }
+
+        function init() {
+            page.head.visible = true;
+            page.head.locked = false;
+            otherPage.head.visible = true;
+            otherPage.head.locked = false;
+            wait_for_visible(true, "Header is not visible initially.");
+            compare(stack.currentPage, page, "Wrong Page on PageStack initially.");
+            compare(page.head.locked, false, "Header is not locked initially.");
+        }
+
+        function scroll(dy) {
+            var p = centerOf(mainView);
+            // Use mouseWheel to scroll because mouseDrag is very unreliable
+            // and does not properly handle negative values for dy.
+            mouseWheel(mainView, p.x, p.y, 0, 2*dy);
+        }
+
+        function scroll_down() {
+            scroll(-header.height);
+        }
+
+        function scroll_up() {
+            scroll(header.height);
+        }
+
+        function wait_for_visible(visible, errorMessage) {
+            waitForHeaderAnimation(mainView);
+            compare(stack.currentPage.head.visible, visible, errorMessage);
+            var mismatchMessage = " Page.head.visible does not match header visibility.";
+            if (visible) {
+                compare(header.y, 0, errorMessage + mismatchMessage);
+            } else {
+                compare(header.y, -header.height, errorMessage + mismatchMessage);
+            }
+        }
+
+        function test_set_visible_to_hide_and_show() {
+            page.head.visible = false;
+            wait_for_visible(false, "Cannot hide unlocked header by setting visible to false.");
+            page.head.visible = true;
+            wait_for_visible(true, "Cannot show unlocked header by setting visible to true.");
+
+            page.head.locked = true;
+            page.head.visible = false;
+            wait_for_visible(false, "Cannot hide locked header by setting visible to false.");
+            page.head.visible = true;
+            wait_for_visible(true, "Cannot show locked header by setting visible to true.");
+        }
+
+        function test_scroll_when_unlocked_updates_visible() {
+            scroll_down();
+            wait_for_visible(false, "Scrolling down does not hide header.");
+            scroll_up();
+            wait_for_visible(true, "Scrolling up does not show header.");
+        }
+
+        function test_scroll_when_locked_does_not_update_visible() {
+            // Note that with a locked header, scrolling up and down does not
+            //  cause the header to move, so the wait_for_visible() calls below
+            //  will return almost instantly.
+            page.head.locked = true;
+            scroll_down();
+            wait_for_visible(true, "Scrolling down hides locked header.");
+            scroll_up();
+            wait_for_visible(true, "Scrolling up hides locked header.");
+
+            page.head.visible = false;
+            waitForHeaderAnimation(mainView);
+            scroll_down();
+            wait_for_visible(false, "Scrolling down shows locked header.");
+            scroll_up();
+            wait_for_visible(false, "Scrolling up shows locked header.");
+        }
+
+        function test_locking_updates_visible() {
+            // locked = false, visible = true.
+            page.head.locked = true;
+            wait_for_visible(true, "Locking hides header.");
+            page.head.locked = false;
+            wait_for_visible(true, "Unlocking hides header.");
+
+            page.head.locked = true;
+            page.head.visible = false;
+            waitForHeaderAnimation(mainView);
+            // When the flickable is scrolled to the top, unlocking the header must show
+            //  the header because you cannot scroll more up to reveal it:
+            page.head.locked = false;
+            wait_for_visible(true, "Unlocking header when flickable is at Y beginning "+
+                             "does not show header.");
+
+            scroll_down();
+            wait_for_visible(false, "Scrolling down does not hide header.");
+            page.head.locked = true;
+            wait_for_visible(false, "Locking shows header.");
+            // When flickable is scrolled down, unlocking header does not show header
+            //  because the user can scroll up to reveal it:
+            page.head.locked = false;
+            wait_for_visible(false, "Unlocking shows header when flickable is not at " +
+                             "Y beginning.");
+        }
+
+        function test_activate_page_shows_header() {
+            page.head.visible = false;
+            waitForHeaderAnimation(mainView);
+
+            // Header becomes visible when new Page becomes active:
+            stack.push(otherPage);
+            wait_for_visible(true, "Pushing page on stack does not show header.");
+
+            // Header becomes visible when Page with previously hidden header
+            // becomes active:
+            stack.pop();
+            wait_for_visible(true, "Activating unlocked Page does not make header visible.");
+        }
+
+        function test_activate_hides_locked_hidden_header() {
+            otherPage.head.locked = true;
+            otherPage.head.visible = false;
+
+            stack.push(otherPage);
+            wait_for_visible(false, "Pushing Page with locked hidden header shows header.");
+            compare(otherPage.head.locked, true, "Pushing Page unlocks header.");
+            compare(page.head.locked, false, "Pushing Page locks previous header.");
+
+            stack.pop();
+            wait_for_visible(true, "Popping to a Page with unlocked header does not show header.");
+            compare(otherPage.head.locked, true, "Popping Page unlocks previous header.");
+            compare(page.head.locked, false, "Popping Page locks header.");
+        }
+
+        function test_hidden_locked_header_stays_hidden() {
+            page.head.locked = true;
+            page.head.visible = false;
+            waitForHeaderAnimation(mainView);
+            stack.push(otherPage);
+            waitForHeaderAnimation(mainView);
+            stack.pop();
+            wait_for_visible(false, "Popping to a Page with locked hidden header shows header.");
+        }
+
+        function test_page_with_no_title_on_pagestack_has_back_button_bug1402054() {
+            page.head.visible = false;
+            waitForHeaderAnimation(mainView);
+            stack.push(titleLessPage);
+            wait_for_visible(true, "Page with no title hides the header.");
+
+            var backButton = findChild(testCase.header, "backButton");
+            verify(null !== backButton, "Header has no back button.");
+            compare(backButton.visible, true, "Page with no title hides the back button.");
+
+            var center = centerOf(backButton);
+            mouseClick(backButton, center.x, center.y);
+            waitForHeaderAnimation(mainView);
+            compare(stack.depth, 1, "Clicking back button of page with no title does not "+
+                    "pop the page from the PageStack.");
+        }
+    }
+}

=== modified file 'tests/unit_x11/tst_components/tst_page13.qml'
--- tests/unit_x11/tst_components/tst_page13.qml	2015-04-02 11:17:02 +0000
+++ tests/unit_x11/tst_components/tst_page13.qml	2015-04-02 11:17:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 Canonical Ltd.
+ * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import QtTest 1.0
+import Ubuntu.Test 1.0
 import Ubuntu.Components 1.3
 
 Item {
@@ -49,11 +49,12 @@
         }
     }
 
-    TestCase {
+    UbuntuTestCase {
+        id: testCase
         name: "Page13API"
         when: windowShown
 
-        function initTestCase() {
+        function init() {
             compare(page.title, "", "Page title is set by default.");
             compare(page.active, true, "Page is inactive by default.");
             compare(page.pageStack, null, "Page has a PageStack by default.");
@@ -94,29 +95,30 @@
         }
 
         function test_flickableY_bug1201452() {
-            var pageTitle = "Hello bug!";
-            page.title = pageTitle;
-            var header = page.__propagated.header;
-
-            var headerHeight = header.height
+            var header = findChild(mainView, "MainView_Header");
+            var headerHeight = header.height;
             var flickableY = 150;
             page.flickable.contentY = flickableY;
             compare(page.flickable.contentY, flickableY,
                     "Flickable.contentY could not be set.");
             compare(page.flickable.topMargin, headerHeight,
                     "topMargin of the flickable does not equal header height.");
-            page.title = "";
-
-            // FIXME: Update the checks below when new API is added
-            //  for showing and hiding the header.
-            compare(header.visible, false, "Header is not hidden when title is unset.");
+
+            page.head.locked = true;
+            page.head.visible = false;
+            waitForHeaderAnimation(mainView);
+
             compare(page.flickable.topMargin, 0,
-                    "topMargin is not 0 when header is hidden.");
+                    "topMargin is not 0 when header is locked hidden.");
             compare(page.flickable.contentY, flickableY + headerHeight,
                     "contentY was not updated properly when header was hidden.");
-            page.title = pageTitle;
+
+            page.head.locked.locked = false;
+            page.head.visible = true;
+            waitForHeaderAnimation(mainView);
+
             compare(page.flickable.contentY, flickableY,
-                    "Making header visible changes flickable.contentY");
+                    "Hiding and showing header changes flickable.contentY.");
             compare(page.flickable.topMargin, headerHeight,
                     "topMargin was not updated when header became visible.");
         }