Merge lp:~nskaggs/ubuntu-ui-toolkit/fix-1328600 into lp:ubuntu-ui-toolkit

[Nicholas Skaggs]

Change the default maxyear property to 15 to avoid 32-bit limitation issues

Change the default maxyear property to 15 to avoid 32-bit limitation issues

[lp:~nskaggs/ubuntu-ui-toolkit/fix-1328600]

1154. By Nicholas Skaggs on 2014-07-18

set min and max values for picker to avoid bug 1328600

1155. By Nicholas Skaggs on 2014-07-18

revert default datepicker change

1156. By Nicholas Skaggs on 2014-07-22

workaround for bug 1346669

Unmerged revisions

=== modified file 'components.api'
--- components.api	2014-07-10 11:50:13 +0000
+++ components.api	2014-07-18 18:17:44 +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
@@ -398,6 +404,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 +629,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 +667,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/control'
--- debian/control	2014-07-09 17:37:43 +0000
+++ debian/control	2014-07-18 18:17:44 +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-18 18:17:44 +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-18 18:17:44 +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-18 18:17:44 +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-18 18:17:44 +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/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-18 18:17:44 +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 'modules/Ubuntu/Components/Colors/FIXME'
--- modules/Ubuntu/Components/Colors/FIXME	2013-07-01 05:54:33 +0000
+++ modules/Ubuntu/Components/Colors/FIXME	2014-07-18 18:17:44 +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-18 18:17:44 +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-18 18:17:44 +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-18 18:17:44 +0000
@@ -175,6 +175,7 @@
     function cancelItemRemoval()
     {
         priv.resetDrag()
+        priv.removed = false
     }
 
     width: parent ? parent.width : units.gu(31)
 
=== 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-18 18:17:44 +0000
@@ -31,12 +31,42 @@
 
     /*!
       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
 
=== modified file 'modules/Ubuntu/Components/Pickers/DatePicker.qml'
--- modules/Ubuntu/Components/Pickers/DatePicker.qml	2014-05-27 07:17:16 +0000
+++ modules/Ubuntu/Components/Pickers/DatePicker.qml	2014-07-18 18:17:44 +0000
@@ -248,7 +248,7 @@
      */
     property date maximum: {
         var d = Date.prototype.midnight.call(new Date());
-        d.setFullYear(d.getFullYear() + 50);
+        d.setFullYear(d.getFullYear() + 15);
         return d;
     }
 
 
=== 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-18 18:17:44 +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-18 18:17:44 +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-18 18:17:44 +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-18 18:17:44 +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-18 18:17:44 +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/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-18 18:17:44 +0000
@@ -15,6 +15,7 @@
  */
 
 import QtQuick 2.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.Themes 0.1
 
 Palette {
@@ -22,13 +23,13 @@
         background: "#EDEDED"
         backgroundText: "#81888888"
         base: "#1A000000"
-        baseText: "#888888"
-        foreground: "#888888"
+        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-18 18:17:44 +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/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-18 18:17:44 +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-18 18:17:44 +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-18 18:17:44 +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-18 18:17:44 +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/PaletteValues.qml'
--- modules/Ubuntu/Components/Themes/PaletteValues.qml	2013-07-05 16:04:07 +0000
+++ modules/Ubuntu/Components/Themes/PaletteValues.qml	2014-07-18 18:17:44 +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-18 18:17:44 +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-18 18:17:44 +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-18 18:17:44 +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-18 18:17:44 +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/qmldir'
--- modules/Ubuntu/Components/qmldir	2014-07-03 13:59:52 +0000
+++ modules/Ubuntu/Components/qmldir	2014-07-18 18:17:44 +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,6 +93,7 @@
 
 #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
 
=== 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-18 18:17:44 +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 'tests/autopilot/ubuntuuitoolkit/__init__.py'
--- tests/autopilot/ubuntuuitoolkit/__init__.py	2014-06-30 10:49:51 +0000
+++ tests/autopilot/ubuntuuitoolkit/__init__.py	2014-07-18 18:17:44 +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/base.py'
--- tests/autopilot/ubuntuuitoolkit/base.py	2014-01-14 00:44:05 +0000
+++ tests/autopilot/ubuntuuitoolkit/base.py	2014-07-18 18:17:44 +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-18 18:17:44 +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__(
@@ -163,3 +169,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-18 18:17:44 +0000
@@ -60,8 +60,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 +69,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 +82,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_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-18 18:17:44 +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
 
=== 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-18 18:17:44 +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-18 18:17:44 +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-18 18:17:44 +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-18 18:17:44 +0000
@@ -17,14 +17,20 @@
 """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')
+        # Start with the toolbar closed to make the full page visible and be
+        # able to swipe it.
+        self.main_view.close_toolbar()
 
     def test_select_option_from_collapsed_optionselector(self):
         collapsed_option_selector = self.main_view.select_single(
 
=== 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-18 18:17:44 +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-18 18:17:44 +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-18 18:17:44 +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-18 18:17:44 +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-18 18:17:44 +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-18 18:17:44 +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.sh'
--- tests/qmlapicheck.sh	2014-06-19 07:21:53 +0000
+++ tests/qmlapicheck.sh	2014-07-18 18:17:44 +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
 
=== modified file 'tests/unit/runtest.sh'
--- tests/unit/runtest.sh	2014-06-16 08:02:48 +0000
+++ tests/unit/runtest.sh	2014-07-18 18:17:44 +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_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-18 18:17:44 +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-18 18:17:44 +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-18 18:17:44 +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_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-18 18:17:44 +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-18 18:17:44 +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