Merge lp:~bzoltan/ubuntu-ui-toolkit/landing_2307 into lp:ubuntu-ui-toolkit

[Zoltan Balogh]

Landing 24.07

Landing 24.07

[lp:~bzoltan/ubuntu-ui-toolkit/landing_2307]

1163. By Zoltan Balogh on 2014-07-23

Don't use component type names in header CPOs for AP tests.

1164. By Zoltan Balogh on 2014-07-23

Don't use component type names in header CPOs for AP tests.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1162
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2112/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2371
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1941
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-amd64-ci/58
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-armhf-ci/58
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-armhf-ci/58/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2547
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3591
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3591/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10281
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1626
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2186
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2186/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1164
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2113/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2379
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1946
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-amd64-ci/59
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-armhf-ci/59
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-armhf-ci/59/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2551
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3600
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3600/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10285
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1629
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2191
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2191/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/landing_2307]

1165. By Zoltan Balogh on 2014-07-24

Remove the hiding of the toolbar on the option selector gallery autopilot tests.

1166. By Zoltan Balogh on 2014-07-24

Remove the hiding of the toolbar on the option selector gallery autopilot tests.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1166
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2114/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2413
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1967
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-amd64-ci/60
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-armhf-ci/60
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-armhf-ci/60/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2580
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3642
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3642/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10321
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1647
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2215
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2215/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'CHANGES'
--- CHANGES	2014-06-04 20:45:16 +0000
+++ CHANGES	2014-07-24 02:10:07 +0000
@@ -108,6 +108,7 @@
 * CHANGED IN Page: Automatic detection of flickable inside a Page to control the header is now limited to Flickables that are anchored to the top of the Page or fill the Page. Header automatically shows when flickable.contentHeight becomes <= flickable.height.
 * CHANGED IN Action, ActionItem, OptionSelectorDelegate: Setting iconName now always selects the requested icon from ubuntu-mobile theme, not the system icon theme.
 * CHANGED IN TabBar: The model now needs to have a selectedIndex property.
+* CHANGED IN Panel: The panel no longer closes automatically when the user presses outside of the opened panel. That was deprecated behavior that was useful in the first version of the Toolbar. Set __closeOnContentsClicks to restore the old behavior, but a better solution is to deal with the press in the app and call Panel.close() when needed.
 
 SDK 0.1.46
 ##########

=== modified file 'components.api'
--- components.api	2014-07-10 11:50:13 +0000
+++ components.api	2014-07-24 02:10:07 +0000
@@ -46,6 +46,12 @@
     readonly property color coolGrey
     property Gradient orangeGradient
     property Gradient greyGradient
+    readonly property color lightGrey
+    readonly property color darkGrey
+    readonly property color red
+    readonly property color green
+    readonly property color blue
+    readonly property color purple
 ComboButton 1.1
 Button
     property bool expanded
@@ -247,10 +253,16 @@
 Page10
     readonly property PageHeadConfiguration head
 PageHeadConfiguration 1.1
-QtObject
+Object
     property list<Action> actions
     property Action backAction
     property Item contents
+    readonly property PageHeadSections sections
+PageHeadSections 1.1
+QtObject
+    property bool enabled
+    property var model
+    property int selectedIndex
 PageHeadState 1.1
 State
     property PageHeadConfiguration head
@@ -398,6 +410,9 @@
     property real minimumValue
     property real maximumValue
     property real value
+ProgressBar 1.1
+ProgressBar
+    property bool showProgressPercentage
 PullToRefresh 1.1
 StyledItem
     readonly property bool releaseToRefresh
@@ -620,6 +635,7 @@
     property color overlayText
     property color field
     property color fieldText
+    property color selection
 ToolbarButton 0.1 1.0
 ActionItem
 ToolbarItems 0.1 1.0
@@ -657,6 +673,7 @@
     function flick(item, x, y, dx, dy, pressTimeout, steps, button, modifiers, delay)
     function mouseLongPress(item, x, y, button, modifiers, delay)
     function tryCompareFunction(func, expectedResult, timeout)
+    function typeString(string)
 plugins.qmltypes
     name: "FilterBehavior"
     prototype: "QObject"

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-15 11:41:35 +0000
+++ debian/changelog	2014-07-24 02:10:07 +0000
@@ -1,3 +1,56 @@
+ubuntu-ui-toolkit (0.1.50+14.10.20140715-0ubuntu2) UNRELEASED; urgency=medium
+
+  [ Christian Dywan ]
+  * Wrap tempfile.NamedTemporaryFile to discard underscored 
+    filenames
+  * Print errors and help to sys.stderr
+  * Fixes false positives where buttons say for example Anrufen 
+    as opposed to Call depending on the local
+  * Use memory alarm backend for API/ deployment and don't warn 
+    about it
+  * Update selection and cursor to blue 
+  * Suppress error output from dpkg-architecture.
+
+  [ Tim Peeters ]
+  * New sizes for icons and touch areas in header.
+  * Workaround for large-timestamp autopilot bug
+  * Push modules/Ubuntu/Components/qmldir in push_to_phone.sh
+  * Various design tweaks:
+    - Update CheckBox/Switch colors
+    - Use new header by default in UITK gallery
+    - Add margins for left and rightmost buttons in header
+  * Updateed font sizes
+  * Don't automatically close a Panel when the user presses next 
+    to it, and update Panel position when its height changes.
+  * Support sections in header divider.
+  * Add new colors to UbuntuColors. 
+    Fixes: https://bugs.launchpad.net/bugs/1335826.
+
+  [ Renato Filho ]
+  * Reset item state if the cancelItemRemoval() function was 
+    called after the item be removed.
+
+  [ Zeller Benjamin ]
+  * Work around LP: #1338602, RotationAnimator crashes application
+
+  [ Michael Zanetti ]
+  * Add typeString to UbuntuTestCase
+
+  [ Ugo Riboni ]
+  * Add a boolean property to allow hiding the ProgressBar label. 
+    Fixes: https://bugs.launchpad.net/bugs/1317377.
+
+  [ Nekhelesh Ramananthan ]
+  * Adds examples to Actions, backAction and fixed the contents 
+    example in the PageHeadConfiguration.
+
+  [ Leo Arias ]
+  * Simulate the supported devices on gallery autopilot tests.
+  * Remove the hiding of the toolbar on the option selector 
+    gallery autopilot tests.
+
+ -- Zoltán Balogh <[e-mail]>  Wed, 23 Jul 2014 13:47:47 +0300
+
 ubuntu-ui-toolkit (0.1.49+14.10.20140715-0ubuntu1) utopic; urgency=low
 
   [ Dimitri John Ledkov ]

=== modified file 'debian/control'
--- debian/control	2014-07-09 17:37:43 +0000
+++ debian/control	2014-07-24 02:10:07 +0000
@@ -39,6 +39,7 @@
                xvfb,
                libgl1-mesa-dri,
                locales,
+               suru-icon-theme,
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/ubuntu-ui-toolkit
 # If you aren't a member of ~ubuntu-sdk-team but need to upload packaging
@@ -135,10 +136,12 @@
          libqt5widgets5,
          python-autopilot (>= 1.4),
          python-fixtures,
+         python-gi,
          python-mock,
          python-testscenarios,
          python-testtools,
          python3-fixtures,
+         python3-gi,
          python3-testscenarios,
          python3-testtools,
          python3-autopilot (>= 1.4),

=== added file 'examples/ubuntu-ui-toolkit-gallery/Colors.qml'
--- examples/ubuntu-ui-toolkit-gallery/Colors.qml	1970-01-01 00:00:00 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Colors.qml	2014-07-24 02:10:07 +0000
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.2
+import Ubuntu.Components 1.1
+
+Template {
+    objectName: "colorsTemplate"
+
+    TemplateSection {
+        title: "UbuntuColors"
+        className: "UbuntuColors"
+
+        // Except orange, none of the colors from UbuntuComponents 1.0
+        // are included because they may be deprecated soon.
+        TemplateRow {
+            title: i18n.tr("Orange")
+            UbuntuShape {
+                color: UbuntuColors.orange
+            }
+        }
+        TemplateRow {
+            title: i18n.tr("Light grey")
+            UbuntuShape {
+                color: UbuntuColors.lightGrey
+            }
+        }
+        TemplateRow {
+            title: i18n.tr("Dark grey")
+            UbuntuShape {
+                color: UbuntuColors.darkGrey
+            }
+        }
+        TemplateRow {
+            title: i18n.tr("Red")
+            UbuntuShape {
+                color: UbuntuColors.red
+            }
+        }
+        TemplateRow {
+            title: i18n.tr("Green")
+            UbuntuShape {
+                color: UbuntuColors.green
+            }
+        }
+        TemplateRow {
+            title: i18n.tr("Blue")
+            UbuntuShape {
+                color: UbuntuColors.blue
+            }
+        }
+        TemplateRow {
+            title: i18n.tr("Purple")
+            UbuntuShape {
+                color: UbuntuColors.purple
+            }
+        }
+    }
+}

