Merge lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20 into lp:ubuntu-ui-toolkit

[Zoltan Balogh]

OTA10-landing-2016-01-20

OTA10-landing-2016-01-20

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1812
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2256/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/79/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/80/console

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

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20]

1813. By Zoltan Balogh on 2016-01-21

Sync with staging

1814. By Zoltan Balogh on 2016-01-21

Sync with staging

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1814
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2257/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/80/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/81/console

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

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20]

1815. By Zoltan Balogh on 2016-01-21

Sync with staging

1816. By Zoltan Balogh on 2016-01-21

Sync with staging

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1816
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2258/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/81/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/82/console

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

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20]

1817. By Zoltan Balogh on 2016-01-21

Fix test script

1818. By Zoltan Balogh on 2016-01-21

Sync with staging

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1818
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2259/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/82/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/83/console

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

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20]

1819. By Zoltan Balogh on 2016-01-25

Sync with staging

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1819
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2260/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/83/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/84/console

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

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20]

1820. By Zoltan Balogh on 2016-01-27

Sync with staging

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1820
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2261/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/84/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/85/console

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

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20]

1821. By Zoltan Balogh on 2016-01-28

Sync with the staging

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1821
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2262/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/85/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/86/console

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

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20]

1822. By Zoltan Balogh on 2016-01-28

sync with staging

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1822
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2263/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/86/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/87/console

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

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20]

1823. By Zoltan Balogh on 2016-01-28

Sync with staging

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1823
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2264/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/87/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/88/console

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

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20]

1824. By Zoltan Balogh on 2016-01-29

Sync with staging

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1824
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2265/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/88/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/89/console

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

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20]

1825. By Zoltan Balogh on 2016-02-02

Sync with the staging

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1825
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2266/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/89/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/90/console

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

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20]

1826. By Zoltan Balogh on 2016-02-03

Sync with the staging

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1826
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2267/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/90/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/91/console

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

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20]

1827. By Zoltan Balogh on 2016-02-03

Sync with staging

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1827
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2268/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/91/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/92/console

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

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20]

1828. By Zoltan Balogh on 2016-02-04

sync with staging

1829. By Zoltan Balogh on 2016-02-04

sync with staging

1830. By Zoltan Balogh on 2016-02-04

sync with staging

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1830
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2269/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/92/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/93/console

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

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20]

1831. By Zoltan Balogh on 2016-02-16

Sync

1832. By Zoltan Balogh on 2016-02-16

Sync

1833. By Zoltan Balogh on 2016-02-16

Sync

1834. By Zoltan Balogh on 2016-02-16

Sync

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1834
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2270/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/93/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/94/console

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

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20]

1835. By Zoltan Balogh on 2016-02-16

Wait for subcomponents in libtoolkit

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1835
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2271/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/94/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/95/console

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

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20]

1836. By Zoltan Balogh on 2016-02-16

do not Wait for subcomponents in libtoolkit

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1836
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2272/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/95/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/96/console

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

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20]

1837. By Zoltan Balogh on 2016-02-17

force non parallel for s390x

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1837
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2273/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/96/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/97/console

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

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20]

1838. By Zoltan Balogh on 2016-02-17

rules syntax fix

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1838
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2274/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/97/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/98/console

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

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20]

1839. By Zoltan Balogh on 2016-02-17

one more s390x non-parallel try + fix docs

1840. By Zoltan Balogh on 2016-02-18

Fix button color in test

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1840
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2275/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/98/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/99/console

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

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20]

1841. By Zoltan Balogh on 2016-02-18

Fixed performance monitor dangling pointer crash.

1842. By Zoltan Balogh on 2016-02-18

Fixed performance monitor crash because of a NULL timer pointer dereference.

1843. By Zoltan Balogh on 2016-02-18

Fixed performance monitor crash because of a NULL timer pointer dereference.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1842
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2276/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/99/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/100/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1843
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2277/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/100/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/101/console

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

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20]

1844. By Zoltan Balogh on 2016-02-19

Sync with staging

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1844
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2278/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/101/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/102/console

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

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20]

1845. By Zoltan Balogh on 2016-02-19

Remove the not helping s390x non-parallel build options.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1845
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2279/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/102/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/103/console

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

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20]

1846. By Zoltan Balogh on 2016-02-22

Sync

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1846
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2281/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/104/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/105/console

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

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20]

1847. By Zoltan Balogh on 2016-02-23

Remove & from test_buttons

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1847
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2282/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/105/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/106/console

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

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20]

1848. By Zoltan Balogh on 2016-02-24

add more deps

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1848
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2283/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/106/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/107/console

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

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20]

1849. By Zoltan Balogh on 2016-02-24

Next try

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1849
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2284/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/107/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/108/console

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

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20]

1850. By Zoltan Balogh on 2016-02-25

Next try

1851. By Zoltan Balogh on 2016-02-25

Next try

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1850
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2285/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/108/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/109/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1851
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2286/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/109/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/110/console

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

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20]

1852. By Zoltan Balogh on 2016-02-26

Sync from staging

[Zoltan Balogh (bzoltan)]

review: Approve

[lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20]

1853. By Zoltan Balogh on 2016-03-01

Fix AbstractButton not resetting eventual negative sensing area margins during resize. Fixing ComboButton altering __mouseArea anchors. lp:~zsombi/ubuntu-ui-toolkit/fix_abstractbuttonsensing_landing_ota10

1854. By Zoltan Balogh on 2016-03-08

 lp:~zsombi/ubuntu-ui-toolkit/stylingCrash

=== modified file 'apicheck/apicheck.pro'
--- apicheck/apicheck.pro	2015-11-30 15:39:52 +0000
+++ apicheck/apicheck.pro	2016-03-08 06:42:31 +0000
@@ -7,4 +7,4 @@
 installPath = $$[QT_INSTALL_LIBS]/ubuntu-ui-toolkit
 apicheck.path = $$installPath
 apicheck.files = apicheck
-INSTALLS += apicheck
+INSTALLS += $$TARGET
 
=== modified file 'components.api'
--- components.api	2015-12-19 10:06:24 +0000
+++ components.api	2016-03-08 06:42:31 +0000
@@ -8,6 +8,7 @@
     signal clicked()
     signal pressAndHold()
     readonly property bool pressed
+    readonly property UCMargins sensingMargins
 Ubuntu.Components.Action 1.3 1.0 0.1 UCAction: QtObject
     property string description
     property bool enabled
@@ -83,6 +84,7 @@
     property bool onScreen
     property bool running
 Ubuntu.Components.AdaptivePageLayout 1.3: PageTreeNode
+    property bool asynchronous
     readonly property int columns
     property list<PageColumnsLayou> layouts
     function var addPageToCurrentColumn(var sourcePage, var page, var properties)
@@ -268,7 +270,8 @@
     function push(var data)
     function clear()
     function QQuickMimeData* newData()
-Ubuntu.Components.ColorUtils 0.1 1.0
+Ubuntu.Components.ColorUtils 1.0 0.1: QtObject singleton
+    function double luminance(color color)
 Ubuntu.Components.ComboButton 1.1: Button
     property double collapsedHeight
     default property list<QtObject> comboList
@@ -276,13 +279,18 @@
     property color dropdownColor
     property bool expanded
     property double expandedHeight
-Ubuntu.Components.ComboButton 1.3: Button
+Ubuntu.Components.ComboButton 1.3: AbstractButton
     property double collapsedHeight
+    property color color
     default property list<QtObject> comboList
     readonly property double comboListHeight
     property color dropdownColor
     property bool expanded
     property double expandedHeight
+    property QFont font
+    property Gradient gradient
+    property string iconPosition
+    property color strokeColor
 Ubuntu.Components.Styles.ComboButtonStyle 1.1: Item
     property Item comboListHolder
     property double comboListMargin
@@ -498,6 +506,12 @@
     property string name
 Ubuntu.Components.Icon 1.1: Icon
     property url source
+Ubuntu.Components.Icon 1.3: Item
+    property bool asynchronous
+    property color color
+    property color keyColor
+    property string name
+    property url source
 Ubuntu.Components.InverseMouse 1.0 0.1 UCInverseMouse: Mouse
 Ubuntu.Components.InverseMouseArea 1.0 0.1 InverseMouseAreaType: MouseArea
     function bool contains(QPointF point)
@@ -615,6 +629,22 @@
 Ubuntu.Components.MainView 1.3: MainViewBase
     property bool automaticOrientation
     default property list<QtObject> contentsItem
+Ubuntu.Components.MainViewBase 1.3 UCMainViewBase: PageTreeNode
+    readonly property PopupContext actionContext
+    readonly property ActionManager actionManager
+    property list<Action> actions
+    property bool anchorToKeyboard
+    property string applicationName
+    property color backgroundColor
+    property color footerColor
+    property color headerColor
+    signal applicationNameChanged(string applicationName)
+    signal anchorToKeyboardChanged(bool anchorToKeyboard)
+    signal headerColorChanged(color headerColor)
+    signal backgroundColorChanged(color backgroundColor)
+    signal footerColorChanged(color footerColor)
+    signal actionManagerChanged(ActionManager actionManager)
+    signal actionContextChanged(PopupContext actionContext)
 Ubuntu.Components.MathUtils 1.0 0.1: QtObject singleton
     function double clamp(double x, double min, double max)
     function double lerp(double delta, double from, double to)
@@ -715,6 +745,7 @@
 Ubuntu.Components.Page 1.1 Page11: Page10
     readonly property PageHeadConfiguration head
 Ubuntu.Components.Page 1.3: PageTreeNode
+    readonly property ActionContext actionContext
     property Flickable flickable
     readonly property PageHeadConfiguration head
     property Item header
@@ -830,8 +861,11 @@
     property PaletteValues normal
     property PaletteValues selected
 Ubuntu.Components.Themes.Palette 1.3: QtObject
+    property PaletteValues disabled
+    property PaletteValues highlighted
     property PaletteValues normal
     property PaletteValues selected
+    property PaletteValues selectedDisabled
 Ubuntu.Components.Themes.PaletteValues 0.1: QtObject
     property color background
     property color backgroundText
@@ -845,17 +879,32 @@
     property color overlayText
     property color selection
 Ubuntu.Components.Themes.PaletteValues 1.3: QtObject
+    property color activity
+    property color activityText
     property color background
+    property color backgroundSecondaryText
+    property color backgroundTertiaryText
     property color backgroundText
     property color base
     property color baseText
     property color field
     property color fieldText
+    property color focus
+    property color focusText
     property color foreground
     property color foregroundText
+    property color negative
+    property color negativeText
     property color overlay
+    property color overlaySecondaryText
     property color overlayText
+    property color positive
+    property color positiveText
+    property color raised
+    property color raisedSecondaryText
+    property color raisedText
     property color selection
+    property color selectionText
 Ubuntu.Components.Panel 1.0 0.1: Item
     property int align
     property bool animate
@@ -947,6 +996,7 @@
     property bool grabDismissAreaEvents
     function var show()
     function var hide()
+Ubuntu.Components.PopupContext 1.3 UCPopupContext: ActionContext
 Ubuntu.Components.Popups.PopupUtils 0.1 1.0 1.3
 Ubuntu.Components.ProgressBar 1.0 0.1: AnimatedItem
     property bool indeterminate
@@ -963,7 +1013,11 @@
     property bool onScreen
     property bool showProgressPercentage
     property double value
-Ubuntu.Components.ProgressionSlot 1.3: Icon
+Ubuntu.Components.ProgressionSlot 1.3: Item
+    property bool asynchronous
+    property color color
+    property color keyColor
+    property string name
     property url source
 Ubuntu.Components.ProportionalShape 1.3 UCProportionalShape: UbuntuShape
 Ubuntu.Components.PullToRefresh 1.1: StyledItem
@@ -1056,6 +1110,7 @@
     function var formatValue(var v)
     property double minimumValue
     readonly property bool pressed
+    property double stepSize
     property double value
 Ubuntu.Components.SliderUtils 0.1 1.0
 Ubuntu.Components.SlotsAttached 1.3: QtObject
@@ -1491,6 +1546,7 @@
     property Item pageStack
 Ubuntu.Components.Styles.ToolbarStyle 1.3: Item
     property Component defaultDelegate
+UCActionContextAttached: QtObject
 Ubuntu.Components.UCApplication 1.0 0.1: QtObject
     property string applicationName
     property QtObject inputMethod
@@ -1503,6 +1559,12 @@
 UCListItemExpansion: QtObject
     property bool expanded
     property double height
+UCMargins: QtObject
+    property double all
+    property double bottom
+    property double left
+    property double right
+    property double top
 UCStateSaverAttached: QtObject
     property bool enabled
     property string properties
@@ -1558,6 +1620,28 @@
     readonly property color purple
     readonly property color red
     readonly property color warmGrey
+Ubuntu.Components.UbuntuColors 1.3: QtObject singleton
+    readonly property color ash
+    readonly property color blue
+    readonly property color coolGrey
+    readonly property color darkAubergine
+    readonly property color darkGrey
+    readonly property color graphite
+    readonly property color green
+    property Gradient greyGradient
+    readonly property color inkstone
+    readonly property color jet
+    readonly property color lightAubergine
+    readonly property color lightGrey
+    readonly property color midAubergine
+    readonly property color orange
+    property Gradient orangeGradient
+    readonly property color porcelain
+    readonly property color purple
+    readonly property color red
+    readonly property color silk
+    readonly property color slate
+    readonly property color warmGrey
 Ubuntu.Components.UbuntuListView 1.0 0.1: ListView
     property int expandedIndex
 Ubuntu.Components.UbuntuListView 1.1 UbuntuListView11: UbuntuListView
 