=== modified file 'examples/ubuntu-ui-toolkit-gallery/ListItems.qml'
--- examples/ubuntu-ui-toolkit-gallery/ListItems.qml	2014-05-07 11:40:37 +0000
+++ examples/ubuntu-ui-toolkit-gallery/ListItems.qml	2014-07-24 02:10:07 +0000
@@ -50,7 +50,7 @@
 
     TemplateSection {
         title: i18n.tr("ThinDivider")
-        className: "ThinDivider"
+        className: "ListItems-ThinDivider"
 
         Column {
             anchors.left: parent.left
@@ -198,6 +198,7 @@
     }
 
     ListItemsSection {
+        id: removableSection
         title: i18n.tr("Removable")
         className: "Standard"
         delegate: ListItem.Standard {
@@ -209,11 +210,21 @@
                 color: Theme.palette.normal.base
             }
         }
+
+        Toolkit.Button {
+            text: i18n.tr("Reset")
+            anchors.right: parent.right
+            onClicked: {
+                for (var i=0, iMax=removableSection.count; i < iMax; i++) {
+                    removableSection.itemAt(i).cancelItemRemoval()
+                }
+            }
+        }
     }
 
     TemplateSection {
         title: i18n.tr("Grouped list")
-        className: "Header"
+        className: "ListItems-Header"
 
         Rectangle {
             color: Qt.rgba(0.0, 0.0, 0.0, 0.01)

=== modified file 'examples/ubuntu-ui-toolkit-gallery/ListItemsSection.qml'
--- examples/ubuntu-ui-toolkit-gallery/ListItemsSection.qml	2014-04-23 09:39:11 +0000
+++ examples/ubuntu-ui-toolkit-gallery/ListItemsSection.qml	2014-07-24 02:10:07 +0000
@@ -20,7 +20,13 @@
 TemplateSection {
     id: section
     property alias delegate: repeater.delegate
-    documentation: "qml-ubuntu-components-listitems0-%1.html".arg(className.toLowerCase())
+    property alias count: repeater.count
+    documentation: "qml-ubuntu-components-listitems-%1.html".arg(className.toLowerCase())
+
+    function itemAt(index)
+    {
+       return repeater.itemAt(index)
+    }
 
     Column {
         id: column

=== modified file 'examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml'
--- examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml	2014-04-23 09:39:11 +0000
+++ examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml	2014-07-24 02:10:07 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 Template {
     objectName: "progressBarsTemplate"
@@ -53,6 +53,27 @@
                 indeterminate: true
             }
         }
+
+        TemplateRow {
+            title: i18n.tr("No label")
+
+            ProgressBar {
+                id: progressNoLabel
+                objectName: "progressbar_nolabel"
+                width: parent.width
+                showProgressPercentage: false
+
+                SequentialAnimation on value {
+                    loops: Animation.Infinite
+                    NumberAnimation {
+                        from: progress.minimumValue
+                        to: progress.maximumValue
+                        duration: 2000
+                    }
+                    PauseAnimation {duration: 1000}
+                }
+            }
+        }
     }
 
     TemplateSection {

=== modified file 'examples/ubuntu-ui-toolkit-gallery/Styles.qml'
--- examples/ubuntu-ui-toolkit-gallery/Styles.qml	2014-06-19 13:11:09 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Styles.qml	2014-07-24 02:10:07 +0000
@@ -28,7 +28,7 @@
     }
 
     OptionSelector {
-        model: [ i18n.tr('Header with Toolbar'), i18n.tr('New Style Header') ]
+        model: [ i18n.tr('New Style Header'), i18n.tr('Header with Toolbar') ]
         expanded: true
         onSelectedIndexChanged: gallery.useDeprecatedToolbar = (selectedIndex == 0)
     }

=== modified file 'examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml'
--- examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml	2014-07-02 13:39:29 +0000
+++ examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml	2014-07-24 02:10:07 +0000
@@ -28,7 +28,11 @@
         label: "Styles"
         source: "Styles.qml"
     }
-
+    ListElement {
+        objectName: "colorsElement"
+        label: "Colors"
+        source: "Colors.qml"
+    }
     ListElement {
         objectName: "togglesElement"
         label: "Toggles"

=== modified file 'examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml'
--- examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml	2014-05-23 13:03:09 +0000
+++ examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml	2014-07-24 02:10:07 +0000
@@ -26,6 +26,7 @@
     // Note! applicationName needs to match the .desktop filename
     applicationName: "ubuntu-ui-toolkit-gallery"
 
+    useDeprecatedToolbar: false
 
     width: units.gu(120)
     height: units.gu(75)

=== modified file 'modules/Ubuntu/Components/AppHeader.qml'
--- modules/Ubuntu/Components/AppHeader.qml	2014-07-01 21:01:23 +0000
+++ modules/Ubuntu/Components/AppHeader.qml	2014-07-24 02:10:07 +0000
@@ -129,6 +129,12 @@
         property int count: tabsModel ? tabsModel.count : 0
         property int selectedIndex: tabsModel ? tabsModel.selectedIndex : -1
     }
+    Item {
+        // FIXME: This is a workaround to be able to get the properties of
+        //  the sections in an autopilot test.
+        objectName: "sectionsProperties"
+        property int selectedIndex: header.config ? header.config.sections.selectedIndex : -1
+    }
 
     /*!
       The flickable that controls the movement of the header.

=== modified file 'modules/Ubuntu/Components/Colors/FIXME'
--- modules/Ubuntu/Components/Colors/FIXME	2013-07-01 05:54:33 +0000
+++ modules/Ubuntu/Components/Colors/FIXME	2014-07-24 02:10:07 +0000
@@ -1,3 +1,7 @@
 UbuntuColors.qml is located in the Colors subdirectory because
 QuickUtils::createQmlObject() fails if the QML file is located in a
 folder that has a qmldir file with JavaScript modules.
+
+UbuntuColors 1.1 is not in a file named UbuntuColors11.qml but in
+UbuntuColors.qml so that qdoc can properly detect the component
+name without a qmldir file.

=== added file 'modules/Ubuntu/Components/Colors/UbuntuColors.qml'
--- modules/Ubuntu/Components/Colors/UbuntuColors.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/Colors/UbuntuColors.qml	2014-07-24 02:10:07 +0000
@@ -0,0 +1,131 @@
+/*
+    Copyright 2014 Canonical Ltd.
+ *
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation; version 3.
+ *
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+ *
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.2
+
+/*!
+    \qmltype UbuntuColors
+    \inqmlmodule Ubuntu.Components 1.1
+    \ingroup ubuntu
+    \brief Singleton defining the Ubuntu color palette.
+
+    Each color of the Ubuntu color palette is accesible from it.
+    For more information on how to appropriately use the colors according to
+    the context, please refer to the
+    \l{http://design.ubuntu.com/brand/colour-palette}{Ubuntu brand guidelines}.
+
+    Example of use:
+
+    \qml
+    Rectangle {
+       color: UbuntuColors.orange
+    }
+    \endqml
+*/
+QtObject {
+    // old colors from UbuntuColors 1.0:
+
+    /*!
+      Orange. Recommended for branded elements, display progress
+      and intensity, textual links on light backgrounds.
+    */
+    readonly property color orange: "#DD4814"
+    /*!
+      \deprecated
+      Ubuntu supporting color: light aubergine
+    */
+    readonly property color lightAubergine: "#77216F"
+    /*!
+      \deprecated
+      Ubuntu supporting color: mid aubergine
+    */
+    readonly property color midAubergine: "#5E2750"
+    /*!
+      \deprecated
+      Ubuntu supporting color: dark aubergine
+    */
+    readonly property color darkAubergine: "#2C001E"
+    /*!
+      \deprecated
+      Ubuntu neutral color: warm grey
+    */
+    readonly property color warmGrey: "#AEA79F"
+    /*!
+      \deprecated
+      Ubuntu neutral color: cool grey
+    */
+    readonly property color coolGrey: "#333333"
+
+    /*!
+      Ubuntu orange gradient
+
+      \sa Button::gradient
+    */
+    property Gradient orangeGradient: Gradient {
+        GradientStop { position: 0.0; color: "#DD4814" }
+        GradientStop { position: 1.0; color: "#D9722D" }
+    }
+    /*!
+      Ubuntu grey gradient
+
+      \sa Button::gradient
+    */
+    property Gradient greyGradient: Gradient {
+        GradientStop { position: 0.0; color: "#888888" }
+        GradientStop { position: 1.0; color: "#BBBBBB" }
+    }
+
+    // New colors introduced in UbuntuColors 1.1:
+
+    /*!
+      Light grey. Recommended for neutral action buttons and
+      secondary text.
+      \since Ubuntu.Components 1.1
+     */
+    readonly property color lightGrey: "#888888"
+
+    /*!
+      Dark grey. Recommended for text and action icons.
+      \since Ubuntu.Components 1.1
+     */
+    readonly property color darkGrey: "#5d5d5d"
+
+    /*!
+      Red. Recommended for negative and irreversible action
+      buttons, errors and alerts.
+      \since Ubuntu.Components 1.1
+     */
+    readonly property color red: "#fc4949"
+
+    /*!
+      Green. Recommended for positive action buttons.
+      \since Ubuntu.Components 1.1
+     */
+    readonly property color green: "#3fb24f"
+
+    /*!
+      Blue. Recommended for text selection and text cursor.
+      \since Ubuntu.Components 1.1
+     */
+    readonly property color blue: "#1ab6ef"
+
+    /*!
+      Purple. Recommended for proper nouns in
+      list items.
+      \since Ubuntu.Components 1.1
+     */
+    readonly property color purple: "#762572"
+}

=== renamed file 'modules/Ubuntu/Components/Colors/UbuntuColors.qml' => 'modules/Ubuntu/Components/Colors/UbuntuColors10.qml'
--- modules/Ubuntu/Components/Colors/UbuntuColors.qml	2013-07-02 00:15:07 +0000
+++ modules/Ubuntu/Components/Colors/UbuntuColors10.qml	2014-07-24 02:10:07 +0000
@@ -1,5 +1,5 @@
 /*
-    Copyright 2013 Canonical Ltd.
+    Copyright 2013-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
@@ -14,67 +14,23 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.2
 
 /*!
-    \qmltype UbuntuColors
-    \inqmlmodule Ubuntu.Components 0.1
-    \ingroup theming
-    \brief Singleton defining the Ubuntu color palette.
-
-    Each color of the Ubuntu color palette is accesible from it.
-    For more information on how to appropriately use the colors according to
-    the context, please refer to the
-    \l{http://design.ubuntu.com/brand/colour-palette}{Ubuntu brand guidelines}.
-
-    Example of use:
-
-    \qml
-    Rectangle {
-       color: UbuntuColors.orange
-    }
-    \endqml
+    \internal
+    Documentation is in UbuntuColors.qml
 */
 QtObject {
-    /*!
-       Ubuntu core color: Ubuntu orange
-    */
     readonly property color orange: "#DD4814"
-    /*!
-       Ubuntu supporting color: light aubergine
-    */
     readonly property color lightAubergine: "#77216F"
-    /*!
-       Ubuntu supporting color: mid aubergine
-    */
     readonly property color midAubergine: "#5E2750"
-    /*!
-       Ubuntu supporting color: dark aubergine
-    */
     readonly property color darkAubergine: "#2C001E"
-    /*!
-       Ubuntu neutral color: warm grey
-    */
     readonly property color warmGrey: "#AEA79F"
-    /*!
-       Ubuntu neutral color: cool grey
-    */
     readonly property color coolGrey: "#333333"
-
-    /*!
-       Ubuntu orange gradient
-
-       \sa Button::gradient
-    */
     property Gradient orangeGradient: Gradient {
         GradientStop { position: 0.0; color: "#DD4814" }
         GradientStop { position: 1.0; color: "#D9722D" }
     }
-    /*!
-       Ubuntu grey gradient
-
-       \sa Button::gradient
-    */
     property Gradient greyGradient: Gradient {
         GradientStop { position: 0.0; color: "#888888" }
         GradientStop { position: 1.0; color: "#BBBBBB" }

=== modified file 'modules/Ubuntu/Components/ListItems/Empty.qml'
--- modules/Ubuntu/Components/ListItems/Empty.qml	2014-06-05 11:42:07 +0000
+++ modules/Ubuntu/Components/ListItems/Empty.qml	2014-07-24 02:10:07 +0000
@@ -175,6 +175,7 @@
     function cancelItemRemoval()
     {
         priv.resetDrag()
+        priv.removed = false
     }
 
     width: parent ? parent.width : units.gu(31)

=== modified file 'modules/Ubuntu/Components/MainView.qml'
--- modules/Ubuntu/Components/MainView.qml	2014-07-10 11:50:13 +0000
+++ modules/Ubuntu/Components/MainView.qml	2014-07-24 02:10:07 +0000
@@ -387,7 +387,8 @@
             config: internal.activePage && internal.activePage.hasOwnProperty("head") &&
                     (internal.activePage.head.actions.length > 0 ||
                      internal.activePage.head.backAction !== null ||
-                     internal.activePage.head.contents !== null) ?
+                     internal.activePage.head.contents !== null ||
+                     internal.activePage.head.sections.model !== undefined) ?
                         internal.activePage.head : headerConfig
 
             property Item tabBar: null

=== modified file 'modules/Ubuntu/Components/PageHeadConfiguration.qml'
--- modules/Ubuntu/Components/PageHeadConfiguration.qml	2014-07-01 11:27:29 +0000
+++ modules/Ubuntu/Components/PageHeadConfiguration.qml	2014-07-24 02:10:07 +0000
@@ -25,18 +25,48 @@
 
     For examples how to use Page.head, see \l Page.
  */
-QtObject {
+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
 
@@ -52,7 +82,7 @@
       \qml
         Page {
             title: "Invisible title"
-            contents: Rectangle {
+            head.contents: Rectangle {
                 color: UbuntuColors.orange
                 height: units.gu(5)
                 width: parent ? parent.width - units.gu(2) : undefined
@@ -64,4 +94,13 @@
       be implemented.
      */
     property Item contents: null
+
+    /*!
+      \qmlproperty PageHeadSections sections
+      Defines the sections in the page header divider.
+     */
+    readonly property alias sections: headSections
+    PageHeadSections {
+        id: headSections
+    }
 }

=== added file 'modules/Ubuntu/Components/PageHeadSections.qml'
--- modules/Ubuntu/Components/PageHeadSections.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/PageHeadSections.qml	2014-07-24 02:10:07 +0000
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.2
+
+/*!
+    \qmltype PageHeadSections
+    \inqmlmodule Ubuntu.Components 1.1
+    \ingroup ubuntu
+    \since Ubuntu.Components 1.1
+    \brief PageHeadSections is used to configure the sections for a \l Page.
+
+    These sections will be shown in the bottom part of the header. This component does not
+    need to be instantiated by the developer, it is automatically part of \l PageHeadConfiguration.
+ */
+QtObject {
+    // To be used inside PageHeadConfiguration
+    id: sections
+
+    /*!
+      Set this property to false to disable user interaction to change the selected section.
+      Default value: true
+     */
+    property bool enabled: true
+
+    /*!
+      List of strings that represent section names. Example:
+      \qml
+        import Ubuntu.Components 1.1
+        import QtQuick 2.2
+
+        MainView {
+            width: units.gu(50)
+            height: units.gu(80)
+
+            useDeprecatedToolbar: false
+
+            Page {
+                id: page
+                title: "Sections"
+                head {
+                    sections {
+                        model: ["one", "two", "three"]
+                    }
+                }
+
+                Label {
+                    anchors.centerIn: parent
+                    text: "Section " + page.head.sections.selectedIndex
+                }
+            }
+        }
+     \endqml
+     */
+    property var model
+
+    /*!
+      The index of the currently selected section in \l model.
+     */
+    property int selectedIndex: model ? 0 : -1
+}

=== modified file 'modules/Ubuntu/Components/Panel.qml'
--- modules/Ubuntu/Components/Panel.qml	2014-04-25 12:53:58 +0000
+++ modules/Ubuntu/Components/Panel.qml	2014-07-24 02:10:07 +0000
@@ -443,13 +443,13 @@
       \internal
       \deprecated
       Enable the InverseMouseArea that closes the panel when the user clicks outside of the panel.
-      This functionality moved to the Toolbar/Page implementation because the mouse area needs to
-      access with the toolbar and header, but this InverseMouseArea is still in the Panel for backwards
-      compatibility in apps that use it directly. Default value is true, but it is set to false in Toolbar.
+      This functionality moved to the MainView to deal with Toolbar hiding, but this InverseMouseArea
+      is still in the Panel for backwards compatibility in apps that use it directly.
+      Default value is false.
 
       FIXME: Remove __closeOnContentsClicks and the IMA below when all apps use Toolbar instead of Panel.
      */
-    property bool __closeOnContentsClicks: true
+    property bool __closeOnContentsClicks: false
     Toolkit.InverseMouseArea {
         anchors.fill: draggingArea
         onPressed: {
@@ -625,6 +625,7 @@
 
     Item {
         id: bar
+        objectName: "bar_item"
         height: parent.height
         width: parent.width
         anchors {
@@ -637,6 +638,7 @@
         property real size: internal.orientation === Qt.Horizontal ? height : width
         //position will always be in the range 0..size, where position==0 means spread, position==size means hidden.
         property real position: panel.opened ? 0 : size
+        onSizeChanged: position = panel.opened ? 0 : size
 
         y: internal.align === Qt.AlignTop ? -position : internal.align === Qt.AlignBottom ? position : 0
         x: internal.align === Qt.AlignLeft ? -position : internal.align === Qt.AlignRight ? position : 0

=== renamed file 'modules/Ubuntu/Components/ProgressBar.qml' => 'modules/Ubuntu/Components/ProgressBar10.qml'
=== added file 'modules/Ubuntu/Components/ProgressBar11.qdoc'
--- modules/Ubuntu/Components/ProgressBar11.qdoc	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/ProgressBar11.qdoc	2014-07-24 02:10:07 +0000
@@ -0,0 +1,6 @@
+/*!
+\qmlproperty bool ProgressBar::showProgressPercentage
+\since Ubuntu.Components 1.1
+
+Specifies if the value of the progress is visible
+*/

=== added file 'modules/Ubuntu/Components/ProgressBar11.qml'
--- modules/Ubuntu/Components/ProgressBar11.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/ProgressBar11.qml	2014-07-24 02:10:07 +0000
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+
+ProgressBar {
+    property bool showProgressPercentage: true
+}

=== modified file 'modules/Ubuntu/Components/TextArea.qml'
--- modules/Ubuntu/Components/TextArea.qml	2014-06-28 17:26:49 +0000
+++ modules/Ubuntu/Components/TextArea.qml	2014-07-24 02:10:07 +0000
@@ -850,7 +850,7 @@
             }
             color: control.__styleInstance.color
             selectedTextColor: Theme.palette.selected.foregroundText
-            selectionColor: Theme.palette.selected.foreground
+            selectionColor: Theme.palette.selected.selection
             font.pixelSize: FontUtils.sizeToPixels("medium")
             // forward keys to the root element so it can be captured outside of it
             // as well as to InputHandler to handle PageUp/PageDown keys

=== modified file 'modules/Ubuntu/Components/TextField.qml'
--- modules/Ubuntu/Components/TextField.qml	2014-06-29 21:46:30 +0000
+++ modules/Ubuntu/Components/TextField.qml	2014-07-24 02:10:07 +0000
@@ -979,7 +979,7 @@
             }
             color: control.__styleInstance.color
             selectedTextColor: Theme.palette.selected.foregroundText
-            selectionColor: Theme.palette.selected.foreground
+            selectionColor: Theme.palette.selected.selection
             font.pixelSize: FontUtils.sizeToPixels("medium")
             passwordCharacter: "\u2022"
             // forward keys to the root element so it can be captured outside of it

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ActivityIndicatorStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ActivityIndicatorStyle.qml	2014-05-22 13:04:58 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ActivityIndicatorStyle.qml	2014-07-24 02:10:07 +0000
@@ -28,7 +28,12 @@
     verticalAlignment: Image.AlignVCenter
     source: "artwork/spinner.png"
 
-    RotationAnimator on rotation {
+    /*
+      Changed from RotationAnimator to RotationAnimation to 
+      work around bug: https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1338602
+      "Activity Indicator crashes in QML/Widget mixed applications"
+    */
+    RotationAnimation on rotation {
         running: styledItem.running
         from: 0
         to: 360

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml	2014-07-24 02:10:07 +0000
@@ -54,7 +54,7 @@
             }
             PropertyChanges {
                 target: background
-                color: Theme.palette.selected.foreground
+                color: UbuntuColors.green
             }
         },
         State {

=== renamed file 'modules/Ubuntu/Components/Themes/Ambiance/HeaderButtonStyle.qml' => 'modules/Ubuntu/Components/Themes/Ambiance/PageHeadButton.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/HeaderButtonStyle.qml	2014-05-01 15:31:38 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/PageHeadButton.qml	2014-07-24 02:10:07 +0000
@@ -14,30 +14,30 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.2
 import Ubuntu.Components 1.1
 
-Item {
-    id: visuals
-    // styling properties
-    property int iconWidth: units.gu(3)
-    property int iconHeight: units.gu(3)
-
-    width: units.gu(5)
-    height: units.gu(5)
+AbstractButton {
+    id: button
+
+    property int iconWidth: units.gu(2)
+    property int iconHeight: iconWidth
+
+    width: visible ? units.gu(4) : 0
+    height: parent ? parent.height : undefined
 
     Image {
         id: icon
         anchors {
             centerIn: parent
         }
-        width: visuals.iconWidth
-        height: visuals.iconWidth
-        source: styledItem.iconSource
-        opacity: styledItem.enabled ? 1.0 : 0.3
+        width: button.iconWidth
+        height: button.iconHeight
+        source: button.iconSource
+        opacity: button.enabled ? 1.0 : 0.3
         sourceSize {
-            width: width
-            height: height
+            width: icon.width
+            height: icon.height
         }
     }
 }

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml	2014-07-04 11:25:50 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml	2014-07-24 02:10:07 +0000
@@ -13,7 +13,7 @@
  * 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 QtQuick 2.2
 import Ubuntu.Components 1.1
 import Ubuntu.Components.Popups 1.0
 import Ubuntu.Components.ListItems 1.0 as ListItem
@@ -32,6 +32,10 @@
 
     implicitHeight: headerStyle.contentHeight + separator.height + separatorBottom.height
 
+    // FIXME: Workaround to get sectionsRepeater.count in autopilot tests,
+    //  see also FIXME in AppHeader where this property is used.
+    property alias __sections_repeater_for_autopilot: sectionsRepeater
+
     BorderImage {
         id: separator
         anchors {
@@ -40,6 +44,42 @@
             right: parent.right
         }
         source: headerStyle.separatorSource
+
+        property PageHeadSections sections: styledItem.config.sections
+
+        Row {
+            id: sectionsRow
+            property int itemWidth: sectionsRow.width / sectionsRepeater.count
+            anchors.fill: parent
+            enabled: separator.sections.enabled
+            visible: separator.sections.model !== undefined
+            opacity: enabled ? 1.0 : 0.5
+
+            Repeater {
+                id: sectionsRepeater
+                model: separator.sections.model
+                objectName: "page_head_sections_repeater"
+                AbstractButton {
+                    id: sectionButton
+                    objectName: "section_button_" + index
+                    enabled: sectionsRow.enabled
+                    width: sectionsRow.itemWidth
+                    height: sectionsRow.height
+                    property bool selected: index === separator.sections.selectedIndex
+                    onClicked: separator.sections.selectedIndex = index;
+
+                    Label {
+                        text: modelData
+                        fontSize: "small"
+                        anchors.fill: parent
+                        horizontalAlignment: Text.AlignHCenter
+                        color: sectionButton.selected ?
+                                   Theme.palette.normal.backgroundText :
+                                   Theme.palette.selected.backgroundText
+                    }
+                }
+            }
+        }
     }
     Image {
         id: separatorBottom
@@ -56,26 +96,22 @@
         anchors {
             left: parent.left
             top: parent.top
+            leftMargin: width > 0 ? units.gu(1) : 0
         }
         width: childrenRect.width
         height: headerStyle.contentHeight
 
-        AbstractButton {
+        PageHeadButton {
             id: customBackButton
             objectName: "customBackButton"
-            height: parent ? parent.height : undefined
-            width: visible ? units.gu(5) : 0
             action: styledItem.config.backAction
             visible: null !== styledItem.config.backAction &&
                      styledItem.config.backAction.visible
-            style: Theme.createStyleComponent("HeaderButtonStyle.qml", backButton)
         }
 
-        AbstractButton {
+        PageHeadButton {
             id: backButton
             objectName: "backButton"
-            height: parent ? parent.height : undefined
-            width: visible ? units.gu(5) : 0
 
             iconName: "back"
             visible: styledItem.pageStack !== null &&
@@ -84,18 +120,15 @@
                      !customBackButton.visible
 
             text: "back"
-            style: Theme.createStyleComponent("HeaderButtonStyle.qml", backButton)
 
             onTriggered: {
                 styledItem.pageStack.pop();
             }
         }
 
-        AbstractButton {
+        PageHeadButton {
             id: tabsButton
             objectName: "tabsButton"
-            height: parent ? parent.height : undefined
-            width: visible ? units.gu(5) : 0
 
             iconName: "navigation-menu"
             visible: styledItem.tabsModel !== null &&
@@ -103,7 +136,6 @@
                      !backButton.visible &&
                      !customBackButton.visible
             text: visible ? styledItem.tabsModel.count + " tabs" : ""
-            style: Theme.createStyleComponent("HeaderButtonStyle.qml", tabsButton)
 
             onTriggered: {
                 tabsPopover.show();
@@ -220,29 +252,26 @@
         anchors {
             top: parent.top
             right: parent.right
+            rightMargin: units.gu(1)
         }
         width: childrenRect.width
         height: headerStyle.contentHeight
 
         Repeater {
             model: numberOfSlots.used
-            AbstractButton {
+            PageHeadButton {
                 id: actionButton
                 objectName: action.objectName + "_header_button"
                 action: actionsContainer.visibleActions[index]
-                style: Theme.createStyleComponent("HeaderButtonStyle.qml", actionButton)
-                width: units.gu(5)
-                height: actionsContainer.height
             }
         }
 
-        AbstractButton {
+        PageHeadButton {
             id: actionsOverflowButton
             objectName: "actions_overflow_button"
             visible: numberOfSlots.requested > numberOfSlots.right
             iconName: "contextual-menu"
             width: visible ? units.gu(5) : 0
-            style: Theme.createStyleComponent("HeaderButtonStyle.qml", actionsOverflowButton)
             height: actionsContainer.height
             onTriggered: actionsOverflowPopover.show()
 

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/Palette.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/Palette.qml	2013-07-05 12:21:32 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/Palette.qml	2014-07-24 02:10:07 +0000
@@ -15,20 +15,21 @@
  */
 
 import QtQuick 2.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.Themes 0.1
 
 Palette {
     normal: PaletteValues {
         background: "#EDEDED"
         backgroundText: "#81888888"
-        base: "#1A000000"
-        baseText: "#888888"
-        foreground: "#888888"
+        base: Qt.rgba(0, 0, 0, 0.1)
+        baseText: UbuntuColors.lightGrey
+        foreground: UbuntuColors.lightGrey
         foregroundText: "#F3F3E7"
         overlay: "#FDFDFD"
-        overlayText: "#888888"
+        overlayText: UbuntuColors.lightGrey
         field: "#1A000000"
-        fieldText: "#888888"
+        fieldText: UbuntuColors.darkGrey
     }
     selected: PaletteValues {
         /* FIXME: 'background' does not come from design
@@ -36,10 +37,11 @@
            that will go away with the new design.
         */
         background: "#B2E6E6E6"
-        backgroundText: "#888888"
-        foreground: "#DD4814"
-        foregroundText: "#F3F3E7"
+        backgroundText: UbuntuColors.darkGrey
+        selection: Qt.rgba(UbuntuColors.blue.r, UbuntuColors.blue.g, UbuntuColors.blue.b, 0.2)
+        foreground: UbuntuColors.blue
+        foregroundText: UbuntuColors.darkGrey
         field: "#FFFFFF"
-        fieldText: "#888888"
+        fieldText: UbuntuColors.darkGrey
     }
 }

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml	2014-07-24 02:10:07 +0000
@@ -20,7 +20,7 @@
 Item {
     id: progressBarStyle
 
-    property ProgressBar progressBar: styledItem
+    property var progressBar: styledItem
 
     implicitWidth: units.gu(38)
     implicitHeight: units.gu(4)
@@ -56,6 +56,7 @@
         color: Theme.palette.normal.baseText
         text: progressBar.indeterminate ? i18n.tr("In Progress")
               : "%1%".arg(Number(progressBarStyle.progress * 100.0).toFixed(0))
+        visible: !progressBar.hasOwnProperty("showProgressPercentage") || progressBar.showProgressPercentage
 
         SequentialAnimation on opacity {
             loops: Animation.Infinite
@@ -76,5 +77,6 @@
         rightColor: Theme.palette.normal.baseText
         progress: (progressBarStyle.progress * background.width - valueLabel.x) / valueLabel.width
         mirror: Qt.application.layoutDirection == Qt.RightToLeft
+        visible: !progressBar.hasOwnProperty("showProgressPercentage") || progressBar.showProgressPercentage
     }
 }

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/SwitchStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/SwitchStyle.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/SwitchStyle.qml	2014-07-24 02:10:07 +0000
@@ -58,8 +58,8 @@
                 bottomMargin: switchStyle.thumbPadding
             }
 
-            color: styledItem.checked ? Theme.palette.selected.foreground
-                                      : Theme.palette.normal.foreground
+            color: styledItem.checked ? UbuntuColors.green
+                                      : Qt.rgba(0, 0, 0, 0.2)
 
             Behavior on x {
                 UbuntuNumberAnimation {
@@ -117,7 +117,7 @@
                 }
                 progress: MathUtils.clamp((thumb.x - parent.x - x) / width, 0.0, 1.0)
                 leftColor: "transparent"
-                rightColor: Theme.palette.selected.foregroundText
+                rightColor: Theme.palette.normal.foregroundText
             }
         }
 
@@ -138,7 +138,7 @@
                     source: "artwork/tick.png"
                 }
                 progress: MathUtils.clamp((thumb.x + thumb.width - parent.x - x) / width, 0.0, 1.0)
-                leftColor: Theme.palette.selected.foregroundText
+                leftColor: Theme.palette.normal.foregroundText
                 rightColor: "transparent"
             }
         }

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml	2014-05-09 05:25:12 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml	2014-07-24 02:10:07 +0000
@@ -47,7 +47,7 @@
     Component {
         id: delegate
         Rectangle {
-            width: units.dp(1)
+            width: units.dp(2)
             color: Theme.palette.selected.foreground
             visible: blinkTimer.timerShowCursor
             Timer {
@@ -70,7 +70,7 @@
     // caretItem
     Image {
         id: caretItem
-        source: "artwork/teardrop-left.png"
+        source: "artwork/caret_noshadow.png"
         anchors {
             top: parent.bottom
             horizontalCenter: parent.horizontalCenter

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/TextSelectionEndCursorStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/TextSelectionEndCursorStyle.qml	2014-05-09 05:25:12 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/TextSelectionEndCursorStyle.qml	2014-07-24 02:10:07 +0000
@@ -55,7 +55,7 @@
     // caretItem
     Image {
         id: caretItem
-        source: "artwork/teardrop-left.png"
+        source: "artwork/caret_noshadow.png"
         anchors {
             top: parent.bottom
             horizontalCenter: parent.horizontalCenter

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/TextSelectionStartCursorStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/TextSelectionStartCursorStyle.qml	2014-05-13 08:00:18 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/TextSelectionStartCursorStyle.qml	2014-07-24 02:10:07 +0000
@@ -55,12 +55,13 @@
     // caretItem
     Image {
         id: caretItem
-        source: "artwork/teardrop-right.png"
+        source: "artwork/caret_noshadow.png"
         anchors {
-            top: parent.bottom
+            bottom: parent.top
             horizontalCenter: parent.horizontalCenter
             topMargin: -units.gu(0.5)
             horizontalCenterOffset: LayoutMirroring.enabled ? -(units.gu(0.7) - caretItem.width) : -units.gu(0.7)
         }
+        rotation: 180
     }
 }

=== added file 'modules/Ubuntu/Components/Themes/Ambiance/artwork/[e-mail]'
Binary files modules/Ubuntu/Components/Themes/Ambiance/artwork/[e-mail]	1970-01-01 00:00:00 +0000 and modules/Ubuntu/Components/Themes/Ambiance/artwork/[e-mail]	2014-07-24 02:10:07 +0000 differ
=== removed file 'modules/Ubuntu/Components/Themes/Ambiance/artwork/[e-mail]'
Binary files modules/Ubuntu/Components/Themes/Ambiance/artwork/[e-mail]	2014-04-25 08:18:46 +0000 and modules/Ubuntu/Components/Themes/Ambiance/artwork/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== removed file 'modules/Ubuntu/Components/Themes/Ambiance/artwork/[e-mail]'
Binary files modules/Ubuntu/Components/Themes/Ambiance/artwork/[e-mail]	2014-04-25 08:18:46 +0000 and modules/Ubuntu/Components/Themes/Ambiance/artwork/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/qmldir'
--- modules/Ubuntu/Components/Themes/Ambiance/qmldir	2014-06-30 10:49:51 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/qmldir	2014-07-24 02:10:07 +0000
@@ -4,7 +4,7 @@
 internal CheckBoxStyle CheckBoxStyle.qml
 internal DialogForegroundStyle DialogForegroundStyle.qml
 internal HeaderStyle HeaderStyle.qml
-internal HeaderButtonStyle HeaderButtonStyle.qml
+internal PageHeadButton PageHeadButton.qml
 MainViewStyle 0.1 MainViewStyle.qml
 ListItemOptionSelector 0.1 ListItemOptionSelector.qml
 OptionSelectorStyle 0.1 OptionSelectorStyle.qml

=== modified file 'modules/Ubuntu/Components/Themes/PaletteValues.qml'
--- modules/Ubuntu/Components/Themes/PaletteValues.qml	2013-07-05 16:04:07 +0000
+++ modules/Ubuntu/Components/Themes/PaletteValues.qml	2014-07-24 02:10:07 +0000
@@ -69,4 +69,8 @@
        Typically used for labels and images.
     */
     property color fieldText
+    /*!
+       Color applied to selected text in editable components.
+    */
+    property color selection
 }

=== modified file 'modules/Ubuntu/Components/Themes/SuruDark/Palette.qml'
--- modules/Ubuntu/Components/Themes/SuruDark/Palette.qml	2013-07-05 14:34:00 +0000
+++ modules/Ubuntu/Components/Themes/SuruDark/Palette.qml	2014-07-24 02:10:07 +0000
@@ -15,6 +15,7 @@
  */
 
 import QtQuick 2.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.Themes 0.1
 
 Palette {
@@ -33,8 +34,9 @@
     selected: PaletteValues {
         background: "#88D6D6D6" // FIXME: not from design
         backgroundText: "#F3F3E7"
-        foreground: "#DD4814"
-        foregroundText: "#F3F3E7"
+        selection: Qt.rgba(UbuntuColors.blue.r, UbuntuColors.blue.g, UbuntuColors.blue.b, 0.2)
+        foreground: UbuntuColors.blue
+        foregroundText: UbuntuColors.darkGrey
         field: "#FFFFFF"
         fieldText: "#888888"
     }

=== modified file 'modules/Ubuntu/Components/deployment.pri'
--- modules/Ubuntu/Components/deployment.pri	2014-04-29 05:39:04 +0000
+++ modules/Ubuntu/Components/deployment.pri	2014-07-24 02:10:07 +0000
@@ -52,6 +52,6 @@
 # Silence spam on stderr due to fonts
 # https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1256999
 # https://bugreports.qt-project.org/browse/QTBUG-36243
-plugins_qmltypes.extra = $$[QT_INSTALL_BINS]/qmlplugindump -notrelocatable Ubuntu.Components 0.1 ../../ 2>/dev/null > $(INSTALL_ROOT)/$$installPath/plugins.qmltypes
+plugins_qmltypes.extra = ALARM_BACKEND=memory $$[QT_INSTALL_BINS]/qmlplugindump -notrelocatable Ubuntu.Components 0.1 ../../ 2>/dev/null > $(INSTALL_ROOT)/$$installPath/plugins.qmltypes
 
 INSTALLS += qmldir_file qml_files js_files artwork_files listitems_files listitems_artwork_files popups_files picker_files styles_files plugins_qmltypes

=== modified file 'modules/Ubuntu/Components/plugin/adapters/alarmsadapter_organizer.cpp'
--- modules/Ubuntu/Components/plugin/adapters/alarmsadapter_organizer.cpp	2014-04-17 14:05:49 +0000
+++ modules/Ubuntu/Components/plugin/adapters/alarmsadapter_organizer.cpp	2014-07-24 02:10:07 +0000
@@ -57,17 +57,14 @@
     , fetchRequest(0)
 {
     QString envManager(qgetenv("ALARM_BACKEND"));
-    if (!envManager.isEmpty() && QOrganizerManager::availableManagers().contains(envManager)) {
-        manager = new QOrganizerManager(envManager);
-    } else {
-        manager = QOrganizerManager::availableManagers().contains(ALARM_MANAGER) ?
-                    new QOrganizerManager(ALARM_MANAGER) : new QOrganizerManager(ALARM_MANAGER_FALLBACK);
+    if (envManager.isEmpty())
+        envManager = ALARM_MANAGER;
+    if (!QOrganizerManager::availableManagers().contains(envManager)) {
+        qWarning() << "WARNING: alarm manager" << envManager << "not installed, using" << QString(ALARM_MANAGER_FALLBACK);
+        envManager = ALARM_MANAGER_FALLBACK;
     }
+    manager = new QOrganizerManager(envManager);
     manager->setParent(q_ptr);
-    if (manager->managerName() != ALARM_MANAGER) {
-        qWarning() << "WARNING: default alarm manager not installed, using" << manager->managerName() << "manager.";
-        qWarning() << "This manager may not provide all the needed features.";
-    }
 
     QList<QOrganizerCollection> collections = manager->collections();
     if (collections.count() > 0) {

=== modified file 'modules/Ubuntu/Components/plugin/plugin.cpp'
--- modules/Ubuntu/Components/plugin/plugin.cpp	2014-06-10 11:47:09 +0000
+++ modules/Ubuntu/Components/plugin/plugin.cpp	2014-07-24 02:10:07 +0000
@@ -92,7 +92,14 @@
     return uriHandler;
 }
 
-static QObject *registerUbuntuColors(QQmlEngine *engine, QJSEngine *scriptEngine)
+static QObject *registerUbuntuColors10(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(scriptEngine)
+    return UbuntuComponentsPlugin::registerQmlSingletonType(engine,
+           "Ubuntu.Components", "Colors/UbuntuColors10.qml");
+}
+
+static QObject *registerUbuntuColors11(QQmlEngine *engine, QJSEngine *scriptEngine)
 {
     Q_UNUSED(scriptEngine)
     return UbuntuComponentsPlugin::registerQmlSingletonType(engine,
@@ -154,7 +161,7 @@
 
 void UbuntuComponentsPlugin::registerTypesToVersion(const char *uri, int major, int minor)
 {
-    qmlRegisterSingletonType<QObject>(uri, major, minor, "UbuntuColors", registerUbuntuColors);
+    qmlRegisterSingletonType<QObject>(uri, major, minor, "UbuntuColors", registerUbuntuColors10);
     qmlRegisterUncreatableType<UbuntuI18n>(uri, major, minor, "i18n", "Singleton object");
     qmlRegisterExtendedType<QQuickImageBase, UCQQuickImageExtension>(uri, major, minor, "QQuickImageBase");
     qmlRegisterUncreatableType<UCUnits>(uri, major, minor, "UCUnits", "Not instantiable");
@@ -184,6 +191,7 @@
     // register 0.1 for backward compatibility
     registerTypesToVersion(uri, 0, 1);
     registerTypesToVersion(uri, 1, 0);
+    qmlRegisterSingletonType<QObject>(uri, 1, 1, "UbuntuColors", registerUbuntuColors11);
 
     // register custom event
     ForwardedEvent::registerForwardedEvent();

=== modified file 'modules/Ubuntu/Components/plugin/ucfontutils.cpp'
--- modules/Ubuntu/Components/plugin/ucfontutils.cpp	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/plugin/ucfontutils.cpp	2014-07-24 02:10:07 +0000
@@ -83,17 +83,17 @@
 qreal UCFontUtils::modularScale(const QString &size)
 {
     if (size == "xx-small") {
-        return 0.606;
+        return 0.677;
     } else if (size == "x-small") {
-        return 0.707;
+        return 0.804;
     } else if (size == "small") {
-        return 0.857;
+        return 0.931;
     } else if (size == "medium") {
-        return 1.0;
+        return 1.079;
     } else if (size == "large") {
-        return 1.414;
+        return 1.291;
     } else if (size == "x-large") {
-        return 1.905;
+        return 1.714;
     }
     return 0.0;
 }

=== modified file 'modules/Ubuntu/Components/qmldir'
--- modules/Ubuntu/Components/qmldir	2014-07-03 13:59:52 +0000
+++ modules/Ubuntu/Components/qmldir	2014-07-24 02:10:07 +0000
@@ -15,7 +15,7 @@
 Label 0.1 Label.qml
 AbstractButton 0.1 AbstractButton.qml
 ActivityIndicator 0.1 ActivityIndicator.qml
-ProgressBar 0.1 ProgressBar.qml
+ProgressBar 0.1 ProgressBar10.qml
 TextField 0.1 TextField.qml
 TextArea 0.1 TextArea.qml
 Switch 0.1 Switch.qml
@@ -65,7 +65,7 @@
 Label 1.0 Label.qml
 AbstractButton 1.0 AbstractButton.qml
 ActivityIndicator 1.0 ActivityIndicator.qml
-ProgressBar 1.0 ProgressBar.qml
+ProgressBar 1.0 ProgressBar10.qml
 TextField 1.0 TextField.qml
 TextArea 1.0 TextArea.qml
 Switch 1.0 Switch.qml
@@ -93,10 +93,12 @@
 
 #version 1.1
 ComboButton 1.1 ComboButton.qml
+ProgressBar 1.1 ProgressBar11.qml
 CrossFadeImage 1.1 CrossFadeImage11.qml
 PullToRefresh 1.1 PullToRefresh.qml
 UbuntuListView 1.1 UbuntuListView11.qml
 internal PageBase Page10.qml
 Page 1.1 Page11.qml
 PageHeadConfiguration 1.1 PageHeadConfiguration.qml
+PageHeadSections 1.1 PageHeadSections.qml
 PageHeadState 1.1 PageHeadState.qml

=== modified file 'modules/Ubuntu/Test/UbuntuTestCase.qml'
--- modules/Ubuntu/Test/UbuntuTestCase.qml	2014-06-19 08:15:49 +0000
+++ modules/Ubuntu/Test/UbuntuTestCase.qml	2014-07-24 02:10:07 +0000
@@ -223,5 +223,14 @@
 			throw new Error("QtQuickTest::fail")
 		}
 	}
-} 
+
+	/*!
+		Convenience function to allow typing a full string instead of single characters
+	*/
+	function typeString(string) {
+		for (var i = 0; i < string.length; i++) {
+			keyClick(string[i]);
+		}
+	}
+}
 

=== modified file 'push_to_phone.sh'
--- push_to_phone.sh	2014-05-30 09:59:17 +0000
+++ push_to_phone.sh	2014-07-24 02:10:07 +0000
@@ -30,6 +30,8 @@
     echo modules/$i '->' /usr/lib/$ARCH/qt5/qml/Ubuntu/Components/
     adb push $i /usr/lib/$ARCH/qt5/qml/Ubuntu/Components/
 done
+echo modules/Ubuntu/Components/qmldir '->' /usr/lib/$ARCH/qt5/qml/Ubuntu/Components/
+adb push Ubuntu/Components/qmldir /usr/lib/$ARCH/qt5/qml/Ubuntu/Components/
 cd ..
 for i in ListItems Pickers Popups Colors Styles Themes artwork; do
     adb push modules/Ubuntu/Components/$i/ /usr/lib/$ARCH/qt5/qml/Ubuntu/Components/$i || exit 1

=== modified file 'tests/autopilot/ubuntuuitoolkit/__init__.py'
--- tests/autopilot/ubuntuuitoolkit/__init__.py	2014-06-30 10:49:51 +0000
+++ tests/autopilot/ubuntuuitoolkit/__init__.py	2014-07-24 02:10:07 +0000
@@ -41,6 +41,7 @@
     'TextField',
     'Toolbar',
     'ToolkitException',
+    'ubuntu_scenarios',
     'UbuntuListView11',
     'UbuntuUIToolkitCustomProxyObjectBase',
 ]
@@ -52,6 +53,7 @@
     environment,
     fixture_setup,
     tests,
+    ubuntu_scenarios
 )
 from ubuntuuitoolkit._custom_proxy_objects import (
     AppHeader,

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py	2014-06-04 22:17:49 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py	2014-07-24 02:10:07 +0000
@@ -52,14 +52,44 @@
         self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
         self.y.wait_for(0)
 
+    @autopilot_logging.log_action(logger.info)
+    def switch_to_section_by_index(self, index):
+        """Select a section in the header divider
+
+        :parameter index: The index of the section to select
+        :raise ToolkitEmulatorException: If the selection index is out of
+                range or useDeprecatedToolbar is set.
+
+        """
+        self._show_if_not_visible()
+
+        if self.useDeprecatedToolbar:
+            raise _common.ToolkitException('Old header has no sections')
+
+        try:
+            object_name = "section_button_" + str(index)
+            button = self.select_single(objectName=object_name)
+        except dbus.StateNotFoundError:
+            raise _common.ToolkitException(
+                'Button for section with given index not found')
+
+        self.pointing_device.click_object(button)
+
+    def get_selected_section_index(self):
+        if self.useDeprecatedToolbar:
+            raise _common.ToolkitException('Old header has no sections')
+
+        sectionsProperties = self.select_single(
+            'QQuickItem', objectName='sectionsProperties')
+        return sectionsProperties.selectedIndex
+
     def click_back_button(self):
         self._show_if_not_visible()
 
         if self.useDeprecatedToolbar:
             raise _common.ToolkitException('Old header has no back button')
         try:
-            back_button = self.select_single(
-                'AbstractButton', objectName='backButton')
+            back_button = self.select_single(objectName='backButton')
         except dbus.StateNotFoundError:
             raise _common.ToolkitException('Missing back button in header')
         if not back_button.visible:
@@ -74,7 +104,7 @@
                 'Old header has no custom back button')
         try:
             custom_back_button = self.select_single(
-                'AbstractButton', objectName='customBackButton')
+                objectName='customBackButton')
         except dbus.StateNotFoundError:
             raise _common.ToolkitException(
                 'Missing custom back button in header')
@@ -138,8 +168,7 @@
 
     def _switch_to_tab_in_drawer_by_index(self, index):
         try:
-            tabs_drawer_button = self.select_single(
-                'AbstractButton', objectName='tabsButton')
+            tabs_drawer_button = self.select_single(objectName='tabsButton')
         except dbus.StateNotFoundError:
             raise _common.ToolkitException(_NO_TABS_ERROR)
         self.pointing_device.click_object(tabs_drawer_button)
@@ -175,8 +204,7 @@
     def _get_action_button(self, action_object_name):
         try:
             object_name = action_object_name + "_header_button"
-            button = self.select_single(
-                'AbstractButton', objectName=object_name)
+            button = self.select_single(objectName=object_name)
         except dbus.StateNotFoundError:
             # the button is not in the header, but it may be in the overflow
             try:
@@ -190,7 +218,6 @@
 
     def _get_action_button_in_overflow(self, action_object_name):
         actions_overflow_button = self.select_single(
-            'AbstractButton',
             objectName='actions_overflow_button')
 
         if not actions_overflow_button.visible:

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py	2014-06-02 23:21:48 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py	2014-07-24 02:10:07 +0000
@@ -41,8 +41,7 @@
     def get_header(self):
         """Return the AppHeader emulator of the MainView."""
         try:
-            return self.select_single(
-                'AppHeader', objectName='MainView_Header')
+            return self.select_single(objectName='MainView_Header')
         except dbus.StateNotFoundError:
             raise _common.ToolkitException('The main view has no header.')
 

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/pickers.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/pickers.py	2014-05-09 05:39:20 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/pickers.py	2014-07-24 02:10:07 +0000
@@ -127,15 +127,18 @@
         if not self._is_time_picker():
             raise _common.ToolkitException(
                 "Can't pick time. The picker mode is: {!r}.".format(self.mode))
+        # Workaround https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1346669
+        # By setting seconds, then minutes, then hours, erratic behavoir
+        # can be dealt with
+        if 'Seconds' in self.mode:
+            self._pick_second(time.second)
+            self.seconds.wait_for(time.second)
+        if 'Minutes' in self.mode:
+            self._pick_minute(time.minute)
+            self.minutes.wait_for(time.minute)
         if 'Hours' in self.mode:
             self._pick_hour(time.hour)
             self.hours.wait_for(time.hour)
-        if 'Minutes' in self.mode:
-            self._pick_minute(time.minute)
-            self.minutes.wait_for(time.minute)
-        if 'Seconds' in self.mode:
-            self._pick_second(time.second)
-            self.seconds.wait_for(time.second)
 
     def _is_time_picker(self):
         mode = self.mode

=== modified file 'tests/autopilot/ubuntuuitoolkit/base.py'
--- tests/autopilot/ubuntuuitoolkit/base.py	2014-01-14 00:44:05 +0000
+++ tests/autopilot/ubuntuuitoolkit/base.py	2014-07-24 02:10:07 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2013 Canonical Ltd.
+# Copyright (C) 2013, 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
@@ -16,6 +16,7 @@
 
 """Base classes for Autopilot tests using the Ubuntu UI Toolkit."""
 
+import os
 import subprocess
 
 from autopilot import (
@@ -25,14 +26,21 @@
 )
 
 
+def get_host_multiarch():
+    if 'deb_host_multiarch' not in os.environ:
+        # Discard errors: the one known message is "GCC not installed"
+        os.environ['deb_host_multiarch'] = subprocess.check_output(
+            ["dpkg-architecture", "-qDEB_HOST_MULTIARCH"],
+            universal_newlines=True, stderr=subprocess.PIPE).strip()
+    return os.environ['deb_host_multiarch']
+
+
 def get_qmlscene_launch_command():
     """Return the command to launch qmlscene for autopilot tests."""
     # We need to specify qt5 because qtchooser doesn't have a default
     # configuration on devices and it seems the environment variable
     # QT_SELECT=qt5 doesn't work for autopilot tests. --Mirv - 2013-10-03
-    arch = subprocess.check_output(
-        ["dpkg-architecture", "-qDEB_HOST_MULTIARCH"],
-        universal_newlines=True).strip()
+    arch = get_host_multiarch()
     return '/usr/lib/{}/qt5/bin/qmlscene'.format(arch)
 
 

=== modified file 'tests/autopilot/ubuntuuitoolkit/fixture_setup.py'
--- tests/autopilot/ubuntuuitoolkit/fixture_setup.py	2014-05-26 06:40:24 +0000
+++ tests/autopilot/ubuntuuitoolkit/fixture_setup.py	2014-07-24 02:10:07 +0000
@@ -15,11 +15,14 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 import copy
+import logging
 import os
 import shutil
 import tempfile
 
 import fixtures
+from autopilot import display
+from gi.repository import Gio
 
 from ubuntuuitoolkit import base, environment
 
@@ -46,6 +49,9 @@
 }
 
 
+logger = logging.getLogger(__name__)
+
+
 class FakeApplication(fixtures.Fixture):
 
     def __init__(
@@ -71,18 +77,26 @@
         return qml_file_path, desktop_file_path
 
     def _write_test_qml_file(self):
-        qml_file = tempfile.NamedTemporaryFile(
-            mode='w+t', suffix='.qml', delete=False)
+        qml_file = self._named_temporary_file(suffix='.qml')
         qml_file.write(self._qml_file_contents)
         qml_file.close()
         return qml_file.name
 
+    def _named_temporary_file(self, dir=None, mode='w+t',
+                              delete=False, suffix=''):
+        # Discard files with underscores which look like an APP_ID to Unity
+        # See https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1329141
+        chars = tempfile._RandomNameSequence.characters.strip("_")
+        tempfile._RandomNameSequence.characters = chars
+        return tempfile.NamedTemporaryFile(dir=dir, mode=mode,
+                                           delete=delete, suffix=suffix)
+
     def _write_test_desktop_file(self, qml_file_path):
         desktop_file_dir = self._get_local_desktop_file_directory()
         if not os.path.exists(desktop_file_dir):
             os.makedirs(desktop_file_dir)
-        desktop_file = tempfile.NamedTemporaryFile(
-            mode='w+t', suffix='.desktop', dir=desktop_file_dir, delete=False)
+        desktop_file = self._named_temporary_file(suffix='.desktop',
+                                                  dir=desktop_file_dir)
         self._desktop_file_dict['Exec'] = (
             self._desktop_file_dict['Exec'].format(
                 qmlscene=base.get_qmlscene_launch_command(),
@@ -163,3 +177,82 @@
             shutil.copyfile(
                 xauthority_file_path,
                 os.path.join(directory, '.Xauthority'))
+
+
+class HideUnity7Launcher(fixtures.Fixture):
+
+    """Hide the Unity7 launcher if it is visible and restore it on clean up."""
+
+    _UNITYSHELL_GSETTINGS_SCHEMA = 'org.compiz.unityshell'
+    _UNITYSHELL_GSETTINGS_PATH = (
+        '/org/compiz/profiles/unity/plugins/unityshell/')
+    _UNITYSHELL_LAUNCHER_KEY = 'launcher-hide-mode'
+    _UNITYSHELL_LAUNCHER_HIDDEN_MODE = 1  # launcher hidden
+
+    def setUp(self):
+        super(HideUnity7Launcher, self).setUp()
+        self._hide_launcher()
+
+    def _hide_launcher(self):
+        if (self._UNITYSHELL_GSETTINGS_SCHEMA in
+                Gio.Settings.list_relocatable_schemas()):
+            unityshell_schema = Gio.Settings.new_with_path(
+                self._UNITYSHELL_GSETTINGS_SCHEMA,
+                self._UNITYSHELL_GSETTINGS_PATH)
+            self._hide_launcher_from_schema(unityshell_schema)
+        else:
+            logger.warning('Unity Shell gsettings schema not found.')
+
+    def _hide_launcher_from_schema(self, unityshell_schema):
+        original_mode = self._get_launcher_mode(unityshell_schema)
+        self.addCleanup(
+            self._set_launcher_mode, unityshell_schema, original_mode)
+        self._set_launcher_mode(
+            unityshell_schema, self._UNITYSHELL_LAUNCHER_HIDDEN_MODE)
+
+    def _get_launcher_mode(self, unityshell_schema):
+        return unityshell_schema.get_int(self._UNITYSHELL_LAUNCHER_KEY)
+
+    def _set_launcher_mode(self, unityshell_schema, mode):
+        unityshell_schema.set_int(self._UNITYSHELL_LAUNCHER_KEY, mode)
+
+
+class SimulateDevice(fixtures.Fixture):
+
+    def __init__(self, app_width, app_height, grid_unit_px):
+        super(SimulateDevice, self).__init__()
+        self.app_width = app_width
+        self.app_height = app_height
+        self.grid_unit_px = grid_unit_px
+        self._screen = None
+
+    def setUp(self):
+        super(SimulateDevice, self).setUp()
+        if self._is_geometry_larger_than_display(
+                self.app_width, self.app_height):
+            scale_divisor = self._get_scale_divisor()
+            self.grid_unit_px = self.grid_unit_px // scale_divisor
+            self.app_width = self.app_width // scale_divisor
+            self.app_height = self.app_height // scale_divisor
+        self.useFixture(
+            fixtures.EnvironmentVariable(
+                'GRID_UNIT_PX', str(self.grid_unit_px)))
+
+    def _get_scale_divisor(self):
+        scale_divisor = 2
+        while self._is_geometry_larger_than_display(
+                self.app_width // scale_divisor,
+                self.app_height // scale_divisor):
+            scale_divisor = scale_divisor * 2
+        return scale_divisor
+
+    def _is_geometry_larger_than_display(self, width, height):
+        screen = self._get_screen()
+        screen_width = screen.get_screen_width()
+        screen_height = screen.get_screen_height()
+        return (width > screen_width) or (height > screen_height)
+
+    def _get_screen(self):
+        if self._screen is None:
+            self._screen = display.Display.create()
+        return self._screen

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/__init__.py'
--- tests/autopilot/ubuntuuitoolkit/tests/__init__.py	2014-06-16 12:07:41 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/__init__.py	2014-07-24 02:10:07 +0000
@@ -39,6 +39,10 @@
     desktop_file_dir = get_local_desktop_file_directory()
     if not os.path.exists(desktop_file_dir):
         os.makedirs(desktop_file_dir)
+    # Strip underscores which look like an APP_ID to Unity
+    # See https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1329141
+    chars = tempfile._RandomNameSequence.characters.strip("_")
+    tempfile._RandomNameSequence.characters = chars
     desktop_file = tempfile.NamedTemporaryFile(
         suffix='.desktop', dir=desktop_file_dir, delete=False)
     desktop_file.write(_DESKTOP_FILE_CONTENTS.encode('utf-8'))
@@ -60,8 +64,8 @@
             os.path.dirname(__file__), '..', '..', '..', '..'))
 
 
-class QMLStringAppTestCase(base.UbuntuUIToolkitAppTestCase):
-    """Base test case for self tests that define the QML on an string."""
+class UbuntuUIToolkitWithFakeAppRunningTestCase(
+        base.UbuntuUIToolkitAppTestCase):
 
     test_qml = ("""
 import QtQuick 2.0
@@ -69,13 +73,12 @@
 
 MainView {
     width: units.gu(48)
-    height: units.gu(60)
+    height: units.gu(80)
 }
 """)
 
     def setUp(self):
-        super(QMLStringAppTestCase, self).setUp()
-        self.pointing_device = Pointer(self.input_device_class.create())
+        super(UbuntuUIToolkitWithFakeAppRunningTestCase, self).setUp()
         self.launch_application()
 
     def launch_application(self):
@@ -83,18 +86,24 @@
             qml_file_contents=self.test_qml)
         self.useFixture(fake_application)
 
-        self.app = self.launch_test_application(
-            base.get_qmlscene_launch_command(),
-            '-I' + _get_module_include_path(),
-            fake_application.qml_file_path,
-            '--desktop_file_hint={0}'.format(
-                fake_application.desktop_file_path),
-            emulator_base=emulators.UbuntuUIToolkitEmulatorBase,
-            app_type='qt')
-
+        desktop_file_name = os.path.basename(
+            fake_application.desktop_file_path)
+        application_name, _ = os.path.splitext(desktop_file_name)
+        self.app = self.launch_upstart_application(
+            application_name,
+            emulator_base=emulators.UbuntuUIToolkitEmulatorBase)
+
+
+class QMLStringAppTestCase(UbuntuUIToolkitWithFakeAppRunningTestCase):
+    """Base test case for self tests that define the QML on an string."""
+
+    def setUp(self):
+        super(QMLStringAppTestCase, self).setUp()
         self.assertThat(
             self.main_view.visible, Eventually(Equals(True)))
 
+        self.pointing_device = Pointer(self.input_device_class.create())
+
     @property
     def main_view(self):
         return self.app.select_single(emulators.MainView)

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_date_picker.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_date_picker.py	2014-05-09 05:39:20 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_date_picker.py	2014-07-24 02:10:07 +0000
@@ -36,11 +36,19 @@
             id: datePicker
             objectName: 'datePicker'
             mode: 'Years|Months|Days'
+            maximum: {
+                var d = new Date()
+                d.setFullYear('2030')
+                return d
+            }
+            minimum: {
+                var d = new Date()
+                d.setFullYear('1990')
+                return d
+            }
             date: {
                 var d = new Date()
-                // Make sure that the picker will have higher and lower values
-                // to select.
-                d.setFullYear(d.getFullYear() + 25)
+                d.setFullYear('2010')
                 d.setMonth('5')
                 d.setDate('15')
                 return d
@@ -50,10 +58,18 @@
             id: timePicker
             objectName: 'timePicker'
             mode: 'Hours|Minutes|Seconds'
+            maximum: {
+                var d = new Date()
+                d.setFullYear('2030')
+                return d
+            }
+            minimum: {
+                var d = new Date()
+                d.setFullYear('1990')
+                return d
+            }
             date: {
                 var d = new Date()
-                // Make sure that the picker will have higher and lower values
-                // to select.
                 d.setHours(12)
                 d.setMinutes('30')
                 d.setSeconds('30')
@@ -133,7 +149,7 @@
 
 class PickDateFromDatePickerTestCase(DatePickerBaseTestCase):
 
-    SELECTED_YEAR = datetime.date.today().year + 25
+    SELECTED_YEAR = 2010
     SELECTED_MONTH = 6  # June
     SELECTED_DAY = 15
 

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py	2014-06-17 07:12:49 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py	2014-07-24 02:10:07 +0000
@@ -15,7 +15,6 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 import os
-import subprocess
 
 import testtools
 import ubuntuuitoolkit
@@ -207,9 +206,7 @@
         if os.path.exists(path_to_local_launcher):
             return path_to_local_launcher
         else:
-            arch = subprocess.check_output(
-                ["dpkg-architecture", "-qDEB_HOST_MULTIARCH"],
-                universal_newlines=True).strip()
+            arch = ubuntuuitoolkit.base.get_host_multiarch()
             path_to_installed_launcher = os.path.join(
                 '/', 'usr', 'lib', arch, 'ubuntu-ui-toolkit', 'launcher')
         return path_to_installed_launcher

=== renamed file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.HeaderActionsTestCase.qml' => 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.ActionsTestCase.qml'
=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.DeprecatedHeaderSectionsTestCase.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.DeprecatedHeaderSectionsTestCase.qml	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.DeprecatedHeaderSectionsTestCase.qml	2014-07-24 02:10:07 +0000
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+
+    useDeprecatedToolbar: true
+
+    Page {
+        id: page
+        title: "Test title"
+
+        Column {
+            spacing: units.gu(1)
+            width: childrenRect.width
+            anchors.centerIn: parent
+
+            Label {
+                text: "Sections enabled"
+            }
+            Switch {
+                id: sectionsEnabledSWitch
+                objectName: "sections_enabled_switch"
+                checked: page.head.sections.enabled
+                onCheckedChanged: page.head.sections.enabled = checked
+            }
+        }
+
+        head {
+            sections.model: ["one", "two", "three"]
+        }
+    }
+}

=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.SectionsTestCase.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.SectionsTestCase.qml	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.SectionsTestCase.qml	2014-07-24 02:10:07 +0000
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+
+    useDeprecatedToolbar: false
+
+    Page {
+        id: page
+        title: "Test title"
+
+        Column {
+            spacing: units.gu(1)
+            width: childrenRect.width
+            anchors.centerIn: parent
+
+            Label {
+                text: "Sections enabled"
+            }
+            Switch {
+                id: sectionsEnabledSWitch
+                objectName: "sections_enabled_switch"
+                checked: page.head.sections.enabled
+                onCheckedChanged: page.head.sections.enabled = checked
+            }
+        }
+
+        head {
+            sections.model: ["one", "two", "three"]
+        }
+    }
+}

=== renamed file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.HeaderToolsTestCase.qml' => 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.ToolsTestCase.qml'
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py	2014-06-29 21:44:06 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py	2014-07-24 02:10:07 +0000
@@ -24,14 +24,14 @@
 from ubuntuuitoolkit import tests
 
 
-class HeaderTestCase(tests.QMLFileAppTestCase):
+class ActionsTestCase(tests.QMLFileAppTestCase):
 
     path = os.path.abspath(__file__)
     dir_path = os.path.dirname(path)
     tools_test_qml_file_path = os.path.join(
-        dir_path, 'test_header.HeaderToolsTestCase.qml')
+        dir_path, 'test_header.ToolsTestCase.qml')
     actions_test_qml_file_path = os.path.join(
-        dir_path, 'test_header.HeaderActionsTestCase.qml')
+        dir_path, 'test_header.ActionsTestCase.qml')
 
     scenarios = [
         ('deprecated tools',
@@ -41,7 +41,7 @@
     ]
 
     def setUp(self):
-        super(HeaderTestCase, self).setUp()
+        super(ActionsTestCase, self).setUp()
         self.header = self.main_view.get_header()
         self.label = self.app.select_single(
             'Label', objectName='clicked_label')
@@ -85,7 +85,6 @@
     def test_overflow_button(self):
         # there are 5 actions plus a custom back action
         overflow_button = self.header.select_single(
-            'AbstractButton',
             objectName='actions_overflow_button')
         self.assertEqual(overflow_button.visible, True)
 
@@ -98,6 +97,73 @@
         self.assertEqual(overflow_button.visible, False)
 
 
+class SectionsTestCase(tests.QMLFileAppTestCase):
+
+    path = os.path.abspath(__file__)
+    dir_path = os.path.dirname(path)
+    test_qml_file_path = os.path.join(
+        dir_path, 'test_header.SectionsTestCase.qml')
+
+    def setUp(self):
+        super(SectionsTestCase, self).setUp()
+        self.header = self.main_view.get_header()
+        # initially, section 0 is selected
+        self.assertEqual(self.header.get_selected_section_index(), 0)
+
+    def test_select_sections(self):
+        for index in [1, 0, 2]:
+            self.header.switch_to_section_by_index(index)
+            self.assertEqual(self.header.get_selected_section_index(), index)
+
+    def test_select_sections_with_sections_disabled(self):
+        sectionsEnabledSwitch = self.app.select_single(
+            'CheckBox', objectName='sections_enabled_switch')
+        sectionsEnabledSwitch.uncheck()
+        for index in [1, 0, 2]:
+            self.header.switch_to_section_by_index(index)
+            # cannot change section by tapping the section name in divider
+            self.assertEqual(self.header.get_selected_section_index(), 0)
+
+
+class DeprecatedHeaderSectionsTestCase(tests.QMLFileAppTestCase):
+
+    path = os.path.abspath(__file__)
+    dir_path = os.path.dirname(path)
+    test_qml_file_path = os.path.join(
+        dir_path, 'test_header.DeprecatedHeaderSectionsTestCase.qml')
+
+    def setUp(self):
+        super(DeprecatedHeaderSectionsTestCase, self).setUp()
+        self.header = self.main_view.get_header()
+
+    def test_get_selection_index(self):
+        error = self.assertRaises(
+            ubuntuuitoolkit.ToolkitException,
+            self.header.get_selected_section_index)
+        self.assertEqual(
+            str(error),
+            'Old header has no sections')
+
+    def test_select_sections(self):
+        error = self.assertRaises(
+            ubuntuuitoolkit.ToolkitException,
+            self.header.switch_to_section_by_index, 1)
+        self.assertEqual(
+            str(error),
+            'Old header has no sections')
+
+    def test_select_sections_with_sections_disabled(self):
+        sectionsEnabledSwitch = self.app.select_single(
+            'CheckBox', objectName='sections_enabled_switch')
+        sectionsEnabledSwitch.uncheck()
+        error = self.assertRaises(
+            ubuntuuitoolkit.ToolkitException,
+            self.header.switch_to_section_by_index, 1)
+        self.assertEqual(
+            str(error),
+            'Old header has no sections')
+
+
 class CustomMainView(ubuntuuitoolkit.MainView):
     """Autopilot helper for a custom main view."""
 

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/__init__.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/__init__.py	2014-06-04 18:45:04 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/__init__.py	2014-07-24 02:10:07 +0000
@@ -19,24 +19,71 @@
 import os
 import shutil
 
+from autopilot.matchers import Eventually
+from testtools.matchers import Equals
+
 import ubuntuuitoolkit
+from ubuntuuitoolkit import fixture_setup
 
 
 class GalleryTestCase(ubuntuuitoolkit.tests.QMLFileAppTestCase):
+
     """Base class for gallery test cases."""
 
     local_desktop_file_path = None
 
     def setUp(self):
-        if self._application_source_exists():
-            self.test_source_path = self._get_path_to_gallery_source()
-        else:
-            self.test_source_path = self._get_path_to_installed_gallery()
-        assert os.path.exists(self.test_source_path)
+        self.test_source_path = self._get_test_source_path()
         self.test_qml_file_path = self._get_test_qml_file_path()
         self.desktop_file_path = self._get_desktop_file_path()
+
+        if self.should_simulate_device():
+            # Hide the Unity7 launcher because it takes space that might be
+            # needed by the app with the simulated size.
+            self.useFixture(fixture_setup.HideUnity7Launcher())
+            # This sets the grid units, so it should be called before launching
+            # the app.
+            self.simulate_device()
+
         super(GalleryTestCase, self).setUp()
 
+        if self.should_simulate_device():
+            # XXX Currently we have no way to launch the application with a
+            # specific size, so we must resize it after it's launched.
+            # --elopio - 2014-06-25
+            self.resize_window()
+
+    def should_simulate_device(self):
+        return (hasattr(self, 'app_width') and hasattr(self, 'app_height') and
+                hasattr(self, 'grid_unit_px'))
+
+    def simulate_device(self):
+        simulate_device_fixture = self.useFixture(fixture_setup.SimulateDevice(
+            self.app_width, self.app_height, self.grid_unit_px))
+        self.app_width = simulate_device_fixture.app_width
+        self.app_height = simulate_device_fixture.app_height
+
+    def resize_window(self):
+        application = self.process_manager.get_running_applications()[0]
+        window = application.get_windows()[0]
+        window.resize(self.app_width, self.app_height)
+
+        def get_window_size():
+            _, _, window_width, window_height = window.geometry
+            return window_width, window_height
+
+        self.assertThat(
+            get_window_size,
+            Eventually(Equals((self.app_width, self.app_height))))
+
+    def _get_test_source_path(self):
+        if self._application_source_exists():
+            test_source_path = self._get_path_to_gallery_source()
+        else:
+            test_source_path = self._get_path_to_installed_gallery()
+        assert os.path.exists(test_source_path)
+        return test_source_path
+
     def _get_path_to_gallery_source(self):
         return os.path.join(
             ubuntuuitoolkit.tests.get_path_to_source_root(), 'examples',

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_buttons.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_buttons.py	2014-05-30 14:24:27 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_buttons.py	2014-07-24 02:10:07 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2012, 2013 Canonical Ltd.
+# Copyright (C) 2012, 2013, 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
@@ -16,14 +16,19 @@
 
 """Tests for the Ubuntu UI Toolkit Gallery - Button component"""
 
+import testscenarios
 from autopilot.matchers import Eventually
 from testtools.matchers import Equals
-from ubuntuuitoolkit.tests.gallery import GalleryTestCase
-
-
-class ButtonsTestCase(GalleryTestCase):
-
-    scenarios = [
+
+from ubuntuuitoolkit import ubuntu_scenarios
+from ubuntuuitoolkit.tests import gallery
+
+import os
+
+
+class ButtonsTestCase(gallery.GalleryTestCase):
+
+    buttons_scenarios = [
         ('standard button', dict(
             button_name="button_text", is_enabled=True, color=None, icon=None,
             text="Call")),
@@ -44,6 +49,15 @@
             icon=None, text="Call"))
     ]
 
+    scenarios = testscenarios.multiply_scenarios(
+        ubuntu_scenarios.get_device_simulation_scenarios(),
+        buttons_scenarios)
+
+    def setUp(self):
+        # Reset the locale to English
+        os.environ['LANGUAGE'] = 'en'
+        super(ButtonsTestCase, self).setUp()
+
     def test_buttons(self):
         self.open_page('buttonsElement')
 

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_gallery.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_gallery.py	2014-06-18 05:35:24 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_gallery.py	2014-07-24 02:10:07 +0000
@@ -16,13 +16,18 @@
 
 """Tests for the Ubuntu UI Toolkit Gallery"""
 
+import testscenarios
+
 import ubuntuuitoolkit
+from ubuntuuitoolkit import ubuntu_scenarios
 from ubuntuuitoolkit.tests import gallery
 
 
 class GalleryAppTestCase(gallery.GalleryTestCase):
     """Generic tests for the Gallery"""
 
+    scenarios = ubuntu_scenarios.get_device_simulation_scenarios()
+
     def test_select_main_view_must_return_main_window_emulator(self):
         main_view = self.main_view
         self.assertIsInstance(main_view, ubuntuuitoolkit.MainView)
@@ -91,13 +96,17 @@
         'sheets', 'animations'
     ]
 
-    scenarios = [
+    pages_scenarios = [
         (name, dict(
             element_name=name+'Element',
             template_name=name+'Template'))
         for name in names
     ]
 
+    scenarios = testscenarios.multiply_scenarios(
+        ubuntu_scenarios.get_device_simulation_scenarios(),
+        pages_scenarios)
+
     def test_open_page(self):
         self.open_page(self.element_name)
         element = self.main_view.select_single(

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py	2014-05-30 14:24:27 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py	2014-07-24 02:10:07 +0000
@@ -17,11 +17,14 @@
 """Tests for the Ubuntu UI Toolkit Gallery - OptionSelector component."""
 
 import ubuntuuitoolkit
+from ubuntuuitoolkit import ubuntu_scenarios
 from ubuntuuitoolkit.tests.gallery import GalleryTestCase
 
 
 class OptionSelectorTestCase(GalleryTestCase):
 
+    scenarios = ubuntu_scenarios.get_device_simulation_scenarios()
+
     def setUp(self):
         super(OptionSelectorTestCase, self).setUp()
         self.open_page('optionSelectorsElement')

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_scrollbar.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_scrollbar.py	2014-06-09 17:20:43 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_scrollbar.py	2014-07-24 02:10:07 +0000
@@ -16,11 +16,14 @@
 
 from autopilot import platform
 
+from ubuntuuitoolkit import ubuntu_scenarios
 from ubuntuuitoolkit.tests import gallery
 
 
 class ScrollBarTestCase(gallery.GalleryTestCase):
 
+    scenarios = ubuntu_scenarios.get_device_simulation_scenarios()
+
     def setUp(self):
         super(ScrollBarTestCase, self).setUp()
         self.open_page('navigationElement')
@@ -30,9 +33,12 @@
     def move_mouse_to_thumb(self):
         # TODO we need a helper to move the interactive thumb.
         # --elopio 2014-05-06
-        thumb = self.scrollbar.select_single(
+        thumb = self.get_mouse_thumb()
+        self.pointing_device.move_to_object(thumb)
+
+    def get_mouse_thumb(self):
+        return self.scrollbar.select_single(
             objectName='interactiveScrollbarThumb')
-        self.pointing_device.move_to_object(thumb)
 
     def test_scrollbar_must_start_without_interactive_thumb(self):
         self.assertEqual(self.scrollbar.interactive, False)
@@ -57,7 +63,12 @@
         self.assertEqual(flickable.is_child_visible(bottom_section), False)
 
         self.move_mouse_to_thumb()
-        x, y = self.pointing_device.position()
-        self.pointing_device.drag(x, y, x, self.main_view.height)
+        mouse_thumb = self.get_mouse_thumb()
+        x, y, width, height = mouse_thumb.globalRect
+        start_x = stop_x = x + (width // 2)
+        start_y = y + (height // 0.8)
+
+        self.pointing_device.drag(
+            start_x, start_y, stop_x, self.main_view.height)
 
         self.assertEqual(flickable.is_child_visible(bottom_section), True)

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_textinput.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_textinput.py	2014-05-30 14:24:27 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_textinput.py	2014-07-24 02:10:07 +0000
@@ -16,7 +16,9 @@
 
 """Tests for the Ubuntu UI Toolkit Gallery - TextInput components"""
 
-from ubuntuuitoolkit import emulators
+import testscenarios
+
+from ubuntuuitoolkit import emulators, ubuntu_scenarios
 from ubuntuuitoolkit.tests.gallery import GalleryTestCase
 import locale
 
@@ -31,7 +33,7 @@
 
     # text_to_write is a function to ensure
     # that locale is evaluated after setUp
-    scenarios = [
+    text_input_scenarios = [
         ('standard textfield', dict(
             objectName='textfield_standard',
             text_to_write=text_to_write_string,
@@ -49,6 +51,10 @@
             expected_text='-100123'))
     ]
 
+    scenarios = testscenarios.multiply_scenarios(
+        ubuntu_scenarios.get_device_simulation_scenarios(),
+        text_input_scenarios)
+
     def setUp(self):
         super(WriteAndClearTextInputTestCase, self).setUp()
         # Apply the user locale from the environment
@@ -74,6 +80,8 @@
 
 class DisabledTextInputTestCase(GalleryTestCase):
 
+    scenarios = ubuntu_scenarios.get_device_simulation_scenarios()
+
     def setUp(self):
         super(DisabledTextInputTestCase, self).setUp()
         self.open_page('textinputsElement')

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_toggles.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_toggles.py	2014-05-30 14:24:27 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_toggles.py	2014-07-24 02:10:07 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2012, 2013 Canonical Ltd.
+# Copyright (C) 2012, 2013, 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
@@ -14,15 +14,17 @@
 # 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/>.
 
-from ubuntuuitoolkit import emulators
+import testscenarios
+
+from testtools.matchers import Equals
+
+from ubuntuuitoolkit import emulators, ubuntu_scenarios
 from ubuntuuitoolkit.tests import gallery
 
-from testtools.matchers import Equals
-
 
 class EnabledTogglesTestCase(gallery.GalleryTestCase):
 
-    scenarios = [
+    toggles_scenarios = [
         ('checkbox unchecked', dict(
             object_name='checkbox_unchecked', initial_state=False)),
         ('checkbox checked', dict(
@@ -33,6 +35,10 @@
             object_name='switch_checked', initial_state=True))
     ]
 
+    scenarios = testscenarios.multiply_scenarios(
+        ubuntu_scenarios.get_device_simulation_scenarios(),
+        toggles_scenarios)
+
     def setUp(self):
         super(EnabledTogglesTestCase, self).setUp()
         self.open_page('togglesElement')
@@ -49,7 +55,7 @@
 
 class DisabledTogglesTestCase(gallery.GalleryTestCase):
 
-    scenarios = [
+    toggles_scenarios = [
         ('checkbox disabled unchecked', dict(
             object_name='checkbox_disabled_unchecked', initial_state=False)),
         ('checkbox disabled checked', dict(
@@ -60,6 +66,10 @@
             object_name='switch_disabled_checked', initial_state=True))
     ]
 
+    scenarios = testscenarios.multiply_scenarios(
+        ubuntu_scenarios.get_device_simulation_scenarios(),
+        toggles_scenarios)
+
     def setUp(self):
         super(DisabledTogglesTestCase, self).setUp()
         self.open_page('togglesElement')

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.py'
--- tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.py	2014-06-03 20:10:53 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.py	2014-07-24 02:10:07 +0000
@@ -24,10 +24,15 @@
     # Python 2 add-on: python-mock.
     import mock
 import testtools
-from autopilot import testcase as autopilot_testcase
-from testtools.matchers import Contains, FileExists, Not
+from autopilot import (
+    display,
+    platform,
+    testcase as autopilot_testcase
+)
+from autopilot.matchers import Eventually
+from testtools.matchers import Contains, Equals, FileExists, Not
 
-from ubuntuuitoolkit import base, environment, fixture_setup
+from ubuntuuitoolkit import base, environment, fixture_setup, tests
 
 
 class FakeApplicationTestCase(testtools.TestCase):
@@ -304,3 +309,99 @@
         self.assertTrue(
             os.path.exists(
                 os.path.join(os.environ.get('HOME'), '.Xauthority')))
+
+
+class HideUnity7LauncherTestCase(
+        tests.UbuntuUIToolkitWithFakeAppRunningTestCase):
+
+    def setUp(self):
+        if platform.model() != 'Desktop':
+            self.skipTest('Unity 7 runs only on desktop.')
+        self.useFixture(fixture_setup.HideUnity7Launcher())
+        super(HideUnity7LauncherTestCase, self).setUp()
+
+    def test_maximized_application_must_use_all_screen_width(self):
+        application = self.process_manager.get_running_applications()[0]
+        window = application.get_windows()[0]
+
+        # Maximize window.
+        screen = display.Display.create()
+        screen_width = screen.get_screen_width()
+        screen_height = screen.get_screen_height()
+        window.resize(screen_width, screen_height)
+
+        def get_window_width():
+            _, _, window_width, _ = window.geometry
+            return window_width
+
+        self.assertThat(
+            get_window_width,
+            Eventually(Equals(screen_width)))
+
+
+class FakeDisplay(object):
+
+    """Fake display with fixed widht and height for use in tests."""
+
+    def __init__(self, width, height):
+        super(FakeDisplay, self).__init__()
+        self.width = width
+        self.height = height
+
+    def get_screen_width(self):
+        return self.width
+
+    def get_screen_height(self):
+        return self.height
+
+
+class SimulateDeviceTestCase(autopilot_testcase.AutopilotTestCase):
+
+    scenarios = [
+        ('Device equal to screen', {
+            'device_width': 100, 'device_height': 100, 'device_grid_unit': 20,
+            'screen_width': 100, 'screen_height': 100,
+            'expected_width': 100, 'expected_height': 100,
+            'expected_grid_unit': 20}),
+        ('Device smaller than screen', {
+            'device_width': 100, 'device_height': 90, 'device_grid_unit': 20,
+            'screen_width': 110, 'screen_height': 100,
+            'expected_width': 100, 'expected_height': 90,
+            'expected_grid_unit': 20}),
+        ('Device wider than screen', {
+            'device_width': 200, 'device_height': 90, 'device_grid_unit': 20,
+            'screen_width': 110, 'screen_height': 100,
+            'expected_width': 100, 'expected_height': 45,
+            'expected_grid_unit': 10}),
+        ('Device taller than screen', {
+            'device_width': 100, 'device_height': 180, 'device_grid_unit': 20,
+            'screen_width': 110, 'screen_height': 100,
+            'expected_width': 50, 'expected_height': 90,
+            'expected_grid_unit': 10}),
+        ('Device bigger than screen', {
+            'device_width': 200, 'device_height': 180, 'device_grid_unit': 20,
+            'screen_width': 110, 'screen_height': 100,
+            'expected_width': 100, 'expected_height': 90,
+            'expected_grid_unit': 10}),
+    ]
+
+    def test_simulate_device_fixture_with_size_smaller_than_screen(self):
+        """Test the simulation of a device that fits the screen.
+
+        All the attributes of the fixture must remain the same.
+
+        """
+
+        simulate_device_fixture = fixture_setup.SimulateDevice(
+            self.device_width, self.device_height, self.device_grid_unit)
+        fake_display = FakeDisplay(self.screen_width, self.screen_height)
+        simulate_device_fixture._screen = fake_display
+
+        self.useFixture(simulate_device_fixture)
+
+        self.assertEqual(
+            int(os.environ.get('GRID_UNIT_PX')), self.expected_grid_unit)
+        self.assertEqual(
+            simulate_device_fixture.app_width, self.expected_width)
+        self.assertEqual(
+            simulate_device_fixture.app_height, self.expected_height)

=== added file 'tests/autopilot/ubuntuuitoolkit/tests/test_ubuntu_scenarios.py'
--- tests/autopilot/ubuntuuitoolkit/tests/test_ubuntu_scenarios.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/test_ubuntu_scenarios.py	2014-07-24 02:10:07 +0000
@@ -0,0 +1,70 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# 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/>.
+
+try:
+    from unittest import mock
+except ImportError:
+    import mock
+
+import testtools
+
+from ubuntuuitoolkit import ubuntu_scenarios
+
+
+class ScenariosTestCase(testtools.TestCase):
+
+    def test_get_nexus_4_scenario(self):
+        expected_scenarios = [
+            ('Simulating Nexus 4 in desktop',
+             dict(app_width=768, app_height=1280, grid_unit_px=18)),
+        ]
+        with mock.patch('autopilot.platform.model') as mock_model:
+            mock_model.return_value = 'Desktop'
+            scenarios = ubuntu_scenarios.get_device_simulation_scenarios(
+                devices=ubuntu_scenarios.NEXUS4_DEVICE)
+        self.assertEqual(expected_scenarios, scenarios)
+
+    def test_get_nexus_10_scenario(self):
+        expected_scenarios = [
+            ('Simulating Nexus 10 in desktop',
+             dict(app_width=2560, app_height=1600, grid_unit_px=20))
+        ]
+
+        with mock.patch('autopilot.platform.model') as mock_model:
+            mock_model.return_value = 'Desktop'
+            scenarios = ubuntu_scenarios.get_device_simulation_scenarios(
+                devices=ubuntu_scenarios.NEXUS10_DEVICE)
+        self.assertEqual(expected_scenarios, scenarios)
+
+    def test_get_default_scenarios_must_return_supported_devices(self):
+        expected_scenarios = [
+            ('Simulating Nexus 4 in desktop',
+             dict(app_width=768, app_height=1280, grid_unit_px=18)),
+            ('Simulating Nexus 10 in desktop',
+             dict(app_width=2560, app_height=1600, grid_unit_px=20))
+        ]
+
+        with mock.patch('autopilot.platform.model') as mock_model:
+            mock_model.return_value = 'Desktop'
+            scenarios = ubuntu_scenarios.get_device_simulation_scenarios()
+        self.assertEqual(expected_scenarios, scenarios)
+
+    def test_get_scenarios_on_device_must_return_no_simulation_scenarios(self):
+        with mock.patch('autopilot.platform.model') as mock_model:
+            mock_model.return_value = 'Not Desktop'
+            scenarios = ubuntu_scenarios.get_device_simulation_scenarios()
+
+        self.assertEqual([('Not Desktop', {})], scenarios)

=== added file 'tests/autopilot/ubuntuuitoolkit/ubuntu_scenarios.py'
--- tests/autopilot/ubuntuuitoolkit/ubuntu_scenarios.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/ubuntu_scenarios.py	2014-07-24 02:10:07 +0000
@@ -0,0 +1,54 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# 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/>.
+
+from autopilot import platform
+
+
+NEXUS4_DEVICE = 'Nexus4'
+NEXUS10_DEVICE = 'Nexus10'
+DEFAULT_DEVICES = (NEXUS4_DEVICE, NEXUS10_DEVICE)
+
+
+def get_device_simulation_scenarios(devices=DEFAULT_DEVICES):
+    """Return a list of devices to be simulated on tests.
+
+    :param devices: The device or devices to simulate. Default value is all the
+        officially supported devices.
+    :type devices: string or sequence of strings.
+    :return: A list of scenarios to be used with the testscenarios python
+        module, with the values of app_width, app_height and grid_unit
+        corresponding to the selected device.
+
+    """
+    if platform.model() == 'Desktop':
+        return _get_device_simulation_scenarios_for_desktop(devices)
+    else:
+        return [(platform.model(), {})]
+
+
+def _get_device_simulation_scenarios_for_desktop(devices):
+    scenarios = []
+    if NEXUS4_DEVICE in devices:
+        scenarios.append(
+            ('Simulating Nexus 4 in desktop',
+             dict(app_width=768, app_height=1280, grid_unit_px=18))
+        )
+    if NEXUS10_DEVICE in devices:
+        scenarios.append(
+            ('Simulating Nexus 10 in desktop',
+             dict(app_width=2560, app_height=1600, grid_unit_px=20))
+        )
+    return scenarios

=== modified file 'tests/qmlapicheck.py'
--- tests/qmlapicheck.py	2014-07-03 13:30:32 +0000
+++ tests/qmlapicheck.py	2014-07-24 02:10:07 +0000
@@ -23,7 +23,7 @@
 
 if len(sys.argv) < 2 or '-h' in sys.argv or '--help' in sys.argv:
     basename = os.path.basename(sys.argv[0])
-    print (
+    sys.exit(
         'Usage:\n  env BUILTINS=foo,bar %s FILENAME [FILENAME2..N]\n\n'
         '  Generate a QML API file\n'
         'Example:\n'
@@ -42,7 +42,6 @@
         '\n'
         'Use the following command to see changes in the API:\n'
         '  diff -Fqml -u components.api{,.new}\n' % (basename, basename))
-    sys.exit(1)
 
 builtins = os.getenv('BUILTINS', '').split(',')
 inputfiles = []
@@ -96,8 +95,7 @@
                         'prototype',
                         'exports']
         else:
-            print('Unknown filetype %s' % fileinput.filename())
-            sys.exit(1)
+            sys.exit('Unknown filetype %s' % fileinput.filename())
         if fileinput.filename() in classes:
             classname = ' '.join(classes[fileinput.filename()])
         else:
@@ -187,9 +185,9 @@
                                 annotated_properties[name] = 'internal'
                             del annotated_properties['internal']
                         if name not in annotated_properties:
-                            print('    %s' % (signature))
-                            print('Error: Missing \\qmlproperty for %s' % name)
-                            sys.exit(1)
+                            sys.exit(
+                                '    %s\nError: Missing \\qmlproperty for %s'
+                                % (signature, name))
                         real_type = annotated_properties[name]
                         signature = signature.replace('alias', real_type)
                 elif filetype == 'qmltypes':

=== modified file 'tests/qmlapicheck.sh'
--- tests/qmlapicheck.sh	2014-06-19 07:21:53 +0000
+++ tests/qmlapicheck.sh	2014-07-24 02:10:07 +0000
@@ -25,7 +25,7 @@
     # Silence spam on stderr due to fonts
     # https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1256999
     # https://bugreports.qt-project.org/browse/QTBUG-36243
-    qmlplugindump $i 0.1 modules 1>> plugins.qmltypes
+    ALARM_BACKEND=memory qmlplugindump $i 0.1 modules 1>> plugins.qmltypes
     test $? != 0 && ERRORS=1
 done
 test $ERRORS = 1 && echo Error: qmlplugindump failed && exit 1

=== renamed directory 'tests/resources/toolbar' => 'tests/resources/header'
=== modified file 'tests/resources/header/header.qml'
--- tests/resources/toolbar/header.qml	2014-07-04 11:25:50 +0000
+++ tests/resources/header/header.qml	2014-07-24 02:10:07 +0000
@@ -178,6 +178,24 @@
                     ]
                 }
             }
+            Tab {
+                title: "Sections"
+                page: Page {
+                    id: sectionsPage
+                    head {
+                        sections {
+                            model: ["navy", "lightblue", "brown", "cyan", "darkgrey"]
+                        }
+                    }
+                    Rectangle {
+                        anchors {
+                            fill: parent
+                            margins: units.gu(2)
+                        }
+                        color: sectionsPage.head.sections.model[sectionsPage.head.sections.selectedIndex]
+                    }
+                }
+            }
         }
     }
 

=== modified file 'tests/unit/runtest.sh'
--- tests/unit/runtest.sh	2014-06-16 08:02:48 +0000
+++ tests/unit/runtest.sh	2014-07-24 02:10:07 +0000
@@ -45,6 +45,7 @@
     # https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1256999
     # https://bugreports.qt-project.org/browse/QTBUG-36243
     QML2_IMPORT_PATH=../../../modules:$QML2_IMPORT_PATH UBUNTU_UI_TOOLKIT_THEMES_PATH=../../../modules \
+    ALARM_BACKEND=memory \
     $_CMD $_ARGS 2>&1 | grep -v 'QFontDatabase: Cannot find font directory'
     # Note: Get first command before the pipe, $? would be ambiguous
     RESULT=${PIPESTATUS[0]}

=== modified file 'tests/unit/tst_components/tst_fontutils.qml'
--- tests/unit/tst_components/tst_fontutils.qml	2014-04-23 08:50:20 +0000
+++ tests/unit/tst_components/tst_fontutils.qml	2014-07-24 02:10:07 +0000
@@ -22,12 +22,12 @@
     name: "FontUtilsAPI"
 
     function test_modularScale() {
-        compare(FontUtils.modularScale("xx-small"), 0.606, "xx-small scale");
-        compare(FontUtils.modularScale("x-small"), 0.707, "x-small scale");
-        compare(FontUtils.modularScale("small"), 0.857, "small scale");
-        compare(FontUtils.modularScale("medium"), 1.0, "medium scale");
-        compare(FontUtils.modularScale("large"), 1.414, "large scale");
-        compare(FontUtils.modularScale("x-large"), 1.905, "x-large scale");
+        compare(FontUtils.modularScale("xx-small"), 0.677, "xx-small scale");
+        compare(FontUtils.modularScale("x-small"), 0.804, "x-small scale");
+        compare(FontUtils.modularScale("small"), 0.931, "small scale");
+        compare(FontUtils.modularScale("medium"), 1.079, "medium scale");
+        compare(FontUtils.modularScale("large"), 1.291, "large scale");
+        compare(FontUtils.modularScale("x-large"), 1.714, "x-large scale");
     }
 
     function test_modularScale_failures() {
@@ -36,12 +36,12 @@
     }
 
     function test_sizeToPixels() {
-        compare(FontUtils.sizeToPixels("xx-small"), 0.606 * units.dp(14), "xx-small scale");
-        compare(FontUtils.sizeToPixels("x-small"), 0.707 * units.dp(14), "x-small scale");
-        compare(FontUtils.sizeToPixels("small"), 0.857 * units.dp(14), "small scale");
-        compare(FontUtils.sizeToPixels("medium"), 1.0 * units.dp(14), "medium scale");
-        compare(FontUtils.sizeToPixels("large"), 1.414 * units.dp(14), "large scale");
-        compare(FontUtils.sizeToPixels("x-large"), 1.905 * units.dp(14), "x-large scale");
+        compare(FontUtils.sizeToPixels("xx-small"), 0.677 * units.dp(14), "xx-small scale");
+        compare(FontUtils.sizeToPixels("x-small"), 0.804 * units.dp(14), "x-small scale");
+        compare(FontUtils.sizeToPixels("small"), 0.931 * units.dp(14), "small scale");
+        compare(FontUtils.sizeToPixels("medium"), 1.079 * units.dp(14), "medium scale");
+        compare(FontUtils.sizeToPixels("large"), 1.291 * units.dp(14), "large scale");
+        compare(FontUtils.sizeToPixels("x-large"), 1.714 * units.dp(14), "x-large scale");
     }
 
     function test_sizeToPixels_failures() {

=== added file 'tests/unit/tst_components/tst_header_sections.qml'
--- tests/unit/tst_components/tst_header_sections.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_components/tst_header_sections.qml	2014-07-24 02:10:07 +0000
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.2
+import QtTest 1.0
+import Ubuntu.Components 1.1
+import Ubuntu.Test 1.0
+
+UbuntuTestCase {
+    name: "PageHeadSectionsAPI"
+
+    MainView {
+        id: mainView
+        width: units.gu(50)
+        height: units.gu(80)
+
+        useDeprecatedToolbar: false
+
+        Page {
+            id: page
+            title: "Sections"
+            head {
+                sections {
+                    model: ["one", "two", "three"]
+                }
+            }
+        }
+    }
+
+    function initTestCase() {
+        compare(mainView.active, true, "MainView always active.");
+        compare(page.active, true, "Single page is active in MainView.");
+    }
+
+    function test_number_of_sections() {
+        var sectionsRepeater = findChild(mainView, "page_head_sections_repeater");
+        compare(sectionsRepeater.count, 3, "Number of sections initialization failed.");
+        page.head.sections.model = ["one"]
+        compare(sectionsRepeater.count, 1, "Number of sections not updated.");
+        page.head.sections.model = ["one", "two", "three"];
+        compare(sectionsRepeater.count, 3, "Number of sections reverted.");
+    }
+
+    function check_selected_button(numberOfButtons, selectedButtonIndex) {
+        for (var i = 0; i < numberOfButtons; i++) {
+            var button = findChild(mainView, "section_button_"+i);
+            if (i === selectedButtonIndex) {
+                compare(button.selected, true, "Button "+i+" is not selected.");
+            } else {
+                compare(button.selected, false, "Button "+i+" is selected.");
+            }
+        }
+    }
+
+    function test_selected_section() {
+        var sectionsRepeater = findChild(mainView, "page_head_sections_repeater");
+        var count = sectionsRepeater.count;
+        check_selected_button(count, 0);
+        page.head.sections.selectedIndex = 2;
+        check_selected_button(count, 2);
+        page.head.sections.selectedIndex = 1;
+        check_selected_button(count, 1);
+        page.head.sections.selectedIndex = 0;
+        check_selected_button(count, 0);
+    }
+}

=== modified file 'tests/unit/tst_components/tst_progressbar.qml'
--- tests/unit/tst_components/tst_progressbar.qml	2014-04-23 08:50:20 +0000
+++ tests/unit/tst_components/tst_progressbar.qml	2014-07-24 02:10:07 +0000
@@ -16,7 +16,8 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import Ubuntu.Components 1.1
+// Note: See tst_progressbar11.qml for the newer API tests
+import Ubuntu.Components 1.0
 
 TestCase {
      name: "ProgressBarAPI"
@@ -28,6 +29,10 @@
          compare(progressBar.indeterminate,newIndeterminated,"can set/get")
      }
 
+     function test_showProgressPercentageExists() {
+         verify(!progressBar.hasOwnProperty("showProgressPercentage"), "Property absent")
+     }
+
      function test_maximumValue() {
          compare(progressBar.maximumValue,1.0,"is set to 1.0 by default")
          var newMaximumValue = 20.0

=== added file 'tests/unit/tst_components/tst_progressbar11.qml'
--- tests/unit/tst_components/tst_progressbar11.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_components/tst_progressbar11.qml	2014-07-24 02:10:07 +0000
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import QtTest 1.0
+import Ubuntu.Components 1.1
+
+TestCase {
+     name: "ProgressBarAPI"
+
+     function test_showProgressPercentageExists() {
+         verify(progressBar.hasOwnProperty("showProgressPercentage"), "Property missing")
+     }
+
+     function test_noLabel() {
+         compare(progressBar.showProgressPercentage,true, "is set by default")
+         var newShowProgressPercentage = false
+         progressBar.showProgressPercentage = newShowProgressPercentage
+         compare(progressBar.showProgressPercentage, newShowProgressPercentage, "can set/get")
+     }
+
+     ProgressBar {
+         id: progressBar
+     }
+}

=== added file 'tests/unit_x11/tst_components/tst_animator.qml'
--- tests/unit_x11/tst_components/tst_animator.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_components/tst_animator.qml	2014-07-24 02:10:07 +0000
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+/**
+ * Test to prevent regressions for bug: https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1338602
+ * Activity Indicator crashes in QML/Widget mixed applications
+ */
+
+import QtQuick 2.2
+import QtQuick.Window 2.1
+import QtTest 1.0
+import Ubuntu.Components 1.1
+
+Item {
+    width: 360
+    height: 360
+    Window {
+        id: root
+        width: 360
+        height: 360
+
+        property int timeout: 500
+        property int runs: 20
+        property bool finished: false
+
+        TestCase {
+            name: "AnimatorRegressionTest"
+            when: windowShown
+
+            function test_show_hide () {
+                tryCompare(root,"finished",true,root.timeout * (root.runs+1));
+            }
+        }
+
+        Timer {
+            property int hits: 0
+            interval: root.timeout; running: !root.finished; repeat: !root.finished
+            onTriggered: {
+                hits++;
+                if (hits >= root.runs) {
+                    root.visible = true;
+                    root.finished = true;
+                    return;
+                }
+
+                root.visible = !root.visible
+            }
+        }
+
+        Flow {
+            anchors.fill: parent
+            Repeater {
+                model: 3
+
+                ActivityIndicator {
+                    running: true
+                }
+            }
+        }
+    }
+}

=== modified file 'tests/unit_x11/tst_components/tst_panel.qml'
--- tests/unit_x11/tst_components/tst_panel.qml	2014-04-23 08:50:20 +0000
+++ tests/unit_x11/tst_components/tst_panel.qml	2014-07-24 02:10:07 +0000
@@ -17,6 +17,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import Ubuntu.Components 1.1
+import Ubuntu.Test 1.0
 
 Item {
     width: 200
@@ -37,7 +38,7 @@
         }
     }
 
-    TestCase {
+    UbuntuTestCase {
         id: testCase
         name: "PanelAPI"
         when: windowShown
@@ -61,6 +62,21 @@
             compare(panel.align, Qt.AlignBottom, "Can set align to bottom");
         }
 
+        function test_height() {
+            var bar = findChild(panel, "bar_item");
+            // panel is not opened
+            panel.height = 123;
+            compare(bar.y, 123, "Panel is properly closed after changing height");
+            panel.open(); wait(500);
+            compare(bar.y, 0, "Panel opens properly after changing height");
+            panel.height = 78;
+            compare(bar.y, 0, "Panel stays propery opened after changing height");
+            panel.close(); wait(500);
+            compare(bar.y, 78, "Panel closes properly after changing height");
+            panel.height = root.height / 2;
+            compare(bar.y, root.height/2, "Panel stays closed properly after changing height");
+        }
+
         function test_opened() {
             panel.open();
             compare(panel.opened, true, "Can set opened");
@@ -167,10 +183,14 @@
         }
 
         function test_clickToDeactivate() {
+            // deprecated test. This functionality is only there for backwards compatibility
+            panel.__closeOnContentsClicks = true;
             panel.open();
             compare(panel.opened && panel.align === Qt.AlignBottom, true, "Panel is opened and bottom-aligned");
             mouseClick(root, root.width / 2, 5, Qt.LeftButton);
             compare(panel.opened, false, "Panel is deactivated by clicking in the view outside of the panel");
+            // reset property to default value
+            panel.__closeOnContentsClicks = false;
         }
 
         function test_hideTimeout_bug1249031() {

=== modified file 'tests/unit_x11/tst_components/tst_textinput_touch.qml'
--- tests/unit_x11/tst_components/tst_textinput_touch.qml	2014-06-24 08:42:47 +0000
+++ tests/unit_x11/tst_components/tst_textinput_touch.qml	2014-07-24 02:10:07 +0000
@@ -192,15 +192,15 @@
             verify(selectedText !== "", "No text selected!");
 
             popupSpy.target = findChild(data.input, "input_handler");
-            TestExtras.touchLongPress(0, data.input, guPoint(1, 1));
+            TestExtras.touchLongPress(0, data.input, guPoint(2, 2));
             waitForRendering(data.input, 500);
             popupSpy.wait();
             compare(data.input.selectedText, selectedText, "Text selection should be the same!");
 
             // cleanup
-            TestExtras.touchRelease(0, data.input, guPoint(1, 1));
+            TestExtras.touchRelease(0, data.input, guPoint(2, 2));
             // dismiss popover
-            TestExtras.touchClick(0, testMain, 0, 0);
+            TestExtras.touchClick(0, testMain, guPoint(0, 0));
         }
 
         function test_drag_cursor_handler_data() {
@@ -275,9 +275,7 @@
             flickerSpy.target = outerFlicker;
             autoSizeTextArea.focus = data.focused;
             var editor = findChild(autoSizeTextArea, "text_input");
-            wait(5000)
             TestExtras.touchDrag(0, editor, guPoint(0, 0), guPoint(0, 40));
-            wait(5000)
             flickerSpy.wait();
         }
     }

=== modified file 'tests/unit_x11/tst_test/tst_ubuntutestcase.qml'
--- tests/unit_x11/tst_test/tst_ubuntutestcase.qml	2014-06-24 07:01:06 +0000
+++ tests/unit_x11/tst_test/tst_ubuntutestcase.qml	2014-07-24 02:10:07 +0000
@@ -17,11 +17,12 @@
 import QtQuick 2.0
 import QtTest 1.0
 import Ubuntu.Test 1.0
+import Ubuntu.Components 1.0
 
 Rectangle {
  id: root
  width: 800
- height: 600
+ height: 1000
 
  Column {
      anchors.fill: parent
@@ -73,6 +74,9 @@
              height: 1000
          }
      }
+     TextField {
+         id: textField
+     }
  }
  
  UbuntuTestCase {
@@ -173,6 +177,11 @@
         flick(flicker, flicker.width, flicker.height, -flicker.width, -flicker.height, 400, 100);
         movementSpy.wait();
     }
+    function test_typeString() {
+        textField.forceActiveFocus();
+        typeString("Hello Ubuntu");
+        tryCompare(textField, "text", "Hello Ubuntu");
+    }
 
     SignalSpy {
         id: touchPressSpy