=== modified file 'debian/changelog'
--- debian/changelog	2016-01-06 04:27:02 +0000
+++ debian/changelog	2016-03-08 06:42:31 +0000
@@ -1,3 +1,151 @@
+ubuntu-ui-toolkit (1.3.1872+16.04-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Timo Jyrinki ]
+  * Fix gles unit test skipping.
+  * Add s390x to the unit test skipping architectures
+  * UITK test plan - wily -> xenial. Fixes LP: #1544490
+
+  [ Christian Dywan ]
+  * Print errors when QuickUtils fails to create a component.
+  * unit tests shouldn't use deprecated Dialog.callera
+  * Correctly count only test case results. The result= value is used in suites
+    and results.
+  * Skip tst_pagehead_visible flakes on non-arm. Fixes LP: #1534651
+  * Skip flaky tst_mousefilterTest::doubleClicked. Fixes LP: #1542215
+  * Suppress click signal if releasing outside of ListItem. Fixes LP: #1541148.
+  * Use gdb in runtest.sh to produce backtraces.
+  * Arrow keys change value of a Slider. Fixes LP: #1523824.
+  * Only use Maliit when enabled explicitly in the environment
+
+  [ Oliver Tilloy ]
+  * Do not try to assign to non-existent property "activeFocusOnPress". 
+    Fixes LP: #1532953
+  * Bubble up ESC key press event if there is no popover to close. 
+    Fixes LP: #1546627
+
+  [ Loïc Molinari ]
+  * Added private items and nodes for the new component styles. 
+    Fixes LP: #1523836
+  * Made use of new private Frame item for the focusing.
+  * Fixed performance monitor crash because of a NULL timer pointer dereference. 
+    Fixes LP: #1546986
+  * Fixed performance monitor dangling pointer crash. Fixes LP: #1546984
+  * [ProportionalShape] Ensured width/height ratio is correct with default values. 
+    Fixes LP: #1546546
+  * Added a workaround to prevent a crash while changing the QPA scale factor.
+
+  [ Florian Boucault ]
+  * Always on performance monitor that logs frames that too long to render.
+  * MainView: proceed to selecting the theme automatically at startup too. 
+    Fixes LP: #1535819
+  * MainView: when no gradient color is needed for the background, rely on 
+    QQuickWindow's GL clear color. Lessens overdraw considerably for most 
+    apps. Fixes LP: #1439133.
+  * Panel: MathUtils used without import prefix was leading to undefined 
+    reference.
+  * Label: use native rendering on low dpi screens (GRID_UNIT_PX <= 10) for 
+    sharper looking text.
+  * Gallery: added palette browser to Colors page.
+
+  [ Tim Peeters ]
+  * Support scrolling in ListViews with horizontal orientation to the 
+    qquicklistview CPO.
+  * Add background to AppHeader and remove contents clipping from MainView.
+    Fixes LP: #1531016, LP: #1531457.
+  * Hide AppHeader when using AdaptivePageLayout. Fixes bug 1531871. 
+    Fixes LP: #1531871.
+  * Implement horizontal flicking in the flickable autopilot CPO.
+  * Re-order to list of pages in the gallery to be alphabetical.
+  * Fix the autopilot failures introduced with the horizontal scrolling in 
+    the Flickable CPO.
+  * Update documentation for MainView, Page, AdaptivePageLayout to use the new 
+    PageHeader in all examples. Deprecate old properties. Fixes LP: #1540574
+  * Add 'animate' property to new internal AppHeaderBase, and do not show a 
+    header animation when starting an app without header. 
+    Fixes LP: #1518002, LP: #1524901.
+  * Use the correct string for skipping tests on x86_64 .
+  * Sections scrolling and keyboard navigation. Fixes LP: #1465048, LP: #1489591
+  * Fix autopilot color button failure.
+
+  [ Zoltán Balogh ]
+  * Create a click packaging project for the UITK Component Gallery.
+  * Improve the test plan executor script.  
+
+  [ Andrea Bernabei ] 
+  * Refer to SlotsLayout.Last instead of SlotsLayout.End in SlotsLayout 
+    documentation. Fixes LP: #1536170.
+  * Update "Import Statement:" in docs of Ubuntu.Components. Currently 
+    Developer's website shows "import Ubuntu.Components 1.2" and "since 
+    Ubuntu.Components 1.3" and that is confusing for all app developers. 
+    Fixes LP: #1531817.
+  * Fix ListItemLayout multiline labels positioning and add docs about
+    aliasing labels properties
+  * UbuntuTestCase flick(): default events delay to 1. Fixes LP: #1549256.
+  * Add Scrollbar and ScrollView tests plus implementation fixes.
+
+  [ Benjamin Zeller ] 
+  * Fix Bug lp:1535241 "AdaptivePageLayout first example is badly broken". 
+    Fixes LP: #1535241.
+  * The click project file is should not be part of the UITK project.
+  * Move MainViewBase to C++.
+  * Move tree.js to C++.
+  * Do not leak the incubator pointer in case a QML engine never took care of 
+    it. Delete the object directly.
+  * Move PageWrapper.qml to C++ for 1.3.
+  * Add Ubuntu toolkit shared library
+  * Move ColorUtils to UbuntuToolkit.
+  * Fixes LP: #1540642
+  * Make sure objects are initialized with extra properties before they are 
+    instantiated in the QML engine. 
+  * Use QQmlProperty::write() instead of QObject::writeProperty()
+ 
+  [ Zsombor Egri ]
+  * Update Palette values for Ubuntu.Components 1.3 and apply the palette on 
+    components. First set of visual updates including ListItem, Text inputs, 
+    CheckBox, Switch, Slider, PageHeader, ActionBar and BottomEdge. 
+    Fixes LP: #1350915.
+  * Contextual Actions - shortcut (and mnemonics) handling must obey 
+    active/inactive contexts, such as Page activation as well as Popups and 
+    Dialogs. Fixes LP: #1514856.
+  * Attach default theme to the QML Engine it creates. Fixes LP: #1527546
+  * Palette fix. Update components to use the palette. Fixes LP: #1495477
+  * Disable rendering performance logs for the unit tests.
+  * Specify message severity for the performance logging category.
+  * Link singletons used as context properties in root context of the QML 
+    Engine to the engine instance. Fixes LP: #1539558.
+  * Specify message severity for the performance logging category.
+  * Expose Icon.asynchronous property to drive image loading of the icon. 
+    Fixes LP: #1535480.
+  * Redo InverseMosueArea tests to not to use shared view for all the tests. 
+    Fixes LP: #1544455
+  * Get singletons report fatal error in case the parent is null upon first 
+    creation. Adjust failing test cases. Fixes LP: #1542309
+  * Deprecated Theme forces palette to be loaded from 1.2 themes. 
+    Fixes LP: #1549830
+  * Introduce AdaptivePageLayout.asynchronous to the API. Fixes LP: #1540449
+  * AbstractButton handles 4x4GU minimal sensing area, exposes sensingMargins
+    to extend sensing area even further. Fixes LP:#1468645, LP: #1508114
+
+  [ Albert Astals Cid ] 
+  * Have a default pixelsPerInch value. Otherwise when running unity8 tests
+    under xvfb we get the wrong parameters warning and tests fail.
+
+  [ Robert Ancell ]
+  * Fix documentation typo - Ubunut -> Ubuntu.
+  * Use new QML package name for qml-module-qtfeedback, drop old QML 
+    package names.
+  * Fix examples using OptionSelectorDelegate that place it in the Toolkit 
+    namespace but don't have the import to match.
+
+  [ Colin Watson ]
+  * Make src/Ubuntu/Test depend on src/Ubuntu/Components, to fix build with 
+    high parallelisation.
+
+  [ Pierre Bertet on 2016-02-17
+  * ComboButton: not based on Button anymore + style update.
+
+ -- Zoltán Balogh <[e-mail]>  Thu, 21 Jan 2016 06:21:26 +0200
+
 ubuntu-ui-toolkit (1.3.1795+16.04.20160106-0ubuntu1) xenial; urgency=medium
 
   [ Christian Dywan ]
 
=== modified file 'debian/control'
--- debian/control	2015-12-17 15:38:35 +0000
+++ debian/control	2016-03-08 06:42:31 +0000
@@ -16,15 +16,15 @@
                libqt5sql5-sqlite,
                qtdeclarative5-dev-tools,
                qtdeclarative5-private-dev,
-               qml-module-qtquick2 | qtdeclarative5-qtquick2-plugin,
-               qml-module-qttest | qtdeclarative5-test-plugin,
-               qml-module-qtquick-window2 | qtdeclarative5-window-plugin,
+               qml-module-qtquick2,
+               qml-module-qttest,
+               qml-module-qtquick-window2,
                qml-module-qtquick-layouts,
-               qtdeclarative5-qtfeedback-plugin,
+               qml-module-qtfeedback,
                qtdeclarative5-unity-action-plugin (>= 1.1.0),
                qtdeclarative5-private-dev,
-               qml-module-qtquick-localstorage | qtdeclarative5-localstorage-plugin,
-               qml-module-qt-labs-settings | qtdeclarative5-settings-plugin,
+               qml-module-qtquick-localstorage,
+               qml-module-qt-labs-settings,
                qml-module-qtqml-models2,
                qtdeclarative5-doc-html,
                qtwebkit5-doc-html,
@@ -42,6 +42,7 @@
                dbus-test-runner,
                accountsservice,
                xvfb,
+               gdb,
                libgl1-mesa-dri,
                locales,
                suru-icon-theme,
@@ -66,15 +67,16 @@
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
 Depends: qml-module-qtgraphicaleffects | libqt5qml-graphicaleffects,
          libqt5svg5,
-         qml-module-qtquick2 | qtdeclarative5-qtquick2-plugin,
-         qml-module-qtquick-window2 | qtdeclarative5-window-plugin,
+         qml-module-qtquick2,
+         qml-module-qtquick-window2,
          qml-module-qtquick-layouts,
-         qtdeclarative5-qtfeedback-plugin,
+         qml-module-qtfeedback,
          qtdeclarative5-unity-action-plugin (>= 1.1.0),
          suru-icon-theme,
          ttf-ubuntu-font-family,
          ubuntu-ui-toolkit-theme (= ${binary:Version}),
          libubuntugestures5 (= ${binary:Version}),
+         libubuntutoolkit5 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
 Conflicts: qt-components-ubuntu
@@ -104,7 +106,7 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
 Description: Ubuntu gestures library development files
- This package contains the development files for 
+ This package contains the development files for
  Ubuntu gestures library with SwipeArea
 
 Package: libubuntugestures5-private-dev
@@ -117,6 +119,25 @@
  This package contains the private development files for
  Ubuntu gestures library with SwipeArea
 
+Package: libubuntutoolkit5
+Architecture: any
+Multi-Arch: same
+Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: Ubuntu toolkit common library for Ubuntu UI Toolkit
+ Contains components and helper classes that are shared between the
+ Ubuntu QML plugins
+
+Package: libubuntutoolkit5-dev
+Architecture: any
+Multi-Arch: same
+Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: Ubuntu toolkit common library development files
+ This package contains the development files for
+ Ubuntu toolkit common library
 
 Package: ubuntu-ui-toolkit-theme
 Architecture: any
@@ -159,7 +180,7 @@
 Depends: ubuntu-ui-toolkit-tools (>= ${source:Version}),
          qtdeclarative5-ubuntu-ui-toolkit-plugin (= ${binary:Version}) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
          ubuntu-ui-toolkit-theme (= ${binary:Version}),
-         qml-module-qtquick-xmllistmodel | qtdeclarative5-xmllistmodel-plugin,
+         qml-module-qtquick-xmllistmodel,
          qml-module-qt-labs-folderlistmodel,
          ${misc:Depends},
          ${shlibs:Depends}
@@ -220,4 +241,3 @@
  .
  This package contains the application launcher, which is a drop-in
  replacement for qmlscene, oxideqmlscene, qml and derivatives.
-
 
=== modified file 'debian/libubuntugestures5-dev.install'
--- debian/libubuntugestures5-dev.install	2015-12-16 09:55:02 +0000
+++ debian/libubuntugestures5-dev.install	2016-03-08 06:42:31 +0000
@@ -1,28 +1,35 @@
-usr/include/*/qt5/UbuntuGestures/ubuntugesturesglobal.h 
-usr/include/*/qt5/UbuntuGestures/CandidateInactivityTimer 
-usr/include/*/qt5/UbuntuGestures/TouchOwnershipEvent 
-usr/include/*/qt5/UbuntuGestures/UbuntuGestures 
-usr/include/*/qt5/UbuntuGestures/pool.h 
-usr/include/*/qt5/UbuntuGestures/unownedtouchevent.h 
-usr/include/*/qt5/UbuntuGestures/DebugHelpers 
-usr/include/*/qt5/UbuntuGestures/debughelpers.h 
-usr/include/*/qt5/UbuntuGestures/touchownershipevent.h 
-usr/include/*/qt5/UbuntuGestures/touchregistry.h 
-usr/include/*/qt5/UbuntuGestures/UbuntuGesturesDepends 
-usr/include/*/qt5/UbuntuGestures/timesource.h 
-usr/include/*/qt5/UbuntuGestures/TimeSource 
-usr/include/*/qt5/UbuntuGestures/timer.h 
-usr/include/*/qt5/UbuntuGestures/UnownedTouchEvent 
-usr/include/*/qt5/UbuntuGestures/TouchRegistry 
-usr/include/*/qt5/UbuntuGestures/Pool 
-usr/include/*/qt5/UbuntuGestures/ubuntugesturesversion.h 
-usr/include/*/qt5/UbuntuGestures/Timer 
-usr/include/*/qt5/UbuntuGestures/candidateinactivitytimer.h 
-usr/include/*/qt5/UbuntuGestures/UbuntuGesturesVersion 
+usr/include/*/qt5/UbuntuGestures/ubuntugesturesglobal.h
+usr/include/*/qt5/UbuntuGestures/CandidateInactivityTimer
+usr/include/*/qt5/UbuntuGestures/TouchOwnershipEvent
+usr/include/*/qt5/UbuntuGestures/UbuntuGestures
+usr/include/*/qt5/UbuntuGestures/pool.h
+usr/include/*/qt5/UbuntuGestures/unownedtouchevent.h
+usr/include/*/qt5/UbuntuGestures/DebugHelpers
+usr/include/*/qt5/UbuntuGestures/debughelpers.h
+usr/include/*/qt5/UbuntuGestures/touchownershipevent.h
+usr/include/*/qt5/UbuntuGestures/touchregistry.h
+usr/include/*/qt5/UbuntuGestures/UbuntuGesturesDepends
+usr/include/*/qt5/UbuntuGestures/timesource.h
+usr/include/*/qt5/UbuntuGestures/TimeSource
+usr/include/*/qt5/UbuntuGestures/timer.h
+usr/include/*/qt5/UbuntuGestures/UnownedTouchEvent
+usr/include/*/qt5/UbuntuGestures/TouchRegistry
+usr/include/*/qt5/UbuntuGestures/Pool
+usr/include/*/qt5/UbuntuGestures/ubuntugesturesversion.h
+usr/include/*/qt5/UbuntuGestures/Timer
+usr/include/*/qt5/UbuntuGestures/candidateinactivitytimer.h
+usr/include/*/qt5/UbuntuGestures/UbuntuGesturesVersion
+usr/include/*/qt5/UbuntuGestures/TimerFactory
+usr/include/*/qt5/UbuntuGestures/AbstractTimer
+usr/include/*/qt5/UbuntuGestures/FakeTimeSource
+usr/include/*/qt5/UbuntuGestures/AbstractTimerFactory
+usr/include/*/qt5/UbuntuGestures/FakeTimerFactory
+usr/include/*/qt5/UbuntuGestures/RealTimeSource
+usr/include/*/qt5/UbuntuGestures/SharedTimeSource
+usr/include/*/qt5/UbuntuGestures/FakeTimer
 usr/lib/*/libUbuntuGestures.prl
 usr/lib/*/libUbuntuGestures.la
 usr/lib/*/libUbuntuGestures.so
 usr/lib/*/pkgconfig/UbuntuGestures.pc
 usr/lib/*/qt5/mkspecs/modules/qt_lib_UbuntuGestures.pri
 usr/lib/*/qt5/mkspecs/modules/qt_lib_UbuntuGestures_private.pri
-
 
=== added file 'debian/libubuntutoolkit5-dev.install'
--- debian/libubuntutoolkit5-dev.install	1970-01-01 00:00:00 +0000
+++ debian/libubuntutoolkit5-dev.install	2016-03-08 06:42:31 +0000
@@ -0,0 +1,15 @@
+usr/include/*/qt5/UbuntuToolkit/ColorUtils
+usr/include/*/qt5/UbuntuToolkit/colorutils.h
+usr/include/*/qt5/UbuntuToolkit/Tree
+usr/include/*/qt5/UbuntuToolkit/tree.h
+usr/include/*/qt5/UbuntuToolkit/UbuntuToolkit
+usr/include/*/qt5/UbuntuToolkit/UbuntuToolkitDepends
+usr/include/*/qt5/UbuntuToolkit/UbuntuToolkitVersion
+usr/include/*/qt5/UbuntuToolkit/ubuntutoolkitglobal.h
+usr/include/*/qt5/UbuntuToolkit/ubuntutoolkitversion.h
+usr/lib/*/libUbuntuToolkit.prl
+usr/lib/*/libUbuntuToolkit.la
+usr/lib/*/libUbuntuToolkit.so
+usr/lib/*/pkgconfig/UbuntuToolkit.pc
+usr/lib/*/qt5/mkspecs/modules/qt_lib_UbuntuToolkit.pri
+usr/lib/*/qt5/mkspecs/modules/qt_lib_UbuntuToolkit_private.pri
 
=== added file 'debian/libubuntutoolkit5.install'
--- debian/libubuntutoolkit5.install	1970-01-01 00:00:00 +0000
+++ debian/libubuntutoolkit5.install	2016-03-08 06:42:31 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/libUbuntuToolkit.so.*
 
=== modified file 'debian/rules'
--- debian/rules	2015-12-03 10:36:02 +0000
+++ debian/rules	2016-03-08 06:42:31 +0000
@@ -11,7 +11,7 @@
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 # Skip tests on the archs they are known to be flaky  with current configuration
-testskip_architectures := powerpc arm64 ppc64el
+testskip_architectures := powerpc arm64 ppc64el s390x
 
 override_dh_auto_configure:
 	qmake -r
 
=== modified file 'documentation/statesaving.qdoc'
--- documentation/statesaving.qdoc	2015-07-22 14:35:48 +0000
+++ documentation/statesaving.qdoc	2016-03-08 06:42:31 +0000
@@ -53,7 +53,7 @@
     for the application. However runtime application name change would require
     application restart.
 
-    Having these preconditions, we can deduct that \l MainViewBase::applicationName
+    Having these preconditions, we can deduct that \l MainView::applicationName
     property is one of the properties which cannot be serialized.
 
     \section1 IDs
 
=== modified file 'documentation/ubuntu-components.qdoc'
--- documentation/ubuntu-components.qdoc	2015-03-03 13:47:48 +0000
+++ documentation/ubuntu-components.qdoc	2016-03-08 06:42:31 +0000
@@ -15,7 +15,7 @@
  */
 
 /*!
-    \qmlmodule Ubuntu.Components 1.2
+    \qmlmodule Ubuntu.Components 1.3
     \title Basic QML Types
     \nextpage {Ubuntu User Interface Toolkit}
 */
 
=== modified file 'documentation/ubuntu-theming.qdoc'
--- documentation/ubuntu-theming.qdoc	2015-08-11 10:01:34 +0000
+++ documentation/ubuntu-theming.qdoc	2016-03-08 06:42:31 +0000
@@ -270,17 +270,11 @@
  * The extended (or even overridden) style component documents must follow the naming
  * convention, and must have the names implied by the components styled.
  *
- * SuruDark theme overrides the Ambiance theme's ListItemStyle, therefore declares the
- * ListItemStyle.qml document, with the following content:
- * \snippet Themes/SuruDark/1.3/ListItemStyle.qml 0
- *
  * The style imports the Ambiance theme module, and extends the Ambiance ListItemStyle
  * component. The same is done in the other style components. However, Palette defines
  * own values, and does not re-use Ambiance palette values.
  * \snippet Themes/SuruDark/1.3/Palette.qml 0
  *
- * The same is done with TabBarStyle and OptionSelectorStyle components.
- *
  * \note If a theme derived from SuruDark wants to override style components not present
  * in SuruDark, they must import the SuruDark's parent theme in the style component.
  * As example, if FancyTheme would want to override the SwitchStyle, it would need to
 
=== modified file 'documentation/ubuntu-ui-toolkit-common.qdocconf'
--- documentation/ubuntu-ui-toolkit-common.qdocconf	2015-09-01 11:59:13 +0000
+++ documentation/ubuntu-ui-toolkit-common.qdocconf	2016-03-08 06:42:31 +0000
@@ -29,7 +29,7 @@
 excludefiles += $BLD/../src/Ubuntu/Components/1.3/PageWrapperUtils.js
 outputdir = $BLD/html
 outputformats = HTML
-version = 1.2
+version = 1.3
 syntaxhighlighting = true
 sourceencoding = UTF-8
 outputencoding = UTF-8
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/About.qml'
--- examples/ubuntu-ui-toolkit-gallery/About.qml	2015-10-23 14:46:16 +0000
+++ examples/ubuntu-ui-toolkit-gallery/About.qml	2016-03-08 06:42:31 +0000
@@ -23,7 +23,7 @@
     theme: ThemeSettings {
         name: "Ubuntu.Components.Themes.SuruDark"
         palette: Palette {
-            normal.background: UbuntuColors.darkGrey
+            normal.background: UbuntuColors.slate
         }
     }
     style: Rectangle {
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/BottomEdgePage.qml'
--- examples/ubuntu-ui-toolkit-gallery/BottomEdgePage.qml	2015-12-02 08:23:14 +0000
+++ examples/ubuntu-ui-toolkit-gallery/BottomEdgePage.qml	2016-03-08 06:42:31 +0000
@@ -132,7 +132,7 @@
                 objectName: "CustomRegion1"
                 enabled: regionConfig.model >= 1
                 to: 0.3
-                property color baseColor: UbuntuColors.lightGrey
+                property color baseColor: UbuntuColors.silk
             },
             BottomEdgeRegion {
                 objectName: "CustomRegion2"
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/Buttons.qml'
--- examples/ubuntu-ui-toolkit-gallery/Buttons.qml	2015-12-07 11:47:35 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Buttons.qml	2016-03-08 06:42:31 +0000
@@ -24,7 +24,7 @@
     TemplateSection {
         className: "Button"
 
-        TemplateRow {
+        TemplateFlow {
             title: i18n.tr("Standard")
 
             Button {
@@ -33,7 +33,7 @@
             }
         }
 
-        TemplateRow {
+        TemplateFlow {
             title: i18n.tr("Stroke")
 
             Button {
@@ -43,7 +43,7 @@
             }
         }
 
-        TemplateRow {
+        TemplateFlow {
             title: i18n.tr("Color")
 
             Button {
@@ -59,7 +59,7 @@
             }
         }
 
-        TemplateRow {
+        TemplateFlow {
             title: i18n.tr("Icon")
 
             Button {
@@ -68,7 +68,7 @@
             }
         }
 
-        TemplateRow {
+        TemplateFlow {
             title: i18n.tr("Icon+Text")
 
             Button {
@@ -87,7 +87,7 @@
             }
         }
 
-        TemplateRow {
+        TemplateFlow {
             title: i18n.tr("Disabled")
 
             Button {
@@ -101,12 +101,13 @@
     TemplateSection {
         className: "ComboButton"
 
-        TemplateRow {
+        TemplateFlow {
             title: i18n.tr("Collapsed")
 
             ComboButton {
                 text: "Press me"
                 objectName: "combobutton_collapsed"
+                width: parent.width < units.gu(30)? parent.width : units.gu(30)
                 comboList:  UbuntuListView {
                     model: 10
                     delegate: Standard {
@@ -116,11 +117,12 @@
             }
         }
 
-        TemplateRow {
+        TemplateFlow {
             title: i18n.tr("Icon")
 
             ComboButton {
                 iconSource: "call.png"
+                width: parent.width < units.gu(30)? parent.width : units.gu(30)
                 comboList:  UbuntuListView {
                     model: 10
                     delegate: Standard {
@@ -130,12 +132,13 @@
             }
         }
 
-        TemplateRow {
+        TemplateFlow {
             title: i18n.tr("Icon+Text")
 
             ComboButton {
                 text: "Answer"
                 iconSource: "call.png"
+                width: parent.width < units.gu(30)? parent.width : units.gu(30)
                 comboList:  UbuntuListView {
                     model: 10
                     delegate: Standard {
@@ -144,13 +147,14 @@
                 }
             }
         }
-        TemplateRow {
+        TemplateFlow {
             title: i18n.tr("Expanded")
 
             ComboButton {
                 text: "Press me"
                 objectName: "combobutton_expanded"
                 expanded: true
+                width: parent.width < units.gu(30)? parent.width : units.gu(30)
                 comboList:  UbuntuListView {
                     model: 10
                     delegate: Standard {
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/Colors.qml'
--- examples/ubuntu-ui-toolkit-gallery/Colors.qml	2015-07-22 13:14:43 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Colors.qml	2016-03-08 06:42:31 +0000
@@ -16,11 +16,131 @@
 
 import QtQuick 2.4
 import Ubuntu.Components 1.3
+import QtQml.Models 2.1
 
 Template {
+    id: colorsTemplate
     objectName: "colorsTemplate"
 
     TemplateSection {
+        id: paletteSection
+
+        title: "Palette"
+        className: "Palette"
+        documentation: "qml-palette.html"
+
+        property var palettes: ["normal", "disabled", "selected", "selectedDisabled", "highlighted"]
+        property var paletteValues: [["background", ["backgroundText", "backgroundSecondaryText", "backgroundTertiaryText"]],
+            ["base", ["baseText"]],
+            ["foreground", ["foregroundText"]],
+            ["field", ["fieldText"]],
+            ["focus", ["focusText"]],
+            ["activity", ["activityText"]],
+            ["negative", ["negativeText"]],
+            ["overlay", ["overlayText", "overlaySecondaryText"]],
+            ["positive", ["positiveText"]],
+            ["raised", ["raisedText", "raisedSecondaryText"]],
+            ["selection", ["selectionText"]]]
+
+        Flow {
+            id: paletteFlow
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+            spacing: units.gu(2)
+            property var previewed
+
+            Repeater {
+                model: paletteSection.palettes
+                Column {
+                    spacing: units.gu(1)
+                    width: paletteColorGrid.width
+                    property var palette: theme.palette[modelData]
+
+                    Label {
+                        text: "theme.palette." + modelData
+                        textSize: Label.Small
+                    }
+
+                    Grid {
+                        id: paletteColorGrid
+                        spacing: units.gu(0)
+
+                        Repeater {
+                            model: paletteSection.paletteValues
+
+                            Item {
+                                id: paletteColor
+                                property string mainColor: modelData[0]
+                                property var textColors: modelData[1]
+                                property bool previewed: paletteFlow.previewed == paletteColor
+                                width: units.gu(4)
+                                height: units.gu(5)
+                                z: previewed ? 10 : 0
+
+                                MouseArea {
+                                    id: colorHoverArea
+                                    anchors.fill: parent
+                                    hoverEnabled: true
+                                    onClicked: paletteFlow.previewed = paletteColor
+                                    onContainsMouseChanged: {
+                                        if (containsMouse) {
+                                            paletteFlow.previewed = paletteColor;
+                                        } else {
+                                            if (paletteFlow.previewed == paletteColor) {
+                                                paletteFlow.previewed = null;
+                                            }
+                                        }
+                                    }
+                                }
+
+                                Rectangle {
+                                    width: paletteColor.width + (previewed ? units.gu(26) : 0)
+                                    height: paletteColor.height + (previewed ? units.gu(2.5) : 0)
+                                    Behavior on height { UbuntuNumberAnimation {duration: UbuntuAnimation.SnapDuration} }
+                                    color: theme.palette.normal.background
+                                    parent: previewed ? colorsTemplate : paletteColor
+                                    x: Math.max(0, paletteColor.mapToItem(parent, 0, 0).x + (previewed ? (paletteColor.width-width)/2 : 0))
+                                    y: paletteColor.mapToItem(parent, 0, 0).y + (previewed ? (paletteColor.height-height)/2 : 0)
+
+                                    Rectangle {
+                                        anchors.fill: parent
+                                        color: palette[mainColor]
+                                        border.width: color == theme.palette.normal.background ? units.dp(1) : 0
+                                        border.color: theme.palette.normal.backgroundText
+                                    }
+
+                                    Column {
+                                        anchors {
+                                            left: parent.left
+                                            leftMargin: units.gu(0.5)
+                                            right: parent.right
+                                            top: parent.top
+                                            topMargin: units.gu(0.5)
+                                        }
+
+                                        Repeater {
+                                            model: textColors
+                                            Label {
+                                                width: previewed ? implicitWidth : parent.width
+                                                text: previewed ? modelData : modelData.slice(0, 4)
+                                                color: palette[modelData]
+                                                textSize: previewed ? Label.Medium : Label.XSmall
+                                                elide: Text.ElideRight
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    TemplateSection {
         title: "UbuntuColors"
         className: "UbuntuColors"
 
@@ -33,15 +153,45 @@
             }
         }
         TemplateRow {
-            title: i18n.tr("Light grey")
-            UbuntuShape {
-                backgroundColor: UbuntuColors.lightGrey
-            }
-        }
-        TemplateRow {
-            title: i18n.tr("Dark grey")
-            UbuntuShape {
-                backgroundColor: UbuntuColors.darkGrey
+            title: i18n.tr("Porcelain")
+            UbuntuShape {
+                backgroundColor: UbuntuColors.porcelain
+            }
+        }
+        TemplateRow {
+            title: i18n.tr("Silk")
+            UbuntuShape {
+                backgroundColor: UbuntuColors.silk
+            }
+        }
+        TemplateRow {
+            title: i18n.tr("Ash")
+            UbuntuShape {
+                backgroundColor: UbuntuColors.ash
+            }
+        }
+        TemplateRow {
+            title: i18n.tr("Graphite")
+            UbuntuShape {
+                backgroundColor: UbuntuColors.graphite
+            }
+        }
+        TemplateRow {
+            title: i18n.tr("Slate")
+            UbuntuShape {
+                backgroundColor: UbuntuColors.slate
+            }
+        }
+        TemplateRow {
+            title: i18n.tr("Inkstone")
+            UbuntuShape {
+                backgroundColor: UbuntuColors.inkstone
+            }
+        }
+        TemplateRow {
+            title: i18n.tr("Jet")
+            UbuntuShape {
+                backgroundColor: UbuntuColors.jet
             }
         }
         TemplateRow {
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/ListItemLayouts.qml'
--- examples/ubuntu-ui-toolkit-gallery/ListItemLayouts.qml	2015-11-10 11:53:53 +0000
+++ examples/ubuntu-ui-toolkit-gallery/ListItemLayouts.qml	2016-03-08 06:42:31 +0000
@@ -79,6 +79,7 @@
                 id: telegramContactsLayout
                 title.text: "Telegram Name goes here"
                 subtitle.text: "last seen 12:02"
+                summary.text: "Oh wow! What a nice layout!"
 
                 Rectangle {
                     id: imageShape
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/NewListItems.qml'
--- examples/ubuntu-ui-toolkit-gallery/NewListItems.qml	2015-09-28 12:26:13 +0000
+++ examples/ubuntu-ui-toolkit-gallery/NewListItems.qml	2016-03-08 06:42:31 +0000
@@ -163,7 +163,7 @@
             model: [ i18n.tr("Basic"), i18n.tr("Colored divider"), i18n.tr("Immutable"), i18n.tr("No divider") ]
             delegate: ListItemWithLabel {
                 title.text: modelData
-                color: dragging ? "lightblue" : "transparent"
+                color: dragging ? theme.palette.selected.base : "transparent"
                 divider {
                     colorFrom: modelData == i18n.tr("Colored divider") ? UbuntuColors.red : Qt.rgba(0.0, 0.0, 0.0, 0.0)
                     colorTo: modelData == i18n.tr("Colored divider") ? UbuntuColors.green : Qt.rgba(0.0, 0.0, 0.0, 0.0)
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/PageHeaders.qml'
--- examples/ubuntu-ui-toolkit-gallery/PageHeaders.qml	2015-12-15 15:08:49 +0000
+++ examples/ubuntu-ui-toolkit-gallery/PageHeaders.qml	2016-03-08 06:42:31 +0000
@@ -44,8 +44,35 @@
                 iconName: "edit"
                 text: "Edit"
                 onTriggered: page.header = editHeader
+            },
+            Action {
+                iconName: standardHeader.extension === sections
+                          ? "media-playback-stop"
+                          : "filters"
+                text: "Sections"
+                onTriggered: {
+                    if (standardHeader.extension) {
+                        standardHeader.extension = null;
+                    } else {
+                        standardHeader.extension = sections;
+                    }
+                }
             }
         ]
+
+        Sections {
+            id: sections
+            visible: standardHeader.extension === sections
+            anchors {
+                left: parent.left
+                right: parent.right
+                bottom: parent.bottom
+            }
+            model: ["one", "two", "three", "four", "five", "six", "seven", "eight", "nine",
+                    "ten", "eleven", "twelve", "thirteen"]
+        }
+
+
     }
 
     PageHeader {
@@ -81,7 +108,7 @@
                 width: label.width + units.gu(4)
                 height: parent.height
                 Rectangle {
-                    color: UbuntuColors.darkGrey
+                    color: UbuntuColors.slate
                     opacity: 0.1
                     anchors.fill: parent
                     visible: button.pressed
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/Popover.qml'
--- examples/ubuntu-ui-toolkit-gallery/Popover.qml	2015-06-24 16:16:51 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Popover.qml	2016-03-08 06:42:31 +0000
@@ -21,7 +21,7 @@
 Template {
     objectName: "popoversTemplate"
 
-    head.actions: [
+    trailingActions: [
         Action {
             text: "Actions"
             iconSource: "call_icon.png"
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/Sections.qml'
--- examples/ubuntu-ui-toolkit-gallery/Sections.qml	2015-10-23 14:46:16 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Sections.qml	2016-03-08 06:42:31 +0000
@@ -22,10 +22,39 @@
     id: sectionsTemplate
 
     header: PageHeader {
+        id: h
         title: sectionsTemplate.title
-        sections.model: ["first", "second", "third"]
+        extension: Sections {
+            anchors {
+                left: parent.left
+                right: parent.right
+                bottom: parent.bottom
+            }
+            model: h.showManySections ? sectionsTemplate.manyActions
+                                      : sectionsTemplate.fewActions
+        }
+        property bool showManySections: false
+        trailingActionBar.actions: [
+            Action {
+                iconName: h.showManySections ? "view-collapse" : "view-expand"
+                text: h.showManySections ? "less" : "more"
+                onTriggered: h.showManySections = !h.showManySections;
+            }
+        ]
     }
 
+    property list<Action> fewActions: [
+        Action { text: "One" },
+        Action { text: "Two" },
+        Action { text: "Three" }
+    ]
+
+    property var manyActions: [
+        "one", "two", "three", "four", "five", "six", "seven", "eight", "nine",
+        "ten", "eleven", "twelve", "thirteen", "fourteen", "fifteen",
+        "sixteen", "seventeen", "eighteen", "nineteen", "twenty"
+    ]
+
     TemplateSection {
         title: "Sections"
         className: "Sections"
@@ -34,19 +63,38 @@
             title: i18n.tr("Enabled")
 
             Sections {
-                actions: [
-                    Action { text: "one" },
-                    Action { text: "two" },
-                    Action { text: "three" }
-                ]
-            }
-        }
-        TemplateRow {
-            title: i18n.tr("Disabled")
-
-            Sections {
-                model: ["one", "two", "three"]
-                enabled: false
+                actions: sectionsTemplate.fewActions
+            }
+        }
+        TemplateRow {
+            title: i18n.tr("Disabled")
+
+            Sections {
+                model: sectionsTemplate.fewActions
+                enabled: false
+            }
+        }
+    }
+
+    TemplateSection {
+        title: "Scrollable sections"
+        className: "Sections"
+
+        TemplateRow {
+            title: i18n.tr("Enabled")
+
+            Sections {
+                model: sectionsTemplate.manyActions
+                width: parent.width
+            }
+        }
+        TemplateRow {
+            title: i18n.tr("Disabled")
+
+            Sections {
+                model: sectionsTemplate.manyActions
+                enabled: false
+                width: parent.width
             }
         }
     }
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/Template.qml'
--- examples/ubuntu-ui-toolkit-gallery/Template.qml	2015-12-16 15:02:33 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Template.qml	2016-03-08 06:42:31 +0000
@@ -23,12 +23,14 @@
     default property alias content: column.children
     property alias spacing: column.spacing
     property alias scrollable: templateFlickable.interactive
+    property list<Action> trailingActions
     flickable: templateFlickable
 
     header: PageHeader {
         title: template.title
         flickable: layout.columns === 1 ? templateFlickable : null
         onFlickableChanged: exposed = true;
+        trailingActionBar.actions: trailingActions
     }
 
     ScrollView {
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml'
--- examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml	2015-12-16 12:58:03 +0000
+++ examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml	2016-03-08 06:42:31 +0000
@@ -17,64 +17,100 @@
 import QtQuick 2.0
 
 ListModel {
-    // Already in design guidelines
-    ListElement {
-        objectName: "navigationElement"
-        label: "Navigation"
-        source: "Navigation.qml"
-    }
     ListElement {
         objectName: "actionBarElement"
         label: "ActionBar"
         source: "ActionBars.qml"
     }
     ListElement {
+        objectName: "animationsElement"
+        label: "Animations"
+        source: "Animations.qml"
+    }
+    ListElement {
+        objectName: "bottomEdgeHintElement"
+        label: "Bottom Edge"
+        source: "BottomEdgePage.qml"
+    }
+    ListElement {
+        objectName: "buttonsElement"
+        label: "Buttons"
+        source: "Buttons.qml"
+    }
+    ListElement {
         objectName: "colorsElement"
         label: "Colors"
         source: "Colors.qml"
     }
     ListElement {
-        objectName: "togglesElement"
-        label: "Toggles"
-        source: "Toggles.qml"
-    }
-    ListElement {
-        objectName: "buttonsElement"
-        label: "Buttons"
-        source: "Buttons.qml"
-    }
-    ListElement {
-        objectName: "slidersElement"
-        label: "Slider"
-        source: "Sliders.qml"
-    }
-    ListElement {
-        objectName: "textinputsElement"
-        label: "Text Field"
-        source: "TextInputs.qml"
-    }
-
+        objectName: "crossFadeImageElement"
+        label: "CrossFadeImage"
+        source: "CrossFadeImage.qml"
+    }
+    ListElement {
+        objectName: "dialogsElement"
+        label: "Dialog"
+        source: "Dialog.qml"
+    }
+    ListElement {
+        objectName: "iconsElement"
+        label: "Icons"
+        source: "Icons.qml"
+    }
+    ListElement {
+        objectName: "labelsElement"
+        label: "Label"
+        source: "Label.qml"
+    }
+    ListElement {
+        objectName: "newListItemsElement"
+        label: "List items (new)"
+        source: "NewListItems.qml"
+    }
+    ListElement {
+        objectName: "listItemsElement"
+        label: "List Items (old)"
+        source: "ListItems.qml"
+    }
+    ListElement {
+        objectName: "listItemLayoutElement"
+        label: "ListItem Layouts"
+        source: "ListItemLayouts.qml"
+    }
+    ListElement {
+        objectName: "navigationElement"
+        label: "Navigation"
+        source: "Navigation.qml"
+    }
     ListElement {
         objectName: "optionSelectorsElement"
         label: "Option Selector"
         source: "OptionSelectors.qml"
     }
-
-    // Not in design guidelines yet
+    ListElement {
+        objectName: "pageHeaderElement"
+        label: "Page header"
+        source: "PageHeaders.qml"
+    }
     ListElement {
         objectName: "pickersElement"
         label: "Pickers"
         source: "Pickers.qml"
     }
     ListElement {
+        objectName: "popoversElement"
+        label: "Popover"
+        source: "Popover.qml"
+    }
+    ListElement {
         objectName: "progressBarsElement"
         label: "Progress and activity"
         source: "ProgressBars.qml"
     }
     ListElement {
-        objectName: "pageHeaderElement"
-        label: "Page header"
-        source: "PageHeaders.qml"
+        objectName: "proportionalShapesElement"
+        label: "Proportional shapes"
+        source: "ProportionalShape.qml"
     }
     ListElement {
         objectName: "sectionsElement"
@@ -82,29 +118,14 @@
         source: "Sections.qml"
     }
     ListElement {
-        objectName: "ubuntuShapesElement"
-        label: "Ubuntu Shape"
-        source: "UbuntuShape.qml"
-    }
-    ListElement {
-        objectName: "iconsElement"
-        label: "Icons"
-        source: "Icons.qml"
-    }
-    ListElement {
-        objectName: "proportionalShapesElement"
-        label: "Proportional shapes"
-        source: "ProportionalShape.qml"
-    }
-    ListElement {
-        objectName: "labelsElement"
-        label: "Label"
-        source: "Label.qml"
-    }
-    ListElement {
-        objectName: "crossFadeImageElement"
-        label: "CrossFadeImage"
-        source: "CrossFadeImage.qml"
+        objectName: "sheetsElement"
+        label: "Sheet"
+        source: "Sheet.qml"
+    }
+    ListElement {
+        objectName: "slidersElement"
+        label: "Slider"
+        source: "Sliders.qml"
     }
     ListElement {
         objectName: "swipeAreaElement"
@@ -112,53 +133,23 @@
         source: "SwipeAreaPage.qml"
     }
     ListElement {
-        objectName: "bottomEdgeHintElement"
-        label: "Bottom Edge"
-        source: "BottomEdgePage.qml"
-    }
-
-    ListElement {
-        objectName: "newListItemsElement"
-        label: "New list items (preview)"
-        source: "NewListItems.qml"
-    }
-    ListElement {
-        objectName: "listItemLayoutElement"
-        label: "ListItemLayouts"
-        source: "ListItemLayouts.qml"
-    }
-    // Already in design guidelines but should be reordered
-    ListElement {
-        objectName: "listItemsElement"
-        label: "List Items"
-        source: "ListItems.qml"
+        objectName: "textinputsElement"
+        label: "Text Field"
+        source: "TextInputs.qml"
+    }
+    ListElement {
+        objectName: "togglesElement"
+        label: "Toggles"
+        source: "Toggles.qml"
     }
     ListElement {
         objectName: "ubuntuListViewElement"
         label: "Ubuntu ListView"
         source: "UbuntuListViews.qml"
     }
-
-    ListElement {
-        objectName: "dialogsElement"
-        label: "Dialog"
-        source: "Dialog.qml"
-    }
-    ListElement {
-        objectName: "popoversElement"
-        label: "Popover"
-        source: "Popover.qml"
-    }
-    ListElement {
-        objectName: "sheetsElement"
-        label: "Sheet"
-        source: "Sheet.qml"
-    }
-
-    // Not in design guidelines yet
-    ListElement {
-        objectName: "animationsElement"
-        label: "Animations"
-        source: "Animations.qml"
+    ListElement {
+        objectName: "ubuntuShapesElement"
+        label: "Ubuntu Shape"
+        source: "UbuntuShape.qml"
     }
 }
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/[e-mail]'
 Binary files examples/ubuntu-ui-toolkit-gallery/[e-mail]	2013-06-29 22:36:27 +0000 and examples/ubuntu-ui-toolkit-gallery/[e-mail]	2016-03-08 06:42:31 +0000 differ
=== removed file 'examples/ubuntu-ui-toolkit-gallery/gallery'
--- examples/ubuntu-ui-toolkit-gallery/gallery	2015-12-02 15:13:43 +0000
+++ examples/ubuntu-ui-toolkit-gallery/gallery	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-. `dirname ${BASH_SOURCE[0]}`/../../export_modules_dir.sh || exit 1
-
-SCRIPT_DIRECTORY=`dirname $0`
-QT_LOGGING_CONF=$SCRIPT_DIRECTORY/gallery-logging.config $BUILD_DIR/ubuntu-ui-toolkit-launcher/ubuntu-ui-toolkit-launcher $@ $SCRIPT_DIRECTORY/ubuntu-ui-toolkit-gallery.qml
 
=== added file 'examples/ubuntu-ui-toolkit-gallery/manifest.json.in'
--- examples/ubuntu-ui-toolkit-gallery/manifest.json.in	1970-01-01 00:00:00 +0000
+++ examples/ubuntu-ui-toolkit-gallery/manifest.json.in	2016-03-08 06:42:31 +0000
@@ -0,0 +1,15 @@
+{
+    "architecture": "all",
+    "description": "Component showcase gallery of the Ubuntu user interface toolkit (UITK)",
+    "framework": "ubuntu-sdk-15.04.3",
+    "hooks": {
+        "ubuntu-ui-toolkit-gallery": {
+            "apparmor": "ubuntu-ui-toolkit-gallery.apparmor",
+            "desktop": "ubuntu-ui-toolkit-gallery.desktop"
+        }
+    },
+    "maintainer": "Zoltán Balogh <[e-mail]>",
+    "name": "com.ubuntu.developer.bzoltan.ubuntu-ui-toolkit-gallery",
+    "title": "Ubuntu UI Toolkit Gallery",
+    "version": "0.5"
+}
 
=== added file 'examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery-click.pro'
--- examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery-click.pro	1970-01-01 00:00:00 +0000
+++ examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery-click.pro	2016-03-08 06:42:31 +0000
@@ -0,0 +1,36 @@
+TEMPLATE = subdirs
+
+#load Ubuntu specific features
+load(ubuntu-click)
+
+# specify the manifest file, this file is required for click
+# packaging and for the IDE to create runconfigurations
+UBUNTU_MANIFEST_FILE=manifest.json.in
+
+TARGET = ubuntu-ui-toolkit-gallery
+
+QML_FILES += $$files(*.qml,true) \
+             $$files(*.js,true)
+
+CONF_FILES +=  ubuntu-ui-toolkit-gallery.apparmor \
+               ubuntu-ui-toolkit-gallery.png
+
+OTHER_FILES += $${CONF_FILES} \
+               $${QML_FILES} \
+               ubuntu-ui-toolkit-gallery.desktop
+
+#specify where the qml/js files are installed to
+qml_files.path = /
+qml_files.files += $${QML_FILES}
+
+#specify where the config files are installed to
+config_files.path = /
+config_files.files += $${CONF_FILES}
+
+#install the desktop file, a translated version is
+#automatically created in the build directory
+desktop_file.path = /
+desktop_file.files = ubuntu-ui-toolkit-gallery.desktop
+desktop_file.CONFIG += no_check_exist
+
+INSTALLS+=config_files qml_files desktop_file
 
=== added file 'examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.apparmor'
--- examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.apparmor	1970-01-01 00:00:00 +0000
+++ examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.apparmor	2016-03-08 06:42:31 +0000
@@ -0,0 +1,9 @@
+{
+    "policy_groups": [
+        "networking"
+    ],
+    "policy_version": 1.3
+}
+
+
+
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.desktop'
--- examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.desktop	2015-08-06 11:50:01 +0000
+++ examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.desktop	2016-03-08 06:42:31 +0000
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Name=Ubuntu UI Toolkit Gallery
-Exec=/usr/bin/ubuntu-ui-toolkit-launcher $@ /usr/lib/ubuntu-ui-toolkit/examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml
+Exec=qmlscene %U ubuntu-ui-toolkit-gallery.qml
 Terminal=false
 Type=Application
 X-Ubuntu-Touch=true
-X-Ubuntu-Gettext-Domain=ubuntu-ui-toolkit-gallery
+X-Ubuntu-Gettext-Domain=com.ubuntu.developer.bzoltan.ubuntu-ui-toolkit-gallery
 # Added Icon and Path as a workaround for http://pad.lv/1227359.
 # TODO remove them once that bug is fixed. --elopio - 2013-09-18
-Icon=/usr/lib/ubuntu-ui-toolkit/examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.png
-Path=/usr/lib/ubuntu-ui-toolkit/examples/ubuntu-ui-toolkit-gallery/
+Icon=ubuntu-ui-toolkit-gallery.png
+
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.pro'
--- examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.pro	2015-12-02 15:13:43 +0000
+++ examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.pro	2016-03-08 06:42:31 +0000
@@ -1,6 +1,6 @@
 TEMPLATE = subdirs
 
-SUBDIRS += Gallery.pro po
+SUBDIRS += po
 
 filetypes = qml png svg js jpg qmlproject desktop
 
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml'
--- examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml	2015-09-30 05:59:49 +0000
+++ examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml	2016-03-08 06:42:31 +0000
@@ -24,7 +24,7 @@
     objectName: "mainView"
 
     // Note! applicationName needs to match the .desktop filename
-    applicationName: "ubuntu-ui-toolkit-gallery"
+    applicationName: "com.ubuntu.developer.bzoltan.ubuntu-ui-toolkit-gallery"
 
     width: units.gu(120)
     height: units.gu(75)
 
=== modified file 'export_modules_dir.sh'
--- export_modules_dir.sh	2015-12-14 13:36:44 +0000
+++ export_modules_dir.sh	2016-03-08 06:42:31 +0000
@@ -19,7 +19,7 @@
 export QML_IMPORT_PATH=$BUILD_DIR/qml
 export QML2_IMPORT_PATH=$BUILD_DIR/qml
 export UBUNTU_UI_TOOLKIT_THEMES_PATH=$BUILD_DIR/qml
-export LD_LIBRARY_PATH=$BUILD_DIR/lib
+export LD_LIBRARY_PATH=$BUILD_DIR/lib:$LD_LIBRARY_PATH
 /sbin/initctl set-env --global QML_IMPORT_PATH=$BUILD_DIR/qml
 /sbin/initctl set-env --global QML2_IMPORT_PATH=$BUILD_DIR/qml
 /sbin/initctl set-env --global UBUNTU_UI_TOOLKIT_THEMES_PATH=$BUILD_DIR/qml
 
=== modified file 'gallery.sh'
--- gallery.sh	2015-11-17 09:17:58 +0000
+++ gallery.sh	2016-03-08 06:42:31 +0000
@@ -17,8 +17,9 @@
 
 if [ "$1" == "--autopilot" ]
 then
-	examples/ubuntu-ui-toolkit-gallery/gallery -testability &
+	tests/Gallery/gallery -testability &
 	autopilot vis
 else
-	examples/ubuntu-ui-toolkit-gallery/gallery $@
+	tests/Gallery/gallery $@
+
 fi
 
=== modified file 'src/Ubuntu/Components/1.2/MainViewBase.qml'
--- src/Ubuntu/Components/1.2/MainViewBase.qml	2015-09-28 12:55:04 +0000
+++ src/Ubuntu/Components/1.2/MainViewBase.qml	2016-03-08 06:42:31 +0000
@@ -48,7 +48,7 @@
 
           Qt bug: https://bugreports.qt-project.org/browse/QTBUG-11712
          */
-        property string themeName: (ColorUtils.luminance(backgroundColor) >= 0.85) ?
+        property string themeName: (Toolkit.ColorUtils.luminance(backgroundColor) >= 0.85) ?
                                    "Ambiance" : "SuruDark"
         onThemeNameChanged: {
             // only change the theme if the current one is a system one.
 
=== modified file 'src/Ubuntu/Components/1.2/Panel.qml'
--- src/Ubuntu/Components/1.2/Panel.qml	2015-04-30 08:32:44 +0000
+++ src/Ubuntu/Components/1.2/Panel.qml	2016-03-08 06:42:31 +0000
@@ -321,7 +321,7 @@
             name: "moving"
             PropertyChanges {
                 target: bar
-                position: MathUtils.clamp(draggingArea.mousePosition - internal.movingDelta, 0, bar.size)
+                position: Toolkit.MathUtils.clamp(draggingArea.mousePosition - internal.movingDelta, 0, bar.size)
             }
         },
         State {
 
=== removed file 'src/Ubuntu/Components/1.2/colorUtils.js'
--- src/Ubuntu/Components/1.2/colorUtils.js	2015-04-30 08:32:44 +0000
+++ src/Ubuntu/Components/1.2/colorUtils.js	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-.pragma library
-
-function luminance(hexcolor){
-    hexcolor = String(hexcolor)
-    var r = parseInt(hexcolor.substr(1,2),16);
-    var g = parseInt(hexcolor.substr(3,2),16);
-    var b = parseInt(hexcolor.substr(5,2),16);
-    return ((r*212)+(g*715)+(b*73))/1000/255;
-}
 
=== modified file 'src/Ubuntu/Components/1.3/AdaptivePageLayout.qml'
--- src/Ubuntu/Components/1.3/AdaptivePageLayout.qml	2015-10-29 10:03:14 +0000
+++ src/Ubuntu/Components/1.3/AdaptivePageLayout.qml	2016-03-08 06:42:31 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
 import Ubuntu.Components 1.3
-import "tree.js" as Tree
+import Ubuntu.Components.Private 1.3
 
 /*!
   \qmltype AdaptivePageLayout
@@ -61,8 +61,12 @@
             primaryPage: page1
             Page {
                 id: page1
-                title: "Main page"
+                header: PageHeader {
+                    id: header
+                    title: "Main Page"
+                }
                 Column {
+                    anchors.top: header.bottom
                     Button {
                         text: "Add Page2 above " + page1.title
                         onClicked: page1.pageStack.addPageToCurrentColumn(page1, page2)
@@ -75,11 +79,15 @@
             }
             Page {
                 id: page2
-                title: "Page #2"
+                header: PageHeader {
+                    title: "Page #2"
+                }
             }
             Page {
                 id: page3
-                title: "Page #3"
+                header: PageHeader {
+                    title: "Page #3"
+                }
             }
         }
     }
@@ -133,8 +141,12 @@
                 id: page1Component
                 Page {
                     id: page1
-                    title: "Main page"
+                    header: PageHeader {
+                        id: header
+                        title: "Main page"
+                    }
                     Column {
+                        anchors.top: header.bottom
                         Button {
                             text: "Add Page2 above " + page1.title
                             onClicked: page1.pageStack.addPageToCurrentColumn(page1, page2)
@@ -148,11 +160,15 @@
             }
             Page {
                 id: page2
-                title: "Page #2"
+                header: PageHeader {
+                    title: "Page #2"
+                }
             }
             Page {
                 id: page3
-                title: "Page #3"
+                header: PageHeader {
+                    title: "Page #3"
+                }
             }
         }
     }
@@ -200,13 +216,17 @@
     /*!
       The property specifies the source of the primaryPage in case the primary
       page is created from a Component or loaded from an external document. It
-      has precedence over \l primaryPage. The page specified in this way will
-      be cerated asynchronously and the instance will be reported through
-      \l primaryPage property.
+      has precedence over \l primaryPage.
       */
     property var primaryPageSource
 
     /*!
+      The property drives the way the pages should be loaded, synchronously or
+      asynchronously. Defaults to true.
+      */
+    property bool asynchronous: true
+
+    /*!
       \qmlproperty int columns
       \readonly
       The property holds the number of columns shown in the layout.
@@ -228,62 +248,70 @@
       is created. \c sourcePage must be active.
 
       The function creates the new page asynchronously if the new \c page to be
-      added is a Component or a QML document. In this case the function returns
-      an incubator which can be used to track the page creation.For more about
-      incubation in QML and creating components asynchronously, see
+      added is a Component or a QML document and the \l asynchronous property is
+      set to true. In this case the function returns an incubator which can be
+      used to track the page creation. For more about incubation in QML and creating
+      components asynchronously, see
       \l {http://doc.qt.io/qt-5/qml-qtqml-component.html#incubateObject-method}
       {Component.incubateObject()}.
       The following example removes an element from the list model whenever the
       page opened in the second column is closed. Note, the example must be run
       on desktop or on a device with at least 90 grid units screen width.
       \qml
-      import QtQuick 2.4
-      import Ubuntu.Components 1.3
-
-      MainView {
-          width: units.gu(90)
-          height: units.gu(70)
-
-          Component {
-              id: page2Component
-              Page {
-                  title: "Second Page"
-                  Button {
-                      text: "Close me"
-                      onClicked: pageStack.removePages(pageStack.primaryPage);
-                  }
-              }
-          }
-
-          AdaptivePageLayout {
-              id: pageLayout
-              anchors.fill: parent
-              primaryPage: Page {
-                  title: "Primary Page"
-                  ListView {
-                      id: listView
-                      anchors.fill: parent
-                      model: 10
-                      delegate: ListItem {
-                          Label { text: modelData }
-                          onClicked: {
-                              var incubator = pageLayout.addPageToNextColumn(pageLayout.primaryPage, page2Component);
-                              if (incubator && incubator.status == Component.Loading) {
-                                  incubator.onStatusChanged = function(status) {
-                                      if (status == Component.Ready) {
-                                          // connect page's destruction to decrement model
-                                          incubator.object.Component.destruction.connect(function() {
-                                              listView.model--;
-                                          });
-                                      }
-                                  }
-                              }
-                          }
-                      }
-                  }
-              }
-          }
-      }
+        import QtQuick 2.4
+        import Ubuntu.Components 1.3
+
+        MainView {
+            width: units.gu(90)
+            height: units.gu(70)
+
+            Component {
+                id: page2Component
+                Page {
+                    header: PageHeader {
+                        id: header
+                        title: "Second Page"
+                    }
+                    Button {
+                        anchors.top: header.bottom
+                        text: "Close me"
+                        onClicked: pageStack.removePages(pageStack.primaryPage);
+                    }
+                }
+            }
+
+            AdaptivePageLayout {
+                id: pageLayout
+                anchors.fill: parent
+                primaryPage: Page {
+                    header: PageHeader {
+                        title: "Primary Page"
+                        flickable: listView
+                    }
+                    ListView {
+                        id: listView
+                        anchors.fill: parent
+                        model: 10
+                        delegate: ListItem {
+                            Label { text: modelData }
+                            onClicked: {
+                                var incubator = pageLayout.addPageToNextColumn(pageLayout.primaryPage, page2Component);
+                                if (incubator && incubator.status == Component.Loading) {
+                                    incubator.onStatusChanged = function(status) {
+                                        if (status == Component.Ready) {
+                                            // connect page's destruction to decrement model
+                                            incubator.object.Component.destruction.connect(function() {
+                                                listView.model--;
+                                            });
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
       \endqml
 
       \sa {http://doc.qt.io/qt-5/qml-qtqml-component.html#incubateObject-method}{Component.incubateObject}
@@ -389,7 +417,7 @@
 
         property bool internalUpdate: false
         property bool completed: false
-        property var tree: new Tree.Tree()
+        property var tree: Tree{}
 
         property int columns: !layout.layouts.length ?
                                   (layout.width >= units.gu(80) ? 2 : 1) :
@@ -440,8 +468,7 @@
         }
 
         function createWrapper(page, properties) {
-            var wrapperComponent = Qt.createComponent("PageWrapper.qml");
-            var wrapperObject = wrapperComponent.createObject(hiddenPages, {synchronous: false});
+            var wrapperObject = pageWrapperComponent.createObject(hiddenPages, {synchronous: !layout.asynchronous});
             wrapperObject.pageStack = layout;
             wrapperObject.properties = properties;
             // set reference last because it will trigger creation of the object
@@ -650,6 +677,13 @@
         }
     }
 
+    Component{
+        id: pageWrapperComponent
+        PageWrapper{
+        }
+    }
+
+
     // default metrics
     Component {
         id: defaultMetrics
@@ -675,13 +709,12 @@
             onTriggered: layout.removePages(wrapper.object)
 
             visible: {
-                var parentWrapper;
-                try {
-                    parentWrapper = d.tree.parent(wrapper);
-                } catch(err) {
+                var parentWrapper = d.tree.parent(wrapper);
+
+                if (!parentWrapper)
                     // Root node has no parent node.
                     return false;
-                }
+
                 if (!wrapper.pageHolder) {
                     // columns are being re-arranged.
                     return false;
@@ -705,7 +738,7 @@
             id: holder
             active: false
             objectName: "ColumnHolder" + column
-            property PageWrapper pageWrapper
+            property var pageWrapper: pageWrapperComponent.createObject()
             property int column
             property alias config: subHeader.config
             property PageColumn metrics: getDefaultMetrics()
@@ -777,6 +810,7 @@
 
                 property color dividerColor: layout.__propagated.header.dividerColor
                 property color panelColor: layout.__propagated.header.panelColor
+                property color backgroundColor: layout.__propagated.header.backgroundColor
 
                 visible: !customHeader && holder.pageWrapper && holder.pageWrapper.active
 
@@ -788,13 +822,13 @@
                     if (!page) {
                         return false;
                     }
-                    var parentWrapper;
-                    try {
-                        parentWrapper = d.tree.parent(holder.pageWrapper);
-                    } catch(err) {
+                    var parentWrapper = d.tree.parent(holder.pageWrapper);
+
+                    if (!parentWrapper) {
                         // Root node has no parent node.
                         return false;
                     }
+
                     var nextInColumn = d.tree.top(holder.column, holder.column < d.columns - 1, 1);
                     return parentWrapper === nextInColumn;
                 }
@@ -809,7 +843,7 @@
                     rightMargin: dividerThickness
                 }
                 width: (column == (d.columns - 1)) || !pageWrapper ? 0 : units.dp(1)
-                color: theme.palette.selected.background
+                color: theme.palette.normal.base
                 MouseArea {
                     id: resizerSensing
                     objectName: "Divider"
@@ -834,7 +868,7 @@
                     when: resizerSensing.pressed
                     PropertyChanges {
                         target: verticalDivider
-                        color: Qt.darker(theme.palette.normal.background, 1.5)
+                        color: Qt.darker(theme.palette.normal.background, 1.7)
                     }
                 }
                 transitions: Transition {
@@ -891,10 +925,11 @@
     /*! \internal */
     // Pages declared as children will be placed directly into hiddenPages
     default property alias data: hiddenPages.data
-    Item {
+    PageTreeNode {
         id: hiddenPages
         objectName: "HiddenPagePool"
         visible: false
+        active: false
         // make sure nothing is shown eventually
         clip: true
         anchors.fill: parent
 
=== modified file 'src/Ubuntu/Components/1.3/AppHeader.qml'
--- src/Ubuntu/Components/1.3/AppHeader.qml	2015-12-14 20:38:59 +0000
+++ src/Ubuntu/Components/1.3/AppHeader.qml	2016-03-08 06:42:31 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.3 as Components
+import Ubuntu.Components.Private 1.3 as Privates
 
 /*!
     \internal
@@ -23,7 +23,8 @@
     \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
 */
-Components.Header {
+Privates.AppHeaderBase {
+    // Note: styleName is set to "PageHeadStyle" in UCAppHeaderBase.
     id: header
 
     anchors {
@@ -32,6 +33,11 @@
     }
 
     /*!
+      The background color of the header. Value set by MainView.
+     */
+    property color backgroundColor
+
+    /*!
       The background color of the divider. Value set by MainView.
      */
     property color dividerColor
@@ -112,7 +118,12 @@
      */
     property QtObject config: null
 
-    Component.onCompleted: internal.updateProperties()
+    animate: false
+    exposed: false
+    Component.onCompleted: {
+        internal.updateProperties();
+        header.animate = true;
+    }
     onConfigChanged: internal.updateProperties()
 
     onExposedChanged: {
@@ -158,6 +169,4 @@
             }
         }
     }
-
-    styleName: "PageHeadStyle"
 }
 
=== modified file 'src/Ubuntu/Components/1.3/ComboButton.qml'
--- src/Ubuntu/Components/1.3/ComboButton.qml	2015-08-20 06:56:44 +0000
+++ src/Ubuntu/Components/1.3/ComboButton.qml	2016-03-08 06:42:31 +0000
@@ -161,10 +161,68 @@
     \section2 Styling
     The style of the component is defined in \l ComboButtonStyle.
   */
-Button {
+AbstractButton {
     id: combo
 
     /*!
+      \deprecated
+      If set to a color, the button has a stroke border instead of a filled
+      shape.
+    */
+    property color strokeColor
+    onStrokeColorChanged: console.warn(
+        "WARNING: ComboButton.strokeColor is deprecated."
+    )
+
+    /*!
+      \deprecated
+      The background color of the button.
+    */
+    property color color
+    onColorChanged: console.warn("WARNING: ComboButton.color is deprecated.")
+
+    /*!
+      \deprecated
+      The gradient used to fill the background of the button.
+      Standard Ubuntu gradients are defined in \l UbuntuColors.
+      If both a gradient and a color are specified, the gradient will be used.
+    */
+    property Gradient gradient
+    onGradientChanged: console.warn(
+        "WARNING: ComboButton.gradient is deprecated."
+    )
+
+    /*!
+      \deprecated
+      The property specifies the color of the dropdown button and the combo
+      list for both collapsed and expanded states. You can use \l expanded to
+      define different colors for expanded or collapsed states.
+      */
+    property color dropdownColor
+    onDropdownColorChanged: console.warn(
+        "WARNING: ComboButton.dropdownColor is deprecated."
+    )
+
+    /*!
+      The font used for the button's text.
+    */
+    property font font: __styleInstance.defaultFont
+
+    /*!
+      The position of the icon relative to the text. Options
+      are "left" and "right". The default value is "left".
+
+      If only text or only an icon is defined, this
+      property is ignored and the text or icon is
+      centered horizontally and vertically in the button.
+
+      Currently this is a string value. We are waiting for
+      support for enums:
+      https://bugreports.qt-project.org/browse/QTBUG-14861
+    */
+    property string iconPosition: "left"
+
+    /*!
       Specifies whether the combo list is expanded or not. The default falue is
       false.
       */
@@ -239,33 +297,16 @@
       */
     default property alias comboList: comboListHolder.data
 
-    /* ----------------- Color and font configurations ----------------- */
-    /*!
-      The property specifies the color of the dropdown button and the combo list
-      for both collapsed and expanded states. You can use \l expanded to define
-      different colors for expanded or collapsed states.
-      */
-    property color dropdownColor: __styleInstance ? __styleInstance.defaultDropdownColor : color
-
-
     styleName: "ComboButtonStyle"
 
-    Component.onCompleted: {
-        // update mouse area to report clicks only on the main button area
-        // area excluding dropDown button and combo list
-        // we must do separate bindings as __mouseArea is a read-only property
-        __mouseArea.anchors.fill = undefined;
-        __mouseArea.anchors.left = Qt.binding(function() {return combo.left;});
-        __mouseArea.anchors.top = Qt.binding(function() {return combo.top;});
-        __mouseArea.anchors.right = Qt.binding(function() {return combo.right;});
-        __mouseArea.anchors.rightMargin = Qt.binding(function() {return combo.__styleInstance.dropDownWidth + combo.__styleInstance.dropDownSeparatorWidth;});
-        __mouseArea.height = Qt.binding(function() {return collapsedHeight;});
-        // for autopilot, set the main button name
-        __mouseArea.objectName = "combobutton_mainbutton";
-
-        // bind a height calculation to avoid unwanted change
-        combo.height = Qt.binding(function() {return collapsedHeight + __styleInstance.comboListPanel.height});
+    // update sensing area to report clicks only on the main button area
+    // area excluding dropDown button and combo list
+    sensingMargins {
+        bottom: -(combo.height - combo.collapsedHeight)
+        right: -combo.__styleInstance.dropDownWidth
     }
+    __mouseArea.objectName: "combobutton_mainbutton"
+    height: collapsedHeight + __styleInstance.comboListPanel.height
 
     // dropdown button
     AbstractButton {
 
=== removed file 'src/Ubuntu/Components/1.3/Icon.qdoc'
--- src/Ubuntu/Components/1.3/Icon.qdoc	2015-04-25 08:54:58 +0000
+++ src/Ubuntu/Components/1.3/Icon.qdoc	1970-01-01 00:00:00 +0000
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*!
-    \qmltype Icon
-    \inqmlmodule Ubuntu.Components 1.1
-    \ingroup ubuntu
-    \brief The Icon component displays an icon from the icon theme.
-
-    The icon theme contains a set of standard icons referred to by their name.
-    Using icons whenever possible enhances consistency accross applications.
-    Each icon has a name and can have different visual representations depending
-    on the size requested.
-
-    Icons can also be colorized. Setting the \l color property will make all pixels
-    with the \l keyColor (by default #808080) colored.
-
-    Example:
-    \qml
-    Icon {
-        width: 64
-        height: 64
-        name: "search"
-    }
-    \endqml
-
-    Example of colorization:
-    \qml
-    Icon {
-        width: 64
-        height: 64
-        name: "search"
-        color: UbuntuColors.warmGrey
-    }
-    \endqml
-
-    Icon themes are created following the
-    \l{http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html}{Freedesktop Icon Theme Specification}.
-*/
-
-/*!
-   The name of the icon to display.
-   \qmlproperty string Icon::name
-
-   If both name and source are set, name will be ignored.
-
-   \note The complete list of icons available in Ubuntu is not published yet.
-       For now please refer to the folders where the icon themes are installed:
-       \list
-         \li Ubuntu Touch: \l file:/usr/share/icons/suru
-         \li Ubuntu Desktop: \l file:/usr/share/icons/ubuntu-mono-dark
-       \endlist
-       These 2 separate icon themes will be merged soon.
-*/
-
-/*!
-   The source url of the icon to display. It has precedence over name.
-
-   If both name and source are set, name will be ignored.
-
-   \since Ubuntu.Components 1.1
-   \qmlproperty url Icon::source
-*/
-
-/*!
-   The color that all pixels that originally are of color \l keyColor should take.
-   \qmlproperty color Icon::color
-*/
-
-/*!
-   The color of the pixels that should be colorized.
-   By default it is set to #808080.
-   \qmlproperty color Icon::keyColor
-*/
 
=== added file 'src/Ubuntu/Components/1.3/Icon.qml'
--- src/Ubuntu/Components/1.3/Icon.qml	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/1.3/Icon.qml	2016-03-08 06:42:31 +0000
@@ -0,0 +1,157 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Zsombor Egri <[e-mail]>
+ *          Loic Molinari <[e-mail]>
+ */
+
+import QtQuick 2.4
+
+/*!
+    \qmltype Icon
+    \inqmlmodule Ubuntu.Components 1.3
+    \inherits Item
+    \ingroup ubuntu
+    \brief The Icon component displays an icon from the icon theme.
+
+    The icon theme contains a set of standard icons referred to by their name.
+    Using icons whenever possible enhances consistency accross applications.
+    Each icon has a name and can have different visual representations depending
+    on the size requested.
+
+    Icons can also be colorized. Setting the \l color property will make all pixels
+    with the \l keyColor (by default #808080) colored.
+
+    Example:
+    \qml
+    Icon {
+        width: 64
+        height: 64
+        name: "search"
+    }
+    \endqml
+
+    Example of colorization:
+    \qml
+    Icon {
+        width: 64
+        height: 64
+        name: "search"
+        color: UbuntuColors.warmGrey
+    }
+    \endqml
+
+    Icon themes are created following the
+    \l{http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html}{Freedesktop Icon Theme Specification}.
+*/
+
+Item {
+    id: icon
+
+    /*!
+       The name of the icon to display.
+       \qmlproperty string Icon::name
+
+       If both name and source are set, name will be ignored.
+
+       \note The complete list of icons available in Ubuntu is not published yet.
+           For now please refer to the folders where the icon themes are installed:
+           \list
+             \li Ubuntu Touch: \l file:/usr/share/icons/suru
+             \li Ubuntu Desktop: \l file:/usr/share/icons/ubuntu-mono-dark
+           \endlist
+           These 2 separate icon themes will be merged soon.
+    */
+    property string name
+
+    /*!
+       The color that all pixels that originally are of color \l keyColor should take.
+       \qmlproperty color Icon::color
+    */
+
+    property alias color: colorizedImage.keyColorOut
+
+    /*!
+       The color of the pixels that should be colorized.
+       By default it is set to #808080.
+       \qmlproperty color Icon::keyColor
+    */
+    property alias keyColor: colorizedImage.keyColorIn
+
+    /*!
+       The source url of the icon to display. It has precedence over name.
+
+       If both name and source are set, name will be ignored.
+
+       \since Ubuntu.Components 1.1
+       \qmlproperty url Icon::source
+    */
+
+    property alias source: image.source
+
+    /*!
+      \qmlproperty bool Icon::asynchronous
+      The property drives the image loading of the icon. Defaults to false.
+    */
+    property alias asynchronous: image.asynchronous
+
+    implicitWidth: image.implicitWidth
+    implicitHeight: image.implicitHeight
+
+    Image {
+        id: image
+        objectName: "image"
+        anchors.fill: parent
+        fillMode: Image.PreserveAspectFit
+
+        sourceSize {
+            width: icon.width
+            height: icon.height
+        }
+
+        source: icon.name ? "image://theme/%1".arg(icon.name) : ""
+
+        cache: true
+        visible: !colorizedImage.visible
+        asynchronous: false
+    }
+
+    ShaderEffect {
+        id: colorizedImage
+        objectName: "shader"
+
+        anchors.fill: parent
+
+        // Whether or not a color has been set.
+        visible: image.status == Image.Ready && keyColorOut != Qt.rgba(0.0, 0.0, 0.0, 0.0)
+
+        property Image source: image
+        property color keyColorOut: Qt.rgba(0.0, 0.0, 0.0, 0.0)
+        property color keyColorIn: "#808080"
+        property real threshold: 0.1
+
+        fragmentShader: "
+            varying highp vec2 qt_TexCoord0;
+            uniform sampler2D source;
+            uniform highp vec4 keyColorOut;
+            uniform highp vec4 keyColorIn;
+            uniform lowp float threshold;
+            uniform lowp float qt_Opacity;
+            void main() {
+                lowp vec4 sourceColor = texture2D(source, qt_TexCoord0);
+                gl_FragColor = mix(keyColorOut * vec4(sourceColor.a), sourceColor, step(threshold, distance(sourceColor.rgb / sourceColor.a, keyColorIn.rgb))) * qt_Opacity;
+            }"
+    }
+}
 
=== modified file 'src/Ubuntu/Components/1.3/MainView.qml'
--- src/Ubuntu/Components/1.3/MainView.qml	2015-10-13 13:37:43 +0000
+++ src/Ubuntu/Components/1.3/MainView.qml	2016-03-08 06:42:31 +0000
@@ -23,9 +23,8 @@
     \qmltype MainView
     \inqmlmodule Ubuntu.Components 1.3
     \ingroup ubuntu
+    \inherits StyledItem
     \brief MainView is the root Item that should be used for all applications.
-        It automatically adds a header and toolbar for its contents and can
-        rotate its content based on the device orientation.
 
     The simplest way to use a MainView is to include a single \l Page object
     inside the MainView:
@@ -38,27 +37,30 @@
             height: units.gu(60)
 
             Page {
-                title: "Simple page"
+                header: PageHeader {
+                    id: pageHeader
+                    title: "Simple page"
+                }
                 Button {
-                    anchors.centerIn: parent
+                    anchors {
+                        horizontalCenter: parent.horizontalCenter
+                        top: pageHeader.bottom
+                        topMargin: units.gu(5)
+                    }
+                    width: units.gu(15)
                     text: "Push me"
-                    width: units.gu(15)
                     onClicked: print("Click!")
                 }
             }
         }
     \endqml
     It is not required to set the anchors of the \l Page as it will automatically fill its parent.
-    The MainView has a header that automatically shows the title of the \l Page.
-
-    Do not include multiple Pages directly inside the MainView, but use \l Tabs
-    or \l PageStack inside MainView to navigate between several Pages.
-
-    For the MainView to automatically rotate its content following the orientation
-    of the device, set the \l automaticOrientation property to true.
-
-    If the \l Page inside the MainView includes a Flickable with enough contents for scrolling,
-    the header will automatically hide and show when the user scrolls up or down:
+
+    Do not include multiple Pages directly inside the MainView, but use \l AdaptivePageLayout
+    inside MainView to navigate between several Pages.
+
+    If the \l Page inside the MainView includes a Flickable, set the flickable property of
+    the PageHeader to automatically hide and show the header when the user scrolls up or down:
     \qml
         import QtQuick 2.4
         import Ubuntu.Components 1.3
@@ -68,9 +70,13 @@
             height: units.gu(60)
 
             Page {
-                title: "Page with Flickable"
+                header: PageHeader {
+                    title: "Page with Flickable"
+                    flickable: myFlickable
+                }
 
                 Flickable {
+                    id: myFlickable
                     anchors.fill: parent
                     contentHeight: column.height
 
@@ -91,20 +97,12 @@
     example.
 
     The examples above show how to include a single \l Page inside a MainView, but more
-    advanced application structures are possible using \l PageStack and \l Tabs.
+    advanced application structures are possible using \l AdaptivePageLayout.
 */
-MainViewBase {
+Toolkit.MainViewBase {
     id: mainView
 
-    /*!
-      \qmlproperty bool MainView::automaticOrientation
-      \deprecated
-
-      Sets whether the application will be automatically rotating when the
-      device is.
-
-      This property has no significance anymore as the shell rotates.
-    */
+    /*! \deprecated */
     property bool automaticOrientation: false
 
     /*!
@@ -121,28 +119,10 @@
                     UbuntuApplication.inputMethod.keyboardRectangle.height : 0
         }
 
-        // clip the contents so that it does not overlap the header
         Item {
-            id: contentsClipper
+            id: contents
             anchors {
-                left: parent.left
-                right: parent.right
-                top: headerItem.bottom
-                bottom: parent.bottom
-            }
-            // only clip when necessary
-            // ListView headers may be positioned at the top, independent from
-            // flickable.contentY, so do not clip depending on activePage.flickable.contentY.
-            clip: headerItem.bottomY > 0 && internal.activePage && internal.activePage.flickable
-
-            Item {
-                id: contents
-                anchors {
-                    fill: parent
-                    
-                    // compensate so that the actual y is always 0
-                    topMargin: -parent.y
-                }
+                fill: parent
             }
         }
 
@@ -159,6 +139,7 @@
             property real bottomY: headerItem.y + headerItem.height
             dividerColor: Qt.darker(mainView.headerColor, 1.1)
             panelColor: Qt.lighter(mainView.headerColor, 1.1)
+            backgroundColor: mainView.headerColor
 
             title: internal.activePage ? internal.activePage.title : ""
             pageStack: internal.activePage ? internal.activePage.pageStack : null
@@ -179,7 +160,8 @@
             // don't show the application header if the page has its own header.
             visible: !(internal.activePage &&
                        internal.activePage.hasOwnProperty("header") &&
-                       internal.activePage.header)
+                       internal.activePage.header) &&
+                     internal.activePage
 
             height: visible ? implicitHeight : 0
 
@@ -250,12 +232,12 @@
           Used by PageStack. This property only exists in MainView 1.2 and later.
          */
         readonly property bool animateHeader: false
-
-        // FIXME: Currently disabled to prevent bug 1461729
-//        readonly property bool animateHeader: headerItem.__styleInstance &&
-//                                              headerItem.__styleInstance.hasOwnProperty("animateIn") &&
-//                                              headerItem.__styleInstance.hasOwnProperty("animateOut") &&
-//                                              headerItem.__styleInstance.hasOwnProperty("animateInFinished") &&
-//                                              headerItem.__styleInstance.hasOwnProperty("animateOutFinished")
+    }
+
+    backgroundColor: theme.palette.normal.background
+
+    PerformanceOverlay {
+        id: performanceOverlay
+        active: false
     }
 }
 
=== removed file 'src/Ubuntu/Components/1.3/MainViewBase.qml'
--- src/Ubuntu/Components/1.3/MainViewBase.qml	2015-12-08 18:34:40 +0000
+++ src/Ubuntu/Components/1.3/MainViewBase.qml	1970-01-01 00:00:00 +0000
@@ -1,173 +0,0 @@
-/*
- * Copyright 2015 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.4
-import Ubuntu.Components 1.3 as Toolkit
-import Ubuntu.PerformanceMetrics 1.0
-import QtQuick.Window 2.0
-
-/*!
-  \internal
-  \qmlabstract MainViewBase
-  \inqmlmodule Ubuntu.Components 1.3
-  \ingroup ubuntu
-  \brief The base class for MainView and MultiColumnView.
-*/
-Toolkit.PageTreeNode {
-    id: mainView
-    styleName: "MainViewStyle"
-
-    /*!
-      The property holds the application's name, which must be the same as the
-      desktop file's name.
-      The name also sets the name of the QCoreApplication and defaults for data
-      and cache folders that work on the desktop and under confinement, as well as
-      the default gettext domain.
-      C++ code that writes files may use QStandardPaths::writableLocation with
-      QStandardPaths::DataLocation or QStandardPaths::CacheLocation.
-    */
-    property string applicationName: ""
-
-    /*!
-      The property holds if the application should automatically resize the
-      contents when the input method appears
-
-      The default value is false.
-    */
-    property bool anchorToKeyboard: false
-
-    /*!
-      \qmlproperty color MainView::headerColor
-      Color of the header's background.
-
-      \sa backgroundColor, footerColor
-    */
-    property color headerColor: backgroundColor
-
-    /*!
-      \qmlproperty color MainView::backgroundColor
-      Color of the background.
-
-      The background is usually a single color. However if \l headerColor
-      or \l footerColor are set then a gradient of colors will be drawn.
-
-      For example, in order for the MainView to draw a color gradient beneath
-      the content:
-      \qml
-          import QtQuick 2.4
-          import Ubuntu.Components 1.2
-
-          MainView {
-              width: units.gu(40)
-              height: units.gu(60)
-
-              headerColor: "#343C60"
-              backgroundColor: "#6A69A2"
-              footerColor: "#8896D5"
-          }
-      \endqml
-
-      \sa footerColor, headerColor
-    */
-    property color backgroundColor: theme.palette.normal.background
-
-    /*!
-      \qmlproperty color MainView::footerColor
-      Color of the footer's background.
-
-      \sa backgroundColor, headerColor
-    */
-    property color footerColor: backgroundColor
-
-    Toolkit.Object {
-        id: autoTheme
-        // FIXME: Define the background colors in MainViewStyle and get rid of the properties
-        //  in MainViewBase. That removes the need for auto-theming.
-
-        /*
-          As we don't know the order the property bindings and onXXXChanged signals are evaluated
-          we should rely only on one property when changing the theme to avoid intermediate
-          theme changes due to properties being evaluated separately.
-
-          Qt bug: https://bugreports.qt-project.org/browse/QTBUG-11712
-         */
-
-        Connections {
-            target: mainView
-
-            onBackgroundColorChanged: {
-                if (mainView.backgroundColor != theme.palette.normal.background) {
-                    // custom color, proceed with auto-theming
-                    autoTheme.themeName = (ColorUtils.luminance(backgroundColor) >= 0.85) ?
-                                "Ambiance" : "SuruDark";
-                }
-            }
-        }
-
-        property string themeName
-        onThemeNameChanged: {
-            // only change the theme if the current one is a system one.
-            if (themeName !== "" && (theme.name.search("Ubuntu.Components.Themes") == 0)) {
-                mainView.theme.name = "Ubuntu.Components.Themes.%1".arg(themeName);
-            }
-        }
-    }
-
-    /*!
-      \qmlproperty bool MainViewBase::active
-      Root views are active by default.
-    */
-    active: true
-
-    /*!
-      \qmlproperty list<Action> MainViewBase::actions
-      A global list of actions that will be available to the system (including HUD)
-      as long as the application is running. For actions that are not always available to the
-      system, but only when a certain \l Page is active, see the actions property of \l Page.
-    */
-    property alias actions: unityActionManager.actions
-
-    /*!
-      \qmlproperty ActionManager MainView::actionManager
-      \readonly
-
-      The ActionManager that supervises the global and local ActionContexts.
-      The \l actions property should be used preferably since it covers most
-      use cases. The ActionManager is accessible to have a more refined control
-      over the actions, e.g. if one wants to add/remove actions dynamically, create
-      specific action contexts, etc.
-    */
-    property alias actionManager: unityActionManager
-    Toolkit.ActionManager {
-        id: unityActionManager
-        onQuit: {
-            // FIXME Wire this up to the application lifecycle management API instead of quit().
-            Qt.quit()
-        }
-    }
-
-    onApplicationNameChanged: {
-        if (applicationName !== "") {
-            i18n.domain = applicationName;
-            UbuntuApplication.applicationName = applicationName
-        }
-    }
-
-    PerformanceOverlay {
-        id: performanceOverlay
-        active: false
-    }
-}
 
=== modified file 'src/Ubuntu/Components/1.3/OptionSelector.qml'
--- src/Ubuntu/Components/1.3/OptionSelector.qml	2015-09-28 14:36:54 +0000
+++ src/Ubuntu/Components/1.3/OptionSelector.qml	2016-03-08 06:42:31 +0000
@@ -216,7 +216,7 @@
 
             readonly property url chevron: __styleInstance.chevron
             readonly property url tick: __styleInstance.tick
-            readonly property color themeColour: theme.palette.selected.fieldText
+            readonly property color themeColour: theme.palette.normal.backgroundText
             readonly property alias colourImage: optionSelector.colourImage
             property bool currentlyExpanded: expanded || multiSelection
 
@@ -264,6 +264,7 @@
 
             ListView {
                 id: list
+                parent: listContainer.__styleInstance.content
 
                 property int previousIndex: -1
                 readonly property alias expanded: optionSelector.expanded
 
=== modified file 'src/Ubuntu/Components/1.3/Page.qml'
--- src/Ubuntu/Components/1.3/Page.qml	2015-12-08 18:34:40 +0000
+++ src/Ubuntu/Components/1.3/Page.qml	2016-03-08 06:42:31 +0000
@@ -15,61 +15,62 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.3 as Toolkit13
+import Ubuntu.Components 1.3
 import "pageUtils.js" as Utils
 
 /*!
     \qmltype Page
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components 1.3
+    \inherits StyledItem
     \ingroup ubuntu
-    \brief A page is the basic Item that must be used inside the \l MainView,
-        \l PageStack and \l Tabs.
+    \brief A page is the basic Item that represents a single view in
+        an Ubuntu application. It is recommended to use the Page inside
+        the \l MainView or \l AdaptivePageLayout.
+
+        \l MainView provides a header for Pages it includes if no
+        \l header property was set. However, the application header is deprecated
+        and it is recommended to set the \l header property instead.
+
         Anchors and height of a Page are automatically determined to align with
         the header of the \l MainView, but can be overridden.
-
-
-    \l MainView provides a header for Pages it includes if no
-    \l header property was set.
-    The text and actions of the header are determined by the \l title
-    and \l head properties of the page:
-
-    \qml
-        import QtQuick 2.4
-        import Ubuntu.Components 1.2
-
-        MainView {
-            width: units.gu(48)
-            height: units.gu(60)
-
-            Page {
-                title: i18n.tr("Example page")
-
-                Label {
-                    anchors.centerIn: parent
-                    text: i18n.tr("Hello world!")
+        Page contents does not automatically leave space for the Page \l header,
+        so this must be taken into account when anchoring the contents of the Page.
+
+        Example:
+        \qml
+            import QtQuick 2.4
+            import Ubuntu.Components 1.3
+
+            MainView {
+                width: units.gu(48)
+                height: units.gu(60)
+
+                Page {
+                    header: PageHeader {
+                        id: pageHeader
+                        title: i18n.tr("Example page")
+
+                        trailingActionBar.actions: [
+                            Action {
+                                iconName: "search"
+                                text: i18n.tr("Search")
+                            }
+                        ]
+                    }
+
+                    Label {
+                        anchors {
+                            horizontalCenter: parent.horizontalCenter
+                            top: pageHeader.bottom
+                            topMargin: units.gu(5)
+                        }
+                        text: i18n.tr("Hello world!")
+                    }
                 }
-
-                head.actions: [
-                    Action {
-                        iconName: "search"
-                        text: i18n.tr("Search")
-                    },
-                    Action {
-                        iconName: "contacts"
-                        text: i18n.tr("Contacts")
-                    }
-                ]
             }
-        }
-    \endqml
-
-    The Page automatically anchors to the left and bottom of its parent. The width of the Page
-    will be the full width of its parent \l MainView or \l PageStack or \l Tab,
-    and the height will adapt to leave space for the header when needed. It is possible to
-    use a Page inside a Loader, but in that case do not set the anchors or size of the Loader
-    so that the Page can control its width and height.
+        \endqml
 */
-Toolkit13.PageTreeNode {
+PageTreeNode {
     id: page
     anchors {
         left: parent ? parent.left : undefined
@@ -78,25 +79,47 @@
     // Set width and height so that a parent Loader can be automatically resized
     // to the size of the loaded Page.
     width: parentNode ? parentNode.width - page.x : undefined
+    // FIXME: We no longer need to take the internal header height into account
+    //  when we remove MainView's AppHeader.
     height: parentNode ? page.flickable ? parentNode.height : parentNode.height - internal.headerHeight : undefined
 
     /*!
+      \qmlproperty ActrionContext Page::actionContext
+      \readonly
+      \since Ubuntu.Components 1.3
+      The action context of the page.
+      */
+    readonly property alias actionContext: localContext
+    ActionContext {
+        id: localContext
+        active: page.active
+        objectName: page.objectName + "Context"
+    }
+
+    /*!
+      \since Ubuntu.Components 1.3
       The header property for this page. Setting this property will reparent the
       header to the page and disable the \l MainView's application header.
       \qml
         Page {
             id: page
-            title: "Page with header"
             header: PageHeader {
-                title: page.title
+                title: "Page with header"
                 trailingActionBar.actions: [
                     Action { iconName: "settings" },
                     Action { iconName: "info" }
                 ]
+                flickable: myFlickable
             }
         }
       \endqml
-      \sa PageHeader
+      To avoid Page content being occluded by the header, the contents of the Page
+      should anchor to the bottom of the header. When the Page contents is flickable,
+      the contents does not need to be anchored to the header, but it is recommended
+      to use a \l PageHeader or \l Header component as the Page header, and set its
+      \l Header::flickable property so that the Flickable gets a top-margin that
+      leaves enough space for the header.
+      \sa PageHeader, Header
      */
     property Item header
     onHeaderChanged: internal.updateHeader()
@@ -105,70 +128,43 @@
     /*! \internal */
     isLeaf: true
 
-    /*!
-      The title of the page. Will be shown in the header of the \l MainView.
-      If the page is used inside a \l Tab, the default title is the \l Tab title.
-      For a Page not inside a \l Tab, the default title is an empty string.
-     */
+    /*! \deprecated */
     property string title: parentNode && parentNode.hasOwnProperty("title") ? parentNode.title : ""
-
-    /*!
-      Optional flickable that controls the MainView header. This property
-      is automatically set to the first child of the page that is Flickable
-      and anchors to the top of the page or fills the page. For example:
-      \qml
-          import QtQuick 2.4
-          import Ubuntu.Components 1.2
-
-          MainView {
-              width: units.gu(30)
-              height: units.gu(50)
-              Page {
-                  id: page
-                  title: "example"
-                  //flickable: null // uncomment for a fixed header
-                  Flickable {
-                      id: content
-                      anchors.fill: parent
-                      contentHeight: units.gu(70)
-                      Label {
-                          text: "hello"
-                          anchors.centerIn: parent
-                      }
-                  }
-              }
-          }
-      \endqml
-      In this example, page.flickable will automatically be set to content because it is
-      a Flickable and it fills its parent. Thus, scrolling down in the Flickable will automatically
-      hide the header.
-
-      Set this property to null to avoid automatic flickable detection, which disables hiding
-      of the header by scrolling in the Flickable. In cases where a flickable should control the header,
-      but it is not automatically detected, the flickable property can be set.
-     */
+    /*! \deprecated */
     property Flickable flickable: Utils.getFlickableChild(page)
-
-    /*!
-      \qmlproperty PageHeadConfiguration Page::head
-      \readonly
-      \deprecated
-      Configuration of the header for this page.
-      Deprecated: This configuration will be replaced by setting the \l header property.
-     */
+    /*! \deprecated */
     readonly property alias head: headerConfig
-    Toolkit13.PageHeadConfiguration {
+    PageHeadConfiguration {
         id: headerConfig
         title: page.title
         flickable: page.flickable
+        onFlickableChanged: internal.printDeprecationWarning()
+        onTitleChanged: internal.printDeprecationWarning()
+        onActionsChanged: internal.printDeprecationWarning()
+        onBackActionChanged: internal.printDeprecationWarning()
     }
 
-    Toolkit13.Object {
+    Object {
         id: internal
 
+        property bool showDeprecationWarning: true
+        function printDeprecationWarning() {
+            if (internal.showDeprecationWarning) {
+                var titleStr = page;
+                if (page.title) {
+                    titleStr += "\"" + page.title + "\"";
+                }
+                titleStr += ": "
+                print(titleStr + "In Ubuntu.Components 1.3, the use of Page.title, Page.flickable and" +
+                      " Page.head is deprecated. Use Page.header and the PageHeader component instead.");
+                internal.showDeprecationWarning = false;
+            }
+        }
+
         property Item previousHeader: null
         property Item previousHeaderParent: null
         function updateHeader() {
+            internal.showDeprecationWarning = false;
             if (internal.previousHeader) {
                 internal.previousHeader.parent = internal.previousHeaderParent;
             }
 
=== modified file 'src/Ubuntu/Components/1.3/PageHeadConfiguration.qml'
--- src/Ubuntu/Components/1.3/PageHeadConfiguration.qml	2015-10-01 12:54:32 +0000
+++ src/Ubuntu/Components/1.3/PageHeadConfiguration.qml	2016-03-08 06:42:31 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * Copyright 2016 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -50,7 +50,7 @@
     PageHeadSections {
         id: headSections
     }
-    property color foregroundColor: theme.palette.selected.backgroundText
+    property color foregroundColor: theme.palette.normal.backgroundText
 
     property bool locked: false
 
 
=== modified file 'src/Ubuntu/Components/1.3/PageHeader.qml'
--- src/Ubuntu/Components/1.3/PageHeader.qml	2015-12-15 14:20:33 +0000
+++ src/Ubuntu/Components/1.3/PageHeader.qml	2016-03-08 06:42:31 +0000
@@ -32,10 +32,13 @@
             StyleHints {
                 foregroundColor: UbuntuColors.orange
                 backgroundColor: "black"
-                dividerColor: UbuntuColors.darkGrey
+                dividerColor: UbuntuColors.slate
             }
         }
     \endqml
+
+    See \l Header properties that are inherited by PageHeader to control
+    the visibility of the header.
 */
 Header {
     id: header
 
=== modified file 'src/Ubuntu/Components/1.3/PageStack.qml'
--- src/Ubuntu/Components/1.3/PageStack.qml	2015-10-21 19:28:41 +0000
+++ src/Ubuntu/Components/1.3/PageStack.qml	2016-03-08 06:42:31 +0000
@@ -17,6 +17,7 @@
 import QtQuick 2.4
 import "../1.2/stack.js" as Stack
 import Ubuntu.Components 1.3
+import Ubuntu.Components.Private 1.3
 
 /*!
     \qmltype PageStack
@@ -224,6 +225,13 @@
         objectName: "pagestack_back_action"
     }
 
+
+    Component {
+        id: pageWrapperComponent
+        PageWrapper{
+        }
+    }
+
     QtObject {
         id: internal
         property Item headStyle: (pageStack.__propagated
@@ -282,8 +290,7 @@
         property var stack: new Stack.Stack()
 
         function createWrapper(page, properties) {
-            var wrapperComponent = Qt.createComponent("PageWrapper.qml");
-            var wrapperObject = wrapperComponent.createObject(pageStack);
+            var wrapperObject = pageWrapperComponent.createObject(pageStack);
             wrapperObject.pageStack = pageStack;
             wrapperObject.properties = properties;
             // set reference last because it will trigger creation of the object
 
=== removed file 'src/Ubuntu/Components/1.3/PageWrapper.qml'
--- src/Ubuntu/Components/1.3/PageWrapper.qml	2015-12-08 18:34:40 +0000
+++ src/Ubuntu/Components/1.3/PageWrapper.qml	1970-01-01 00:00:00 +0000
@@ -1,160 +0,0 @@
-/*
- * Copyright 2015 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.4
-import Ubuntu.Components 1.3 as Toolkit
-import "PageWrapperUtils.js" as Utils
-
-/*!
-    \internal
-    \qmltype PageWrapper
-    \inqmlmodule Ubuntu.Components 1.1
-    \ingroup ubuntu
-    \brief Internal class used by \l PageStack
-*/
-Toolkit.PageTreeNode {
-    id: pageWrapper
-    anchors.fill: parent
-
-    /*!
-      The reference to the page object. This can be the page
-      itself (which is an Item), but also a url pointing to a QML file.
-     */
-    property var reference
-
-    /*!
-      The initialized page object, or null if the object needs to be created.
-     */
-    property Item object: null
-
-    /*!
-      This variable will be true if \l object holds an object that was created
-      from the given reference, and thus can be destroyed when no the page is deactivated.
-     */
-    property bool canDestroy: false
-
-    /*!
-      Column number in AdaptivePageLayout.
-      */
-    property int column: 0
-
-    /*!
-      Parent page.
-      */
-    property Item parentPage
-
-    /*!
-      Parent PageWrapper or the parentPage.
-      */
-    property Item parentWrapper
-
-    /*!
-      Page holder in AdaptivePageLayout.
-      */
-    property Item pageHolder
-
-    /*!
-      Instructs to load the page synchronously or not. Used by AdaptivePageLayout.
-      True by default to keep PageStack integrity.
-      */
-    property bool synchronous: true
-
-    /*!
-      Incubator for the asynchronous page creation
-      */
-    property var incubator: null
-
-    /*!
-      Signal emitted when incubator completes page loading.
-      */
-    signal pageLoaded()
-
-    /*!
-      Returns true if the current PageWrapper is a child of the given page
-      */
-    function childOf(page) {
-        if (parentPage == page) return true;
-        if (page && parentWrapper) {
-            var wrapper = parentWrapper;
-            while (wrapper) {
-                if (wrapper.object == page) {
-                    return true;
-                }
-                wrapper = wrapper.parentWrapper;
-            }
-        }
-        return false;
-    }
-
-    /*!
-      This value is updated when a PageWrapper is pushed to/popped from a PageStack.
-     */
-    active: false
-
-    /*!
-      \internal
-     */
-    onActiveChanged: {
-        if (reference) {
-            if (pageWrapper.active) Utils.activate(pageWrapper);
-            else Utils.deactivate(pageWrapper);
-        }
-    }
-
-    visible: active
-
-    /*!
-      Properties are use to initialize a new object, or if reference
-      is already an object, properties are copied to the object when activated.
-      Set properties before setting the reference.
-     */
-    property var properties
-
-    /*!
-      \internal
-      */
-    onReferenceChanged: {
-        Utils.deactivate(pageWrapper);
-        if (pageWrapper.object) pageWrapper.object = null;
-        Utils.initPage(pageWrapper);
-        if (pageWrapper.active && reference) {
-            if ((pageWrapper.incubator && pageWrapper.incubator.status == Component.Ready) || pageWrapper.object) {
-                Utils.activate(pageWrapper);
-            } else {
-                // asynchronous, connect page activation
-                pageLoaded.connect(function () {
-                    Utils.activate(pageWrapper);
-                });
-            }
-        }
-    }
-
-    /*!
-      \internal
-     */
-    Component.onDestruction: {
-        Utils.deactivate(pageWrapper);
-        if (pageWrapper.canDestroy) Utils.destroyObject(pageWrapper);
-    }
-
-    /*!
-      \internal
-      Destroy \l object. Only call this function if \l canDestroy
-     */
-    function destroyObject() {
-        Utils.destroyObject(pageWrapper);
-    }
-}
 
=== removed file 'src/Ubuntu/Components/1.3/PageWrapperUtils.js'
--- src/Ubuntu/Components/1.3/PageWrapperUtils.js	2015-10-16 09:18:03 +0000
+++ src/Ubuntu/Components/1.3/PageWrapperUtils.js	1970-01-01 00:00:00 +0000
@@ -1,202 +0,0 @@
-/*
- * Copyright 2015 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*!
-  \qmltype PageWrapperUtils
-  \inqmlmodule Ubuntu.Components 1.3
-  \ingroup ubuntu
-  \internal
-  \brief Internal book-keeping used by AdaptivePageLayout.
- */
-
-//.pragma library // FIXME: cannot refer to Component.Error if I use this.
-// FIXME: ideally we would make this a stateless library, but that breaks applications
-//  that rely on accessing context variables in pages that were pushed on a PageStack
-//  by url (PageStack.push("FileName.qml")) because of a Qt bug:
-//  https://bugreports.qt-project.org/browse/QTBUG-31347
-
-/*!
-  \internal
-  \qmlmethod PageWrapperUtils::Incubator(pageWrapper, pageComponent)
-  Incubator wrapper object. Used when page is loaded asynchronously.
-  */
-
-function Incubator(pageWrapper, pageComponent) {
-    // private variable for QmlIncubatorObject
-    var incubator = null;
-
-    // public API
-    this.status = Component.Ready;
-    this.object = null;
-    this.onStatusChanged = null;
-    this.forceCompletion = function () {
-        if (incubator) {
-            incubator.forceCompletion();
-        }
-    }
-
-    // internal function to catch status changes
-    function incubatorStatusChanged(status) {
-        // update wrapper incubator fields
-        pageWrapper.incubator.status = status;
-        pageWrapper.incubator.object = pageWrapper.object = incubator.object;
-
-        // forward state change to the user
-        if (pageWrapper.incubator.onStatusChanged) {
-            // call onStatusChanged
-            pageWrapper.incubator.onStatusChanged(status);
-        }
-
-        // emit pageWrapper's pageLoaded signal to complete page activation
-        if (status === Component.Ready) {
-            pageWrapper.pageLoaded();
-        }
-
-        // cleanup of ready or error
-        if (status !== Component.Loading) {
-            pageWrapper.incubator = null;
-        }
-    }
-
-    function incubatePage() {
-        if (pageComponent.status == Component.Loading) {
-            return;
-        }
-
-        if (pageWrapper.properties) {
-            incubator = pageComponent.incubateObject(pageWrapper, pageWrapper.properties);
-        } else {
-            incubator = pageComponent.incubateObject(pageWrapper);
-        }
-
-        if (!incubator) {
-            throw new Error("Error while loading page: " + pageComponent.errorString());
-        } else if (incubator.status != Component.Ready) {
-            pageWrapper.incubator.status = incubator.status;
-            incubator.onStatusChanged = incubatorStatusChanged;
-        } else {
-            incubatorStatusChanged(incubator.status);
-        }
-    }
-
-    // main
-    pageWrapper.incubator = this;
-    if (pageComponent.status == Component.Loading) {
-        pageComponent.statusChanged.connect(incubatePage);
-        this.status = Component.Loading;
-    }
-    incubatePage();
-}
-
-/*******************************************************
- *
- */
-/*!
-  \internal
-  \qmlmethod PageWrapperUtils::initPage(pageWrapper)
-  Initialize pageWrapper.object.
- */
-function initPage(pageWrapper) {
-    var pageComponent;
-
-    if (pageWrapper.reference.createObject) {
-        // page reference is a component
-        pageComponent = pageWrapper.reference;
-    } else if (typeof pageWrapper.reference == "string") {
-        // page reference is a string (url)
-        if (pageWrapper.synchronous) {
-            pageComponent = Qt.createComponent(pageWrapper.reference);
-        } else {
-            pageComponent = Qt.createComponent(pageWrapper.reference, Component.Asynchronous);
-        }
-    }
-
-    if (pageComponent) {
-        if (pageComponent.status === Component.Error) {
-            throw new Error("Error while loading page: " + pageComponent.errorString());
-        } else {
-            // create the object
-            if (pageWrapper.synchronous) {
-                if (pageWrapper.properties) {
-                    // initialize the object with the given properties
-                    pageWrapper.object = pageComponent.createObject(pageWrapper, pageWrapper.properties);
-                } else {
-                    pageWrapper.object = pageComponent.createObject(pageWrapper);
-                }
-            } else {
-                pageWrapper.incubator = new Incubator(pageWrapper, pageComponent);
-            }
-            pageWrapper.canDestroy = true;
-        }
-    } else {
-        // page reference is an object
-        pageWrapper.object = pageWrapper.reference;
-        pageWrapper.object.parent = pageWrapper;
-        pageWrapper.canDestroy = false;
-
-        // copy the properties to the page object
-        for (var prop in pageWrapper.properties) {
-            if (pageWrapper.properties.hasOwnProperty(prop)) {
-                pageWrapper.object[prop] = pageWrapper.properties[prop];
-            }
-        }
-    }
-
-    return pageWrapper.object;
-}
-
-/*!
-  \internal
-  \qmlmethod PageWrapperUtils::activate(pageWrapper)
-  Create the page object if needed, and make the page object visible.
- */
-function activate(pageWrapper) {
-    if (!pageWrapper.object) {
-        initPage(pageWrapper);
-    }
-
-    // Having the same page pushed multiple times on a stack changes
-    // the parent of the page object. Change it back here.
-    pageWrapper.object.parent = pageWrapper;
-
-    // Some page objects are invisible initially. Make visible.
-
-    pageWrapper.object.visible = true;
-    pageWrapper.active = true;
-}
-
-/*!
-  \internal
-  \qmlmethod PageWrapperUtils::deactivate(pageWrapper)
-  Hide page object.
- */
-function deactivate(pageWrapper) {
-    pageWrapper.active = false;
-}
-
-/*!
-  \internal
-  \qmlmethod PageWrapperUtils::destroyObject(pageWrapper)
-  Destroy the page object if pageWrapper.canDestroy is true.
-  Do nothing if pageWrapper.canDestroy is false.
- */
-function destroyObject(pageWrapper) {
-    if (pageWrapper.canDestroy) {
-        pageWrapper.object.destroy();
-        pageWrapper.object = null;
-        pageWrapper.canDestroy = false;
-    }
-}
 
=== modified file 'src/Ubuntu/Components/1.3/Panel.qml'
--- src/Ubuntu/Components/1.3/Panel.qml	2015-04-25 08:54:58 +0000
+++ src/Ubuntu/Components/1.3/Panel.qml	2016-03-08 06:42:31 +0000
@@ -321,7 +321,7 @@
             name: "moving"
             PropertyChanges {
                 target: bar
-                position: MathUtils.clamp(draggingArea.mousePosition - internal.movingDelta, 0, bar.size)
+                position: Toolkit.MathUtils.clamp(draggingArea.mousePosition - internal.movingDelta, 0, bar.size)
             }
         },
         State {
 
=== modified file 'src/Ubuntu/Components/1.3/ScrollView.qml'
--- src/Ubuntu/Components/1.3/ScrollView.qml	2015-12-16 15:01:29 +0000
+++ src/Ubuntu/Components/1.3/ScrollView.qml	2016-03-08 06:42:31 +0000
@@ -99,45 +99,45 @@
     Keys.enabled: true
     Keys.onLeftPressed: {
         if (horizontalScrollbar.__styleInstance !== null) {
-            horizontalScrollbar.__styleInstance.scroll(-flickableItem.width*internal.shortScrollingRatio)
+            horizontalScrollbar.__styleInstance.scrollBy(-flickableItem.width*internal.shortScrollingRatio, true)
         }
     }
     Keys.onRightPressed: {
         if (horizontalScrollbar.__styleInstance !== null) {
-            horizontalScrollbar.__styleInstance.scroll(flickableItem.width*internal.shortScrollingRatio)
+            horizontalScrollbar.__styleInstance.scrollBy(flickableItem.width*internal.shortScrollingRatio, true)
         }
     }
     Keys.onDownPressed: {
         if (verticalScrollbar.__styleInstance !== null) {
-            verticalScrollbar.__styleInstance.scroll(flickableItem.height*internal.shortScrollingRatio)
+            verticalScrollbar.__styleInstance.scrollBy(flickableItem.height*internal.shortScrollingRatio, true)
         }
     }
     Keys.onUpPressed: {
         if (verticalScrollbar.__styleInstance !== null) {
-            verticalScrollbar.__styleInstance.scroll(-flickableItem.height*internal.shortScrollingRatio)
+            verticalScrollbar.__styleInstance.scrollBy(-flickableItem.height*internal.shortScrollingRatio, true)
         }
     }
     Keys.onPressed:  {
         if (event.key == Qt.Key_Escape) {
-            var scrollbarWithActiveDrag = (horizontalScrollbar.__styleInstance && horizontalScrollbar.__styleInstance.draggingThumb)
-                    || (verticalScrollbar.__styleInstance && verticalScrollbar.__styleInstance.draggingThumb)
+            var scrollbarWithActiveDrag = (horizontalScrollbar.__styleInstance && horizontalScrollbar.__styleInstance.draggingThumb && horizontalScrollbar)
+                    || (verticalScrollbar.__styleInstance && verticalScrollbar.__styleInstance.draggingThumb && verticalScrollbar)
                     || null
             if (scrollbarWithActiveDrag !== null) {
                 scrollbarWithActiveDrag.__styleInstance.resetScrollingToPreDrag()
+                event.accepted = true
             }
-            event.accepted = true
         } else if (verticalScrollbar.__styleInstance !== null) {
             if (event.key == Qt.Key_PageDown) {
-                verticalScrollbar.__styleInstance.scroll(flickableItem.height*internal.longScrollingRatio)
+                verticalScrollbar.__styleInstance.scrollBy(flickableItem.height*internal.longScrollingRatio, true)
                 event.accepted = true
             } else if (event.key == Qt.Key_PageUp) {
-                verticalScrollbar.__styleInstance.scroll(-flickableItem.height*internal.longScrollingRatio)
+                verticalScrollbar.__styleInstance.scrollBy(-flickableItem.height*internal.longScrollingRatio, true)
                 event.accepted = true
             } else if (event.key == Qt.Key_Home) {
-                verticalScrollbar.__styleInstance.scrollToBeginning()
+                verticalScrollbar.__styleInstance.scrollToBeginning(true)
                 event.accepted = true
             } else if (event.key == Qt.Key_End) {
-                verticalScrollbar.__styleInstance.scrollToEnd()
+                verticalScrollbar.__styleInstance.scrollToEnd(true)
                 event.accepted = true
             }
         }
 
=== modified file 'src/Ubuntu/Components/1.3/Scrollbar.qml'
--- src/Ubuntu/Components/1.3/Scrollbar.qml	2015-12-08 10:58:38 +0000
+++ src/Ubuntu/Components/1.3/Scrollbar.qml	2016-03-08 06:42:31 +0000
@@ -112,11 +112,13 @@
       simulate the system setting (which will be implemented in unity8, I guess)
       True --> Steppers style, non-overlay scrollbars
       False --> Indicator and Trough styles
+      CURRENTLY UNUSED
     */
     property bool __alwaysOnScrollbars: false
 
     /*! internal
       Used by ScrollView to tweak Scrollbar's anchoring logic for the always-on scrollbars.
+      CURRENTLY UNUSED
     */
     property Item __viewport: null
 
 
=== modified file 'src/Ubuntu/Components/1.3/Sections.qml'
--- src/Ubuntu/Components/1.3/Sections.qml	2015-12-08 21:38:59 +0000
+++ src/Ubuntu/Components/1.3/Sections.qml	2016-03-08 06:42:31 +0000
@@ -80,10 +80,6 @@
      */
     property var model: actions
     onModelChanged: {
-        if (model && model.length > 3) {
-            // FIXME: Make the Sections scrollable for more than 3 sections.
-            console.warn("It is not YET recommended or supported to use more than three sections.");
-        }
         if (internal.done) {
             if (!model || model.length === 0) {
                 selectedIndex = -1;
 
=== modified file 'src/Ubuntu/Components/1.3/Slider.qml'
--- src/Ubuntu/Components/1.3/Slider.qml	2015-11-18 15:07:15 +0000
+++ src/Ubuntu/Components/1.3/Slider.qml	2016-03-08 06:42:31 +0000
@@ -63,11 +63,11 @@
 
     // FIXME(loicm) Add Support for the stepSize property.
 
-    // /*!
-    //    The distance between two selectable values in the range defined by
-    //    [minimumValue, maximumValue].
-    // */
-    // property real stepSize: 1.0
+    /*!
+       The distance between two selectable values in the range defined by
+       [minimumValue, maximumValue].
+    */
+    property real stepSize: (Math.abs(minimumValue) + Math.abs(maximumValue)) / 100.0
 
     /*!
        The current value of the slider. This property is not changed while the
@@ -175,6 +175,12 @@
             }
         }
 
+        function adjustValue(increment) {
+            if (Qt.application.layoutDirection == Qt.RightToLeft)
+                increment *= -1;
+            slider.value = Toolkit.MathUtils.clamp(slider.value + increment, slider.minimumValue, slider.maximumValue);
+        }
+
         /* Mimic the behaviour of the 'pressed' property with one important difference:
            'pressed' is set to true only after the onPressed handler has been executed.
            That prevents us from doing interesting animations upon press.
@@ -206,5 +212,14 @@
         onLiveValueChanged: if (isPressed) slider.requestFocus(Qt.MouseFocusReason)
     }
 
+    Keys.onLeftPressed: {
+        if (event.modifiers === Qt.NoModifier)
+            __internals.adjustValue(-slider.stepSize);
+    }
+    Keys.onRightPressed: {
+        if (event.modifiers === Qt.NoModifier)
+            __internals.adjustValue(slider.stepSize);
+    }
+
     styleName: "SliderStyle"
 }
 
=== modified file 'src/Ubuntu/Components/1.3/TextArea.qml'
--- src/Ubuntu/Components/1.3/TextArea.qml	2015-12-14 15:15:46 +0000
+++ src/Ubuntu/Components/1.3/TextArea.qml	2016-03-08 06:42:31 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * Copyright 2015-2016 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -757,7 +757,6 @@
 
     //internals
 
-    opacity: enabled ? 1.0 : 0.3
     activeFocusOnPress: true
     activeFocusOnTab: true
 
@@ -768,7 +767,13 @@
     }
 
     // Escape should close the context menu even if the menu takes no input focus
-    Keys.onEscapePressed: if (activeFocus && inputHandler.popover) PopupUtils.close(inputHandler.popover)
+    Keys.onEscapePressed: {
+        if (activeFocus && inputHandler.popover) {
+            PopupUtils.close(inputHandler.popover)
+        } else {
+            event.accepted = false
+        }
+    }
 
     LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft
     LayoutMirroring.childrenInherit: true
@@ -827,7 +832,7 @@
         }
         // hint is shown till user types something in the field
         visible: (editor.text == "") && !editor.inputMethodComposing
-        color: theme.palette.normal.backgroundText
+        color: theme.palette.normal.base
         font: editor.font
         elide: Text.ElideRight
         wrapMode: Text.WordWrap
 
=== modified file 'src/Ubuntu/Components/1.3/TextField.qml'
--- src/Ubuntu/Components/1.3/TextField.qml	2015-12-22 09:56:19 +0000
+++ src/Ubuntu/Components/1.3/TextField.qml	2016-03-08 06:42:31 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * Copyright 2015-2016 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -833,7 +833,6 @@
 
     // internals
 
-    opacity: enabled ? 1.0 : 0.3
     activeFocusOnPress: true
     activeFocusOnTab: true
 
@@ -844,7 +843,13 @@
     }
 
     // Escape should close the context menu even if the menu takes no input focus
-    Keys.onEscapePressed: if (activeFocus && inputHandler.popover) PopupUtils.close(inputHandler.popover)
+    Keys.onEscapePressed: {
+        if (activeFocus && inputHandler.popover) {
+            PopupUtils.close(inputHandler.popover)
+        } else {
+            event.accepted = false
+        }
+    }
 
     LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft
     LayoutMirroring.childrenInherit: true
@@ -897,10 +902,13 @@
         onChildrenChanged: {
             // reparenting
             for (var i = 0; i < children.length; i++) {
-                children[i].parent = leftPane;
-                children[i].anchors.verticalCenter = verticalCenter;
-                children[i].activeFocusOnPress = false;
-                children[i].activeFocusOnTab = false;
+                var child = children[i];
+                child.parent = leftPane;
+                child.anchors.verticalCenter = verticalCenter;
+                if (child.hasOwnProperty("activeFocusOnPress")) {
+                    child.activeFocusOnPress = false;
+                }
+                child.activeFocusOnTab = false;
             }
         }
     }
@@ -921,10 +929,13 @@
         onChildrenChanged: {
             // reparenting
             for (var i = 0; i < children.length; i++) {
-                children[i].parent = rightPane;
-                children[i].anchors.verticalCenter = verticalCenter;
-                children[i].activeFocusOnPress = false;
-                children[i].activeFocusOnTab = false;
+                var child = children[i];
+                child.parent = rightPane;
+                child.anchors.verticalCenter = verticalCenter;
+                if (child.hasOwnProperty("activeFocusOnPress")) {
+                    child.activeFocusOnPress = false;
+                }
+                child.activeFocusOnTab = false;
             }
         }
     }
@@ -977,7 +988,7 @@
         }
         // hint is shown till user types something in the field
         visible: (editor.text == "") && !editor.inputMethodComposing
-        color: theme.palette.normal.backgroundText
+        color: theme.palette.normal.baseText
         font: editor.font
         elide: Text.ElideRight
     }
 
=== modified file 'src/Ubuntu/Components/1.3/Toolbar.qml'
--- src/Ubuntu/Components/1.3/Toolbar.qml	2015-12-15 15:08:49 +0000
+++ src/Ubuntu/Components/1.3/Toolbar.qml	2016-03-08 06:42:31 +0000
@@ -35,7 +35,7 @@
                 width: label.width + units.gu(4)
                 height: parent.height
                 Rectangle {
-                    color: UbuntuColors.darkGrey
+                    color: UbuntuColors.slate
                     opacity: 0.1
                     anchors.fill: parent
                     visible: button.pressed
 
=== modified file 'src/Ubuntu/Components/1.3/UbuntuColors.qml'
--- src/Ubuntu/Components/1.3/UbuntuColors.qml	2015-04-25 08:54:58 +0000
+++ src/Ubuntu/Components/1.3/UbuntuColors.qml	2016-03-08 06:42:31 +0000
@@ -1,5 +1,5 @@
 /*
-    Copyright 2014 Canonical Ltd.
+    Copyright 2016 Canonical Ltd.
  *
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU Lesser General Public License as published by
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype UbuntuColors
-    \inqmlmodule Ubuntu.Components 1.1
+    \inqmlmodule Ubuntu.Components 1.3
     \ingroup ubuntu
     \brief Singleton defining the Ubuntu color palette.
 
@@ -37,13 +37,10 @@
     \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 colors
+      ---------------------------------------------------------------*/
     /*!
       \deprecated
       Ubuntu supporting color: light aubergine
@@ -72,7 +69,7 @@
 
     /*!
       Ubuntu orange gradient
-
+      \deprecated
       \sa Button::gradient
     */
     property Gradient orangeGradient: Gradient {
@@ -81,7 +78,7 @@
     }
     /*!
       Ubuntu grey gradient
-
+      \deprecated
       \sa Button::gradient
     */
     property Gradient greyGradient: Gradient {
@@ -89,39 +86,61 @@
         GradientStop { position: 1.0; color: "#BBBBBB" }
     }
 
-    // New colors introduced in UbuntuColors 1.1:
+    /*---------------------------------------------------------------
+      Supported colors
+      ---------------------------------------------------------------*/
+    /*!
+      Orange. Recommended for branded elements, display progress
+      and intensity, textual links on light backgrounds.
+    */
+    readonly property color orange: "#E95420"
 
     /*!
+      \deprecated
       Light grey. Recommended for neutral action buttons and
       secondary text.
       \since Ubuntu.Components 1.1
      */
-    readonly property color lightGrey: "#929292"
-
-    /*!
+    readonly property color lightGrey: "#cdcdcd"
+
+    /*!
+      Silk. Recommended for neutral action buttons and
+      secondary text.
+      \since Ubuntu.Components 1.3
+     */
+    readonly property color silk: "#cdcdcd"
+
+    /*!
+      \deprecated
       Dark grey. Recommended for text and action icons.
       \since Ubuntu.Components 1.1
      */
     readonly property color darkGrey: "#5d5d5d"
 
     /*!
+      Slate. Recommended for text and action icons.
+      \since Ubuntu.Components 1.3
+     */
+    readonly property color slate: "#5d5d5d"
+
+    /*!
       Red. Recommended for negative and irreversible action
       buttons, errors and alerts.
       \since Ubuntu.Components 1.1
      */
-    readonly property color red: "#f32c36"
+    readonly property color red: "#ed3146"
 
     /*!
       Green. Recommended for positive action buttons.
       \since Ubuntu.Components 1.1
      */
-    readonly property color green: "#00a132"
+    readonly property color green: "#3eb34f"
 
     /*!
       Blue. Recommended for text selection and text cursor.
       \since Ubuntu.Components 1.1
      */
-    readonly property color blue: "#12a3d8"
+    readonly property color blue: "#19b6ee"
 
     /*!
       Purple. Recommended for proper nouns in
@@ -129,4 +148,34 @@
       \since Ubuntu.Components 1.1
      */
     readonly property color purple: "#762572"
+
+    /*!
+      Porcelain. Recommended for foregrounds.
+      \since Ubuntu.Components 1.3
+      */
+    readonly property color porcelain: "#f7f7f7"
+
+    /*!
+      Ash. Recommended for subtitles and other tertiary content.
+      \since Ubuntu.Components 1.3
+      */
+    readonly property color ash: "#888888"
+
+    /*!
+      Graphite. Recommended for coloring dark themes' background.
+      \since Ubuntu.Components 1.3
+      */
+    readonly property color graphite: "#666666"
+
+    /*!
+      Inkstone. Recommended for foreground colors in dark themes.
+      \since Ubuntu.Components 1.3
+      */
+    readonly property color inkstone: "#3b3b3b"
+
+    /*!
+      Jet. Recommended for content coloring.
+      \since Ubuntu.Components 1.3
+      */
+    readonly property color jet: "#111111"
 }
 
=== removed file 'src/Ubuntu/Components/1.3/colorUtils.js'
--- src/Ubuntu/Components/1.3/colorUtils.js	2015-07-24 18:25:07 +0000
+++ src/Ubuntu/Components/1.3/colorUtils.js	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2013-2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*!
-  \internal
-  \qmltype colorUtils
-  \inqmlmodule Ubuntu.Components 1.3
-  \ingroup ubuntu
-  \brief Various chromatic utility functions.
- */
-
-.pragma library
-
-/*!
-  \qmlmethod colorUtils::luminance(hexcolor)
-  Get the luminance for a color.
- */
-function luminance(hexcolor){
-    hexcolor = String(hexcolor)
-    var r = parseInt(hexcolor.substr(1,2),16);
-    var g = parseInt(hexcolor.substr(3,2),16);
-    var b = parseInt(hexcolor.substr(5,2),16);
-    return ((r*212)+(g*715)+(b*73))/1000/255;
-}
 
=== removed file 'src/Ubuntu/Components/1.3/tree.js'
--- src/Ubuntu/Components/1.3/tree.js	2015-07-17 16:27:55 +0000
+++ src/Ubuntu/Components/1.3/tree.js	1970-01-01 00:00:00 +0000
@@ -1,182 +0,0 @@
-/*
- * Copyright 2015 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-.pragma library
-
-function Tree() {
-    // list<object> of nodes
-    var nodes = [];
-
-    // list<int> of stems
-    var stems = [];
-
-    // list<int> of indices of parent nodes
-    var parents = [];
-
-    // int number of nodes in the tree
-    var size = 0;
-
-    // Return the index of the given node.
-    // Returns -1 the node was not found.
-    this.index = function(node) {
-        return nodes.indexOf(node);
-    }
-
-    // Add newNode to the tree in the specified stem, with the specified parent node.
-    // The root node should be added with parentNode null. All other nodes must be added
-    // with a parentNode that is already in the tree.
-    this.add = function(stem, parentNode, newNode) {
-        if (this.index(newNode) !== -1) {
-            throw "Cannot add the same node twice to a tree.";
-        }
-        if (size === 0) {
-            // adding root node
-            if (parentNode !== null) {
-                throw "Root node must have parentNode null.";
-            }
-        } else {
-            // adding non-root node
-            if (parentNode === null) {
-                throw "Only root node has parentNode null."
-            }
-            if (this.index(parentNode) === -1) {
-                throw "Cannot add non-root node if parentNode is not in the tree.";
-            }
-        }
-        nodes.push(newNode);
-        stems.push(stem);
-        parents.push(parentNode);
-        size++;
-    }
-
-    // Remove all nodes from the specified stem and higher stems.
-    //
-    // Returns the removed nodes.
-    this.prune = function(stem) {
-        var newNodes = [];
-        var newStems = [];
-        var newParents = [];
-        var removedNodes = [];
-        for (var i = 0; i < nodes.length; i++) {
-            if (stems[i] < stem) {
-                newNodes.push(nodes[i]);
-                newStems.push(stems[i]);
-                newParents.push(parents[i]);
-            } else {
-                removedNodes.push(nodes[i]);
-            }
-        }
-        nodes = newNodes;
-        stems = newStems;
-        parents = newParents;
-        size = nodes.length;
-        return removedNodes;
-    }
-
-    // Chops all nodes with an index higher than the given node which
-    //  are in the same stem or a higher stem.
-    //
-    // If, and only if, (inclusive) then also chop the given node.
-    //
-    // Default values for node and inclusive are top() and true.
-    // Returns a list that contains the nodes that were chopped.
-    this.chop = function(node, inclusive) {
-        node = typeof node !== 'undefined' ? node : this.top();
-        inclusive = typeof inclusive !== 'undefined' ? inclusive : true
-        var nodeIndex = this.index(node);
-        if (nodeIndex < 0) {
-            // given node is not in the tree.
-            return [];
-        }
-        if (inclusive) {
-            size = nodeIndex;
-        } else {
-            size = nodeIndex + 1;
-        }
-
-        // Nodes with index(node) >= nodeIndex && stem >= stems[nodeIndex];
-        var badNodes = []; // to fill below
-
-        // Nodes with index(node) >= nodeIndex (any stem).
-        // Potential bad nodes to be removed.
-        var uglyNodes = nodes.slice(size);
-        var uglyStems = stems.slice(size); // to check below
-        var uglyParents = parents.slice(size);
-
-        var stem = stems[nodeIndex];
-        // Good nodes, with index(node) < nodeIndex && stem < stems[nodeIndex]:
-        nodes = nodes.slice(0, size);
-        stems = stems.slice(0, size);
-        parents = parents.slice(0, size);
-
-        // Add nodes with index(node) > nodeIndex && stem < stems[nodeIndex] back:
-        for (var i = 0; i < uglyNodes.length; i++) {
-            if (uglyStems[i] < stem) {
-                // Because the stem of the parentNode <= stem of the node,
-                //  the node that is added back has the parentNode in nodes.
-                nodes.push(uglyNodes[i]);
-                stems.push(uglyStems[i]);
-                parents.push(uglyParents[i]);
-                size++;
-            } else {
-                badNodes.push(uglyNodes[i]);
-            }
-        }
-        return badNodes;
-    }
-
-    // Returns the n'th node when traversing one or more stems from the
-    //  top down. When exactMatch, only the specified stem is traversed, and
-    //  when !exactMatch the specified stem and all higher stems are traversed.
-    //
-    // Returns null if no matching node was found.
-    //
-    // Default value for stem: 0
-    // Default value for exactMatch: false
-    // Default value for n: 0 (first node)
-    //
-    // Calling top() with no parameters returns top(0, false, 0) which is the
-    //  last node that was added to the tree.
-    this.top = function(stem, exactMatch, n) {
-        stem = typeof stem !== 'undefined' ? stem : 0
-        exactMatch = typeof exactMatch !== 'undefined' ? exactMatch : false
-        n = typeof n !== 'undefined' ? n : 0
-
-        var st;
-        var count = n;
-        for (var i = size - 1; i >= 0; i--) {
-            st = stems[i];
-            if ((exactMatch && st === stem) || (!exactMatch && st >= stem)) {
-                count--;
-            }
-            if (count < 0) {
-                return nodes[i];
-            }
-        }
-        return null;
-    }
-
-    // Return the parent node of the specified node in the tree
-    this.parent = function(node) {
-        var i = nodes.indexOf(node);
-        if (i === -1) {
-            throw "Specified node not found in tree.";
-        } else if (i === 0) {
-            throw "Root node has no parent node.";
-        }
-        return parents[i];
-    }
-}
 
=== modified file 'src/Ubuntu/Components/ComponentModule.pro'
--- src/Ubuntu/Components/ComponentModule.pro	2015-12-17 13:48:23 +0000
+++ src/Ubuntu/Components/ComponentModule.pro	2016-03-08 06:42:31 +0000
@@ -31,7 +31,6 @@
              1.2/AppHeader.qml \
              1.2/Captions.qml \
              1.2/CheckBox.qml \
-             1.2/colorUtils.js \
              1.2/ComboButton.qml \
              1.2/CrossFadeImage10.qml \
              1.2/CrossFadeImage11.qml \
@@ -92,7 +91,6 @@
              1.3/dateUtils.js \
              1.3/DraggingArea.qml \
              1.3/InputHandler.qml \
-             1.3/MainViewBase.qml \
              1.3/MainView.qml \
              1.3/OptionSelectorDelegate.qml \
              1.3/OptionSelector.qml \
@@ -103,8 +101,6 @@
              1.3/Page.qml \
              1.3/PageStack.qml \
              1.3/pageUtils.js \
-             1.3/PageWrapper.qml \
-             1.3/PageWrapperUtils.js \
              1.3/Panel.qml \
              1.3/ProgressBar.qml \
              1.3/PullToRefresh.qml \
@@ -122,7 +118,6 @@
              1.3/Toolbar.qml \
              1.3/ToolbarButton.qml \
              1.3/ToolbarItems.qml \
-             1.3/tree.js \
              1.3/UbuntuColors.qml \
              1.3/UbuntuListView.qml \
              1.3/UbuntuNumberAnimation.qml \
@@ -131,7 +126,8 @@
              1.3/PageColumnsLayout.qml \
              1.3/ProgressionSlot.qml \
              1.3/ScrollView.qml \
-             1.3/PageHeader.qml
+             1.3/PageHeader.qml \
+             1.3/Icon.qml
 
 OTHER_FILES+= qmldir \
              1.3/CrossFadeImage.qdoc \
 
=== modified file 'src/Ubuntu/Components/ListItems/1.2/ItemSelector.qml'
--- src/Ubuntu/Components/ListItems/1.2/ItemSelector.qml	2015-04-30 08:32:44 +0000
+++ src/Ubuntu/Components/ListItems/1.2/ItemSelector.qml	2016-03-08 06:42:31 +0000
@@ -70,7 +70,7 @@
 
             Component {
                 id: selectorDelegate
-                Toolkit.OptionSelectorDelegate { text: name; subText: description; iconSource: image }
+                OptionSelectorDelegate { text: name; subText: description; iconSource: image }
             }
 
             ListModel {
 
=== modified file 'src/Ubuntu/Components/ListItems/1.3/Empty.qml'
--- src/Ubuntu/Components/ListItems/1.3/Empty.qml	2015-09-21 14:44:13 +0000
+++ src/Ubuntu/Components/ListItems/1.3/Empty.qml	2016-03-08 06:42:31 +0000
@@ -277,6 +277,8 @@
         }
     }
 
+    // exposed for OptionSelector
+    property alias __highlight: highlight
     Rectangle {
         id: highlight
 
@@ -291,7 +293,7 @@
             top: parent.top
         }
         height: emptyListItem.height - bottomDividerLine.height
-        color: theme.palette.selected.background
+        color: theme.palette.highlighted.background
     }
 
     ThinDivider {
 
=== modified file 'src/Ubuntu/Components/ListItems/1.3/ItemSelector.qml'
--- src/Ubuntu/Components/ListItems/1.3/ItemSelector.qml	2015-09-28 14:36:54 +0000
+++ src/Ubuntu/Components/ListItems/1.3/ItemSelector.qml	2016-03-08 06:42:31 +0000
@@ -70,7 +70,7 @@
 
             Component {
                 id: selectorDelegate
-                Toolkit.OptionSelectorDelegate { text: name; subText: description; iconSource: image }
+                OptionSelectorDelegate { text: name; subText: description; iconSource: image }
             }
 
             ListModel {
 
=== modified file 'src/Ubuntu/Components/ListItems/1.3/LabelVisual.qml'
--- src/Ubuntu/Components/ListItems/1.3/LabelVisual.qml	2015-09-07 10:05:58 +0000
+++ src/Ubuntu/Components/ListItems/1.3/LabelVisual.qml	2016-03-08 06:42:31 +0000
@@ -31,7 +31,14 @@
     }
 
     elide: Text.ElideRight
-    color: selected ? UbuntuColors.orange : secondary ? overlay ? theme.palette.normal.overlayText : theme.palette.normal.backgroundText
-                                                      : overlay ? theme.palette.selected.overlayText : theme.palette.selected.backgroundText
+    color: selected
+           ? theme.palette.selected.backgroundText
+           : (secondary
+              ? (overlay
+                 ? theme.palette.normal.overlaySecondaryText
+                 : theme.palette.normal.backgroundSecondaryText)
+              : (overlay
+                 ? theme.palette.normal.overlayText
+                 : theme.palette.normal.backgroundText))
     opacity: label.enabled ? 1.0 : 0.5
 }
 
=== modified file 'src/Ubuntu/Components/ListItems/1.3/Standard.qml'
--- src/Ubuntu/Components/ListItems/1.3/Standard.qml	2015-12-21 19:43:34 +0000
+++ src/Ubuntu/Components/ListItems/1.3/Standard.qml	2016-03-08 06:42:31 +0000
@@ -172,7 +172,7 @@
             bottom: parent.bottom
             left: parent.left
         }
-        color: theme.palette.selected.background
+        color: theme.palette.highlighted.background
     }
 
     Rectangle {
@@ -185,7 +185,7 @@
             bottom: parent.bottom
             right: parent.right
         }
-        color: theme.palette.selected.background
+        color: theme.palette.highlighted.background
     }
 
     IconVisual {
 
=== modified file 'src/Ubuntu/Components/Popups/1.3/Dialog.qml'
--- src/Ubuntu/Components/Popups/1.3/Dialog.qml	2015-12-14 08:27:39 +0000
+++ src/Ubuntu/Components/Popups/1.3/Dialog.qml	2016-03-08 06:42:31 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * Copyright 2016 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -99,7 +99,7 @@
       the caller, if possible.
      */
     property Item caller
-    onCallerChanged: console.debug("caller DEPRECATED")
+    onCallerChanged: console.warn("'caller' is DEPRECATED. It has no effect.")
 
     /*!
       The property holds the margins from the dialog's dismissArea. The property
@@ -180,6 +180,13 @@
                 height: childrenRect.height + foreground.margins
                 onWidthChanged: updateChildrenWidths();
 
+                // put the context into this component to save ActionContext lookup
+                PopupContext {
+                    id: localContext
+                    objectName: dialog.objectName + "DialogContext"
+                    active: foreground.visible
+                }
+
                 Label {
                     horizontalAlignment: Text.AlignHCenter
                     text: dialog.title
@@ -187,14 +194,14 @@
                     maximumLineCount: 2
                     elide: Text.ElideRight
                     textSize: Label.Large
-                    color: UbuntuColors.darkGrey
+                    color: theme.palette.normal.overlayText
                     visible: (text !== "")
                 }
 
                 Label {
                     horizontalAlignment: Text.AlignHCenter
                     text: dialog.text
-                    color: UbuntuColors.darkGrey
+                    color: theme.palette.normal.overlayText
                     wrapMode: Text.Wrap
                     visible: (text !== "")
                 }
 
=== modified file 'src/Ubuntu/Components/Popups/1.3/Popover.qml'
--- src/Ubuntu/Components/Popups/1.3/Popover.qml	2015-12-09 12:34:18 +0000
+++ src/Ubuntu/Components/Popups/1.3/Popover.qml	2016-03-08 06:42:31 +0000
@@ -227,6 +227,14 @@
                 right: parent.right
             }
             height: childrenRect.height
+
+            // put the PopupContext inside the container to save one step
+            // in the context lookup
+            PopupContext {
+                id: popupContext
+                objectName: popover.objectName + "PopupContext"
+                active: foreground.visible
+            }
         }
 
         onWidthChanged: internal.updatePosition()
 
=== modified file 'src/Ubuntu/Components/Themes/1.3/Palette.qml'
--- src/Ubuntu/Components/Themes/1.3/Palette.qml	2015-04-24 14:34:39 +0000
+++ src/Ubuntu/Components/Themes/1.3/Palette.qml	2016-03-08 06:42:31 +0000
@@ -48,12 +48,32 @@
 */
 QtObject {
     /*!
-       Color palette to use when the widget is not in any particular state.
+       Color palette to use when the widget is in the default state.
     */
     property PaletteValues normal: PaletteValues{}
+
+    /*!
+      Color palette to use when the widget is in the disabled (enabled: false)
+      state.
+      \since Ubuntu.Components.Themes 1.3
+    */
+    property PaletteValues disabled: PaletteValues{}
+
     /*!
        Color palette to use when the widget is selected, for example when
        a tab is the current one.
     */
     property PaletteValues selected: PaletteValues{}
+
+    /*!
+       Color palette to use when the widget is selected and disabled.
+      \since Ubuntu.Components.Themes 1.3
+    */
+    property PaletteValues selectedDisabled: PaletteValues{}
+
+    /*!
+      Color palette values to use when the widget is highlighted.
+      \since Ubuntu.Components.Themes 1.3
+      */
+    property PaletteValues highlighted: PaletteValues{}
 }
 
=== modified file 'src/Ubuntu/Components/Themes/1.3/PaletteValues.qml'
--- src/Ubuntu/Components/Themes/1.3/PaletteValues.qml	2015-04-24 14:34:39 +0000
+++ src/Ubuntu/Components/Themes/1.3/PaletteValues.qml	2016-03-08 06:42:31 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2016 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -33,6 +33,17 @@
     */
     property color backgroundText
     /*!
+       Color applied to secondary content on the \l background color.
+       \since Ubuntu.Components.Themes 1.3
+    */
+    property color backgroundSecondaryText
+    /*!
+       Color applied to tertiary content on the \l background color.
+       \since Ubuntu.Components.Themes 1.3
+    */
+    property color backgroundTertiaryText
+
+    /*!
        Color applied to the background of widgets.
     */
     property color base
@@ -41,6 +52,7 @@
        Typically used for labels and images.
     */
     property color baseText
+
     /*!
        Color applied to widgets on top of the base colour.
     */
@@ -50,9 +62,26 @@
        Typically used for labels and images.
     */
     property color foregroundText
+
+    /*!
+       Color applied to widgets on top of any layer, background or base.
+       \since Ubuntu.Components.Themes 1.3
+    */
+    property color raised
+    /*!
+       Color applied to elements placed on top of the \l raised color.
+       \since Ubuntu.Components.Themes 1.3
+    */
+    property color raisedText
+    /*!
+       Color applied to seconday elements placed on top of the \l raised color.
+       \since Ubuntu.Components.Themes 1.3
+    */
+    property color raisedSecondaryText
+
     /*!
        Color applied to the background of widgets floating over other widgets.
-       For example: popovers, Toolbar.
+       For example popovers, menus, dialogs.
     */
     property color overlay
     /*!
@@ -61,7 +90,13 @@
     */
     property color overlayText
     /*!
-       Colour applied to the backgrouhnd of text input fields.
+       Color applied to secondary elements placed on top of the \l overlay color.
+       \since Ubuntu.Components.Themes 1.3
+    */
+    property color overlaySecondaryText
+
+    /*!
+       Colour applied to the background of text input fields.
     */
     property color field
     /*!
@@ -69,8 +104,59 @@
        Typically used for labels and images.
     */
     property color fieldText
+
+    /*!
+       Colour applied to the positive actions.
+       \since Ubuntu.Components.Themes 1.3
+    */
+    property color positive
+    /*!
+       Color applied to elements placed on top of the \l positive color.
+       \since Ubuntu.Components.Themes 1.3
+    */
+    property color positiveText
+
+    /*!
+       Colour applied to the negative actions.
+       \since Ubuntu.Components.Themes 1.3
+    */
+    property color negative
+    /*!
+       Color applied to elements placed on top of the \l negative color.
+       \since Ubuntu.Components.Themes 1.3
+    */
+    property color negativeText
+
+    /*!
+       Colour applied to the activity colors. Typical example is progress indication,
+       activity indication.
+       \since Ubuntu.Components.Themes 1.3
+    */
+    property color activity
+    /*!
+       Color applied to elements placed on top of the \l activity color.
+       \since Ubuntu.Components.Themes 1.3
+    */
+    property color activityText
+
     /*!
        Color applied to selected text in editable components.
     */
     property color selection
+    /*!
+       Color applied to elements placed on top of the \l selection color.
+       \since Ubuntu.Components.Themes 1.3
+    */
+    property color selectionText
+
+    /*!
+      Color applied for the focus frame drawn around the active focus component
+      if it was focused using keyboard navigation.
+      */
+    property color focus
+
+    /*!
+      Color applied to elements placed on top of the \l focus color.
+      */
+    property color focusText
 }
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.2/MainViewStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.2/MainViewStyle.qml	2015-04-24 14:52:19 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.2/MainViewStyle.qml	2016-03-08 06:42:31 +0000
@@ -40,6 +40,13 @@
         anchors.fill: parent
         color: styledItem.backgroundColor
         gradient: internals.isGradient ? backgroundGradient : null
+        visible: internals.isGradient
+    }
+
+    Binding {
+        target: typeof window != 'undefined' ? window : null
+        property: "color"
+        value: styledItem.backgroundColor
     }
 
     Image {
 
=== added file 'src/Ubuntu/Components/Themes/Ambiance/1.3/AmbianceNormal.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/AmbianceNormal.qml	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/AmbianceNormal.qml	2016-03-08 06:42:31 +0000
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Themes 1.3
+
+PaletteValues {
+    background: "#FFFFFF"
+    backgroundText: UbuntuColors.jet
+    backgroundSecondaryText: UbuntuColors.slate
+    backgroundTertiaryText: UbuntuColors.ash
+    base: UbuntuColors.silk
+    baseText: UbuntuColors.ash
+    foreground: UbuntuColors.porcelain
+    foregroundText: UbuntuColors.jet
+    raised: "#FFFFFF"
+    raisedText: UbuntuColors.slate
+    raisedSecondaryText: UbuntuColors.silk
+    overlay: "#FFFFFF"
+    overlayText: UbuntuColors.slate
+    overlaySecondaryText: UbuntuColors.silk
+    field: "#FFFFFF"
+    fieldText: UbuntuColors.jet
+    focus: UbuntuColors.orange
+    focusText: "#FFFFFF"
+    selection: Qt.rgba(UbuntuColors.blue.r, UbuntuColors.blue.g, UbuntuColors.blue.b, 0.2)
+    selectionText: UbuntuColors.jet
+    positive: UbuntuColors.green
+    positiveText: "#FFFFFF"
+    negative: UbuntuColors.red
+    negativeText: "#FFFFFF"
+    activity: UbuntuColors.blue
+    activityText: "#FFFFFF"
+}
+
 
=== added file 'src/Ubuntu/Components/Themes/Ambiance/1.3/AmbianceSelected.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/AmbianceSelected.qml	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/AmbianceSelected.qml	2016-03-08 06:42:31 +0000
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+AmbianceNormal {
+    background: UbuntuColors.porcelain
+    backgroundText: UbuntuColors.blue
+    backgroundTertiaryText: UbuntuColors.blue
+    base: UbuntuColors.ash
+    baseText: UbuntuColors.blue
+    foreground: UbuntuColors.ash
+}
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeHintStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeHintStyle.qml	2015-11-06 06:29:11 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeHintStyle.qml	2016-03-08 06:42:31 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * Copyright 2016 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -25,6 +25,14 @@
 
     readonly property BottomEdgeHint hint: styledItem
 
+    property color backgroundColor: styledItem.enabled
+                                    ? theme.palette.normal.overlay
+                                    : theme.palette.disabled.overlay
+
+    property color foregroundColor: styledItem.enabled
+                                    ? theme.palette.normal.overlayText
+                                    : theme.palette.disabled.overlayText
+
     // translate hint status into state
     state: {
         switch (hint.status) {
@@ -102,7 +110,8 @@
             centerIn: parent
             topMargin: styledItem.height
         }
-        name: "up"
+        name: "toolkit_bottom-edge-hint"
+        color: foregroundColor
     }
 
     Rectangle {
@@ -114,7 +123,7 @@
             topMargin: styledItem.height
         }
         height: styledItem.height
-        color: theme.palette.normal.overlay
+        color: backgroundColor
         ThinDivider {
             anchors.top: parent.top
         }
@@ -133,13 +142,13 @@
                 width: height
                 height: units.gu(2)
                 anchors.verticalCenter: parent.verticalCenter
-                color: theme.palette.normal.overlayText
+                color: foregroundColor
             }
             Label {
                 id: label
                 text: styledItem.text
                 textSize: Label.Medium
-                color: theme.palette.normal.overlayText
+                color: foregroundColor
                 height: styledItem.height
                 anchors.verticalCenter: parent.verticalCenter
                 verticalAlignment: Text.AlignVCenter
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeStyle.qml	2015-12-10 16:39:45 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeStyle.qml	2016-03-08 06:42:31 +0000
@@ -27,7 +27,9 @@
     revealThreshold: bottomEdge.hint.height + units.gu(2)
 
     // own styling properties
-    property color backgroundColor: Qt.rgba(0, 0, 0, Math.min(0.25, (height - revealThreshold - panelItem.y) / (height - revealThreshold)))
+    property color backgroundColor: !panelItem.collapsing
+                                    ? Qt.rgba(0, 0, 0, Math.min(0.25, (height - revealThreshold - panelItem.y) / (height - revealThreshold)))
+                                    : "transparent"
     property color panelColor: theme.palette.normal.overlay
     property color shadowColor: "#000000"
 
@@ -43,6 +45,7 @@
     Rectangle {
         id: panelItem
         objectName: "bottomedge_panel"
+        property bool collapsing: false
         anchors {
             left: parent.left
             right: parent.right
@@ -57,6 +60,12 @@
 
         Behavior on anchors.topMargin { UbuntuNumberAnimation { id: panelBehavior } }
 
+        Connections {
+            target: bottomEdge
+            onCollapseStarted: panelItem.collapsing = true
+            onCollapseCompleted: panelItem.collapsing = false
+        }
+
         state: bottomEdge.status > BottomEdge.Hidden ? "drop-hint" : ""
         states: [
             State {
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/BubbleShape.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/BubbleShape.qml	2015-07-22 13:14:43 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/BubbleShape.qml	2016-03-08 06:42:31 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * Copyright 2016 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -28,15 +28,14 @@
     /*!
       The background color of the bubble.
      */
-    property color color: square ? theme.palette.normal.background : theme.palette.normal.overlay
+    property color color: square
+                            ? theme.palette.normal.background
+                            : theme.palette.normal.overlay
 
     property point target
     property string direction: "down"
     property bool clipContent: false
     default property alias children: content.children
-    // FIXME: This should not be necessary. See
-    // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1214978
-    property alias arrowSource: arrow.source
 
     implicitWidth: units.gu(10)
     implicitHeight: units.gu(8)
@@ -111,7 +110,7 @@
     UbuntuShape {
         anchors.fill: parent
         aspect: UbuntuShape.Flat
-        backgroundColor: theme.palette.normal.overlay
+        backgroundColor: bubbleShape.color
         source: bubbleShape.clipContent ? shapeSource : null
         visible: !square
     }
@@ -139,34 +138,4 @@
             visible: bubbleShape.clipContent
         }
     }
-
-    Item {
-        x: target.x
-        y: target.y
-
-        Image {
-            id: arrow
-
-            visible: !square && bubbleShape.direction != "none"
-
-            function directionToRotation(direction) {
-                switch (direction) {
-                case "up":
-                    return 180;
-                case "left":
-                    return 90;
-                case "right":
-                    return -90;
-                default: // "down" or "none"
-                    return 0;
-                }
-            }
-
-            x: -width / 2.0
-            y: -height
-            transformOrigin: Item.Bottom
-            rotation: directionToRotation(bubbleShape.direction)
-            source: Qt.resolvedUrl("../artwork/bubble_arrow.png")
-        }
-    }
 }
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/CheckBoxStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/CheckBoxStyle.qml	2015-12-09 14:45:54 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/CheckBoxStyle.qml	2016-03-08 06:42:31 +0000
@@ -23,19 +23,21 @@
     /*!
       The padding between the background shape and the outside border of the checkbox.
      */
-    property real backgroundPadding: units.gu(0.33)
+    property real backgroundPadding: 0
 
     /*!
       The background color when the checkbox is not checked.
      */
-    property color uncheckedBackgroundColor: Qt.rgba(theme.palette.normal.foreground.r,
-                                                     theme.palette.normal.foreground.g,
-                                                     theme.palette.normal.foreground.b, 0.2)
+    property color uncheckedBackgroundColor: styledItem.enabled
+                                                ? theme.palette.normal.foreground
+                                                : theme.palette.disabled.foreground
 
     /*!
       The background color when the checkbox is checked.
      */
-    property color checkedBackgroundColor: UbuntuColors.green
+    property color checkedBackgroundColor: styledItem.enabled
+                                            ? theme.palette.normal.positive
+                                            : theme.palette.disabled.raised
 
     /*!
       The image to show inside the checkbox when it is checked.
@@ -45,17 +47,17 @@
     /*!
       The color of the icon.
      */
-    property color iconColor: theme.palette.normal.foregroundText
+    property color iconColor: styledItem.enabled
+                                ? theme.palette.normal.positiveText
+                                : theme.palette.disabled.raisedText
 
     /*!
       The padding between the icon and the border of the thumb.
      */
-    property real iconPadding: backgroundPadding
-
-    opacity: enabled ? 1.0 : 0.5
-
-    implicitWidth: units.gu(3)
-    implicitHeight: units.gu(3)
+    property real iconPadding: units.gu(0.4)
+
+    implicitWidth: units.gu(2)
+    implicitHeight: units.gu(2)
 
     FocusShape {
     }
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/ComboButtonStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/ComboButtonStyle.qml	2015-12-09 14:25:50 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/ComboButtonStyle.qml	2016-03-08 06:42:31 +0000
@@ -23,20 +23,16 @@
 
     // configurations
     dropDownWidth: units.gu(5)
-    dropDownSeparatorWidth: units.dp(2)
     comboListMargin: units.gu(0.8)
     comboListHolder: comboListContent
     comboListPanel: panelItem
     defaultColor: mainButton.defaultColor
     defaultGradient: mainButton.defaultGradient
-    defaultDropdownColor: combo.expanded ? Qt.rgba(0, 0, 0, 0.05) : defaultColor
+    defaultDropdownColor: mainButton.defaultColor
     defaultFont: mainButton.defaultFont
 
-
-    width: combo.width
-    height: combo.collapsedHeight
-
-    property ComboButton combo: styledItem
+    width: styledItem.width
+    height: styledItem.collapsedHeight
 
     implicitWidth: mainButton.implicitWidth
     implicitHeight: mainButton.implicitHeight
@@ -44,25 +40,159 @@
     LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft
     LayoutMirroring.childrenInherit: true
 
-    ButtonStyle {
+    Item {
         id: mainButton
+
+        property real minimumWidth: units.gu(36)
+        property real horizontalPadding: units.gu(4)
+        property color defaultColor: theme.palette.normal.foreground
+        property font defaultFont: Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")})
+        property Gradient defaultGradient: null
+        property real buttonFaceOffset: -dropDownWidth/2
+        property bool stroke: false
+
+        /*!
+          The property overrides the button's default background with an item. This
+          item can be used by derived styles to reuse the ButtonStyle and override
+          the default coloured background with an image or any other drawing.
+          The default value is null.
+        */
+        property Item backgroundSource: comboFace
+
         anchors {
             left: parent.left
             top: parent.top
             right: parent.right
         }
-        height: combo.collapsedHeight
-        // overrides
-        backgroundSource: comboFace
-        buttonFaceOffset: -dropDownWidth/2 - dropDownSeparatorWidth
-        horizontalPadding: units.gu(4) - dropDownSeparatorWidth
-        minimumWidth: units.gu(36)
-
-        // FIXME: use hardcoded color while we get the theme palette updated
-        defaultColor: "#b2b2b2"
-        defaultGradient: null
-
-        // button face
+        width: styledItem.width
+        height: styledItem.collapsedHeight
+        implicitWidth: Math.max(
+            minimumWidth, foreground.implicitWidth + 2 * mainButton.horizontalPadding
+        )
+        implicitHeight: units.gu(4)
+
+        LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft
+        LayoutMirroring.childrenInherit: true
+
+        UbuntuShape {
+            id: background
+            anchors.fill: parent
+            borderSource: "radius_idle.sci"  // Deprecated, use a dedicated shape.
+            visible: mainButton.stroke ? false : ((backgroundColor.a != 0.0) || mainButton.backgroundSource)
+            source: mainButton.backgroundSource
+
+            backgroundColor: defaultColor
+            backgroundMode: UbuntuShape.SolidColor
+            opacity: styledItem.enabled ? 1.0 : 0.6
+        }
+
+        Item {
+            id: foreground
+
+            property string iconPosition: styledItem.iconPosition
+            property real iconSize: units.gu(2)
+            property real spacing: mainButton.horizontalPadding
+            property bool hasIcon: styledItem.iconSource != ""
+            property bool hasText: styledItem.text != ""
+
+            anchors {
+                centerIn: parent
+                horizontalCenterOffset: mainButton.buttonFaceOffset
+            }
+            transformOrigin: Item.Top
+            width: parent.width - 2*mainButton.horizontalPadding
+            implicitHeight: Math.max(foregroundIcon.height, foregroundLabel.height)
+            scale: styledItem.pressed ? 0.98 : 1.0
+            Behavior on scale {
+                NumberAnimation {
+                    duration: UbuntuAnimation.SnapDuration
+                    easing.type: Easing.Linear
+                }
+            }
+            state: foreground.hasIcon && hasText ? iconPosition : "center"
+
+            Icon {
+                id: foregroundIcon
+                visible: foreground.hasIcon
+                anchors.verticalCenter: parent.verticalCenter
+                width: foreground.iconSize
+                height: foreground.iconSize
+                color: foregroundLabel.color
+                source: styledItem.iconSource
+            }
+
+            Label {
+                id: foregroundLabel